From 34f374baec9b4914f1ee6c8415c0fd811c7714a5 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 15 Nov 2023 16:17:55 +0100
Subject: [PATCH] Todo: Move TodoPlugin class definition to .cpp

Change-Id: I5b82b14bf86655f0dab9379effb4ff156900b610
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/todo/CMakeLists.txt |  2 +-
 src/plugins/todo/todo.qbs       |  1 -
 src/plugins/todo/todoplugin.cpp | 45 ++++++++++++++++++++-------------
 src/plugins/todo/todoplugin.h   | 28 --------------------
 4 files changed, 28 insertions(+), 48 deletions(-)
 delete mode 100644 src/plugins/todo/todoplugin.h

diff --git a/src/plugins/todo/CMakeLists.txt b/src/plugins/todo/CMakeLists.txt
index cc8b72a2d66..ac9b61e3096 100644
--- a/src/plugins/todo/CMakeLists.txt
+++ b/src/plugins/todo/CMakeLists.txt
@@ -18,7 +18,7 @@ add_qtc_plugin(Todo
     todooutputpane.cpp todooutputpane.h
     todooutputtreeview.cpp todooutputtreeview.h
     todooutputtreeviewdelegate.cpp todooutputtreeviewdelegate.h
-    todoplugin.cpp todoplugin.h
+    todoplugin.cpp
     todoplugin.qrc
     todoprojectsettingswidget.cpp todoprojectsettingswidget.h
     todotr.h
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index bbd3ed74cbe..f3ea7fc96fa 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -46,7 +46,6 @@ QtcPlugin {
         "todooutputtreeviewdelegate.cpp",
         "todooutputtreeviewdelegate.h",
         "todoplugin.cpp",
-        "todoplugin.h",
         "todoplugin.qrc",
         "todotr.h",
     ]
diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp
index 42b62333ced..6da4a2bd8e5 100644
--- a/src/plugins/todo/todoplugin.cpp
+++ b/src/plugins/todo/todoplugin.cpp
@@ -2,8 +2,6 @@
 // Copyright (C) 2016 Vasiliy Sorokin
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "todoplugin.h"
-
 #include "optionsdialog.h"
 #include "todooutputpane.h"
 #include "todoitemsprovider.h"
@@ -14,11 +12,11 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <projectexplorer/projectpanelfactory.h>
+#include <extensionsystem/iplugin.h>
+
 #include <utils/link.h>
 
-namespace Todo {
-namespace Internal {
+namespace Todo::Internal {
 
 class TodoPluginPrivate : public QObject
 {
@@ -87,20 +85,31 @@ void TodoPluginPrivate::createTodoOutputPane()
             this, &TodoPluginPrivate::todoItemClicked);
 }
 
-TodoPlugin::TodoPlugin()
+class TodoPlugin final : public ExtensionSystem::IPlugin
 {
-    qRegisterMetaType<TodoItem>("TodoItem");
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Todo.json")
 
-TodoPlugin::~TodoPlugin()
-{
-    delete d;
-}
+public:
+    TodoPlugin()
+    {
+        qRegisterMetaType<TodoItem>("TodoItem");
+    }
 
-void TodoPlugin::initialize()
-{
-    d = new TodoPluginPrivate;
-}
+    ~TodoPlugin() final
+    {
+        delete d;
+    }
 
-} // namespace Internal
-} // namespace Todo
+    void initialize() final
+    {
+        d = new TodoPluginPrivate;
+    }
+
+private:
+    TodoPluginPrivate *d = nullptr;
+};
+
+} // Todo::Internal
+
+#include "todoplugin.moc"
diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h
deleted file mode 100644
index 73cf865cb52..00000000000
--- a/src/plugins/todo/todoplugin.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2016 Dmitry Savchenko
-// Copyright (C) 2016 Vasiliy Sorokin
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace Todo {
-namespace Internal {
-
-class TodoPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Todo.json")
-
-public:
-    TodoPlugin();
-    ~TodoPlugin() final;
-
-    void initialize() final;
-
-private:
-    class TodoPluginPrivate *d = nullptr;
-};
-
-} // namespace Internal
-} // namespace Todo