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/qtgui/advsearch_w.cpp
+5 -5
View File
@@ -360,7 +360,7 @@ using namespace Rcl;
void AdvSearch::runSearch()
{
string stemLang = prefs.stemlang();
STD_SHARED_PTR<SearchData> sdata(new SearchData(conjunctCMB->currentIndex() == 0 ?
std::shared_ptr<SearchData> sdata(new SearchData(conjunctCMB->currentIndex() == 0 ?
SCLT_AND : SCLT_OR, stemLang));
bool hasclause = false;
@@ -427,7 +427,7 @@ void AdvSearch::runSearch()
if (sdata->getTp() == SCLT_AND) {
sdata->addClause(pathclause);
} else {
STD_SHARED_PTR<SearchData>
std::shared_ptr<SearchData>
nsdata(new SearchData(SCLT_AND, stemLang));
nsdata->addClause(new Rcl::SearchDataClauseSub(sdata));
nsdata->addClause(pathclause);
@@ -462,7 +462,7 @@ void AdvSearch::runSearch()
// Set up fields from existing search data, which must be compatible
// with what we can do...
void AdvSearch::fromSearch(STD_SHARED_PTR<SearchData> sdata)
void AdvSearch::fromSearch(std::shared_ptr<SearchData> sdata)
{
if (sdata->m_tp == SCLT_OR)
conjunctCMB->setCurrentIndex(1);
@@ -560,7 +560,7 @@ void AdvSearch::slotHistoryNext()
{
if (g_advshistory == 0)
return;
STD_SHARED_PTR<Rcl::SearchData> sd = g_advshistory->getnewer();
std::shared_ptr<Rcl::SearchData> sd = g_advshistory->getnewer();
if (!sd)
return;
fromSearch(sd);
@@ -570,7 +570,7 @@ void AdvSearch::slotHistoryPrev()
{
if (g_advshistory == 0)
return;
STD_SHARED_PTR<Rcl::SearchData> sd = g_advshistory->getolder();
std::shared_ptr<Rcl::SearchData> sd = g_advshistory->getolder();
if (!sd)
return;
fromSearch(sd);
src/qtgui/advsearch_w.h
+3 -3
View File
@@ -25,7 +25,7 @@
#include "searchclause_w.h"
#include "recoll.h"
#include MEMORY_INCLUDE
#include <memory>
#include "searchdata.h"
#include "advshist.h"
@@ -56,7 +56,7 @@ public slots:
virtual void restrictFtCB_toggled(bool);
virtual void restrictCtCB_toggled(bool);
virtual void runSearch();
virtual void fromSearch(STD_SHARED_PTR<Rcl::SearchData> sdata);
virtual void fromSearch(std::shared_ptr<Rcl::SearchData> sdata);
virtual void browsePB_clicked();
virtual void saveFileTypes();
virtual void delClause();
@@ -66,7 +66,7 @@ public slots:
virtual void slotHistoryPrev();
signals:
void startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool);
void startSearch(std::shared_ptr<Rcl::SearchData>, bool);
private:
virtual void init();
src/qtgui/advshist.cpp
+9 -9
View File
@@ -33,38 +33,38 @@ AdvSearchHist::AdvSearchHist()
AdvSearchHist::~AdvSearchHist()
{
for (vector<STD_SHARED_PTR<SearchData> >::iterator it = m_entries.begin();
for (vector<std::shared_ptr<SearchData> >::iterator it = m_entries.begin();
it != m_entries.end(); it++) {
it->reset();
}
}
STD_SHARED_PTR<Rcl::SearchData> AdvSearchHist::getnewest()
std::shared_ptr<Rcl::SearchData> AdvSearchHist::getnewest()
{
if (m_entries.empty())
return STD_SHARED_PTR<Rcl::SearchData>();
return std::shared_ptr<Rcl::SearchData>();
return m_entries[0];
}
STD_SHARED_PTR<Rcl::SearchData> AdvSearchHist::getolder()
std::shared_ptr<Rcl::SearchData> AdvSearchHist::getolder()
{
m_current++;
if (m_current >= int(m_entries.size())) {
m_current--;
return STD_SHARED_PTR<Rcl::SearchData>();
return std::shared_ptr<Rcl::SearchData>();
}
return m_entries[m_current];
}
STD_SHARED_PTR<Rcl::SearchData> AdvSearchHist::getnewer()
std::shared_ptr<Rcl::SearchData> AdvSearchHist::getnewer()
{
if (m_current == -1 || m_current == 0 || m_entries.empty())
return STD_SHARED_PTR<Rcl::SearchData>();
return std::shared_ptr<Rcl::SearchData>();
return m_entries[--m_current];
}
bool AdvSearchHist::push(STD_SHARED_PTR<SearchData> sd)
bool AdvSearchHist::push(std::shared_ptr<SearchData> sd)
{
m_entries.insert(m_entries.begin(), sd);
if (m_current != -1)
@@ -83,7 +83,7 @@ bool AdvSearchHist::read()
for (list<string>::const_iterator it = lxml.begin(); it != lxml.end();
it++) {
STD_SHARED_PTR<SearchData> sd = xmlToSearchData(*it);
std::shared_ptr<SearchData> sd = xmlToSearchData(*it);
if (sd)
m_entries.push_back(sd);
}
src/qtgui/advshist.h
+6 -6
View File
@@ -21,7 +21,7 @@
#include <vector>
#include "recoll.h"
#include MEMORY_INCLUDE
#include <memory>
#include "searchdata.h"
/** Advanced search history.
@@ -44,14 +44,14 @@ public:
~AdvSearchHist();
// Add entry
bool push(STD_SHARED_PTR<Rcl::SearchData>);
bool push(std::shared_ptr<Rcl::SearchData>);
// Get latest. does not change state
STD_SHARED_PTR<Rcl::SearchData> getnewest();
std::shared_ptr<Rcl::SearchData> getnewest();
// Cursor
STD_SHARED_PTR<Rcl::SearchData> getolder();
STD_SHARED_PTR<Rcl::SearchData> getnewer();
std::shared_ptr<Rcl::SearchData> getolder();
std::shared_ptr<Rcl::SearchData> getnewer();
void clear();
@@ -59,7 +59,7 @@ private:
bool read();
int m_current;
std::vector<STD_SHARED_PTR<Rcl::SearchData> > m_entries;
std::vector<std::shared_ptr<Rcl::SearchData> > m_entries;
};
#endif // _ADVSHIST_H_INCLUDED_
src/qtgui/confgui/confgui.h
+2 -2
View File
@@ -46,7 +46,7 @@
#include <qstring.h>
#include <qwidget.h>
#include MEMORY_INCLUDE
#include <memory>
class QHBoxLayout;
class QLineEdit;
@@ -65,7 +65,7 @@ namespace confgui {
virtual bool set(const std::string& val) = 0;
virtual bool get(std::string& val) = 0;
};
typedef STD_SHARED_PTR<ConfLinkRep> ConfLink;
typedef std::shared_ptr<ConfLinkRep> ConfLink;
// Useful to store/manage data which has no direct representation in
// the config, ie list of subkey directories
src/qtgui/preview_plaintorich.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ QString PlainToRichQtPreview::curAnchorName() const
ToRichThread::ToRichThread(const string &i, const HighlightData& hd,
STD_SHARED_PTR<PlainToRichQtPreview> ptr,
std::shared_ptr<PlainToRichQtPreview> ptr,
QStringList& qrichlist,
QObject *parent)
: QThread(parent), m_input(i), m_hdata(hd), m_ptr(ptr), m_output(qrichlist)
src/qtgui/preview_plaintorich.h
+3 -3
View File
@@ -21,7 +21,7 @@
#include <map>
#include <string>
#include <vector>
#include MEMORY_INCLUDE
#include <memory>
#include <QThread>
#include <QStringList>
@@ -58,7 +58,7 @@ class ToRichThread : public QThread {
public:
ToRichThread(const string &i, const HighlightData& hd,
STD_SHARED_PTR<PlainToRichQtPreview> ptr,
std::shared_ptr<PlainToRichQtPreview> ptr,
QStringList& qrichlst, // Output
QObject *parent = 0);
virtual void run();
@@ -66,7 +66,7 @@ public:
private:
const string &m_input;
const HighlightData &m_hdata;
STD_SHARED_PTR<PlainToRichQtPreview> m_ptr;
std::shared_ptr<PlainToRichQtPreview> m_ptr;
QStringList &m_output;
};
src/qtgui/preview_w.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include <stdio.h>
#include MEMORY_INCLUDE
#include <memory>
#include <QComboBox>
#include <qvariant.h>
@@ -73,7 +73,7 @@ protected:
private:
Preview *m_preview;
STD_SHARED_PTR<PlainToRichQtPreview> m_plaintorich;
std::shared_ptr<PlainToRichQtPreview> m_plaintorich;
bool m_dspflds;
string m_url; // filename for this tab
src/qtgui/rclm_saveload.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ void RclMain::saveLastQuery()
xml = sSearch->asXML();
} else {
if (g_advshistory) {
STD_SHARED_PTR<Rcl::SearchData> sd;
std::shared_ptr<Rcl::SearchData> sd;
sd = g_advshistory->getnewest();
if (sd) {
xml = sd->asXML();
@@ -116,7 +116,7 @@ void RclMain::loadSavedQuery()
}
// Try to parse as SearchData
STD_SHARED_PTR<SearchData> sd = xmlToSearchData(xml);
std::shared_ptr<SearchData> sd = xmlToSearchData(xml);
if (sd) {
showAdvSearchDialog();
asearchform->fromSearch(sd);
src/qtgui/rclm_view.cpp
+3 -3
View File
@@ -66,9 +66,9 @@ void RclMain::viewUrl()
// StartNativeViewer needs a db source to call getEnclosing() on.
Rcl::Query *query = new Rcl::Query(rcldb);
DocSequenceDb *src =
new DocSequenceDb(STD_SHARED_PTR<Rcl::Query>(query), "",
STD_SHARED_PTR<Rcl::SearchData>(new Rcl::SearchData));
m_source = STD_SHARED_PTR<DocSequence>(src);
new DocSequenceDb(std::shared_ptr<Rcl::Query>(query), "",
std::shared_ptr<Rcl::SearchData>(new Rcl::SearchData));
m_source = std::shared_ptr<DocSequence>(src);
// Start a native viewer if the mimetype has one defined, else a
src/qtgui/rclm_wins.cpp
+2 -2
View File
@@ -49,8 +49,8 @@ void RclMain::showAdvSearchDialog()
this, SLOT (fileExit()));
connect(asearchform,
SIGNAL(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)),
this, SLOT(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)));
SIGNAL(startSearch(std::shared_ptr<Rcl::SearchData>, bool)),
this, SLOT(startSearch(std::shared_ptr<Rcl::SearchData>, bool)));
asearchform->show();
} else {
// Close and reopen, in hope that makes us visible...
src/qtgui/rclmain_w.cpp
+20 -51
View File
@@ -17,7 +17,7 @@
#include "autoconfig.h"
#include <utility>
#include MEMORY_INCLUDE
#include <memory>
#include <stdlib.h>
#include <qapplication.h>
@@ -68,20 +68,6 @@
#include "rclhelp.h"
#include "moc_rclmain_w.cpp"
/* Qt5 moc expands macros when defining signals. The SIGNAL() macro is
a stringification, so it does not expand macros. We have signals
where one of the types is a #define (for the variations on
std::shared_ptr). In qt5, the connection does not work because the
signal string is different between the definition and the connect
call, because of the different macro expansion. We have to use
another level of macro in Qt5 to force macro expansion, but not in
Qt4, so we both define the XSIGNAL and XSLOT macros here, and have
ifdefs in the code. What a mess... */
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#define XSIGNAL(X) SIGNAL(X)
#define XSLOT(X) SLOT(X)
#endif
using std::pair;
QString g_stringAllStem, g_stringNoStem;
@@ -307,15 +293,9 @@ void RclMain::init()
connect(&m_watcher, SIGNAL(fileChanged(QString)),
this, SLOT(updateIdxStatus()));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
connect(sSearch,
XSIGNAL(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)),
this, XSLOT(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)));
#else
connect(sSearch,
SIGNAL(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)),
this, SLOT(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)));
#endif
SIGNAL(startSearch(std::shared_ptr<Rcl::SearchData>, bool)),
this, SLOT(startSearch(std::shared_ptr<Rcl::SearchData>, bool)));
connect(sSearch, SIGNAL(clearSearch()),
this, SLOT(resetSearch()));
connect(preferencesMenu, SIGNAL(triggered(QAction*)),
@@ -383,14 +363,8 @@ void RclMain::init()
restable->setRclMain(this, true);
connect(actionSaveResultsAsCSV, SIGNAL(triggered()),
restable, SLOT(saveAsCSV()));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
connect(this, XSIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
restable, XSLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#else
connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
restable, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#endif
connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)),
restable, SLOT(setDocSource(std::shared_ptr<DocSequence>)));
connect(this, SIGNAL(searchReset()),
restable, SLOT(resetSource()));
connect(this, SIGNAL(resultsReady()),
@@ -419,13 +393,8 @@ void RclMain::init()
this, SLOT(showSnippets(Rcl::Doc)));
reslist->setRclMain(this, true);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
connect(this, XSIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
reslist, XSLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#else
connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
reslist, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#endif
connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)),
reslist, SLOT(setDocSource(std::shared_ptr<DocSequence>)));
connect(firstPageAction, SIGNAL(triggered()),
reslist, SLOT(resultPageFirst()));
connect(prevPageAction, SIGNAL(triggered()),
@@ -694,7 +663,7 @@ void RclMain::fileExit()
}
// Start a db query and set the reslist docsource
void RclMain::startSearch(STD_SHARED_PTR<Rcl::SearchData> sdata, bool issimple)
void RclMain::startSearch(std::shared_ptr<Rcl::SearchData> sdata, bool issimple)
{
LOGDEB("RclMain::startSearch. Indexing " << (m_idxproc?"on":"off") << " Active " << (m_queryActive) << "\n" );
if (m_queryActive) {
@@ -703,7 +672,7 @@ void RclMain::startSearch(STD_SHARED_PTR<Rcl::SearchData> sdata, bool issimple)
}
m_queryActive = true;
restable->setEnabled(false);
m_source = STD_SHARED_PTR<DocSequence>();
m_source = std::shared_ptr<DocSequence>();
m_searchIsSimple = issimple;
@@ -733,11 +702,11 @@ void RclMain::startSearch(STD_SHARED_PTR<Rcl::SearchData> sdata, bool issimple)
curPreview = 0;
DocSequenceDb *src =
new DocSequenceDb(STD_SHARED_PTR<Rcl::Query>(query),
new DocSequenceDb(std::shared_ptr<Rcl::Query>(query),
string(tr("Query results").toUtf8()), sdata);
src->setAbstractParams(prefs.queryBuildAbstract,
prefs.queryReplaceAbstract);
m_source = STD_SHARED_PTR<DocSequence>(src);
m_source = std::shared_ptr<DocSequence>(src);
m_source->setSortSpec(m_sortspec);
m_source->setFiltSpec(m_filtspec);
@@ -747,9 +716,9 @@ void RclMain::startSearch(STD_SHARED_PTR<Rcl::SearchData> sdata, bool issimple)
}
class QueryThread : public QThread {
STD_SHARED_PTR<DocSequence> m_source;
std::shared_ptr<DocSequence> m_source;
public:
QueryThread(STD_SHARED_PTR<DocSequence> source)
QueryThread(std::shared_ptr<DocSequence> source)
: m_source(source)
{
}
@@ -961,8 +930,8 @@ void RclMain::showSubDocs(Rcl::Doc doc)
new DocSequenceDocs(rcldb, docs,
qs2utf8s(tr("Sub-documents and attachments")));
src->setDescription(qs2utf8s(tr("Sub-documents and attachments")));
STD_SHARED_PTR<DocSequence>
source(new DocSource(theconfig, STD_SHARED_PTR<DocSequence>(src)));
std::shared_ptr<DocSequence>
source(new DocSource(theconfig, std::shared_ptr<DocSequence>(src)));
ResTable *res = new ResTable();
res->setRclMain(this, false);
@@ -1003,7 +972,7 @@ void RclMain::showDocHistory()
{
LOGDEB("RclMain::showDocHistory\n" );
emit searchReset();
m_source = STD_SHARED_PTR<DocSequence>();
m_source = std::shared_ptr<DocSequence>();
curPreview = 0;
string reason;
@@ -1012,8 +981,8 @@ void RclMain::showDocHistory()
return;
}
// Construct a bogus SearchData structure
STD_SHARED_PTR<Rcl::SearchData>searchdata =
STD_SHARED_PTR<Rcl::SearchData>(new Rcl::SearchData(Rcl::SCLT_AND, cstr_null));
std::shared_ptr<Rcl::SearchData>searchdata =
std::shared_ptr<Rcl::SearchData>(new Rcl::SearchData(Rcl::SCLT_AND, cstr_null));
searchdata->setDescription((const char *)tr("History data").toUtf8());
@@ -1022,8 +991,8 @@ void RclMain::showDocHistory()
new DocSequenceHistory(rcldb, g_dynconf,
string(tr("Document history").toUtf8()));
src->setDescription((const char *)tr("History data").toUtf8());
DocSource *source = new DocSource(theconfig, STD_SHARED_PTR<DocSequence>(src));
m_source = STD_SHARED_PTR<DocSequence>(source);
DocSource *source = new DocSource(theconfig, std::shared_ptr<DocSequence>(src));
m_source = std::shared_ptr<DocSequence>(source);
m_source->setSortSpec(m_sortspec);
m_source->setFiltSpec(m_filtspec);
emit docSourceChanged(m_source);
src/qtgui/rclmain_w.h
+4 -4
View File
@@ -30,7 +30,7 @@
#include "rcldb.h"
#include "searchdata.h"
#include "spell_w.h"
#include MEMORY_INCLUDE
#include <memory>
#include "pathut.h"
#include "guiutils.h"
@@ -123,7 +123,7 @@ public slots:
virtual void toggleIndexing();
virtual void rebuildIndex();
virtual void specialIndex();
virtual void startSearch(STD_SHARED_PTR<Rcl::SearchData> sdata,
virtual void startSearch(std::shared_ptr<Rcl::SearchData> sdata,
bool issimple);
virtual void previewClosed(Preview *w);
virtual void showAdvSearchDialog();
@@ -189,7 +189,7 @@ private slots:
virtual void updateIdxStatus();
virtual void onWebcacheDestroyed(QObject *);
signals:
void docSourceChanged(STD_SHARED_PTR<DocSequence>);
void docSourceChanged(std::shared_ptr<DocSequence>);
void stemLangChanged(const QString& lang);
void sortDataChanged(DocSeqSortSpec);
void resultsReady();
@@ -233,7 +233,7 @@ private:
DocSeqFiltSpec m_filtspec;
bool m_sortspecnochange;
DocSeqSortSpec m_sortspec;
STD_SHARED_PTR<DocSequence> m_source;
std::shared_ptr<DocSequence> m_source;
IndexerState m_indexerState;
bool m_queryActive;
bool m_firstIndexing;
src/qtgui/reslist.cpp
+5 -5
View File
@@ -47,7 +47,7 @@
#include "pathut.h"
#include "mimehandler.h"
#include "plaintorich.h"
#include MEMORY_INCLUDE
#include <memory>
#include "internfile.h"
#include "indexer.h"
#include "snippets_w.h"
@@ -421,10 +421,10 @@ int ResList::newListId()
extern "C" int XFlush(void *);
void ResList::setDocSource(STD_SHARED_PTR<DocSequence> nsource)
void ResList::setDocSource(std::shared_ptr<DocSequence> nsource)
{
LOGDEB("ResList::setDocSource()\n" );
m_source = STD_SHARED_PTR<DocSequence>(new DocSource(theconfig, nsource));
m_source = std::shared_ptr<DocSequence>(new DocSource(theconfig, nsource));
}
// A query was executed, or the filtering/sorting parameters changed,
@@ -447,7 +447,7 @@ void ResList::readDocSource()
void ResList::resetList()
{
LOGDEB("ResList::resetList()\n" );
setDocSource(STD_SHARED_PTR<DocSequence>());
setDocSource(std::shared_ptr<DocSequence>());
resetView();
}
@@ -900,7 +900,7 @@ void ResList::linkWasClicked(const QUrl &url)
LOGERR("ResList::linkWasClicked: can't get doc for " << (i) << "\n" );
return;
}
emit editRequested(ResultPopup::getParent(STD_SHARED_PTR<DocSequence>(),
emit editRequested(ResultPopup::getParent(std::shared_ptr<DocSequence>(),
doc));
}
break;
src/qtgui/reslist.h
+3 -3
View File
@@ -33,7 +33,7 @@
#include "docseq.h"
#include "sortseq.h"
#include "filtseq.h"
#include MEMORY_INCLUDE
#include <memory>
#include "rcldoc.h"
#include "reslistpager.h"
@@ -66,7 +66,7 @@ class ResList : public RESLIST_PARENTCLASS
void setRclMain(RclMain *m, bool ismain);
public slots:
virtual void setDocSource(STD_SHARED_PTR<DocSequence> nsource);
virtual void setDocSource(std::shared_ptr<DocSequence> nsource);
virtual void resetList(); // Erase current list
virtual void resPageUpOrBack(); // Page up pressed
virtual void resPageDownOrNext(); // Page down pressed
@@ -118,7 +118,7 @@ class ResList : public RESLIST_PARENTCLASS
private:
QtGuiResListPager *m_pager;
STD_SHARED_PTR<DocSequence> m_source;
std::shared_ptr<DocSequence> m_source;
int m_popDoc; // Docnum for the popup menu.
int m_curPvDoc;// Docnum for current preview
int m_lstClckMod; // Last click modifier.
src/qtgui/respopup.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
namespace ResultPopup {
QMenu *create(QWidget *me, int opts, STD_SHARED_PTR<DocSequence> source, Rcl::Doc& doc)
QMenu *create(QWidget *me, int opts, std::shared_ptr<DocSequence> source, Rcl::Doc& doc)
{
QMenu *popup = new QMenu(me);
@@ -134,7 +134,7 @@ QMenu *create(QWidget *me, int opts, STD_SHARED_PTR<DocSequence> source, Rcl::Do
return popup;
}
Rcl::Doc getParent(STD_SHARED_PTR<DocSequence> source, Rcl::Doc& doc)
Rcl::Doc getParent(std::shared_ptr<DocSequence> source, Rcl::Doc& doc)
{
Rcl::Doc pdoc;
if (!source || !source->getEnclosing(doc, pdoc)) {
src/qtgui/respopup.h
+2 -2
View File
@@ -22,9 +22,9 @@ namespace ResultPopup {
enum Options {showExpand = 0x1, showSubs = 0x2, isMain = 0x3,
showSaveOne = 0x4, showSaveSel = 0x8};
extern QMenu *create(QWidget *me, int opts,
STD_SHARED_PTR<DocSequence> source,
std::shared_ptr<DocSequence> source,
Rcl::Doc& doc);
extern Rcl::Doc getParent(STD_SHARED_PTR<DocSequence> source,
extern Rcl::Doc getParent(std::shared_ptr<DocSequence> source,
Rcl::Doc& doc);
extern void copyFN(const Rcl::Doc &doc);
extern void copyURL(const Rcl::Doc &doc);
src/qtgui/restable.cpp
+7 -7
View File
@@ -35,7 +35,7 @@
#include <QMessageBox>
#include "recoll.h"
#include MEMORY_INCLUDE
#include <memory>
#include "docseq.h"
#include "log.h"
#include "restable.h"
@@ -290,13 +290,13 @@ void RecollModel::readDocSource()
endResetModel();
}
void RecollModel::setDocSource(STD_SHARED_PTR<DocSequence> nsource)
void RecollModel::setDocSource(std::shared_ptr<DocSequence> nsource)
{
LOGDEB("RecollModel::setDocSource\n" );
if (!nsource) {
m_source = STD_SHARED_PTR<DocSequence>();
m_source = std::shared_ptr<DocSequence>();
} else {
m_source = STD_SHARED_PTR<DocSequence>(new DocSource(theconfig, nsource));
m_source = std::shared_ptr<DocSequence>(new DocSource(theconfig, nsource));
m_hdata.clear();
m_source->getTerms(m_hdata);
}
@@ -661,7 +661,7 @@ void ResTable::takeFocus()
tableView->setFocus(Qt::ShortcutFocusReason);
}
void ResTable::setDocSource(STD_SHARED_PTR<DocSequence> nsource)
void ResTable::setDocSource(std::shared_ptr<DocSequence> nsource)
{
LOGDEB("ResTable::setDocSource\n" );
if (m_model)
@@ -676,7 +676,7 @@ void ResTable::setDocSource(STD_SHARED_PTR<DocSequence> nsource)
void ResTable::resetSource()
{
LOGDEB("ResTable::resetSource\n" );
setDocSource(STD_SHARED_PTR<DocSequence>());
setDocSource(std::shared_ptr<DocSequence>());
}
void ResTable::saveAsCSV()
@@ -777,7 +777,7 @@ void ResTable::linkWasClicked(const QUrl &url)
// Open parent folder
case 'F':
{
emit editRequested(ResultPopup::getParent(STD_SHARED_PTR<DocSequence>(),
emit editRequested(ResultPopup::getParent(std::shared_ptr<DocSequence>(),
m_detaildoc));
}
break;
src/qtgui/restable.h
+5 -5
View File
@@ -23,7 +23,7 @@
#include <string>
#include <map>
#include <vector>
#include MEMORY_INCLUDE
#include <memory>
#include "ui_restable.h"
#include "docseq.h"
@@ -51,8 +51,8 @@ public:
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
// Specific methods
virtual void readDocSource();
virtual void setDocSource(STD_SHARED_PTR<DocSequence> nsource);
virtual STD_SHARED_PTR<DocSequence> getDocSource() {return m_source;}
virtual void setDocSource(std::shared_ptr<DocSequence> nsource);
virtual std::shared_ptr<DocSequence> getDocSource() {return m_source;}
virtual void deleteColumn(int);
virtual const std::vector<std::string>& getFields() {return m_fields;}
virtual const std::map<std::string, QString>& getAllFields()
@@ -73,7 +73,7 @@ signals:
void sortDataChanged(DocSeqSortSpec);
private:
mutable STD_SHARED_PTR<DocSequence> m_source;
mutable std::shared_ptr<DocSequence> m_source;
std::vector<std::string> m_fields;
std::vector<FieldGetter*> m_getters;
static std::map<std::string, QString> o_displayableFields;
@@ -127,7 +127,7 @@ public:
public slots:
virtual void onTableView_currentChanged(const QModelIndex&);
virtual void on_tableView_entered(const QModelIndex& index);
virtual void setDocSource(STD_SHARED_PTR<DocSequence> nsource);
virtual void setDocSource(std::shared_ptr<DocSequence> nsource);
virtual void saveColState();
virtual void resetSource();
virtual void readDocSource(bool resetPos = true);
src/qtgui/snippets_w.h
+3 -3
View File
@@ -19,7 +19,7 @@
#include "autoconfig.h"
#include MEMORY_INCLUDE
#include <memory>
#include <QString>
@@ -33,7 +33,7 @@ class SnippetsW : public QWidget, public Ui::Snippets
{
Q_OBJECT
public:
SnippetsW(Rcl::Doc doc, STD_SHARED_PTR<DocSequence> source, QWidget* parent = 0)
SnippetsW(Rcl::Doc doc, std::shared_ptr<DocSequence> source, QWidget* parent = 0)
: QWidget(parent), m_doc(doc), m_source(source)
{
setupUi((QDialog*)this);
@@ -52,7 +52,7 @@ signals:
private:
void init();
Rcl::Doc m_doc;
STD_SHARED_PTR<DocSequence> m_source;
std::shared_ptr<DocSequence> m_source;
};
#endif /* _SNIPPETS_W_H_INCLUDED_ */
src/qtgui/spell_w.cpp
+1 -1
View File
@@ -362,7 +362,7 @@ void SpellW::showStats()
string reason;
string q = string("mime:") + *it;
Rcl::SearchData *sd = wasaStringToRcl(theconfig, "", q, reason);
STD_SHARED_PTR<Rcl::SearchData> rq(sd);
std::shared_ptr<Rcl::SearchData> rq(sd);
Rcl::Query query(rcldb);
if (!query.setQuery(rq)) {
LOGERR("Query setup failed: " << (query.getReason()) << "" );
src/qtgui/ssearch_w.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
#include <sstream>
#include <set>
#include MEMORY_INCLUDE
#include <memory>
#include <qapplication.h>
#include <qinputdialog.h>
@@ -309,7 +309,7 @@ bool SSearch::startSimpleSearch(const string& u8, int maxexp)
m_xml = xml.str();
LOGDEB("SSearch::startSimpleSearch:xml:[" << (m_xml) << "]\n" );
STD_SHARED_PTR<Rcl::SearchData> rsdata(sdata);
std::shared_ptr<Rcl::SearchData> rsdata(sdata);
emit startSearch(rsdata, true);
return true;
}
src/qtgui/ssearch_w.h
+2 -2
View File
@@ -27,7 +27,7 @@ class QTimer;
#include "recoll.h"
#include "searchdata.h"
#include MEMORY_INCLUDE
#include <memory>
#include "ui_ssearchb.h"
@@ -73,7 +73,7 @@ public slots:
virtual void takeFocus();
signals:
void startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool);
void startSearch(std::shared_ptr<Rcl::SearchData>, bool);
void clearSearch();
private:
bool m_escape;
src/qtgui/webcache.cpp
+4 -4
View File
@@ -18,8 +18,8 @@
#include <sstream>
#include <iostream>
#include MEMORY_INCLUDE
#include UNORDERED_MAP_INCLUDE
#include <memory>
#include <unordered_map>
#ifdef _WIN32
#define USING_STD_REGEX
@@ -62,7 +62,7 @@ public:
class WebcacheModelInternal {
public:
STD_SHARED_PTR<BeagleQueueCache> cache;
std::shared_ptr<BeagleQueueCache> cache;
vector<CEnt> all;
vector<CEnt> disp;
};
@@ -81,7 +81,7 @@ WebcacheModel::~WebcacheModel()
void WebcacheModel::reload()
{
m->cache =
STD_SHARED_PTR<BeagleQueueCache>(new BeagleQueueCache(theconfig));
std::shared_ptr<BeagleQueueCache>(new BeagleQueueCache(theconfig));
m->all.clear();
m->disp.clear();
src/qtgui/webcache.h
+1 -1
View File
@@ -20,7 +20,7 @@
#include <vector>
#include <string>
#include MEMORY_INCLUDE
#include <memory>
#include "ui_webcache.h"
src/qtgui/xmltosd.h
+2 -2
View File
@@ -60,12 +60,12 @@
* </SD>
*/
#include MEMORY_INCLUDE
#include <memory>
#include "searchdata.h"
// Parsing XML from advanced search history or saved advanced search to to
// SearchData structure:
STD_SHARED_PTR<Rcl::SearchData> xmlToSearchData(const string& xml);
std::shared_ptr<Rcl::SearchData> xmlToSearchData(const string& xml);
// Parsing XML from saved simple search to ssearch parameters
struct SSearchDef {