get the kio to build (and works on suse12.2) + compiler warnings

src/index/fetcher.cpp

@@ -28,7 +28,7 @@ DocFetcher *docFetcherMake(const Rcl::Doc& idoc)
 {
     if (idoc.url.empty()) {
         LOGERR(("docFetcherMakeg:: no url in doc!\n"));
-        return false;
+        return 0;
     }
     string backend;
     idoc.getmeta(Rcl::Doc::keybcknd, &backend);

src/kde/kioslave/kio_recoll/htmlif.cpp

@@ -43,6 +43,7 @@ using namespace std;
 #include "plaintorich.h"
 #include "internfile.h"
 #include "wipedir.h"
+#include "hldata.h"
 
 using namespace KIO;
 
@@ -260,9 +261,9 @@ void RecollProtocol::showPreview(const Rcl::Doc& idoc)
     PlainToRichKio ptr(fname);
     ptr.set_inputhtml(!fdoc.mimetype.compare("text/html"));
     list<string> otextlist;
-    HiliteData hdata;
+    HighlightData hdata;
     if (!m_source.isNull())
-	m_source->getTerms(hdata.terms, hdata.groups, hdata.gslks);
+	m_source->getTerms(hdata);
     ptr.plaintorich(fdoc.text, otextlist, hdata);
 
     QByteArray array;

src/kde/kioslave/kio_recoll/kio_recoll.cpp

@@ -323,11 +323,11 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
 						Rcl::SCLT_OR : Rcl::SCLT_AND, 
 						qs);
 	}
-	sd = new Rcl::SearchData(Rcl::SCLT_OR);
+	sd = new Rcl::SearchData(Rcl::SCLT_OR, "english");
 	if (sd && clp)
 	    sd->addClause(clp);
     } else {
-	sd = wasaStringToRcl(o_rclconfig, qs, m_reason);
+	sd = wasaStringToRcl(o_rclconfig, "english", qs, m_reason);
     }
     if (!sd) {
 	m_reason = "Internal Error: cant build search";
@@ -336,7 +336,6 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
     }
 
     RefCntr<Rcl::SearchData> sdata(sd);
