get the kio to build (and works on suse12.2) + compiler warnings
This commit is contained in:
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user