CompilationDatabasePM: Use setup function for plugin items

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

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp

@@ -41,8 +41,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace CompilationDatabaseProjectManager {
+namespace CompilationDatabaseProjectManager::Internal {
-namespace Internal {
 
 namespace {
 
@@ -481,48 +480,65 @@ static TextEditor::TextDocument *createCompilationDatabaseDocument()
     return doc;
 }
 
-CompilationDatabaseEditorFactory::CompilationDatabaseEditorFactory()
+class CompilationDatabaseEditorFactory final : public TextEditor::TextEditorFactory
-{
-    setId(Constants::COMPILATIONDATABASEPROJECT_ID);
-    setDisplayName(::Core::Tr::tr("Compilation Database"));
-    addMimeType(Constants::COMPILATIONDATABASEMIMETYPE);
-
-    setEditorCreator([]() { return new TextEditor::BaseTextEditor; });
-    setEditorWidgetCreator([]() { return new TextEditor::TextEditorWidget; });
-    setDocumentCreator(createCompilationDatabaseDocument);
-    setUseGenericHighlighter(true);
-    setCommentDefinition(Utils::CommentDefinition::HashStyle);
-    setCodeFoldingSupported(true);
-}
-
-class CompilationDatabaseBuildConfiguration : public BuildConfiguration
 {
 public:
-    CompilationDatabaseBuildConfiguration(Target *target, Utils::Id id)
+    CompilationDatabaseEditorFactory()
-        : BuildConfiguration(target, id)
     {
+        setId(Constants::COMPILATIONDATABASEPROJECT_ID);
+        setDisplayName(::Core::Tr::tr("Compilation Database"));
+        addMimeType(Constants::COMPILATIONDATABASEMIMETYPE);
+
+        setEditorCreator([] { return new TextEditor::BaseTextEditor; });
+        setEditorWidgetCreator([] { return new TextEditor::TextEditorWidget; });
+        setDocumentCreator(createCompilationDatabaseDocument);
+        setUseGenericHighlighter(true);
+        setCommentDefinition(Utils::CommentDefinition::HashStyle);
+        setCodeFoldingSupported(true);
     }
 };
 
-
+void setupCompilationDatabaseEditor()
-CompilationDatabaseBuildConfigurationFactory::CompilationDatabaseBuildConfigurationFactory()
 {
-    registerBuildConfiguration<CompilationDatabaseBuildConfiguration>(
+    static CompilationDatabaseEditorFactory theCompilationDatabaseEditorFactory;
-        "CompilationDatabase.CompilationDatabaseBuildConfiguration");
-
-    setSupportedProjectType(Constants::COMPILATIONDATABASEPROJECT_ID);
-    setSupportedProjectMimeTypeName(Constants::COMPILATIONDATABASEMIMETYPE);
-
-    setBuildGenerator([](const Kit *, const FilePath &projectPath, bool) {
-        const QString name = QCoreApplication::translate("QtC::ProjectExplorer", "Release");
-        ProjectExplorer::BuildInfo info;
-        info.typeName = name;
-        info.displayName = name;
-        info.buildType = BuildConfiguration::Release;
-        info.buildDirectory = projectPath.parentDir();
-        return QList<BuildInfo>{info};
-    });
 }
 
-} // namespace Internal
+// CompilationDatabaseBuildConfigurationFactory
-} // namespace CompilationDatabaseProjectManager
+
+class CompilationDatabaseBuildConfiguration final : public BuildConfiguration
+{
+public:
+    CompilationDatabaseBuildConfiguration(Target *target, Id id)
+        : BuildConfiguration(target, id)
+    {}
+};
+
+class CompilationDatabaseBuildConfigurationFactory final : public BuildConfigurationFactory
+{
+public:
+    CompilationDatabaseBuildConfigurationFactory()
+    {
+        registerBuildConfiguration<CompilationDatabaseBuildConfiguration>(
+            "CompilationDatabase.CompilationDatabaseBuildConfiguration");
+
+        setSupportedProjectType(Constants::COMPILATIONDATABASEPROJECT_ID);
+        setSupportedProjectMimeTypeName(Constants::COMPILATIONDATABASEMIMETYPE);
+
+        setBuildGenerator([](const Kit *, const FilePath &projectPath, bool) {
+            const QString name = QCoreApplication::translate("QtC::ProjectExplorer", "Release");
+            ProjectExplorer::BuildInfo info;
+            info.typeName = name;
+            info.displayName = name;
+            info.buildType = BuildConfiguration::Release;
+            info.buildDirectory = projectPath.parentDir();
+            return QList<BuildInfo>{info};
+        });
+    }
+};
+
+void setupCompilationDatabaseBuildConfiguration()
+{
+    static CompilationDatabaseBuildConfigurationFactory theCDBuildConfigurationFactory;
+}
+
+} // CompilationDatabaseProjectManager::Internal

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h

