From bde92e035e165eb208f89bd8440c67e446a12d94 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 16 Nov 2023 15:51:58 +0100
Subject: [PATCH] FakeVim: Move plugin class definition to .cpp

Change-Id: Iac485bbd6cd00ddfae189a6f82c9f5f2c7e9aaf9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/fakevim/CMakeLists.txt    |  2 +-
 src/plugins/fakevim/fakevim.qbs       |  1 -
 src/plugins/fakevim/fakevimplugin.cpp | 65 ++++++++++++++-------------
 src/plugins/fakevim/fakevimplugin.h   | 34 --------------
 4 files changed, 35 insertions(+), 67 deletions(-)
 delete mode 100644 src/plugins/fakevim/fakevimplugin.h

diff --git a/src/plugins/fakevim/CMakeLists.txt b/src/plugins/fakevim/CMakeLists.txt
index 1006bf6b0dd..856f1a7710a 100644
--- a/src/plugins/fakevim/CMakeLists.txt
+++ b/src/plugins/fakevim/CMakeLists.txt
@@ -5,7 +5,7 @@ add_qtc_plugin(FakeVim
     fakevim.qrc
     fakevimactions.cpp fakevimactions.h
     fakevimhandler.cpp fakevimhandler.h
-    fakevimplugin.cpp fakevimplugin.h
+    fakevimplugin.cpp
     fakevimtr.h
 )
 
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index a4dad38428f..ecc682c9361 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -21,7 +21,6 @@ QtcPlugin {
         "fakevimhandler.cpp",
         "fakevimhandler.h",
         "fakevimplugin.cpp",
-        "fakevimplugin.h",
         "fakevimtr.h",
     ]
 
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index c709b46266d..b922e8f2bab 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "fakevimplugin.h"
-
 #include "fakevimactions.h"
 #include "fakevimhandler.h"
 #include "fakevimtr.h"
@@ -25,6 +23,8 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/statusbarmanager.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <texteditor/codeassist/assistinterface.h>
@@ -88,8 +88,7 @@ using namespace TextEditor;
 using namespace Core;
 using namespace Utils;
 
-namespace FakeVim {
-namespace Internal {
+namespace FakeVim::Internal {
 
 const char INSTALL_HANDLER[]                = "TextEditor.FakeVimHandler";
 const char SETTINGS_CATEGORY[]              = "D.FakeVim";
@@ -2050,38 +2049,42 @@ static void setupTest(QString *title, FakeVimHandler **handler, QWidget **edit)
 
 QObject *createFakeVimTester( void (*setupTest)(QString *, FakeVimHandler **, QWidget **) ); // in fakevim_test.cpp
 
-FakeVimPlugin::FakeVimPlugin()
+class FakeVimPlugin : public ExtensionSystem::IPlugin
 {
-    addTestCreator([] { return createFakeVimTester(&setupTest); });
-    dd = new FakeVimPluginPrivate;
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "FakeVim.json")
 
-FakeVimPlugin::~FakeVimPlugin()
-{
-    delete dd;
-    dd = nullptr;
-}
+public:
+    FakeVimPlugin()
+    {
+        addTestCreator([] { return createFakeVimTester(&setupTest); });
+        dd = new FakeVimPluginPrivate;
+    }
+    ~FakeVimPlugin() override
+    {
+        delete dd;
+        dd = nullptr;
+    }
 
-void FakeVimPlugin::initialize()
-{
-    dd->initialize();
-}
+    ExtensionSystem::IPlugin::ShutdownFlag aboutToShutdown()
+    {
+        StatusBarManager::destroyStatusBarWidget(dd->m_miniBuffer);
+        dd->m_miniBuffer = nullptr;
+        return SynchronousShutdown;
+    }
 
-ExtensionSystem::IPlugin::ShutdownFlag FakeVimPlugin::aboutToShutdown()
-{
-    StatusBarManager::destroyStatusBarWidget(dd->m_miniBuffer);
-    dd->m_miniBuffer = nullptr;
-    return SynchronousShutdown;
-}
+    void initialize() override
+    {
+        dd->initialize();
+    }
 
-void FakeVimPlugin::extensionsInitialized()
-{
-    dd->m_miniBuffer = new MiniBuffer;
-    StatusBarManager::addStatusBarWidget(dd->m_miniBuffer, StatusBarManager::LastLeftAligned);
-}
+    void extensionsInitialized() override
+    {
+        dd->m_miniBuffer = new MiniBuffer;
+        StatusBarManager::addStatusBarWidget(dd->m_miniBuffer, StatusBarManager::LastLeftAligned);
+    }
+};
 
-
-} // namespace Internal
-} // namespace FakeVim
+} // FakeVim::Internal
 
 #include "fakevimplugin.moc"
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
deleted file mode 100644
index dfdc5a3a30b..00000000000
--- a/src/plugins/fakevim/fakevimplugin.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2016 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 FakeVim {
-namespace Internal {
-
-class FakeVimHandler;
-
-class FakeVimPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "FakeVim.json")
-
-public:
-    FakeVimPlugin();
-    ~FakeVimPlugin() override;
-
-private:
-    // implementation of ExtensionSystem::IPlugin
-    void initialize() override;
-    ShutdownFlag aboutToShutdown() override;
-    void extensionsInitialized() override;
-
-private:
-    friend class FakeVimPluginPrivate;
-
-};
-
-} // namespace Internal
-} // namespace FakeVim