6 files changed, 20 insertions, 40 deletions

diff --git a/src/plugins/ctfvisualizer/CMakeLists.txt b/src/plugins/ctfvisualizer/CMakeLists.txt
index d8f9c5a3ce4..700843ba1b7 100644
--- a/src/plugins/ctfvisualizer/CMakeLists.txt
+++ b/src/plugins/ctfvisualizer/CMakeLists.txt
@@ -13,7 +13,6 @@ add_qtc_plugin(CtfVisualizer
     ctfvisualizertraceview.cpp
     ctfstatisticsmodel.h
     ctfstatisticsview.h
-    ctfvisualizerplugin.h
     ctfvisualizertool.h
     ctfvisualizertr.h
     ctftimelinemodel.h
diff --git a/src/plugins/ctfvisualizer/ctfvisualizer.qbs b/src/plugins/ctfvisualizer/ctfvisualizer.qbs
index 63091dc4b45..6d1f2f6570e 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizer.qbs
+++ b/src/plugins/ctfvisualizer/ctfvisualizer.qbs
@@ -19,7 +19,7 @@ QtcPlugin {
         "ctftimelinemodel.cpp", "ctftimelinemodel.h",
         "ctftracemanager.cpp", "ctftracemanager.h",
         "ctfvisualizerconstants.h",
-        "ctfvisualizerplugin.cpp", "ctfvisualizerplugin.h",
+        "ctfvisualizerplugin.cpp",
         "ctfvisualizertool.cpp", "ctfvisualizertool.h",
         "ctfvisualizertraceview.cpp", "ctfvisualizertraceview.h",
         "ctfvisualizertr.h",
diff --git a/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp b/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
index 1ccbc210dfc..80868c3e24f 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizerplugin.cpp
@@ -1,26 +1,23 @@
 // Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company,
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "ctfvisualizerplugin.h"
-
 #include "ctfvisualizertool.h"
 
+#include <extensionsystem/iplugin.h>
+
 namespace CtfVisualizer::Internal {
 
-class CtfVisualizerPluginPrivate
+class CtfVisualizerPlugin : public ExtensionSystem::IPlugin
 {
-public:
-    CtfVisualizerTool profilerTool;
-};
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CtfVisualizer.json")
 
-CtfVisualizerPlugin::~CtfVisualizerPlugin()
-{
-    delete d;
-}
+    void initialize() final
+    {
+        setupCtfVisualizerTool();
+    }
+};
 
-void CtfVisualizerPlugin::initialize()
-{
-    d = new CtfVisualizerPluginPrivate;
-}
+} // CtfVisualizer::Internal
 
-} // namespace CtfVisualizer::Internal
+#include "ctfvisualizerplugin.moc"
diff --git a/src/plugins/ctfvisualizer/ctfvisualizerplugin.h b/src/plugins/ctfvisualizer/ctfvisualizerplugin.h
deleted file mode 100644
index 54e759db580..00000000000
--- a/src/plugins/ctfvisualizer/ctfvisualizerplugin.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company,
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace CtfVisualizer::Internal {
-
-class CtfVisualizerPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CtfVisualizer.json")
-
-public:
-    ~CtfVisualizerPlugin();
-
-    void initialize() final;
-
-    class CtfVisualizerPluginPrivate *d = nullptr;
-};
-
-} // namespace CtfVisualizer::Internal
diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
index 79589d44225..0d84b35b8dc 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
@@ -251,4 +251,9 @@ void CtfVisualizerTool::loadJson(const QString &fileName)
     m_loader->start();
 }
 
+void setupCtfVisualizerTool()
+{
+    static CtfVisualizerTool theCtfVisualizerTool;
+}
+
 }  // namespace CtfVisualizer::Internal
diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.h b/src/plugins/ctfvisualizer/ctfvisualizertool.h
index de2facffe75..8427ef04379 100644
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.h
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.h
@@ -66,4 +66,6 @@ private:
     QMenu *const m_restrictToThreadsMenu;
 };
 
+void setupCtfVisualizerTool();
+
 } // namespace CtfVisualizer::Internal