Analyzer: Remove AnalyzerStartParameters from AnalyzerRunControl ctor

Change-Id: I0f7e982a9144469869e0c42daedfb411789511ca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

16 files changed, 65 insertions, 66 deletions

diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index e051cd7c1a..75a59f1948 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -47,8 +47,7 @@ using namespace ProjectExplorer;
 
 namespace Analyzer {
 
-AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
-        RunConfiguration *runConfiguration, Core::Id runMode)
+AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
     : RunControl(runConfiguration, runMode)
 {
     setIcon(Icons::ANALYZER_CONTROL_START);
@@ -61,9 +60,6 @@ AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
             m_workingDirectory = runConfiguration->target()->project()->projectDirectory().toString();
     }
 
-    setRunnable(AnalyzerRunnable(sp));
-    setConnection(AnalyzerConnection(sp));
-
     connect(this, &AnalyzerRunControl::finished,
             this, &AnalyzerRunControl::runControlFinished);
     connect(AnalyzerManager::stopAction(), &QAction::triggered,
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index 6938724c69..bd6c507daf 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -46,10 +46,6 @@ class ANALYZER_EXPORT AnalyzerRunControl : public ProjectExplorer::RunControl
     Q_OBJECT
 
 public:
-    AnalyzerRunControl(const AnalyzerStartParameters &sp,
-        ProjectExplorer::RunConfiguration *runConfiguration,
-        Core::Id runMode);
-
     AnalyzerRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
         Core::Id runMode);
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index edbbc65347..77cc54c398 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -71,9 +71,8 @@ public:
 // QmlProfilerRunControl
 //
 
