tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

got rid of the STD_SHARED_XX std/tr1 defines

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/query/docseq.cpp
+2 -2
View File
@@ -82,7 +82,7 @@ bool DocSource::buildStack()
} else {
if (m_fspec.isNotNull()) {
m_seq =
STD_SHARED_PTR<DocSequence>(new DocSeqFiltered(m_config, m_seq, m_fspec));
std::shared_ptr<DocSequence>(new DocSeqFiltered(m_config, m_seq, m_fspec));
}
}
@@ -92,7 +92,7 @@ bool DocSource::buildStack()
}
} else {
if (m_sspec.isNotNull()) {
m_seq = STD_SHARED_PTR<DocSequence>(new DocSeqSorted(m_seq, m_sspec));
m_seq = std::shared_ptr<DocSequence>(new DocSeqSorted(m_seq, m_sspec));
}
}
return true;
src/query/docseq.h
+5 -5
View File
@@ -155,7 +155,7 @@ class DocSequence {
virtual bool canSort() {return false;}
virtual bool setFiltSpec(const DocSeqFiltSpec &) {return false;}
virtual bool setSortSpec(const DocSeqSortSpec &) {return false;}
virtual STD_SHARED_PTR<DocSequence> getSourceSeq() {return STD_SHARED_PTR<DocSequence>();}
virtual std::shared_ptr<DocSequence> getSourceSeq() {return std::shared_ptr<DocSequence>();}
static void set_translations(const std::string& sort, const std::string& filt)
{
@@ -181,7 +181,7 @@ protected:
*/
class DocSeqModifier : public DocSequence {
public:
DocSeqModifier(STD_SHARED_PTR<DocSequence> iseq)
DocSeqModifier(std::shared_ptr<DocSequence> iseq)
: DocSequence(""), m_seq(iseq)
{}
virtual ~DocSeqModifier() {}
@@ -241,7 +241,7 @@ public:
{
return m_seq->title();
}
virtual STD_SHARED_PTR<DocSequence> getSourceSeq()
virtual std::shared_ptr<DocSequence> getSourceSeq()
{
return m_seq;
}
@@ -254,7 +254,7 @@ protected:
return m_seq->getDb();
}
STD_SHARED_PTR<DocSequence> m_seq;
std::shared_ptr<DocSequence> m_seq;
};
class RclConfig;
@@ -263,7 +263,7 @@ class RclConfig;
// sorting and filtering in ways depending on the base seqs capabilities
class DocSource : public DocSeqModifier {
public:
DocSource(RclConfig *config, STD_SHARED_PTR<DocSequence> iseq)
DocSource(RclConfig *config, std::shared_ptr<DocSequence> iseq)
: DocSeqModifier(iseq), m_config(config)
{}
virtual bool canFilter() {return true;}
src/query/docseqdb.cpp
+4 -4
View File
@@ -28,8 +28,8 @@
using std::list;
DocSequenceDb::DocSequenceDb(STD_SHARED_PTR<Rcl::Query> q, const string &t,
STD_SHARED_PTR<Rcl::SearchData> sdata)
DocSequenceDb::DocSequenceDb(std::shared_ptr<Rcl::Query> q, const string &t,
std::shared_ptr<Rcl::SearchData> sdata)
: DocSequence(t), m_q(q), m_sdata(sdata), m_fsdata(sdata),
m_rescnt(-1),
m_queryBuildAbstract(true),
@@ -164,7 +164,7 @@ bool DocSequenceDb::setFiltSpec(const DocSeqFiltSpec &fs)
std::unique_lock<std::mutex> locker(o_dblock);
if (fs.isNotNull()) {
// We build a search spec by adding a filtering layer to the base one.
m_fsdata = STD_SHARED_PTR<Rcl::SearchData>(
m_fsdata = std::shared_ptr<Rcl::SearchData>(
new Rcl::SearchData(Rcl::SCLT_AND, m_sdata->getStemLang()));
Rcl::SearchDataClauseSub *cl =
new Rcl::SearchDataClauseSub(m_sdata);
@@ -188,7 +188,7 @@ bool DocSequenceDb::setFiltSpec(const DocSeqFiltSpec &fs)
if (sd) {
Rcl::SearchDataClauseSub *cl1 =
new Rcl::SearchDataClauseSub(
STD_SHARED_PTR<Rcl::SearchData>(sd));
std::shared_ptr<Rcl::SearchData>(sd));
m_fsdata->addClause(cl1);
}
}
src/query/docseqdb.h
+6 -6
View File
@@ -17,7 +17,7 @@
#ifndef _DOCSEQDB_H_INCLUDED_
#define _DOCSEQDB_H_INCLUDED_
#include "docseq.h"
#include MEMORY_INCLUDE
#include <memory>
#include "searchdata.h"
#include "rclquery.h"
@@ -25,8 +25,8 @@
/** A DocSequence from a Db query */
class DocSequenceDb : public DocSequence {
public:
DocSequenceDb(STD_SHARED_PTR<Rcl::Query> q, const string &t,
STD_SHARED_PTR<Rcl::SearchData> sdata);
DocSequenceDb(std::shared_ptr<Rcl::Query> q, const string &t,
std::shared_ptr<Rcl::SearchData> sdata);
virtual ~DocSequenceDb() {}
virtual bool getDoc(int num, Rcl::Doc &doc, string * = 0);
virtual int getResCnt();
@@ -60,9 +60,9 @@ class DocSequenceDb : public DocSequence {
protected:
virtual Rcl::Db *getDb();
private:
STD_SHARED_PTR<Rcl::Query> m_q;
STD_SHARED_PTR<Rcl::SearchData> m_sdata;
STD_SHARED_PTR<Rcl::SearchData> m_fsdata; // Filtered
std::shared_ptr<Rcl::Query> m_q;
std::shared_ptr<Rcl::SearchData> m_sdata;
std::shared_ptr<Rcl::SearchData> m_fsdata; // Filtered
int m_rescnt;
bool m_queryBuildAbstract;
bool m_queryReplaceAbstract;
src/query/filtseq.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ static bool filter(const DocSeqFiltSpec& fs, const Rcl::Doc *x)
return false;
}
DocSeqFiltered::DocSeqFiltered(RclConfig *conf, STD_SHARED_PTR<DocSequence> iseq,
DocSeqFiltered::DocSeqFiltered(RclConfig *conf, std::shared_ptr<DocSequence> iseq,
DocSeqFiltSpec &filtspec)
: DocSeqModifier(iseq), m_config(conf)
{
src/query/filtseq.h
+2 -2
View File
@@ -20,7 +20,7 @@
#include <vector>
#include <string>
#include MEMORY_INCLUDE
#include <memory>
#include "docseq.h"
@@ -32,7 +32,7 @@ class RclConfig;
*/
class DocSeqFiltered : public DocSeqModifier {
public:
DocSeqFiltered(RclConfig *conf, STD_SHARED_PTR<DocSequence> iseq,
DocSeqFiltered(RclConfig *conf, std::shared_ptr<DocSequence> iseq,
DocSeqFiltSpec &filtspec);
virtual ~DocSeqFiltered() {}
virtual bool canFilter() {return true;}
src/query/recollq.cpp
+1 -1
View File
@@ -342,7 +342,7 @@ endopts:
return 1;
}
STD_SHARED_PTR<Rcl::SearchData> rq(sd);
std::shared_ptr<Rcl::SearchData> rq(sd);
Rcl::Query query(&rcldb);
if (op_flags & OPT_S) {
query.setSortBy(sortfield, (op_flags & OPT_D) ? false : true);
src/query/reslistpager.h
+3 -3
View File
@@ -20,7 +20,7 @@
#include "autoconfig.h"
#include <vector>
#include MEMORY_INCLUDE
#include <memory>
#include "docseq.h"
#include "hldata.h"
@@ -40,7 +40,7 @@ public:
{
m_hiliter = ptr;
}
void setDocSource(STD_SHARED_PTR<DocSequence> src, int winfirst = -1)
void setDocSource(std::shared_ptr<DocSequence> src, int winfirst = -1)
{
m_pagesize = m_newpagesize;
m_winfirst = winfirst;
@@ -129,7 +129,7 @@ private:
int m_winfirst;
bool m_hasNext;
PlainToRich *m_hiliter;
STD_SHARED_PTR<DocSequence> m_docSource;
std::shared_ptr<DocSequence> m_docSource;
std::vector<ResListEntry> m_respage;
};
src/query/sortseq.h
+2 -2
View File
@@ -20,7 +20,7 @@
#include <vector>
#include <string>
#include MEMORY_INCLUDE
#include <memory>
#include "docseq.h"
@@ -30,7 +30,7 @@
*/
class DocSeqSorted : public DocSeqModifier {
public:
DocSeqSorted(STD_SHARED_PTR<DocSequence> iseq, DocSeqSortSpec &sortspec)
DocSeqSorted(std::shared_ptr<DocSequence> iseq, DocSeqSortSpec &sortspec)
: DocSeqModifier(iseq)
{
setSortSpec(sortspec);
src/query/wasaparse.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ static void addSubQuery(WasaParserDriver *d,
{
if (sd && sq)
sd->addClause(
new Rcl::SearchDataClauseSub(STD_SHARED_PTR<Rcl::SearchData>(sq)));
new Rcl::SearchDataClauseSub(std::shared_ptr<Rcl::SearchData>(sq)));
}