PerfProfiler: Move towards the canonical plugin setup pattern

Change-Id: I5d2f468c35c154664550175aefd21307b8107bba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 29 insertions, 16 deletions

diff --git a/src/plugins/perfprofiler/perfprofilerplugin.cpp b/src/plugins/perfprofiler/perfprofilerplugin.cpp
index a6fc393cabe..087fd0d7651 100644
--- a/src/plugins/perfprofiler/perfprofilerplugin.cpp
+++ b/src/plugins/perfprofiler/perfprofilerplugin.cpp
@@ -52,32 +52,44 @@
 #include <QAction>
 #include <QDebug>
 #include <QMenu>
-#include <QtPlugin>
 
 using namespace ProjectExplorer;
 
 namespace PerfProfiler {
+namespace Internal {
 
 Q_GLOBAL_STATIC(PerfSettings, perfGlobalSettings)
 
-bool PerfProfilerPlugin::initialize(const QStringList &arguments, QString *errorString)
+class PerfProfilerPluginPrivate
 {
-    Q_UNUSED(arguments)
-    Q_UNUSED(errorString)
+public:
+    PerfProfilerPluginPrivate()
+    {
+        RunConfiguration::registerAspect<PerfRunConfigurationAspect>();
 
-    (void) new Internal::PerfOptionsPage(this);
+        RunControl::registerWorkerCreator(ProjectExplorer::Constants::PERFPROFILER_RUN_MODE,
+                       [](RunControl *runControl){ return new PerfProfilerRunner(runControl); });
 
-    RunConfiguration::registerAspect<PerfRunConfigurationAspect>();
+        auto constraint = [](RunConfiguration *) { return true; };
+        RunControl::registerWorker<PerfProfilerRunner>
+                (ProjectExplorer::Constants::PERFPROFILER_RUN_MODE, constraint);
+    }
 
-    (void) new Internal::PerfProfilerTool(this);
+    PerfOptionsPage optionsPage;
+    PerfProfilerTool profilerTool;
+};
 
-    RunControl::registerWorkerCreator(ProjectExplorer::Constants::PERFPROFILER_RUN_MODE,
-        [](RunControl *runControl){ return new Internal::PerfProfilerRunner(runControl); });
+PerfProfilerPlugin::~PerfProfilerPlugin()
+{
+    delete d;
+}
 
-    auto constraint = [](RunConfiguration *) { return true; };
-    RunControl::registerWorker<Internal::PerfProfilerRunner>
-            (ProjectExplorer::Constants::PERFPROFILER_RUN_MODE, constraint);
+bool PerfProfilerPlugin::initialize(const QStringList &arguments, QString *errorString)
+{
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
+    d = new PerfProfilerPluginPrivate;
     return true;
 }
 
@@ -85,19 +97,20 @@ void PerfProfilerPlugin::extensionsInitialized()
 {
 }
 
-PerfProfiler::PerfSettings *PerfProfilerPlugin::globalSettings()
+PerfSettings *PerfProfilerPlugin::globalSettings()
 {
     return perfGlobalSettings();
 }
 
-QList<QObject *> PerfProfiler::PerfProfilerPlugin::createTestObjects() const
+QList<QObject *> PerfProfilerPlugin::createTestObjects() const
 {
     QList<QObject *> tests;
 #if WITH_TESTS
-    tests << new Internal::PerfProfilerTraceFileTest;
-    tests << new Internal::PerfResourceCounterTest;
+    tests << new PerfProfilerTraceFileTest;
+    tests << new PerfResourceCounterTest;
 #endif // WITH_TESTS
     return tests;
 }
 
+} // namespace Internal
 } // namespace PerfProfiler