Keep multiple search results in history.

Change-Id: I7350c78479343e85b1ca4957e08bccefb5756d20
Reviewed-on: http://codereview.qt-project.org/4556
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

src/plugins/cpptools/cppfindreferences.cpp

@@ -161,8 +161,7 @@ public:
 
 CppFindReferences::CppFindReferences(CppModelManagerInterface *modelManager)
     : QObject(modelManager),
-      _modelManager(modelManager),
-      m_currentSearch(0)
+      _modelManager(modelManager)
 {
     m_watcher.setPendingResultsLimit(1);
     connect(&m_watcher, SIGNAL(resultsReadyAt(int,int)), this, SLOT(displayResults(int,int)));
@@ -227,9 +226,11 @@ static void find_helper(QFutureInterface<Usage> &future,
 
 void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context)
 {
-    m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(Find::SearchResultWindow::SearchOnly);
     Overview overview;
-    m_currentSearch->setInfo(tr("C++ Usages:"), QString(), overview(context.fullyQualifiedName(symbol)));
+    m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(tr("C++ Usages:"),
+                                                QString(),
+                                                overview(context.fullyQualifiedName(symbol)),
+                                                Find::SearchResultWindow::SearchOnly);
     connect(m_currentSearch, SIGNAL(activated(Find::SearchResultItem)),
             this, SLOT(openEditor(Find::SearchResultItem)));
 
@@ -243,10 +244,12 @@ void CppFindReferences::renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus:
         const QString textToReplace = replacement.isEmpty()
                 ? QString::fromUtf8(id->chars(), id->size()) : replacement;
 
-        m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(
-                Find::SearchResultWindow::SearchAndReplace, QLatin1String("CppEditor"));
         Overview overview;
-        m_currentSearch->setInfo(tr("C++ Usages:"), QString(), overview(context.fullyQualifiedName(symbol)));
+        m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(
+                    tr("C++ Usages:"),
+                    QString(),
+                    overview(context.fullyQualifiedName(symbol)),
+                    Find::SearchResultWindow::SearchAndReplace, QLatin1String("CppEditor"));
         m_currentSearch->setTextToReplace(textToReplace);
 
         connect(m_currentSearch, SIGNAL(activated(Find::SearchResultItem)),
@@ -293,6 +296,10 @@ void CppFindReferences::onReplaceButtonClicked(const QString &text,
 
 void CppFindReferences::displayResults(int first, int last)
 {
+    if (!m_currentSearch) {
+        m_watcher.cancel();
+        return;
+    }
     for (int index = first; index != last; ++index) {
         Usage result = m_watcher.future().resultAt(index);
         m_currentSearch->addResult(result.path,
@@ -305,7 +312,8 @@ void CppFindReferences::displayResults(int first, int last)
 
 void CppFindReferences::searchFinished()
 {
-    m_currentSearch->finishSearch();
+    if (m_currentSearch)
+        m_currentSearch->finishSearch();
     m_currentSearch = 0;
     emit changed();
 }
@@ -422,8 +430,11 @@ static void findMacroUses_helper(QFutureInterface<Usage> &future,
 
 void CppFindReferences::findMacroUses(const Macro &macro)
 {
-    m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(Find::SearchResultWindow::SearchOnly);
-    m_currentSearch->setInfo(tr("C++ Macro Usages:"), QString(), QString::fromLocal8Bit(macro.name()));
+    m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(
+                tr("C++ Macro Usages:"),
+                QString(),
+                macro.name(),
+                Find::SearchResultWindow::SearchOnly);
 
     Find::SearchResultWindow::instance()->popup(true);
 

src/plugins/cpptools/cppfindreferences.h

@@ -94,7 +94,7 @@ private:
 
 private:
     QPointer<CPlusPlus::CppModelManagerInterface> _modelManager;
-    Find::SearchResult *m_currentSearch;
+    QPointer<Find::SearchResult> m_currentSearch;
     QFutureWatcher<CPlusPlus::Usage> m_watcher;
 
     mutable QMutex m_depsLock;

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -104,7 +104,6 @@ SymbolsFindFilter::SymbolsFindFilter(CppModelManager *manager)
     : m_manager(manager),
       m_isRunning(false),
       m_enabled(true),
-      m_currentSearch(0),
       m_symbolsToSearch(SearchSymbols::AllTypes),
       m_scope(SearchProjectsOnly)
 {
@@ -150,8 +149,7 @@ void SymbolsFindFilter::findAll(const QString &txt, Find::FindFlags findFlags)
     m_isRunning = true;
     emit changed();
     Find::SearchResultWindow *window = Find::SearchResultWindow::instance();
-    m_currentSearch = window->startNewSearch();
-    m_currentSearch->setInfo(label(), toolTip(findFlags), txt);
+    m_currentSearch = window->startNewSearch(label(), toolTip(findFlags), txt);
     connect(m_currentSearch, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
     window->popup(true);
 
@@ -177,6 +175,10 @@ void SymbolsFindFilter::findAll(const QString &txt, Find::FindFlags findFlags)
 
 void SymbolsFindFilter::addResults(int begin, int end)
 {
+    if (!m_currentSearch) {
+        m_watcher.cancel();
+        return;
+    }
     QList<Find::SearchResultItem> items;
     for (int i = begin; i < end; ++i)
         items << m_watcher.resultAt(i);
@@ -185,7 +187,8 @@ void SymbolsFindFilter::addResults(int begin, int end)
 
 void SymbolsFindFilter::finish()
 {
-    m_currentSearch->finishSearch();
+    if (m_currentSearch)
+        m_currentSearch->finishSearch();
     m_currentSearch = 0;
     m_isRunning = false;
     emit changed();

src/plugins/cpptools/symbolsfindfilter.h

@@ -40,6 +40,7 @@
 
 #include <QtCore/QFutureInterface>
 #include <QtCore/QFutureWatcher>
+#include <QtCore/QPointer>
 #include <QtGui/QWidget>
 #include <QtGui/QCheckBox>
 #include <QtGui/QRadioButton>
@@ -97,7 +98,7 @@ private:
     bool m_isRunning;
     bool m_enabled;
     QFutureWatcher<Find::SearchResultItem> m_watcher;
-    Find::SearchResult *m_currentSearch;
+    QPointer<Find::SearchResult> m_currentSearch;
     SearchSymbols::SymbolTypes m_symbolsToSearch;
     SearchSymbols m_search;
     SearchScope m_scope;