diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-05-16 15:59:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-05-22 13:41:46 +0200 |
| commit | 8a7bc472dc970d39c698ad7af7b358daaf0aaa6c (patch) | |
| tree | 26fca65f3512acb1290e30a42a0422ac6d19cc1a /src/plugins/cpptools | |
| parent | cfa703c6927980a4e08f08f3a98b4eb89071bb31 (diff) | |
| download | qt-creator-8a7bc472dc970d39c698ad7af7b358daaf0aaa6c.tar.gz | |
Mark canceled searches as such.
Task-number: QTCREATORBUG-6820
Change-Id: Ic14c0ea6f26e4a05c642012b87578f30c817fef7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppfindreferences.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cpptools/symbolsfindfilter.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index d1332f0e0d..a5d59f30c6 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -275,7 +275,7 @@ void CppFindReferences::findAll_helper(Find::SearchResult *search) { CppFindReferencesParameters parameters = search->userData().value<CppFindReferencesParameters>(); if (!(parameters.symbol && parameters.symbol->identifier())) { - search->finishSearch(); + search->finishSearch(false); return; } connect(search, SIGNAL(cancelled()), this, SLOT(cancel())); @@ -313,7 +313,7 @@ void CppFindReferences::searchAgain() Snapshot snapshot = CppModelManagerInterface::instance()->snapshot(); search->restart(); if (!findSymbol(¶meters, snapshot)) { - search->finishSearch(); + search->finishSearch(false); return; } search->setUserData(qVariantFromValue(parameters)); @@ -498,7 +498,7 @@ void CppFindReferences::searchFinished() QFutureWatcher<Usage> *watcher = static_cast<QFutureWatcher<Usage> *>(sender()); Find::SearchResult *search = m_watchers.value(watcher); if (search) - search->finishSearch(); + search->finishSearch(watcher->isCanceled()); m_watchers.remove(watcher); } diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index 578cbaed95..4356af9a22 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -217,7 +217,7 @@ void SymbolsFindFilter::finish() static_cast<QFutureWatcher<Find::SearchResultItem> *>(sender()); Find::SearchResult *search = m_watchers.value(watcher); if (search) - search->finishSearch(); + search->finishSearch(watcher->isCanceled()); m_watchers.remove(watcher); watcher->deleteLater(); } |