Coco: Move plugin class definition to .cpp

Change-Id: Ic183657636ab2d8094eee5253a0d6679ea5a805d
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/coco/CMakeLists.txt

@@ -2,6 +2,6 @@ add_qtc_plugin(Coco
   PLUGIN_DEPENDS Core LanguageClient
   SOURCES
     cocolanguageclient.cpp cocolanguageclient.h
-    cocoplugin.cpp cocoplugin.h
+    cocoplugin.cpp
     cocotr.h
 )

src/plugins/coco/coco.qbs

@@ -11,7 +11,6 @@ QtcPlugin {
 
     files: [
         "cocoplugin.cpp",
-        "cocoplugin.h",
         "cocolanguageclient.cpp",
         "cocolanguageclient.h",
     ]

src/plugins/coco/cocoplugin.cpp

@@ -1,15 +1,17 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "cocoplugin.h"
-
 #include "cocolanguageclient.h"
 #include "cocotr.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/icore.h>
+
 #include <debugger/analyzer/analyzerconstants.h>
+
+#include <extensionsystem/iplugin.h>
+
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 
@@ -21,85 +23,83 @@ using namespace Utils;
 
 namespace Coco {
 
-class CocoPluginPrivate
+class CocoPlugin final : public ExtensionSystem::IPlugin
 {
-public:
+    Q_OBJECT
-    void startCoco();
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Coco.json")
 
+public:
+    ~CocoPlugin() final
+    {
+        // FIXME: Kill m_client?
+    }
+
+    void initialize() final
+    {
+        using namespace Core;
+        ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
+        if (menu) {
+            auto startCoco = new QAction("Squish Coco ...", this);
+            Command *cmd = ActionManager::registerAction(startCoco, "Coco.startCoco");
+            menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS);
+
+            connect(startCoco, &QAction::triggered, this, [this] { this->startCoco(); });
+        }
+    }
+
+    void startCoco()
+    {
+        if (m_client)
+            m_client->shutdown();
+        m_client = nullptr;
+
+        QDialog dialog(Core::ICore::dialogParent());
+        dialog.setModal(true);
+        auto layout = new QFormLayout();
+
+        const Environment env = Environment::systemEnvironment();
+        const FilePath squishCocoPath = FilePath::fromUserInput(env.value("SQUISHCOCO"));
+        const FilePath candidate = FilePath("coveragebrowser").searchInPath({squishCocoPath},
+                                                                            FilePath::PrependToPath);
+
+        PathChooser cocoChooser;
+        if (!candidate.isEmpty())
+            cocoChooser.setFilePath(candidate);
+        cocoChooser.setExpectedKind(PathChooser::Command);
+        cocoChooser.setPromptDialogTitle(Tr::tr("Select a Squish Coco CoverageBrowser Executable"));
+
+        cocoChooser.setHistoryCompleter("Coco.CoverageBrowser.history", true);
+        layout->addRow(Tr::tr("CoverageBrowser:"), &cocoChooser);
+        PathChooser csmesChoser;
+        csmesChoser.setHistoryCompleter("Coco.CSMes.history", true);
+        csmesChoser.setExpectedKind(PathChooser::File);
+        csmesChoser.setInitialBrowsePathBackup(FileUtils::homePath());
+        csmesChoser.setPromptDialogFilter(Tr::tr("Coco instrumentation files (*.csmes)"));
+        csmesChoser.setPromptDialogTitle(Tr::tr("Select a Squish Coco Instrumentation File"));
+        layout->addRow(Tr::tr("CSMes:"), &csmesChoser);
+        QDialogButtonBox buttons(QDialogButtonBox::Cancel | QDialogButtonBox::Open);
+        layout->addItem(new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
+        layout->addWidget(&buttons);
+        dialog.setLayout(layout);
+        dialog.resize(480, dialog.height());
+
+        QObject::connect(&buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
+        QObject::connect(&buttons, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
+
+        if (dialog.exec() == QDialog::Accepted) {
+            const FilePath cocoPath = cocoChooser.filePath();
+            const FilePath csmesPath = csmesChoser.filePath();
+            if (cocoPath.isExecutableFile() && csmesPath.exists()) {
+                m_client = new CocoLanguageClient(cocoPath, csmesPath);
+                m_client->start();
+            }
+        }
+    }
+
+private:
     CocoLanguageClient *m_client = nullptr;
 };
 
-void CocoPluginPrivate::startCoco()
-{
-    if (m_client)
-        m_client->shutdown();
-    m_client = nullptr;
-
-    QDialog dialog(Core::ICore::dialogParent());
-    dialog.setModal(true);
-    auto layout = new QFormLayout();
-
-    const Environment env = Environment::systemEnvironment();
-    const FilePath squishCocoPath = FilePath::fromUserInput(env.value("SQUISHCOCO"));
-    const FilePath candidate = FilePath("coveragebrowser").searchInPath({squishCocoPath},
-                                                                        FilePath::PrependToPath);
-
-    PathChooser cocoChooser;
-    if (!candidate.isEmpty())
-        cocoChooser.setFilePath(candidate);
-    cocoChooser.setExpectedKind(PathChooser::Command);
-    cocoChooser.setPromptDialogTitle(Tr::tr("Select a Squish Coco CoverageBrowser Executable"));
-
-    cocoChooser.setHistoryCompleter("Coco.CoverageBrowser.history", true);
-    layout->addRow(Tr::tr("CoverageBrowser:"), &cocoChooser);
-    PathChooser csmesChoser;
-    csmesChoser.setHistoryCompleter("Coco.CSMes.history", true);
-    csmesChoser.setExpectedKind(PathChooser::File);
-    csmesChoser.setInitialBrowsePathBackup(FileUtils::homePath());
-    csmesChoser.setPromptDialogFilter(Tr::tr("Coco instrumentation files (*.csmes)"));
-    csmesChoser.setPromptDialogTitle(Tr::tr("Select a Squish Coco Instrumentation File"));
-    layout->addRow(Tr::tr("CSMes:"), &csmesChoser);
-    QDialogButtonBox buttons(QDialogButtonBox::Cancel | QDialogButtonBox::Open);
-    layout->addItem(new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
-    layout->addWidget(&buttons);
-    dialog.setLayout(layout);
-    dialog.resize(480, dialog.height());
-
-    QObject::connect(&buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
-    QObject::connect(&buttons, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
-
-    if (dialog.exec() == QDialog::Accepted) {
-        const FilePath cocoPath = cocoChooser.filePath();
-        const FilePath csmesPath = csmesChoser.filePath();
-        if (cocoPath.isExecutableFile() && csmesPath.exists()) {
-            m_client = new CocoLanguageClient(cocoPath, csmesPath);
-            m_client->start();
-        }
-    }
-}
-
-CocoPlugin::CocoPlugin()
-    : d (new CocoPluginPrivate)
-{}
-
-CocoPlugin::~CocoPlugin()
-{
-    delete d;
-}
-
-void CocoPlugin::initialize()
-{
-    using namespace Core;
-    ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
-    if (menu) {
-        auto startCoco = new QAction("Squish Coco ...", this);
-        Command *cmd = ActionManager::registerAction(startCoco, "Coco.startCoco");
-        menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS);
-
-        connect(startCoco, &QAction::triggered, this, [this] { d->startCoco(); });
-    }
-}
-
 } // namespace Coco
 
-
+#include "cocoplugin.moc"

src/plugins/coco/cocoplugin.h

@@ -1,26 +0,0 @@
-// Copyright (C) 2022 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 Coco {
-
-class CocoPluginPrivate;
-
-class CocoPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Coco.json")
-
-public:
-    CocoPlugin();
-    ~CocoPlugin() override;
-
-    void initialize() override;
-private:
-    CocoPluginPrivate *d;
-};
-
-} // namespace Coco