From 792b1c5b3ef06f47d510da933d78b196190704f5 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 11 Jan 2024 15:07:27 +0100
Subject: [PATCH] AppMan: Inline plugin class definition in .cpp

Change-Id: Ib5ccfec0726497421d24e9892de822d7259bcd7a
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
---
 .../qtapplicationmanager/CMakeLists.txt       |  2 +-
 .../qtapplicationmanager/appmanagerplugin.cpp | 42 +++++++++++--------
 .../qtapplicationmanager/appmanagerplugin.h   | 26 ------------
 .../qtapplicationmanager.qbs                  |  1 -
 4 files changed, 25 insertions(+), 46 deletions(-)
 delete mode 100644 src/plugins/qtapplicationmanager/appmanagerplugin.h

diff --git a/src/plugins/qtapplicationmanager/CMakeLists.txt b/src/plugins/qtapplicationmanager/CMakeLists.txt
index 3d99d6e406d..bb0ef7e8439 100644
--- a/src/plugins/qtapplicationmanager/CMakeLists.txt
+++ b/src/plugins/qtapplicationmanager/CMakeLists.txt
@@ -15,7 +15,7 @@ add_qtc_plugin(QtApplicationManagerIntegration
     appmanagerremoteinstallpackagestep.cpp appmanagerremoteinstallpackagestep.h
     appmanagermakeinstallstep.cpp appmanagermakeinstallstep.h
     appmanagercmakepackagestep.cpp appmanagercmakepackagestep.h
-    appmanagerplugin.cpp appmanagerplugin.h
+    appmanagerplugin.cpp
     appmanagerrunconfiguration.cpp appmanagerrunconfiguration.h
     appmanagerruncontrol.cpp appmanagerruncontrol.h
     appmanagerstringaspect.cpp appmanagerstringaspect.h
diff --git a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
index 8a16f45044a..189b196c112 100644
--- a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
@@ -3,8 +3,6 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "appmanagerplugin.h"
-
 #include "appmanagercreatepackagestep.h"
 #include "appmanagerdeployconfigurationautoswitcher.h"
 #include "appmanagerdeployconfigurationfactory.h"
@@ -16,27 +14,35 @@
 #include "appmanagerrunconfiguration.h"
 #include "appmanagerruncontrol.h"
 
+#include <extensionsystem/iplugin.h>
+
 namespace AppManager::Internal {
 
-AppManagerPlugin::~AppManagerPlugin() = default;
-
-void AppManagerPlugin::initialize()
+class AppManagerPlugin final : public ExtensionSystem::IPlugin
 {
-    setupAppManagerCMakePackageStep();
-    setupAppManagerMakeInstallStep();
-    setupAppManagerCreatePackageStep();
-    setupAppManagerDeployPackageStep();
-    setupAppManagerInstallPackageStep();
-    setupAppManagerRemoteInstallPackageStep();
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QtApplicationManagerIntegration.json")
 
-    setupAppManagerDeployConfiguration();
-    setupAppManagerDeployConfigurationAutoSwitcher();
+    void initialize() final
+    {
+        setupAppManagerCMakePackageStep();
+        setupAppManagerMakeInstallStep();
+        setupAppManagerCreatePackageStep();
+        setupAppManagerDeployPackageStep();
+        setupAppManagerInstallPackageStep();
+        setupAppManagerRemoteInstallPackageStep();
 
-    setupAppManagerRunConfiguration();
+        setupAppManagerDeployConfiguration();
+        setupAppManagerDeployConfigurationAutoSwitcher();
 
-    setupAppManagerRunWorker();
-    setupAppManagerDebugWorker();
-    setupAppManagerQmlToolingWorker();
-}
+        setupAppManagerRunConfiguration();
+
+        setupAppManagerRunWorker();
+        setupAppManagerDebugWorker();
+        setupAppManagerQmlToolingWorker();
+    }
+};
 
 } // AppManager::Internal
+
+#include "appmanagerplugin.moc"
diff --git a/src/plugins/qtapplicationmanager/appmanagerplugin.h b/src/plugins/qtapplicationmanager/appmanagerplugin.h
deleted file mode 100644
index ca95268b900..00000000000
--- a/src/plugins/qtapplicationmanager/appmanagerplugin.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2019 Luxoft Sweden AB
-// Copyright (C) 2018 Pelagicore AG
-// Copyright (C) 2023 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 AppManager::Internal {
-
-class AppManagerPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QtApplicationManagerIntegration.json")
-
-public:
-    ~AppManagerPlugin() final;
-
-private:
-    void initialize() final;
-
-    class AppManagerPluginPrivate *d = nullptr;
-};
-
-} // AppManager::Internal
diff --git a/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs b/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs
index 468e9f45051..25ab142b19e 100644
--- a/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs
+++ b/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs
@@ -39,7 +39,6 @@ QtcPlugin {
         "appmanagermakeinstallstep.cpp",
         "appmanagermakeinstallstep.h",
         "appmanagerplugin.cpp",
-        "appmanagerplugin.h",
         "appmanagerremoteinstallpackagestep.cpp",
         "appmanagerremoteinstallpackagestep.h",
         "appmanagerrunconfiguration.cpp",