get the kio to build (and works on suse12.2) + compiler warnings
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@
|
||||
|
||||
#include "recollq.h"
|
||||
|
||||
RclConfig *theconfig;
|
||||
extern RclConfig *theconfig;
|
||||
RclConfig *thestableconfig;
|
||||
PTMutexInit thestableconfiglock;
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user