Remove PluginManager::futureSynchronizer()

Use the global synchronizer from Utils::futureSynchronizer() directly

Change-Id: Ic8843bc1ff7951c041529a258f36117f08ec4b35
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

15 files changed, 16 insertions, 49 deletions

diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 9aa10709be..4fbaba01e5 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -434,11 +434,6 @@ QString PluginManager::systemInformation()
     return result;
 }
 
-FutureSynchronizer *PluginManager::futureSynchronizer()
-{
-    return Utils::futureSynchronizer();
-}
-
 /*!
     The list of paths were the plugin manager searches for plugins.
 
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index c5045e7187..68bba7a83c 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -16,8 +16,6 @@ QT_BEGIN_NAMESPACE
 class QTextStream;
 QT_END_NAMESPACE
 
-namespace Utils { class FutureSynchronizer; }
-
 namespace ExtensionSystem {
 class IPlugin;
 class PluginSpec;
@@ -139,8 +137,6 @@ public:
 
     static QString systemInformation();
 
-    static Utils::FutureSynchronizer *futureSynchronizer();
-
 signals:
     void objectAdded(QObject *obj);
     void aboutToRemoveObject(QObject *obj);
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp
index cb76705cdc..cd184766a7 100644
--- a/src/plugins/cmakeprojectmanager/fileapireader.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp
@@ -12,8 +12,6 @@
 
 #include <coreplugin/messagemanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/projectexplorer.h>
 
 #include <utils/algorithm.h>
@@ -172,7 +170,7 @@ void FileApiReader::stop()
 
     if (m_future) {
         m_future->cancel();
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(*m_future);
+        Utils::futureSynchronizer()->addFuture(*m_future);
     }
     m_future = {};
     m_isParsing = false;
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index 4ab893a9e6..1ba5a9a1f1 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -8,8 +8,6 @@
 
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/treescanner.h>
 
 #include <utils/async.h>
@@ -190,7 +188,7 @@ void CompilationDbParser::start()
                                    "CompilationDatabase.Parse");
     ++m_runningParserJobs;
     m_parserWatcher.setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 void CompilationDbParser::stop()
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index 9769fa82d6..d81c3be586 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -5,8 +5,6 @@
 
 #include "../coreplugintr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/algorithm.h>
@@ -277,8 +275,8 @@ ResultsCollector::~ResultsCollector()
         return;
 
     m_deduplicator->cancel();
-    if (ExtensionSystem::PluginManager::futureSynchronizer()) {
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
+    if (Utils::futureSynchronizer()) {
+        Utils::futureSynchronizer()->addFuture(m_watcher->future());
         return;
     }
     m_watcher->future().waitForFinished();
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index 4cd17ae52d..b4ec9769d7 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -21,8 +21,6 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <texteditor/refactoroverlay.h>
 #include <texteditor/texteditorconstants.h>
 
@@ -239,7 +237,7 @@ void FunctionDeclDefLinkFinder::startFindLinkAt(
     m_watcher.reset(new QFutureWatcher<std::shared_ptr<FunctionDeclDefLink> >());
     connect(m_watcher.get(), &QFutureWatcherBase::finished, this, &FunctionDeclDefLinkFinder::onFutureDone);
     m_watcher->setFuture(Utils::asyncRun(findLinkHelper, result, refactoringChanges));
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
+    Utils::futureSynchronizer()->addFuture(m_watcher->future());
 }
 
 bool FunctionDeclDefLink::isValid() const
diff --git a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
index e398c14b86..f9e13df082 100644
--- a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
+++ b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
@@ -9,8 +9,6 @@
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/TranslationUnit.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
@@ -143,7 +141,7 @@ void SemanticInfoUpdater::updateDetached(const SemanticInfo::Source &source)
     });
     const auto future = Utils::asyncRun(CppModelManager::sharedThreadPool(), doUpdate, source);
     d->m_watcher->setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 SemanticInfo SemanticInfoUpdater::semanticInfo() const
diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
index 67fb6d7a1b..bf1eabd153 100644
--- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp
+++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
@@ -7,8 +7,6 @@
 #include "cppeditorwidget.h"
 #include "cppmodelmanager.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 #include <utils/textutils.h>
@@ -75,7 +73,7 @@ CppUseSelectionsUpdater::RunnerInfo CppUseSelectionsUpdater::update(CallType cal
         m_runnerWordStartPosition = params.textCursor.position();
 
         m_runnerWatcher->setFuture(cppEditorDocument->cursorInfo(params));
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_runnerWatcher->future());
+        Utils::futureSynchronizer()->addFuture(m_runnerWatcher->future());
         return RunnerInfo::Started;
     } else { // synchronous case
         abortSchedule();
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 0aa3b2e769..2e1c5ab275 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -9,8 +9,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/kitoptionspage.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -488,7 +486,7 @@ void DebuggerItemConfigWidget::binaryPathHasChanged()
                 tmp.reinitializeFromFile();
                 return tmp;
             }));
-            ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_updateWatcher.future());
+            Utils::futureSynchronizer()->addFuture(m_updateWatcher.future());
         } else {
             const DebuggerItem tmp;
             setAbis(tmp.abiNames());
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 3a968a1e86..1e09d6ec9d 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -11,7 +11,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/async.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/submitfilemodel.h>
@@ -210,7 +209,7 @@ void GitSubmitEditor::updateFileModel()
     Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"),
                                    TASK_UPDATE_COMMIT);
 
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_fetchWatcher.future());
+    Utils::futureSynchronizer()->addFuture(m_fetchWatcher.future());
 }
 
 void GitSubmitEditor::forceUpdateFileModel()
diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp
index a117afd916..1c87253fc7 100644
--- a/src/plugins/help/helpmanager.cpp
+++ b/src/plugins/help/helpmanager.cpp
@@ -8,8 +8,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/filesystemwatcher.h>
@@ -140,7 +138,7 @@ void HelpManager::registerDocumentation(const QStringList &files)
     }
 
     QFuture<bool> future = Utils::asyncRun(&registerDocumentationNow, collectionFilePath(), files);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
     Utils::onResultReady(future, this, [](bool docsChanged){
         if (docsChanged) {
             d->m_helpEngine->setupData();
@@ -203,7 +201,7 @@ void HelpManager::unregisterDocumentation(const QStringList &files)
 
     d->m_userRegisteredFiles.subtract(Utils::toSet(files));
     QFuture<bool> future = Utils::asyncRun(&unregisterDocumentationNow, collectionFilePath(), files);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
     Utils::onResultReady(future, this, [](bool docsChanged){
         if (docsChanged) {
             d->m_helpEngine->setupData();
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index d7ad6bf3be..6d7d559d48 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -12,8 +12,6 @@
 
 #include <coreplugin/icore.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -34,8 +32,8 @@
 
 #include <utils/algorithm.h>
 #include <utils/futuresynchronizer.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QDomDocument>
@@ -386,8 +384,7 @@ void IosConfigurations::updateSimulators()
         dev = IDevice::ConstPtr(new IosSimulator(devId));
         devManager->addDevice(dev);
     }
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(
-        SimulatorControl::updateAvailableSimulators(this));
+    Utils::futureSynchronizer()->addFuture(SimulatorControl::updateAvailableSimulators(this));
 }
 
 void IosConfigurations::setDeveloperPath(const FilePath &devPath)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 336f1d2246..ecc83ecf01 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2187,7 +2187,7 @@ void ProjectExplorerPluginPrivate::checkRecentProjectsAsync()
               p.exists = p.filePath.needsDevice() || p.filePath.isFile();
               return p;
           });
-    PluginManager::futureSynchronizer()->addFuture(m_recentProjectsFuture);
+    Utils::futureSynchronizer()->addFuture(m_recentProjectsFuture);
 
     onResultReady(m_recentProjectsFuture, this, [this](const RecentProjectsEntry &p) {
         auto it = std::find_if(
diff --git a/src/plugins/python/pythonbuildconfiguration.cpp b/src/plugins/python/pythonbuildconfiguration.cpp
index 1255af1442..a64020083a 100644
--- a/src/plugins/python/pythonbuildconfiguration.cpp
+++ b/src/plugins/python/pythonbuildconfiguration.cpp
@@ -30,8 +30,6 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/commandline.h>
 #include <utils/detailswidget.h>
@@ -110,7 +108,7 @@ void PySideBuildStep::checkForPySide(const FilePath &python, const QString &pySi
     });
     const auto future = Pip::instance(python)->info(package);
     m_watcher->setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 void PySideBuildStep::handlePySidePackageInfo(const PipPackageInfo &pySideInfo,
diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp
index 2bab91fa71..550a021a87 100644
--- a/src/plugins/valgrind/xmlprotocol/parser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/parser.cpp
@@ -10,8 +10,6 @@
 #include "suppression.h"
 #include "../valgrindtr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/expected.h>
 #include <utils/futuresynchronizer.h>
@@ -684,7 +682,7 @@ public:
         if (!m_watcher)
             return;
         m_thread->cancel();
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
+        Utils::futureSynchronizer()->addFuture(m_watcher->future());
     }
 
     void start()