tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get things to compile with QT_NO_STL

Browse Source
This commit is contained in:
dockes 2006-04-04 07:55:30 +00:00
parent d014d5cfef
commit dbd3f570ba
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qtgui/main.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.38 2006-03-29 17:31:55 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: main.cpp,v 1.39 2006-04-04 07:55:29 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -157,7 +157,7 @@ int main( int argc, char ** argv )
rclconfig = recollinit(recollCleanup, sigcleanup, reason); rclconfig = recollinit(recollCleanup, sigcleanup, reason);
if (!rclconfig || !rclconfig->ok()) { if (!rclconfig || !rclconfig->ok()) {
QString msg = app.translate("Main", "Configuration problem: "); QString msg = app.translate("Main", "Configuration problem: ");
msg += reason; msg += QString::fromUtf8(reason.c_str());
QMessageBox::critical(0, "Recoll", msg); QMessageBox::critical(0, "Recoll", msg);
exit(1); exit(1);
} }
@ -219,13 +219,13 @@ int main( int argc, char ** argv )
information information
#endif #endif
(0, "Recoll", (0, "Recoll",
app.translate("Main", "Could not open database in ")+ app.translate("Main", "Could not open database in ") +
QString(dbdir) + QString::fromLocal8Bit(dbdir.c_str()) +
app.translate("Main", app.translate("Main",
".\n" ".\n"
"Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed."), "Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed."),
"Ok", "Ok",
"Cancel", 0, 0, 1 )) { "Cancel", 0, 0, 1 )) {
case 0: // Ok case 0: // Ok
break; break;
case 1: // Cancel case 1: // Cancel

2
src/qtgui/preview/preview.ui.h
View File

@ -439,7 +439,7 @@ bool Preview::loadFileInCurrentTab(string fn, size_t sz, const Rcl::Doc &idoc)
char csz[20]; char csz[20];
sprintf(csz, "%lu", (unsigned long)sz); sprintf(csz, "%lu", (unsigned long)sz);
QString msg = QString("Loading: %1 (size %2 bytes)") QString msg = QString("Loading: %1 (size %2 bytes)")
.arg(fn) .arg(QString::fromLocal8Bit(fn.c_str()))
.arg(csz); .arg(csz);
// Create progress dialog and aux objects // Create progress dialog and aux objects

4
src/qtgui/rclmain.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.17 2006-04-01 21:02:12 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.18 2006-04-04 07:55:29 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -480,7 +480,7 @@ void RclMain::showDocHistory()
DocSequence *docsource; DocSequence *docsource;
if (sortwidth > 0) { if (sortwidth > 0) {
DocSequenceHistory myseq(rcldb, m_history, tr("Document history")); DocSequenceHistory myseq(rcldb, m_history, string(tr("Document history").utf8()));
docsource = new DocSeqSorted(myseq, sortwidth, sortspecs, docsource = new DocSeqSorted(myseq, sortwidth, sortspecs,
string(tr("Document history (sorted)").utf8())); string(tr("Document history (sorted)").utf8()));
} else { } else {