rclversion.h must not include xapian.h. Replace with Rcl::version_string()

This commit is contained in:
dockes
2009-10-17 06:38:04 +00:00
parent f61590c31d
commit a27ddc32c4
6 changed files with 20 additions and 10 deletions
+2 -2
View File
@@ -51,7 +51,6 @@ static char rcsid[] = "@(#$Id: main.cpp,v 1.73 2008-12-17 08:01:40 dockes Exp $
#include "rclinit.h"
#include "debuglog.h"
#ifdef WITH_KDE
#include "rclversion.h"
#endif
#include "rclmain_w.h"
#include "ssearch_w.h"
@@ -192,7 +191,8 @@ int main(int argc, char **argv)
}
#ifdef WITH_KDE
KAboutData about("recoll", I18N_NOOP("Recoll"), rclversion, description,
KAboutData about("recoll", I18N_NOOP("Recoll"), Rcl::version_string(),
description,
KAboutData::License_GPL, "(C) 2006 Jean-Francois Dockes", 0, 0, "jean-francois.dockes@wanadoo.fr");
about.addAuthor( "Jean-Francois Dockes", 0,
"jean-francois.dockes@wanadoo.fr" );
+3 -3
View File
@@ -70,7 +70,6 @@ using std::pair;
#include "pathut.h"
#include "smallut.h"
#include "advsearch_w.h"
#include "rclversion.h"
#include "sortseq.h"
#include "uiprefs_w.h"
#include "guiutils.h"
@@ -627,8 +626,9 @@ void RclMain::showExtIdxDialog()
void RclMain::showAboutDialog()
{
string vstring = string("Recoll ") + rclversion +
"<br>" + "http://www.recoll.org";
string vstring = Rcl::version_string() +
string("<br> http://www.recoll.org") +
string("<br> http://www.xapian.org");
QMessageBox::information(this, tr("About Recoll"), vstring.c_str());
}
void RclMain::showMissingHelpers()