From 317ca88e091757c9bcdd60c9c8b5d6fadc37fd2d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 9 Jan 2024 18:00:18 +0100
Subject: [PATCH] ClassView: Inline plugin class definition to .cpp

Change-Id: I0d9026fd2f6d98247eed2a44ab09ad7f1321ae64
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/classview/CMakeLists.txt      |  2 +-
 src/plugins/classview/classview.qbs       |  1 -
 src/plugins/classview/classviewplugin.cpp | 28 +++++++++++++----------
 src/plugins/classview/classviewplugin.h   | 26 ---------------------
 4 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 src/plugins/classview/classviewplugin.h

diff --git a/src/plugins/classview/CMakeLists.txt b/src/plugins/classview/CMakeLists.txt
index caac4802bfc..feb44678d76 100644
--- a/src/plugins/classview/CMakeLists.txt
+++ b/src/plugins/classview/CMakeLists.txt
@@ -7,7 +7,7 @@ add_qtc_plugin(ClassView
     classviewnavigationwidgetfactory.cpp classviewnavigationwidgetfactory.h
     classviewparser.cpp classviewparser.h
     classviewparsertreeitem.cpp classviewparsertreeitem.h
-    classviewplugin.cpp classviewplugin.h
+    classviewplugin.cpp
     classviewsymbolinformation.cpp classviewsymbolinformation.h
     classviewsymbollocation.cpp classviewsymbollocation.h
     classviewtr.h
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 8e7df50419a..78bd31ec79e 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -25,7 +25,6 @@ QtcPlugin {
         "classviewparsertreeitem.cpp",
         "classviewparsertreeitem.h",
         "classviewplugin.cpp",
-        "classviewplugin.h",
         "classviewsymbolinformation.cpp",
         "classviewsymbolinformation.h",
         "classviewsymbollocation.cpp",
diff --git a/src/plugins/classview/classviewplugin.cpp b/src/plugins/classview/classviewplugin.cpp
index d137d606b21..4d069c469b4 100644
--- a/src/plugins/classview/classviewplugin.cpp
+++ b/src/plugins/classview/classviewplugin.cpp
@@ -1,13 +1,12 @@
 // Copyright (C) 2016 Denis Mingulov
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "classviewplugin.h"
-
 #include "classviewmanager.h"
 #include "classviewnavigationwidgetfactory.h"
 
-namespace ClassView {
-namespace Internal {
+#include <extensionsystem/iplugin.h>
+
+namespace ClassView::Internal {
 
 ///////////////////////////////// Plugin //////////////////////////////////
 
@@ -19,13 +18,18 @@ namespace Internal {
     projects in the sidebar.
 */
 
-ClassViewPlugin::~ClassViewPlugin() = default;
-
-void ClassViewPlugin::initialize()
+class ClassViewPlugin final : public ExtensionSystem::IPlugin
 {
-    setupClassViewNavigationWidgetFactory();
-    setupClassViewManager(this);
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClassView.json")
 
-} // namespace Internal
-} // namespace ClassView
+    void initialize() final
+    {
+        setupClassViewNavigationWidgetFactory();
+        setupClassViewManager(this);
+    }
+};
+
+} // ClassView::Internal
+
+#include "classviewplugin.moc"
diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h
deleted file mode 100644
index 48a69e748db..00000000000
--- a/src/plugins/classview/classviewplugin.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2016 Denis Mingulov
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace ClassView {
-namespace Internal {
-
-class ClassViewPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClassView.json")
-
-public:
-    ClassViewPlugin() = default;
-    ~ClassViewPlugin() final;
-
-private:
-    void initialize() final;
-    void extensionsInitialized() final {}
-};
-
-} // namespace Internal
-} // namespace ClassView