Switch to unified view

a/src/query/docseqdb.h b/src/query/docseqdb.h
...
...
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef _DOCSEQDB_H_INCLUDED_
17
#ifndef _DOCSEQDB_H_INCLUDED_
18
#define _DOCSEQDB_H_INCLUDED_
18
#define _DOCSEQDB_H_INCLUDED_
19
#include "docseq.h"
19
#include "docseq.h"
20
#include MEMORY_INCLUDE
20
#include <memory>
21
21
22
#include "searchdata.h"
22
#include "searchdata.h"
23
#include "rclquery.h"
23
#include "rclquery.h"
24
24
25
/** A DocSequence from a Db query */
25
/** A DocSequence from a Db query */
26
class DocSequenceDb : public DocSequence {
26
class DocSequenceDb : public DocSequence {
27
 public:
27
 public:
28
    DocSequenceDb(STD_SHARED_PTR<Rcl::Query> q, const string &t, 
28
    DocSequenceDb(std::shared_ptr<Rcl::Query> q, const string &t, 
29
        STD_SHARED_PTR<Rcl::SearchData> sdata);
29
        std::shared_ptr<Rcl::SearchData> sdata);
30
    virtual ~DocSequenceDb() {}
30
    virtual ~DocSequenceDb() {}
31
    virtual bool getDoc(int num, Rcl::Doc &doc, string * = 0);
31
    virtual bool getDoc(int num, Rcl::Doc &doc, string * = 0);
32
    virtual int getResCnt();
32
    virtual int getResCnt();
33
    virtual void getTerms(HighlightData& hld);
33
    virtual void getTerms(HighlightData& hld);
34
34
...
...
58
    virtual string title();
58
    virtual string title();
59
59
60
protected:
60
protected:
61
    virtual Rcl::Db *getDb();
61
    virtual Rcl::Db *getDb();
62
private:
62
private:
63
    STD_SHARED_PTR<Rcl::Query>      m_q;
63
    std::shared_ptr<Rcl::Query>      m_q;
64
    STD_SHARED_PTR<Rcl::SearchData> m_sdata;
64
    std::shared_ptr<Rcl::SearchData> m_sdata;
65
    STD_SHARED_PTR<Rcl::SearchData> m_fsdata; // Filtered 
65
    std::shared_ptr<Rcl::SearchData> m_fsdata; // Filtered 
66
    int                      m_rescnt;
66
    int                      m_rescnt;
67
    bool                     m_queryBuildAbstract;
67
    bool                     m_queryBuildAbstract;
68
    bool                     m_queryReplaceAbstract;
68
    bool                     m_queryReplaceAbstract;
69
    bool                     m_isFiltered;
69
    bool                     m_isFiltered;
70
    bool                     m_isSorted;
70
    bool                     m_isSorted;