@@ -59,16 +59,8 @@ public:
     Utils::FileSystemWatcher * const m_deployFileWatcher;
 };
 
-class CompilationDatabaseEditorFactory : public TextEditor::TextEditorFactory
+void setupCompilationDatabaseEditor();
-{
-public:
-    CompilationDatabaseEditorFactory();
-};
 
-class CompilationDatabaseBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
+void setupCompilationDatabaseBuildConfiguration();
-{
-public:
-    CompilationDatabaseBuildConfigurationFactory();
-};
 
 } // CompilationDatabaseProjectManager::Internal

src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp

@@ -29,27 +29,15 @@ namespace CompilationDatabaseProjectManager::Internal {
 const char CHANGEROOTDIR[] = "CompilationDatabaseProjectManager.ChangeRootDirectory";
 const char COMPILE_COMMANDS_JSON[] = "compile_commands.json";
 
-class CompilationDatabaseProjectManagerPluginPrivate
-{
-public:
-    CompilationDatabaseEditorFactory editorFactory;
-    CompilationDatabaseBuildConfigurationFactory buildConfigFactory;
-    QAction changeRootAction{Tr::tr("Change Root Directory")};
-};
-
 class CompilationDatabaseProjectManagerPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CompilationDatabaseProjectManager.json")
 
-    ~CompilationDatabaseProjectManagerPlugin()
-    {
-        delete d;
-    }
-
     void initialize() final
     {
-        d = new CompilationDatabaseProjectManagerPluginPrivate;
+        setupCompilationDatabaseEditor();
+        setupCompilationDatabaseBuildConfiguration();
 
         Utils::FileIconProvider::registerIconOverlayForFilename(Utils::Icons::PROJECT.imageFilePath().toString(),
                                                                 COMPILE_COMMANDS_JSON);
@@ -60,21 +48,21 @@ class CompilationDatabaseProjectManagerPlugin final : public ExtensionSystem::IP
         ProjectManager::registerProjectType<CompilationDatabaseProject>(
             Constants::COMPILATIONDATABASEMIMETYPE);
 
-        Command *cmd = ActionManager::registerAction(&d->changeRootAction, CHANGEROOTDIR);
+        Command *cmd = ActionManager::registerAction(&m_changeRootAction, CHANGEROOTDIR);
 
         ActionContainer *mprojectContextMenu = ActionManager::actionContainer(
             ProjectExplorer::Constants::M_PROJECTCONTEXT);
         mprojectContextMenu->addSeparator(ProjectExplorer::Constants::G_PROJECT_TREE);
         mprojectContextMenu->addAction(cmd, ProjectExplorer::Constants::G_PROJECT_TREE);
 
-        connect(&d->changeRootAction, &QAction::triggered,
+        connect(&m_changeRootAction, &QAction::triggered,
                 ProjectTree::instance(), &ProjectTree::changeProjectRootDirectory);
 
         const auto onProjectChanged = [this] {
             const auto currentProject = qobject_cast<CompilationDatabaseProject *>(
                 ProjectTree::currentProject());
 
-            d->changeRootAction.setEnabled(currentProject);
+            m_changeRootAction.setEnabled(currentProject);
         };
 
         connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged,
@@ -88,7 +76,7 @@ class CompilationDatabaseProjectManagerPlugin final : public ExtensionSystem::IP
 #endif
     }
 
-    class CompilationDatabaseProjectManagerPluginPrivate *d = nullptr;
+    QAction m_changeRootAction{Tr::tr("Change Root Directory")};
 };
 
 } // CompilationDatabaseProjectManager::Internal