-QmlProfilerRunControl::QmlProfilerRunControl(const AnalyzerStartParameters &sp,
-                                             RunConfiguration *runConfiguration)
-    : AnalyzerRunControl(sp, runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
+QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration)
+    : AnalyzerRunControl(runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
     , d(new QmlProfilerRunControlPrivate)
 {
     // Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
index 35cbd5442e..989f85afcd 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
@@ -38,8 +38,7 @@ class QmlProfilerRunControl : public Analyzer::AnalyzerRunControl
     Q_OBJECT
 
 public:
-    QmlProfilerRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                      ProjectExplorer::RunConfiguration *runConfiguration);
+    QmlProfilerRunControl(ProjectExplorer::RunConfiguration *runConfiguration);
     ~QmlProfilerRunControl();
 
     void registerProfilerStateManager( QmlProfilerStateManager *profilerState );
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 8c95be2928..742d219502 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -215,7 +215,9 @@ AnalyzerRunControl *QmlProfilerTool::createRunControl(const AnalyzerStartParamet
                                                    settings->flushInterval() : 0);
     d->m_profilerConnections->setAggregateTraces(settings->aggregateTraces());
 
-    QmlProfilerRunControl *engine = new QmlProfilerRunControl(sp, runConfiguration);
+    QmlProfilerRunControl *engine = new QmlProfilerRunControl(runConfiguration);
+    engine->setRunnable(AnalyzerRunnable(sp));
+    engine->setConnection(AnalyzerConnection(sp));
 
     engine->registerProfilerStateManager(d->m_profilerState);
 
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 5ceada359f..88604c8e7f 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -39,9 +39,8 @@ using namespace Analyzer;
 using namespace Valgrind;
 using namespace Valgrind::Internal;
 
-CallgrindRunControl::CallgrindRunControl(const AnalyzerStartParameters &sp,
-         ProjectExplorer::RunConfiguration *runConfiguration)
-    : ValgrindRunControl(sp, runConfiguration, CALLGRIND_RUN_MODE)
+CallgrindRunControl::CallgrindRunControl(ProjectExplorer::RunConfiguration *runConfiguration)
+    : ValgrindRunControl(runConfiguration, CALLGRIND_RUN_MODE)
     , m_markAsPaused(false)
 {
     connect(&m_runner, &Callgrind::CallgrindRunner::finished,
diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h
index 9097e001c4..15f30ed0a3 100644
--- a/src/plugins/valgrind/callgrindengine.h
+++ b/src/plugins/valgrind/callgrindengine.h
@@ -39,8 +39,7 @@ class CallgrindRunControl : public ValgrindRunControl
     Q_OBJECT
 
 public:
-    CallgrindRunControl(const Analyzer::AnalyzerStartParameters &sp,
-        ProjectExplorer::RunConfiguration *runConfiguration);
+    CallgrindRunControl(ProjectExplorer::RunConfiguration *runConfiguration);
 
     bool startEngine();
 
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 64ed8c1292..178e89fa76 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -116,8 +116,7 @@ public:
     void doClear(bool clearParseData);
     void updateEventCombo();
 
-    ValgrindRunControl *createRunControl(const AnalyzerStartParameters &sp,
-        RunConfiguration *runConfiguration = 0);
+    ValgrindRunControl *createRunControl(RunConfiguration *runConfiguration = 0);
 
 signals:
     void cycleDetectionEnabled(bool enabled);
@@ -510,16 +509,14 @@ CallgrindTool::~CallgrindTool()
     delete d;
 }
 
-ValgrindRunControl *CallgrindTool::createRunControl(const AnalyzerStartParameters &sp,
-    RunConfiguration *runConfiguration)
+ValgrindRunControl *CallgrindTool::createRunControl(RunConfiguration *runConfiguration)
 {
-    return d->createRunControl(sp, runConfiguration);
+    return d->createRunControl(runConfiguration);
 }
 
-ValgrindRunControl *CallgrindToolPrivate::createRunControl(const AnalyzerStartParameters &sp,
-    RunConfiguration *runConfiguration)
+ValgrindRunControl *CallgrindToolPrivate::createRunControl(RunConfiguration *runConfiguration)
 {
-    CallgrindRunControl *rc = new CallgrindRunControl(sp, runConfiguration);
+    auto rc = new CallgrindRunControl(runConfiguration);
 
     connect(rc, &CallgrindRunControl::parserDataReady,
             this, &CallgrindToolPrivate::takeParserDataFromRunControl);
diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h
index 178a40eb09..6eba091d4a 100644
--- a/src/plugins/valgrind/callgrindtool.h
+++ b/src/plugins/valgrind/callgrindtool.h
@@ -48,8 +48,7 @@ public:
     CallgrindTool(QObject *parent);
     ~CallgrindTool();
 
-    ValgrindRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp,
-        ProjectExplorer::RunConfiguration *runConfiguration = 0);
+    ValgrindRunControl *createRunControl(ProjectExplorer::RunConfiguration *runConfiguration = 0);
     QWidget *createWidgets();
 
 public slots:
diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp
index da59e10172..a8f382cc32 100644
--- a/src/plugins/valgrind/memcheckengine.cpp
+++ b/src/plugins/valgrind/memcheckengine.cpp
@@ -51,9 +51,8 @@ using namespace Valgrind::XmlProtocol;
 namespace Valgrind {
 namespace Internal {
 
-MemcheckRunControl::MemcheckRunControl(const AnalyzerStartParameters &sp,
-        RunConfiguration *runConfiguration, Core::Id runMode)
-    : ValgrindRunControl(sp, runConfiguration, runMode)
+MemcheckRunControl::MemcheckRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
+    : ValgrindRunControl(runConfiguration, runMode)
 {
     connect(&m_parser, &XmlProtocol::ThreadedParser::error,
             this, &MemcheckRunControl::parserError);
@@ -129,9 +128,8 @@ QStringList MemcheckRunControl::suppressionFiles() const
     return m_settings->suppressionFiles();
 }
 
-MemcheckWithGdbRunControl::MemcheckWithGdbRunControl(const AnalyzerStartParameters &sp,
-                                                     RunConfiguration *runConfiguration)
-    : MemcheckRunControl(sp, runConfiguration, MEMCHECK_WITH_GDB_RUN_MODE)
+MemcheckWithGdbRunControl::MemcheckWithGdbRunControl(RunConfiguration *runConfiguration)
+    : MemcheckRunControl(runConfiguration, MEMCHECK_WITH_GDB_RUN_MODE)
 {
     connect(&m_runner, &Memcheck::MemcheckRunner::started,
             this, &MemcheckWithGdbRunControl::startDebugger);
diff --git a/src/plugins/valgrind/memcheckengine.h b/src/plugins/valgrind/memcheckengine.h
index 0dcdf86b5c..a1ac1f8373 100644
--- a/src/plugins/valgrind/memcheckengine.h
+++ b/src/plugins/valgrind/memcheckengine.h
@@ -40,8 +40,7 @@ class MemcheckRunControl : public ValgrindRunControl
     Q_OBJECT
 
 public:
-    MemcheckRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                       ProjectExplorer::RunConfiguration *runConfiguration,
+    MemcheckRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
                        Core::Id runMode);
 
     bool startEngine() override;
@@ -69,8 +68,7 @@ class MemcheckWithGdbRunControl : public MemcheckRunControl
     Q_OBJECT
 
 public:
-    MemcheckWithGdbRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                              ProjectExplorer::RunConfiguration *runConfiguration);
+    MemcheckWithGdbRunControl(ProjectExplorer::RunConfiguration *runConfiguration);
 
 protected:
     QStringList toolArguments() const override;
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index d57af79470..c69fbe8caa 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -423,8 +423,7 @@ QWidget *MemcheckTool::createWidgets()
     return widget;
 }
 
-MemcheckRunControl *MemcheckTool::createRunControl(const AnalyzerStartParameters &sp,
-                                                   RunConfiguration *runConfiguration,
+MemcheckRunControl *MemcheckTool::createRunControl(RunConfiguration *runConfiguration,
                                                    Core::Id runMode)
 {
     m_frameFinder->setFiles(runConfiguration ? runConfiguration->target()
@@ -432,9 +431,9 @@ MemcheckRunControl *MemcheckTool::createRunControl(const AnalyzerStartParameters
 
     MemcheckRunControl *engine = 0;
     if (runMode == MEMCHECK_RUN_MODE)
-        engine = new MemcheckRunControl(sp, runConfiguration, runMode);
+        engine = new MemcheckRunControl(runConfiguration, runMode);
     else
-        engine = new MemcheckWithGdbRunControl(sp, runConfiguration);
+        engine = new MemcheckWithGdbRunControl(runConfiguration);
     connect(engine, &MemcheckRunControl::starting, this, &MemcheckTool::engineStarting);
     connect(engine, &MemcheckRunControl::parserError, this, &MemcheckTool::parserError);
     connect(engine, &MemcheckRunControl::internalParserError, this, &MemcheckTool::internalParserError);
diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h
index 58f60e145f..c648dcdf13 100644
--- a/src/plugins/valgrind/memchecktool.h
+++ b/src/plugins/valgrind/memchecktool.h
@@ -85,8 +85,7 @@ public:
 
     QWidget *createWidgets();
 
-    MemcheckRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                                         ProjectExplorer::RunConfiguration *runConfiguration,
+    MemcheckRunControl *createRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
                                          Core::Id runMode);
 
 private slots:
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 506feca46b..12832a434a 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -49,9 +49,8 @@ using namespace ProjectExplorer;
 namespace Valgrind {
 namespace Internal {
 
-ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
-        RunConfiguration *runConfiguration, Core::Id runMode)
-    : AnalyzerRunControl(sp, runConfiguration, runMode),
+ValgrindRunControl::ValgrindRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
+    : AnalyzerRunControl(runConfiguration, runMode),
       m_settings(0),
       m_isStopping(false)
 {
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index af12030577..cd6d9ad99c 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -43,8 +43,7 @@ class ValgrindRunControl : public Analyzer::AnalyzerRunControl
     Q_OBJECT
 
 public:
-    ValgrindRunControl(const Analyzer::AnalyzerStartParameters &sp,
-                       ProjectExplorer::RunConfiguration *runConfiguration,
+    ValgrindRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
                        Core::Id runMode);
     ~ValgrindRunControl();
 
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 2ec34d314c..4a2e3f73d1 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -133,7 +133,10 @@ void ValgrindPlugin::extensionsInitialized()
     auto cgWidgetCreator = [cgTool] { return cgTool->createWidgets(); };
     auto cgRunControlCreator = [cgTool](const AnalyzerStartParameters &sp,
         RunConfiguration *runConfiguration, Core::Id) {
-        return cgTool->createRunControl(sp, runConfiguration);
+        auto runControl = cgTool->createRunControl(runConfiguration);
+        runControl->setRunnable(AnalyzerRunnable(sp));
+        runControl->setConnection(AnalyzerConnection(sp));
+        return runControl;
     };
 
     if (!Utils::HostOsInfo::isWindowsHost()) {
@@ -141,8 +144,14 @@ void ValgrindPlugin::extensionsInitialized()
         action->setActionId("Memcheck.Local");
         action->setToolId("Memcheck");
         action->setWidgetCreator(mcWidgetCreator);
-        action->setRunControlCreator(std::bind(&MemcheckTool::createRunControl,
-                                               mcTool, _1, _2, MEMCHECK_RUN_MODE));
+        action->setRunControlCreator([mcTool](const AnalyzerStartParameters &sp,
+            ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode)
+        {
+            auto runControl = mcTool->createRunControl(runConfig, runMode);
+            runControl->setRunnable(AnalyzerRunnable(sp));
+            runControl->setConnection(AnalyzerConnection(sp));
+            return runControl;
+        });
         action->setToolMode(DebugMode);
         action->setRunMode(MEMCHECK_RUN_MODE);
         action->setText(tr("Valgrind Memory Analyzer"));
@@ -156,8 +165,14 @@ void ValgrindPlugin::extensionsInitialized()
         action->setActionId("MemcheckWithGdb.Local");
         action->setToolId("MemcheckWithGdb");
         action->setWidgetCreator([mcgTool] { return mcgTool->createWidgets(); });
-        action->setRunControlCreator(std::bind(&MemcheckTool::createRunControl,
-                                               mcgTool, _1, _2, MEMCHECK_WITH_GDB_RUN_MODE));
+        action->setRunControlCreator([mcgTool](const AnalyzerStartParameters &sp,
+            ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode)
+        {
+            auto runControl = mcgTool->createRunControl(runConfig, runMode);
+            runControl->setRunnable(AnalyzerRunnable(sp));
+            runControl->setConnection(AnalyzerConnection(sp));
+            return runControl;
+        });
         action->setToolMode(DebugMode);
         action->setRunMode(MEMCHECK_WITH_GDB_RUN_MODE);
         action->setText(tr("Valgrind Memory Analyzer with GDB"));
@@ -190,12 +205,15 @@ void ValgrindPlugin::extensionsInitialized()
         StartRemoteDialog dlg;
         if (dlg.exec() != QDialog::Accepted)
             return;
-        AnalyzerStartParameters sp;
-        sp.connParams = dlg.sshParams();
-        sp.debuggee = dlg.executable();
-        sp.debuggeeArgs = dlg.arguments();
-        ValgrindRunControl *rc = mcTool->createRunControl(sp, 0, MEMCHECK_RUN_MODE);
+        ValgrindRunControl *rc = mcTool->createRunControl(0, MEMCHECK_RUN_MODE);
         QTC_ASSERT(rc, return);
+        AnalyzerRunnable runnable;
+        runnable.debuggee = dlg.executable();
+        runnable.debuggeeArgs = dlg.arguments();
+        rc->setRunnable(runnable);
+        AnalyzerConnection connection;
+        connection.connParams = dlg.sshParams();
+        rc->setConnection(connection);
         rc->setDisplayName(dlg.executable());
         rc->setWorkingDirectory(dlg.workingDirectory());
         rc->setCustomStart();
@@ -214,12 +232,15 @@ void ValgrindPlugin::extensionsInitialized()
         StartRemoteDialog dlg;
         if (dlg.exec() != QDialog::Accepted)
             return;
-        AnalyzerStartParameters sp;
-        sp.connParams = dlg.sshParams();
-        sp.debuggee = dlg.executable();
-        sp.debuggeeArgs = dlg.arguments();
-        ValgrindRunControl *rc = cgTool->createRunControl(sp, 0);
+        ValgrindRunControl *rc = cgTool->createRunControl(0);
         QTC_ASSERT(rc, return);
+        AnalyzerRunnable runnable;
+        runnable.debuggee = dlg.executable();
+        runnable.debuggeeArgs = dlg.arguments();
+        rc->setRunnable(runnable);
+        AnalyzerConnection connection;
+        connection.connParams = dlg.sshParams();
+        rc->setConnection(connection);
         rc->setDisplayName(dlg.executable());
         rc->setWorkingDirectory(dlg.workingDirectory());
         rc->setCustomStart();