yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

1.22 compat (shared_ptr) for kde4 kio

Browse source
This commit is contained in:
Jean-Francois Dockes 2016-06-15 17:41:22 +02:00
parent 8a7fec1b97
commit 6c970d7d43
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kde/kioslave/kio_recoll-kde4/dirif.cpp
View file

@ -194,7 +194,7 @@ void RecollProtocol::stat(const KUrl & url)
} else if (ingest.isResult(&qd, &num)) { } else if (ingest.isResult(&qd, &num)) {
if (syncSearch(qd)) { if (syncSearch(qd)) {
Rcl::Doc doc; Rcl::Doc doc;
if (num >= 0 && !m_source.isNull() && if (num >= 0 && m_source &&
m_source->getDoc(num, doc)) { m_source->getDoc(num, doc)) {
entry = resultToUDSEntry(doc, num); entry = resultToUDSEntry(doc, num);
} else { } else {

2
src/kde/kioslave/kio_recoll-kde4/htmlif.cpp
View file

@ -254,7 +254,7 @@ void RecollProtocol::showPreview(const Rcl::Doc& idoc)
ptr.set_inputhtml(!fdoc.mimetype.compare("text/html")); ptr.set_inputhtml(!fdoc.mimetype.compare("text/html"));
list<string> otextlist; list<string> otextlist;
HighlightData hdata; HighlightData hdata;
if (!m_source.isNull()) if (m_source)
m_source->getTerms(hdata); m_source->getTerms(hdata);
ptr.plaintorich(fdoc.text, otextlist, hdata); ptr.plaintorich(fdoc.text, otextlist, hdata);

4
src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp
View file

@ -268,7 +268,7 @@ void RecollProtocol::get(const KUrl& url)
return; return;
} }
Rcl::Doc doc; Rcl::Doc doc;
if (resnum >= 0 && !m_source.isNull() && m_source->getDoc(resnum, doc)) { if (resnum >= 0 && m_source && m_source->getDoc(resnum, doc)) {
mimeType(doc.mimetype.c_str()); mimeType(doc.mimetype.c_str());
redirection(KUrl::fromLocalFile((const char *)(doc.url.c_str()+7))); redirection(KUrl::fromLocalFile((const char *)(doc.url.c_str()+7)));
goto out; goto out;
@ -278,7 +278,7 @@ void RecollProtocol::get(const KUrl& url)
return; return;
} }
Rcl::Doc doc; Rcl::Doc doc;
if (resnum >= 0 && !m_source.isNull() && m_source->getDoc(resnum, doc)) { if (resnum >= 0 && m_source && m_source->getDoc(resnum, doc)) {
showPreview(doc); showPreview(doc);
goto out; goto out;
} }