All Plugins: Use global future synchronizer

Instead of using plugin's own synchronizers. The global
synchronizer does the synchronization just before all the
plugins' destructors run (in sync), so this should be
the right equivalent.

Change-Id: I8d09c9ea4a11b7a703684ad5319191ce310d992e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 6ae5f816c3..eed5a6d0e4 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -13,12 +13,13 @@
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <texteditor/textdocument.h>
 
 #include <utils/asynctask.h>
 #include <utils/differ.h>
 #include <utils/fileutils.h>
-#include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 
 #include <QAction>
@@ -114,8 +115,9 @@ DiffFilesController::DiffFilesController(IDocument *document)
         QList<std::optional<FileData>> *outputList = storage.activeStorage();
 
         const auto setupDiff = [this](AsyncTask<FileData> &async, const ReloadInput &reloadInput) {
-            async.setConcurrentCallData(DiffFile(ignoreWhitespace(), contextLineCount()), reloadInput);
-            async.setFutureSynchronizer(Internal::DiffEditorPlugin::futureSynchronizer());
+            async.setConcurrentCallData(
+                DiffFile(ignoreWhitespace(), contextLineCount()), reloadInput);
+            async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         };
         const auto onDiffDone = [outputList](const AsyncTask<FileData> &async, int i) {
             if (async.isResultAvailable())
@@ -415,12 +417,10 @@ public:
 
     DiffEditorFactory m_editorFactory;
     DiffEditorServiceImpl m_service;
-    FutureSynchronizer m_futureSynchronizer;
 };
 
 DiffEditorPluginPrivate::DiffEditorPluginPrivate()
 {
-    m_futureSynchronizer.setCancelOnWait(true);
     //register actions
     ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS);
     toolsContainer->insertGroup(Core::Constants::G_TOOLS_DEBUG, Constants::G_TOOLS_DIFF);
@@ -535,12 +535,6 @@ void DiffEditorPlugin::initialize()
     d = new DiffEditorPluginPrivate;
 }
 
-FutureSynchronizer *DiffEditorPlugin::futureSynchronizer()
-{
-    QTC_ASSERT(s_instance, return nullptr);
-    return &s_instance->d->m_futureSynchronizer;
-}
-
 } // namespace Internal
 } // namespace DiffEditor