Revert "PerfProfiler: Use new setup for PerfRunConfigurationAspect"

This reverts commit b49f847576653a2c61c73809d5001e391fba9f09.

The class access is used in perfprofilerruncontrol.cpp.

Change-Id: I1c0d9d1230224f04d39e71706064fd09b4071954
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

3 files changed, 26 insertions, 32 deletions

diff --git a/src/plugins/perfprofiler/perfprofilerplugin.cpp b/src/plugins/perfprofiler/perfprofilerplugin.cpp
index 06b61ac5038..93568849496 100644
--- a/src/plugins/perfprofiler/perfprofilerplugin.cpp
+++ b/src/plugins/perfprofiler/perfprofilerplugin.cpp
@@ -12,6 +12,8 @@
 
 #include <extensionsystem/iplugin.h>
 
+using namespace ProjectExplorer;
+
 namespace PerfProfiler::Internal {
 
 class PerfProfilerPlugin final : public ExtensionSystem::IPlugin
@@ -23,7 +25,7 @@ class PerfProfilerPlugin final : public ExtensionSystem::IPlugin
     {
         setupPerfProfilerTool();
         setupPerfProfilerRunWorker();
-        setupPerfRunConfigurationAspect();
+        RunConfiguration::registerAspect<PerfRunConfigurationAspect>();
 
 #if WITH_TESTS
         //   addTest<PerfProfilerTraceFileTest>();  // FIXME these tests have to get rewritten
diff --git a/src/plugins/perfprofiler/perfrunconfigurationaspect.cpp b/src/plugins/perfprofiler/perfrunconfigurationaspect.cpp
index ae6cde6c809..748c266f0fe 100644
--- a/src/plugins/perfprofiler/perfrunconfigurationaspect.cpp
+++ b/src/plugins/perfprofiler/perfrunconfigurationaspect.cpp
@@ -1,44 +1,24 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "perfrunconfigurationaspect.h"
-
-#include "perfprofiler_global.h"
 #include "perfprofilerconstants.h"
 #include "perfprofilertr.h"
+#include "perfrunconfigurationaspect.h"
 #include "perfsettings.h"
 
-#include <projectexplorer/runconfiguration.h>
-
 #include <debugger/analyzer/analyzerrunconfigwidget.h>
 
-using namespace ProjectExplorer;
-
 namespace PerfProfiler {
 
-class PerfRunConfigurationAspect
-    : public GlobalOrProjectAspect
+PerfRunConfigurationAspect::PerfRunConfigurationAspect(ProjectExplorer::Target *target)
 {
-    Q_OBJECT
-
-public:
-    PerfRunConfigurationAspect(Target *target)
-    {
-        setProjectSettings(new PerfSettings(target));
-        setGlobalSettings(&PerfProfiler::globalSettings());
-        setId(Constants::PerfSettingsId);
-        setDisplayName(Tr::tr("Performance Analyzer Settings"));
-        setUsingGlobalSettings(true);
-        resetProjectToGlobalSettings();
-        setConfigWidgetCreator([this] { return new Debugger::AnalyzerRunConfigWidget(this); });
-    }
-};
-
-void setupPerfRunConfigurationAspect()
-{
-    RunConfiguration::registerAspect<PerfRunConfigurationAspect>();
+    setProjectSettings(new PerfSettings(target));
+    setGlobalSettings(&PerfProfiler::globalSettings());
+    setId(Constants::PerfSettingsId);
+    setDisplayName(Tr::tr("Performance Analyzer Settings"));
+    setUsingGlobalSettings(true);
+    resetProjectToGlobalSettings();
+    setConfigWidgetCreator([this] { return new Debugger::AnalyzerRunConfigWidget(this); });
 }
 
 } // namespace PerfProfiler
-
-#include "perfrunconfigurationaspect.moc"
diff --git a/src/plugins/perfprofiler/perfrunconfigurationaspect.h b/src/plugins/perfprofiler/perfrunconfigurationaspect.h
index 88268023a7b..8f3e3927aa1 100644
--- a/src/plugins/perfprofiler/perfrunconfigurationaspect.h
+++ b/src/plugins/perfprofiler/perfrunconfigurationaspect.h
@@ -3,8 +3,20 @@
 
 #pragma once
 
+#include "perfprofiler_global.h"
+
+#include <projectexplorer/runconfiguration.h>
+
+#include <QObject>
+
 namespace PerfProfiler {
 
-void setupPerfRunConfigurationAspect();
+class PERFPROFILER_EXPORT PerfRunConfigurationAspect :
+        public ProjectExplorer::GlobalOrProjectAspect
+{
+    Q_OBJECT
+public:
+    PerfRunConfigurationAspect(ProjectExplorer::Target *target);
+};
 
-} // PerfProfiler
+} // namespace PerfProfiler