got rid of the STD_SHARED_XX std/tr1 defines

This commit is contained in:
Jean-Francois Dockes
2016-07-13 15:12:25 +02:00
parent 0e0b660ebc
commit 0b0385e459
65 changed files with 219 additions and 257 deletions
@@ -332,8 +332,8 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
return false;
}
STD_SHARED_PTR<Rcl::SearchData> sdata(sd);
STD_SHARED_PTR<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(STD_SHARED_PTR<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 = STD_SHARED_PTR<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 MEMORY_INCLUDE
#include <memory>
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;
STD_SHARED_PTR<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;
};
+4 -4
View File
@@ -336,8 +336,8 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
return false;
}
STD_SHARED_PTR<Rcl::SearchData> sdata(sd);
STD_SHARED_PTR<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?";
@@ -346,12 +346,12 @@ bool RecollProtocol::doSearch(const QueryDesc& qd)
}
DocSequenceDb *src =
new DocSequenceDb(STD_SHARED_PTR<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, u8s2qs("Can't build result sequence"));
return false;
}
m_source = STD_SHARED_PTR<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);
+2 -2
View File
@@ -28,7 +28,7 @@
#include "rcldb.h"
#include "docseq.h"
#include "reslistpager.h"
#include MEMORY_INCLUDE
#include <memory>
class RecollProtocol;
@@ -191,7 +191,7 @@ private:
// (one slave several konqueror windows) would be to have a small
// cache of recent searches kept open.
RecollKioPager m_pager;
STD_SHARED_PTR<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;
};