diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 72acef58ef6..2283ecc7afd 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -43,9 +43,9 @@ #include #include +#include #include -#include #include using namespace CPlusPlus; @@ -256,7 +256,7 @@ void FunctionDeclDefLinkFinder::startFindLinkAt( // handle the rest in a thread m_watcher.reset(new QFutureWatcher >()); connect(m_watcher.data(), SIGNAL(finished()), this, SLOT(onFutureDone())); - m_watcher->setFuture(QtConcurrent::run(&findLinkHelper, result, refactoringChanges)); + m_watcher->setFuture(Utils::runAsync(findLinkHelper, result, refactoringChanges)); } FunctionDeclDefLink::FunctionDeclDefLink() diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp index 16b3a24a098..446c525f5ab 100644 --- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp +++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp @@ -40,8 +40,8 @@ #include #include +#include -#include #include #include #include @@ -350,7 +350,7 @@ void CppUseSelectionsUpdater::handleSymbolCaseAsynchronously(const Document::Ptr m_findUsesCursorPosition = m_editorWidget->position(); const Params params = Params(m_editorWidget->textCursor(), document, snapshot); - m_findUsesWatcher->setFuture(QtConcurrent::run(&findUses, params)); + m_findUsesWatcher->setFuture(Utils::runAsync(findUses, params)); } void CppUseSelectionsUpdater::handleSymbolCaseSynchronously(const Document::Ptr document, diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 4031b2dac70..272fd9f1287 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -203,9 +203,9 @@ BuiltinEditorDocumentProcessor::~BuiltinEditorDocumentProcessor() void BuiltinEditorDocumentProcessor::run() { - m_parserFuture = QtConcurrent::run(&runParser, - parser(), - CppModelManager::instance()->workingCopy()); + m_parserFuture = Utils::runAsync(runParser, + parser(), + CppModelManager::instance()->workingCopy()); } BaseEditorDocumentParser::Ptr BuiltinEditorDocumentProcessor::parser() diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index e4e8a398234..81a5be27df8 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -353,7 +353,7 @@ QFuture BuiltinIndexingSupport::refreshSourceFiles(const QSet &so params.workingCopy = mgr->workingCopy(); params.sourceFiles = sourceFiles; - QFuture result = QtConcurrent::run(&parse, params); + QFuture result = Utils::runAsync(parse, params); if (m_synchronizer.futures().size() > 10) { QList > futures = m_synchronizer.futures(); diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index b4e1cb5d419..e91bab1f579 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -32,9 +32,9 @@ #include -#include #include -#include +#include +#include namespace CppTools { diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 713ea84e79e..d8732be1f9c 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -365,7 +365,7 @@ void CppFindReferences::findAll_helper(SearchResult *search, Symbol *symbol, SearchResultWindow::instance()->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus); const WorkingCopy workingCopy = m_modelManager->workingCopy(); QFuture result; - result = QtConcurrent::run(&find_helper, workingCopy, context, symbol); + result = Utils::runAsync(find_helper, workingCopy, context, symbol); createWatcher(result, search); FutureProgress *progress = ProgressManager::addTask(result, tr("Searching for Usages"), @@ -669,7 +669,7 @@ void CppFindReferences::findMacroUses(const Macro ¯o, const QString &replace } QFuture result; - result = QtConcurrent::run(&findMacroUses_helper, workingCopy, snapshot, macro); + result = Utils::runAsync(findMacroUses_helper, workingCopy, snapshot, macro); createWatcher(result, search); FutureProgress *progress = ProgressManager::addTask(result, tr("Searching for Usages"), diff --git a/src/plugins/cpptools/cppsemanticinfoupdater.cpp b/src/plugins/cpptools/cppsemanticinfoupdater.cpp index c1267eb4166..a95c90521ce 100644 --- a/src/plugins/cpptools/cppsemanticinfoupdater.cpp +++ b/src/plugins/cpptools/cppsemanticinfoupdater.cpp @@ -200,8 +200,7 @@ void SemanticInfoUpdater::updateDetached(const SemanticInfo::Source source) return; } - d->m_future = QtConcurrent::run - (&SemanticInfoUpdaterPrivate::update_helper, d.data(), source); + d->m_future = Utils::runAsync(&SemanticInfoUpdaterPrivate::update_helper, d.data(), source); } SemanticInfo SemanticInfoUpdater::semanticInfo() const diff --git a/src/plugins/cpptools/symbolsearcher_test.cpp b/src/plugins/cpptools/symbolsearcher_test.cpp index 64e114a0397..1eae1a9b9a7 100644 --- a/src/plugins/cpptools/symbolsearcher_test.cpp +++ b/src/plugins/cpptools/symbolsearcher_test.cpp @@ -106,7 +106,7 @@ public: const QScopedPointer symbolSearcher( indexingSupport->createSymbolSearcher(searchParameters, QSet() << testFile)); QFuture search - = QtConcurrent::run(&SymbolSearcher::runSearch, symbolSearcher.data()); + = Utils::runAsync(&SymbolSearcher::runSearch, symbolSearcher.data()); search.waitForFinished(); ResultDataList results = ResultData::fromSearchResultList(search.results()); QCOMPARE(results, expectedResults); diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index dd2bb02fe2f..6d88b9deaf7 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -145,7 +145,7 @@ void SymbolsFindFilter::startSearch(SearchResult *search) SymbolSearcher *symbolSearcher = m_manager->indexingSupport()->createSymbolSearcher(parameters, projectFileNames); connect(watcher, SIGNAL(finished()), symbolSearcher, SLOT(deleteLater())); - watcher->setFuture(QtConcurrent::run(&SymbolSearcher::runSearch, symbolSearcher)); + watcher->setFuture(Utils::runAsync(&SymbolSearcher::runSearch, symbolSearcher)); FutureProgress *progress = ProgressManager::addTask(watcher->future(), tr("Searching for Symbol"), Core::Constants::TASK_SEARCH); connect(progress, SIGNAL(clicked()), search, SLOT(popup()));