feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mark canceled searches as such.

Browse Source 
Task-number: QTCREATORBUG-6820

Change-Id: Ic14c0ea6f26e4a05c642012b87578f30c817fef7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Eike Ziller
2012-05-16 15:59:16 +02:00
parent cfa703c692
commit 8a7bc472dc
8 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -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(&parameters, 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);
}

2
src/plugins/cpptools/symbolsfindfilter.cpp
View File

@@ -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();
}