Macros: Move plugin class definition to .cpp

Change-Id: I7ac41e64dd4b3b52876aaafd77218c330e220f67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/macros/CMakeLists.txt

@@ -11,7 +11,7 @@ add_qtc_plugin(Macros
     macrooptionspage.cpp macrooptionspage.h
     macros.qrc
     macrosconstants.h
-    macrosplugin.cpp macrosplugin.h
+    macrosplugin.cpp
     macrotextfind.cpp macrotextfind.h
     macrostr.h
     texteditormacrohandler.cpp texteditormacrohandler.h

src/plugins/macros/macros.qbs

@@ -30,7 +30,6 @@ QtcPlugin {
         "macros.qrc",
         "macrosconstants.h",
         "macrosplugin.cpp",
-        "macrosplugin.h",
         "macrostr.h",
         "macrotextfind.cpp",
         "macrotextfind.h",

src/plugins/macros/macrosplugin.cpp

@@ -1,16 +1,12 @@
 // Copyright (C) 2016 Nicolas Arnaud-Cormos
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "macrosplugin.h"
-
 #include "macrolocatorfilter.h"
 #include "macromanager.h"
 #include "macrooptionspage.h"
 #include "macrosconstants.h"
 #include "macrostr.h"
 
-#include <texteditor/texteditorconstants.h>
-
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -18,14 +14,17 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 
+#include <extensionsystem/iplugin.h>
+
+#include <texteditor/texteditorconstants.h>
+
 #include <QAction>
 #include <QKeySequence>
 #include <QMenu>
 
-namespace Macros {
+namespace Macros::Internal {
-namespace Internal {
 
-class MacrosPluginPrivate
+class MacrosPluginPrivate final
 {
 public:
     MacroManager macroManager;
@@ -33,12 +32,18 @@ public:
     MacroLocatorFilter locatorFilter;
 };
 
-MacrosPlugin::~MacrosPlugin()
+class MacrosPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
+
+public:
+    ~MacrosPlugin() final
     {
         delete d;
     }
 
-void MacrosPlugin::initialize()
+    void initialize() final
     {
         d = new MacrosPluginPrivate;
 
@@ -78,5 +83,10 @@ void MacrosPlugin::initialize()
         connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro);
     }
 
-} // Internal
+private:
-} // Macros
+    MacrosPluginPrivate *d = nullptr;
+};
+
+} // Macros::Internal
+
+#include "macrosplugin.moc"

src/plugins/macros/macrosplugin.h

@@ -1,26 +0,0 @@
-// Copyright (C) 2016 Nicolas Arnaud-Cormos
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace Macros {
-namespace Internal {
-
-class MacrosPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
-
-public:
-    ~MacrosPlugin() final;
-
-    void initialize() final;
-
-private:
-    class MacrosPluginPrivate *d = nullptr;
-};
-
-} // namespace Internal
-} // namespace Macros