-    sdata->setStemlang("english");
     RefCntr<Rcl::Query>query(new Rcl::Query(m_rcldb));
     query->setCollapseDuplicates(prefs.collapseDuplicates);
     if (!query->setQuery(sdata)) {

src/qtgui/guiutils.cpp

@@ -33,6 +33,7 @@
 
 RclDynConf *g_dynconf;
 AdvSearchHist *g_advshistory;
+RclConfig *theconfig;
 
 // The table should not be necessary, but I found no css way to get
 // qt 4.6 qtextedit to clear the margins after the float img without 

src/qtgui/main.cpp

@@ -49,7 +49,7 @@
 
 #include "recollq.h"
 
-RclConfig *theconfig;
+extern RclConfig *theconfig;
 RclConfig *thestableconfig;
 PTMutexInit thestableconfiglock;
 

src/query/dynconf.h

@@ -49,6 +49,7 @@
 /** Interface for a stored object. */
 class DynConfEntry {
  public:
+    virtual ~DynConfEntry() {}
     /** Decode object-as-string coming out from storage */
     virtual bool decode(const std::string &value) = 0;
     /** Encode object state into state for storing */
@@ -63,6 +64,7 @@ class RclSListEntry : public DynConfEntry {
     RclSListEntry() 
     {
     }
+    virtual ~RclSListEntry() {}
     RclSListEntry(const std::string& v) 
     : value(v) 
     {

src/rcldb/stemdb.h

@@ -66,6 +66,7 @@ public:
 	: m_stemmer(lang), m_lang(lang)
     {
     }
+    virtual ~SynTermTransStem() {}
     virtual std::string operator()(const std::string& in)
     {
 	string out = m_stemmer(in);

website/download.html

@@ -39,7 +39,7 @@
 	  <tbody>
 	    <tr>
 	      <td><a href="#source">Source</a></td>
-              <td><a href="#rpms">Rpm/deb packages</a></td>
+              <td><a href="#packages">Packages (.rpm and .deb)</a></td>
               <td><a href="BUGS.html">Known bugs</a></td>
 	      <td><a href="#ports">Mac ports</a></td>
 	      <td><a href="filters/filters.html">Filters</a> </td>
@@ -60,11 +60,16 @@
       <p>Recoll <a href="usermanual/rcl.install.html">
 	  Installation / building manual</a>.</p> 
 
-      <p>The indexing filters for some document types may need
+      <p>The indexing filters used for some document types may need
         external packages not installed on your system by default, and
         not installed automatically with Recoll: <a
 	href="features.html#doctypes"> take a look at the list</a> and
-	decide what you need to install.</p> 
+	decide what you need to
+	install. Also <a href="filters/filters.html">new or updated
+	filters</a> sometimes become available after a release. As a
+	rule, all filters are compatible with all Recoll
+	versions. Any compatibility problem will be explicitely
+	mentionned.</p>
 
       <p>The Recoll term explorer tool in phonetic mode (marginally
 	useful and optional) uses the <b>aspell</b> package, version
@@ -93,20 +98,6 @@
 	the <a href="CHANGES.html">changes file</a>), there is
 	probably no necessity to upgrade anyway.</p>
 
-      <h2><a name="filters">Updated filters</a></h2>
-
-      <p>New and updated filters are sometimes 
-	<a href="filters/filters.html">available</a> before the next
-	Recoll release. As far as I know, all current filters are
-	fully compatible with older Recoll releases (from 1.13), so
-	you can install new or updated filters on
-	older Recoll packages and gain new file type support without
-	destabilizing your search setup.</p>
-
-      <p>You may be interested by the new XML and TAR filters, and an
-      updated Open Office filter that appeared after the 1.17.3
-      release.</p>
-
       <h2><a name="source">Source</a></h2>
 
       <h3>Current release distribution: 1.17.3:</h3> 
@@ -165,15 +156,6 @@
 
       </ul>
 
-      <h3>KDE3 kicker applet:</h3>
-       <p>the applet can start a Recoll search
-        from the KDE3 toolbar. It is in a separate source file.
-	<a href="recoll_applet-1.10.0.tgz">recoll_applet-1.10.0.tgz</a>.
-	This is a very slightly modified version of the 
-	<a href="http://demandiseineseite.gmxhome.de/find/">
-	find_applet</a>. It will work with any recoll version after
-	1.10. <em>KDE 3 only</em>.</p>
-
       <h3>Source repository:</h3>
       <p>The <span class="application">Recoll</span> source repository is
         hosted on 
@@ -204,7 +186,7 @@
 	<a href="older/recoll-1.0.16.tar.gz">1.0.16</a>.
       </p>
 
-      <h2><a name="rpms">Packages</a></h2>
+      <h2><a name="packages">Packages</a></h2>
 
       <p>Packages or ports for Recoll are available in the standard
         repositories for many distributions.</p>
@@ -225,22 +207,21 @@
       <h3><a name="ubuntu">Ubuntu</a></h3>
 
         <p>There are Personal Package Archives on launchpad.net for 
-          <a href="http://www.launchpad.net/~xapian-backports/+archive/xapian-1.2">
-            Xapian</a>, 
           <a  href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">
             Recoll, kio-recoll and recoll-lens</a>. These were built from the
-          latest versions, for a set of Ubuntu series.</p>
+          latest versions, for a set of Ubuntu series. starting at
-
+          Lucid. The installation is very simple:
-        <p>Ubuntu 10.04 (lucid) and later versions just need the Recoll
+          <pre><tt>
-          PPA.</p> 
+          sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
-
+          sudo apt-get update
-        <p>I am not producing packages for older versions any more,
+          sudo apt-get install recoll
-        but some are still stored on Launchpad, and you'll find some
+          </tt></pre>
-        instructions to install them in
-        the <a href="download-1.14.html">older download page</a>.
-        </p>
 
 
+        <h3><a name="mint">Mint Linux</a></h3>
+        <p>The Ubuntu PPA works perfectly for Mint 13 (and probably
+          other releases too). Just follow the instructions for Ubuntu.</p>
+        
       <h3>RPMS</h3> 
 
        <p>Some Fedora and Mandriva packages unfortunately think that they

website/filters/filters.html

@@ -65,14 +65,10 @@
 	<a href="mimeview">mimeview</a> </p>
 
       <blockquote>
-        <p>There is a new rclepub filter for EPUB ebooks. It new for
+        <p>There is a new rclepub filter for EPUB ebooks. It is new for
           all recoll versions before 1.18.0.</p>
         <p>rclchm needs to be updated for all Recoll versions up
           to and including 1.17.1.</p>
-	<p>All filters are up to date in Recoll 1.16.2, except
-	  rclchm, and the new ones for gnumeric and Okular annotations.</p>
-        <p>Recoll 1.15 may benefit from some of the newer
-          filters linked below.</p>
         <p>If you are running an older Recoll version, you really
           should upgrade.</p>
       </blockquote>