Debugger: Remove DebuggerRunControl

Use plain RunControl + DebuggerRunTool combo instead.

Change-Id: Ib71b5eab50da667b9d71dcc6689d2643ad8ecdee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 14 insertions, 30 deletions

diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index 27c72a6d78..8fea7dc399 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -42,11 +42,11 @@ using namespace ProjectExplorer;
 namespace BareMetal {
 namespace Internal {
 
-BareMetalDebugSupport::BareMetalDebugSupport(RunControl *runControl)
-    : ToolRunner(runControl)
+BareMetalDebugSupport::BareMetalDebugSupport(RunControl *runControl, const Debugger::DebuggerStartParameters &sp)
+    : Debugger::DebuggerRunTool(runControl, sp)
     , m_appLauncher(new ProjectExplorer::ApplicationLauncher(this))
 {
-    connect(this->runControl()->toolRunner(), &Debugger::DebuggerRunTool::requestRemoteSetup,
+    connect(this, &Debugger::DebuggerRunTool::requestRemoteSetup,
             this, &BareMetalDebugSupport::remoteSetupRequested);
     connect(runControl, &RunControl::finished,
             this, &BareMetalDebugSupport::debuggingFinished);
@@ -96,12 +96,12 @@ void BareMetalDebugSupport::appRunnerFinished(bool success)
 
     if (m_state == Running) {
         if (!success)
-            runControl()->toolRunner()->notifyInferiorIll();
+            notifyInferiorIll();
     } else if (m_state == StartingRunner) {
         Debugger::RemoteSetupResult result;
         result.success = false;
         result.reason = tr("Debugging failed.");
-        runControl()->toolRunner()->notifyEngineRemoteSetupFinished(result);
+        notifyEngineRemoteSetupFinished(result);
     }
 
     reset();
@@ -116,7 +116,7 @@ void BareMetalDebugSupport::appRunnerError(const QString &error)
 {
     if (m_state == Running) {
         showMessage(error, Debugger::AppError);
-        runControl()->toolRunner()->notifyInferiorIll();
+        notifyInferiorIll();
     } else if (m_state != Inactive) {
         adapterSetupFailed(error);
     }
@@ -127,7 +127,7 @@ void BareMetalDebugSupport::adapterSetupDone()
     m_state = Running;
     Debugger::RemoteSetupResult result;
     result.success = true;
-    runControl()->toolRunner()->notifyEngineRemoteSetupFinished(result);
+    notifyEngineRemoteSetupFinished(result);
 }
 
 void BareMetalDebugSupport::adapterSetupFailed(const QString &error)
@@ -137,7 +137,7 @@ void BareMetalDebugSupport::adapterSetupFailed(const QString &error)
     Debugger::RemoteSetupResult result;
     result.success = false;
     result.reason = tr("Initial setup failed: %1").arg(error);
-    runControl()->toolRunner()->notifyEngineRemoteSetupFinished(result);
+    notifyEngineRemoteSetupFinished(result);
 }
 
 void BareMetalDebugSupport::startExecution()
@@ -188,16 +188,5 @@ void BareMetalDebugSupport::reset()
     m_state = Inactive;
 }
 
-void BareMetalDebugSupport::showMessage(const QString &msg, int channel)
-{
-    if (m_state != Inactive)
-        runControl()->toolRunner()->showMessage(msg, channel);
-}
-
-Debugger::DebuggerRunControl *BareMetalDebugSupport::runControl()
-{
-    return qobject_cast<Debugger::DebuggerRunControl *>(ToolRunner::runControl());
-}
-
 } // namespace Internal
 } // namespace BareMetal
diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h
index feb90479e4..3baef0f9ab 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.h
+++ b/src/plugins/baremetal/baremetaldebugsupport.h
@@ -25,21 +25,20 @@
 
 #pragma once
 
-#include <projectexplorer/runconfiguration.h>
-
-namespace Debugger { class DebuggerRunControl; }
+#include <debugger/debuggerruncontrol.h>
 
 namespace ProjectExplorer { class ApplicationLauncher; }
 
 namespace BareMetal {
 namespace Internal {
 
-class BareMetalDebugSupport : public ProjectExplorer::ToolRunner
+class BareMetalDebugSupport : public Debugger::DebuggerRunTool
 {
     Q_OBJECT
 
 public:
-    explicit BareMetalDebugSupport(ProjectExplorer::RunControl *runControl);
+    BareMetalDebugSupport(ProjectExplorer::RunControl *runControl,
+                          const Debugger::DebuggerStartParameters &sp);
     ~BareMetalDebugSupport();
 
 private:
@@ -60,9 +59,6 @@ private:
     void startExecution();
     void setFinished();
     void reset();
-    void showMessage(const QString &msg, int channel);
-
-    Debugger::DebuggerRunControl *runControl();
 
     ProjectExplorer::ApplicationLauncher *m_appLauncher;
     State m_state = Inactive;
diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
index af493efcee..5cbe0948d7 100644
--- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp
+++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
@@ -135,9 +135,8 @@ RunControl *BareMetalRunControlFactory::create(
     if (p->startupMode() == GdbServerProvider::StartupOnNetwork)
         sp.remoteSetupNeeded = true;
 
-    auto runControl = createDebuggerRunControl(sp, rc, errorMessage, mode);
-    if (runControl && sp.remoteSetupNeeded)
-        new BareMetalDebugSupport(runControl);
+    auto runControl = new RunControl(rc, mode);
+    new BareMetalDebugSupport(runControl, sp);
 
     return runControl;
 }