Use std[::tr1]::shared_ptr instead of local RefCntr by default
This commit is contained in:
@@ -332,8 +332,8 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
|
||||
return false;
|
||||
}
|
||||
|
||||
RefCntr<Rcl::SearchData> sdata(sd);
|
||||
RefCntr<Rcl::Query>query(new Rcl::Query(m_rcldb));
|
||||
STD_SHARED_PTR<Rcl::SearchData> sdata(sd);
|
||||
STD_SHARED_PTR<Rcl::Query>query(new Rcl::Query(m_rcldb));
|
||||
query->setCollapseDuplicates(prefs.collapseDuplicates);
|
||||
if (!query->setQuery(sdata)) {
|
||||
m_reason = "Query execute failed. Invalid query or syntax error?";
|
||||
@@ -342,12 +342,12 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
|
||||
}
|
||||
|
||||
DocSequenceDb *src =
|
||||
new DocSequenceDb(RefCntr<Rcl::Query>(query), "Query results", sdata);
|
||||
new DocSequenceDb(STD_SHARED_PTR<Rcl::Query>(query), "Query results", sdata);
|
||||
if (src == 0) {
|
||||
error(KIO::ERR_SLAVE_DEFINED, "Can't build result sequence");
|
||||
return false;
|
||||
}
|
||||
m_source = RefCntr<DocSequence>(src);
|
||||
m_source = STD_SHARED_PTR<DocSequence>(src);
|
||||
// Reset pager in all cases. Costs nothing, stays at page -1 initially
|
||||
// htmldosearch will fetch the first page if needed.
|
||||
m_pager.setDocSource(m_source);
|
||||
|
||||
@@ -32,7 +32,7 @@ using std::string;
|
||||
#include "rcldb.h"
|
||||
#include "reslistpager.h"
|
||||
#include "docseq.h"
|
||||
#include "refcntr.h"
|
||||
#include MEMORY_INCLUDE
|
||||
|
||||
class RecollProtocol;
|
||||
|
||||
@@ -181,7 +181,7 @@ class RecollProtocol : public KIO::SlaveBase {
|
||||
// (one slave several konqueror windows) would be to have a small
|
||||
// cache of recent searches kept open.
|
||||
RecollKioPager m_pager;
|
||||
RefCntr<DocSequence> m_source;
|
||||
STD_SHARED_PTR<DocSequence> m_source;
|
||||
// Note: page here is not used, current page always comes from m_pager.
|
||||
QueryDesc m_query;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user