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

Windows: fix signal connections using STD_SHARED_PTR. won't work, reason unknown

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-10-07 09:43:02 +02:00
parent 2a96ee4a27
commit c33185746b
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qtgui/rclmain_w.cpp
View File

@ -287,11 +287,15 @@ void RclMain::init()
connect(&m_watcher, SIGNAL(fileChanged(QString)), connect(&m_watcher, SIGNAL(fileChanged(QString)),
this, SLOT(idxStatus())); this, SLOT(idxStatus()));
#ifdef _WIN32
connect(sSearch, SIGNAL(startSearch(std::shared_ptr<Rcl::SearchData>, bool)),
this, SLOT(startSearch(std::shared_ptr<Rcl::SearchData>, bool)));
#else
connect(sSearch, SIGNAL(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)), connect(sSearch, SIGNAL(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)),
this, SLOT(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool))); this, SLOT(startSearch(STD_SHARED_PTR<Rcl::SearchData>, bool)));
#endif
connect(sSearch, SIGNAL(clearSearch()), connect(sSearch, SIGNAL(clearSearch()),
this, SLOT(resetSearch())); this, SLOT(resetSearch()));
connect(preferencesMenu, SIGNAL(triggered(QAction*)), connect(preferencesMenu, SIGNAL(triggered(QAction*)),
this, SLOT(setStemLang(QAction*))); this, SLOT(setStemLang(QAction*)));
connect(preferencesMenu, SIGNAL(aboutToShow()), connect(preferencesMenu, SIGNAL(aboutToShow()),
@ -348,8 +352,14 @@ void RclMain::init()
restable->setRclMain(this, true); restable->setRclMain(this, true);
connect(actionSaveResultsAsCSV, SIGNAL(triggered()), connect(actionSaveResultsAsCSV, SIGNAL(triggered()),
restable, SLOT(saveAsCSV())); restable, SLOT(saveAsCSV()));
#ifdef _WIN32
connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)),
restable, SLOT(setDocSource(std::shared_ptr<DocSequence>)));
#else
connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)), connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
restable, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>))); restable, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#endif
connect(this, SIGNAL(searchReset()), connect(this, SIGNAL(searchReset()),
restable, SLOT(resetSource())); restable, SLOT(resetSource()));
connect(this, SIGNAL(resultsReady()), connect(this, SIGNAL(resultsReady()),
@ -378,8 +388,13 @@ void RclMain::init()
this, SLOT(showSnippets(Rcl::Doc))); this, SLOT(showSnippets(Rcl::Doc)));
reslist->setRclMain(this, true); reslist->setRclMain(this, true);
#ifdef _WIN32
connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)),
reslist, SLOT(setDocSource(std::shared_ptr<DocSequence>)));
#else
connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)), connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR<DocSequence>)),
reslist, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>))); reslist, SLOT(setDocSource(STD_SHARED_PTR<DocSequence>)));
#endif
connect(firstPageAction, SIGNAL(triggered()), connect(firstPageAction, SIGNAL(triggered()),
reslist, SLOT(resultPageFirst())); reslist, SLOT(resultPageFirst()));
connect(prevPageAction, SIGNAL(triggered()), connect(prevPageAction, SIGNAL(triggered()),

4
src/qtgui/ssearch_w.cpp
View File

@ -14,8 +14,11 @@
* Free Software Foundation, Inc., * Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "autoconfig.h"
#include <sstream> #include <sstream>
#include <set> #include <set>
#include MEMORY_INCLUDE
#include <qapplication.h> #include <qapplication.h>
#include <qinputdialog.h> #include <qinputdialog.h>
@ -34,7 +37,6 @@
#include "guiutils.h" #include "guiutils.h"
#include "searchdata.h" #include "searchdata.h"
#include "ssearch_w.h" #include "ssearch_w.h"
#include MEMORY_INCLUDE
#include "textsplit.h" #include "textsplit.h"
#include "wasatorcl.h" #include "wasatorcl.h"
#include "rclhelp.h" #include "rclhelp.h"