CppEditorPlugin: Partially pimpl and avoid use of global object pool

Change-Id: I1e55848a9947ff0b4bffcdca717419db8f6f2fa5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 3 insertions, 30 deletions

diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h
index c1d86a6159..c4fb3b720b 100644
--- a/src/plugins/cppeditor/cppeditorplugin.h
+++ b/src/plugins/cppeditor/cppeditorplugin.h
@@ -25,19 +25,12 @@
 
 #pragma once
 
-#include <coreplugin/editormanager/ieditorfactory.h>
-
 #include <extensionsystem/iplugin.h>
 
-#include <QtPlugin>
-#include <QAction>
-
-namespace TextEditor { class BaseTextEditor; }
-
 namespace CppEditor {
 namespace Internal {
 
-class CppCodeModelInspectorDialog;
+class CppEditorPluginPrivate;
 class CppQuickFixAssistProvider;
 
 class CppEditorPlugin : public ExtensionSystem::IPlugin
@@ -51,9 +44,8 @@ public:
 
     static CppEditorPlugin *instance();
 
-    bool initialize(const QStringList &arguments, QString *errorMessage = 0) override;
+    bool initialize(const QStringList &arguments, QString *errorMessage) override;
     void extensionsInitialized() override;
-    ShutdownFlag aboutToShutdown() override;
 
     CppQuickFixAssistProvider *quickFixProvider() const;
 
@@ -71,11 +63,6 @@ public:
     void renameSymbolUnderCursor();
     void switchDeclarationDefinition();
 
-private:
-    void onTaskStarted(Core::Id type);
-    void onAllTasksFinished(Core::Id type);
-    void inspectCppCodeModel();
-
 #ifdef WITH_TESTS
 private:
     QList<QObject *> createTestObjects() const override;
@@ -252,21 +239,7 @@ private slots:
 #endif // WITH_TESTS
 
 private:
-    Core::IEditor *createEditor(QWidget *parent);
-
-    static CppEditorPlugin *m_instance;
-
-    QAction *m_renameSymbolUnderCursorAction;
-    QAction *m_findUsagesAction;
-    QAction *m_reparseExternallyChangedFiles;
-    QAction *m_openTypeHierarchyAction;
-    QAction *m_openIncludeHierarchyAction;
-
-    CppQuickFixAssistProvider *m_quickFixProvider;
-
-    QPointer<CppCodeModelInspectorDialog> m_cppCodeModelInspectorDialog;
-
-    QPointer<TextEditor::BaseTextEditor> m_currentEditor;
+    CppEditorPluginPrivate *d = nullptr;
 };
 
 } // namespace Internal