GenericProject: Move plugin class definition to .cpp

Change-Id: I4da63d3d106431d7d0c8976e8d1705e40a68646c
Reviewed-by: Jarek Kobus <[email protected]>

4 files changed, 27 insertions, 45 deletions

diff --git a/src/plugins/genericprojectmanager/CMakeLists.txt b/src/plugins/genericprojectmanager/CMakeLists.txt
index 764ce9282c6..27c50924d24 100644
--- a/src/plugins/genericprojectmanager/CMakeLists.txt
+++ b/src/plugins/genericprojectmanager/CMakeLists.txt
@@ -11,6 +11,6 @@ add_qtc_plugin(GenericProjectManager
     genericprojectconstants.h
     genericprojectfileseditor.cpp genericprojectfileseditor.h
     genericprojectmanagertr.h
-    genericprojectplugin.cpp genericprojectplugin.h
+    genericprojectplugin.cpp
     genericprojectwizard.cpp genericprojectwizard.h
 )
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 5ce959e9a64..10b471081ce 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -34,7 +34,6 @@ QtcPlugin {
         "genericprojectfileseditor.h",
         "genericprojectmanagertr.h",
         "genericprojectplugin.cpp",
-        "genericprojectplugin.h",
         "genericprojectwizard.cpp",
         "genericprojectwizard.h",
     ]
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 9db1af67539..25721445f5e 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "genericprojectplugin.h"
-
 #include "genericbuildconfiguration.h"
 #include "genericmakestep.h"
 #include "genericproject.h"
@@ -14,6 +12,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projectnodes.h>
@@ -28,8 +28,7 @@ using namespace ProjectExplorer;
 using namespace Utils;
 namespace PEC = ProjectExplorer::Constants;
 
-namespace GenericProjectManager {
-namespace Internal {
+namespace GenericProjectManager::Internal {
 
 class GenericProjectPluginPrivate : public QObject
 {
@@ -41,16 +40,6 @@ public:
     GenericBuildConfigurationFactory buildConfigFactory;
 };
 
-GenericProjectPlugin::~GenericProjectPlugin()
-{
-    delete d;
-}
-
-void GenericProjectPlugin::initialize()
-{
-    d = new GenericProjectPluginPrivate;
-}
-
 GenericProjectPluginPrivate::GenericProjectPluginPrivate()
 {
     ProjectManager::registerProjectType<GenericProject>(Constants::GENERICMIMETYPE);
@@ -83,5 +72,26 @@ GenericProjectPluginPrivate::GenericProjectPluginPrivate()
     });
 }
 
-} // namespace Internal
-} // namespace GenericProjectManager
+class GenericProjectPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "GenericProjectManager.json")
+
+public:
+    ~GenericProjectPlugin() final
+    {
+        delete d;
+    }
+
+private:
+    void initialize() final
+    {
+        d = new GenericProjectPluginPrivate;
+    }
+
+    GenericProjectPluginPrivate *d = nullptr;
+};
+
+} // GenericProjectManager::Internal
+
+#include "genericprojectplugin.moc"
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h
deleted file mode 100644
index 9fab0fcc1b2..00000000000
--- a/src/plugins/genericprojectmanager/genericprojectplugin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace GenericProjectManager {
-namespace Internal {
-
-class GenericProjectPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "GenericProjectManager.json")
-
-public:
-    ~GenericProjectPlugin() override;
-
-private:
-    void initialize() override;
-    void extensionsInitialized() override { }
-
-    class GenericProjectPluginPrivate *d = nullptr;
-};
-
-} // namespace Internal
-} // namespace GenericProject