From a4d83484324d905a9c89ad08c2749b30df9776db Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 31 Jan 2024 20:05:47 +0100
Subject: [PATCH] EffektComposer: Move plugin class definition to .cpp

And clean up a bit.

Change-Id: Ib3d69555ed3e05741570c9aa386e6b9c8ea449fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/effectcomposer/CMakeLists.txt     |  2 +-
 .../effectcomposer/effectcomposerplugin.cpp   | 64 +++++++++----------
 .../effectcomposer/effectcomposerplugin.h     | 32 ----------
 3 files changed, 32 insertions(+), 66 deletions(-)
 delete mode 100644 src/plugins/effectcomposer/effectcomposerplugin.h

diff --git a/src/plugins/effectcomposer/CMakeLists.txt b/src/plugins/effectcomposer/CMakeLists.txt
index 90ae166d615..71805ea1be2 100644
--- a/src/plugins/effectcomposer/CMakeLists.txt
+++ b/src/plugins/effectcomposer/CMakeLists.txt
@@ -6,7 +6,7 @@ add_qtc_plugin(EffectComposer
     Qt::Core Qt::CorePrivate Qt::Widgets Qt::Qml Qt::QmlPrivate Qt::Quick
     QtCreator::Utils
   SOURCES
-    effectcomposerplugin.cpp effectcomposerplugin.h
+    effectcomposerplugin.cpp
     effectcomposerwidget.cpp effectcomposerwidget.h
     effectcomposerview.cpp effectcomposerview.h
     effectcomposermodel.cpp effectcomposermodel.h
diff --git a/src/plugins/effectcomposer/effectcomposerplugin.cpp b/src/plugins/effectcomposer/effectcomposerplugin.cpp
index 0d2f2798cf8..be37b1c6c42 100644
--- a/src/plugins/effectcomposer/effectcomposerplugin.cpp
+++ b/src/plugins/effectcomposer/effectcomposerplugin.cpp
@@ -1,29 +1,12 @@
 // 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 "effectcomposerplugin.h"
+#include <effectcomposerview.h>
 
-#include "effectcomposerview.h"
-
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/imode.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/externaltool.h>
-#include <coreplugin/externaltoolmanager.h>
-
-#include <componentcore_constants.h>
-#include <designeractionmanager.h>
-#include <viewmanager.h>
-#include <qmldesigner/dynamiclicensecheck.h>
 #include <qmldesignerplugin.h>
-#include <modelnodeoperations.h>
 
-#include <QJsonDocument>
-#include <QMap>
+#include <extensionsystem/iplugin.h>
+
 
 namespace EffectComposer {
 
@@ -32,22 +15,37 @@ static bool enableEffectComposer()
     return true;
 }
 
-bool EffectComposerPlugin::delayedInitialize()
+class EffectComposerPlugin : public ExtensionSystem::IPlugin
 {
-    if (m_delayedInitialized)
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "EffectComposer.json")
+
+public:
+    EffectComposerPlugin() {}
+    ~EffectComposerPlugin() override {}
+
+    bool delayedInitialize() override
+    {
+        if (m_delayedInitialized)
+            return true;
+
+        if (enableEffectComposer()) {
+            auto *designerPlugin = QmlDesigner::QmlDesignerPlugin::instance();
+            auto &viewManager = designerPlugin->viewManager();
+
+            viewManager.registerView(std::make_unique<EffectComposerView>(
+                QmlDesigner::QmlDesignerPlugin::externalDependenciesForPluginInitializationOnly()));
+        }
+
+        m_delayedInitialized = true;
+
         return true;
-
-    if (enableEffectComposer()) {
-        auto *designerPlugin = QmlDesigner::QmlDesignerPlugin::instance();
-        auto &viewManager = designerPlugin->viewManager();
-
-        viewManager.registerView(std::make_unique<EffectComposerView>(
-            QmlDesigner::QmlDesignerPlugin::externalDependenciesForPluginInitializationOnly()));
     }
 
-    m_delayedInitialized = true;
-
-    return true;
-}
+private:
+    bool m_delayedInitialized = false;
+};
 
 } // namespace EffectComposer
+
+#include "effectcomposerplugin.moc"
diff --git a/src/plugins/effectcomposer/effectcomposerplugin.h b/src/plugins/effectcomposer/effectcomposerplugin.h
deleted file mode 100644
index 239565f1cfb..00000000000
--- a/src/plugins/effectcomposer/effectcomposerplugin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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>
-#include <utils/process.h>
-
-namespace Core {
-class ActionContainer;
-class ExternalTool;
-}
-
-namespace EffectComposer {
-
-class EffectComposerPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "EffectComposer.json")
-
-public:
-    EffectComposerPlugin() {}
-    ~EffectComposerPlugin() override {}
-
-    bool delayedInitialize() override;
-
-private:
-    bool m_delayedInitialized = false;
-};
-
-} // namespace EffectComposer
-