From e0dae4d0b3cbaed4f98f776938a48c32df509a9b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 15 Jan 2024 16:08:15 +0100
Subject: [PATCH] Perforce: Hide plugin class definition in .cpp

Change-Id: I6ae58a937b069ccc6a9b9f411bc42178f57133e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/perforce/perforceeditor.cpp |  2 +-
 src/plugins/perforce/perforceplugin.cpp | 48 +++++++++++++++----------
 src/plugins/perforce/perforceplugin.h   | 25 ++-----------
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index 178391760bd..7f122432436 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -59,7 +59,7 @@ VcsBase::BaseAnnotationHighlighterCreator PerforceEditorWidget::annotationHighli
 QString PerforceEditorWidget::findDiffFile(const QString &f) const
 {
     QString errorMessage;
-    const QString fileName = PerforcePlugin::fileNameFromPerforceName(f.trimmed(), false, &errorMessage);
+    const QString fileName = fileNameFromPerforceName(f.trimmed(), false, &errorMessage);
     if (fileName.isEmpty())
         qWarning("%s", qPrintable(errorMessage));
     return fileName;
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index a94a12adb30..8fc35a3ff17 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -22,6 +22,8 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/locator/commandlocator.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <texteditor/textdocument.h>
 
 #include <utils/environment.h>
@@ -42,7 +44,6 @@
 #include <QAction>
 #include <QDebug>
 #include <QDir>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QGuiApplication>
 #include <QMainWindow>
@@ -557,12 +558,6 @@ PerforcePluginPrivate::PerforcePluginPrivate()
     });
 }
 
-void PerforcePlugin::extensionsInitialized()
-{
-    dd->extensionsInitialized();
-    dd->getTopLevel();
-}
-
 void PerforcePluginPrivate::openCurrentFile()
 {
     const VcsBasePluginState state = currentState();
@@ -704,7 +699,7 @@ void PerforcePluginPrivate::printOpenedFileList()
         mapped.clear();
         const int delimiterPos = line.indexOf(delimiter);
         if (delimiterPos > 0)
-            mapped = PerforcePlugin::fileNameFromPerforceName(line.left(delimiterPos), true, &errorMessage);
+            mapped = fileNameFromPerforceName(line.left(delimiterPos), true, &errorMessage);
         if (mapped.isEmpty())
             VcsOutputWindow::appendSilently(line);
         else
@@ -1623,9 +1618,7 @@ static QString msgWhereFailed(const QString & file, const QString &why)
 }
 
 // Map a perforce name "//xx" to its real name in the file system
-QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName,
-                                                 bool quiet,
-                                                 QString *errorMessage)
+QString fileNameFromPerforceName(const QString &perforceName, bool quiet, QString *errorMessage)
 {
     // All happy, already mapped
     if (!perforceName.startsWith(QLatin1String("//")))
@@ -1691,16 +1684,33 @@ void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool i
         checker->waitForFinished();
 }
 
-PerforcePlugin::~PerforcePlugin()
+class PerforcePlugin final : public ExtensionSystem::IPlugin
 {
-    delete dd;
-    dd = nullptr;
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Perforce.json")
 
-void PerforcePlugin::initialize()
-{
-    dd = new PerforcePluginPrivate;
-}
+    ~PerforcePlugin() final
+    {
+        delete dd;
+        dd = nullptr;
+    }
+
+    void initialize() final
+    {
+        dd = new PerforcePluginPrivate;
+    }
+
+    void extensionsInitialized() final
+    {
+        dd->extensionsInitialized();
+        dd->getTopLevel();
+    }
+
+#ifdef WITH_TESTS
+private slots:
+    void testLogResolving();
+#endif
+};
 
 #ifdef WITH_TESTS
 void PerforcePlugin::testLogResolving()
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index 4c511767cfb..d0be5ab869f 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -3,30 +3,11 @@
 
 #pragma once
 
-#include <extensionsystem/iplugin.h>
+#include <QString>
 
 namespace Perforce::Internal {
 
-class PerforcePlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Perforce.json")
-
-    ~PerforcePlugin() final;
-
-    void initialize() final;
-    void extensionsInitialized() final;
-
-public:
-    // Map a perforce name "//xx" to its real name in the file system
-    static QString fileNameFromPerforceName(const QString& perforceName,
-                                            bool quiet,
-                                            QString *errorMessage);
-
-#ifdef WITH_TESTS
-private slots:
-    void testLogResolving();
-#endif
-};
+// Map a perforce name "//xx" to its real name in the file system
+QString fileNameFromPerforceName(const QString &perforceName, bool quiet, QString *errorMessage);
 
 } // Perforce::Internal