Debugger: Make validateExecutable a validateRunParameters

Gets rid of the odd and otherwise unused
DebuggerEngine::mutableRunParameters() function.

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

2 files changed, 4 insertions, 11 deletions

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 0e026ba358..a0e97ec8c9 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1011,7 +1011,7 @@ void DebuggerEngine::setRunTool(DebuggerRunTool *runTool)
         d->m_device = d->m_runParameters.inferior.device;
     d->m_terminalRunner = runTool->terminalRunner();
 
-    validateExecutable();
+    validateRunParameters(d->m_runParameters);
 
     d->setupViews();
 }
@@ -1080,11 +1080,6 @@ const DebuggerRunParameters &DebuggerEngine::runParameters() const
     return d->m_runParameters;
 }
 
-DebuggerRunParameters &DebuggerEngine::mutableRunParameters() const
-{
-    return d->m_runParameters;
-}
-
 IDevice::ConstPtr DebuggerEngine::device() const
 {
     return d->m_device;
@@ -2604,9 +2599,8 @@ Context CppDebuggerEngine::languageContext() const
     return Context(Constants::C_CPPDEBUGGER);
 }
 
-void CppDebuggerEngine::validateExecutable()
+void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
 {
-    DebuggerRunParameters &rp = mutableRunParameters();
     const bool warnOnRelease = boolSetting(WarnOnReleaseBuilds) && rp.toolChainAbi.osFlavor() != Abi::AndroidLinuxFlavor;
     bool warnOnInappropriateDebugger = false;
     QString detailedWarning;
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 36dbf8e0d4..fad3212bf6 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -264,7 +264,7 @@ public:
     void updateWatchData(const QString &iname); // FIXME: Merge with above.
     virtual void selectWatchData(const QString &iname);
 
-    virtual void validateExecutable() {}
+    virtual void validateRunParameters(DebuggerRunParameters &) {}
     virtual void prepareForRestart() {}
     virtual void abortDebuggerProcess() {} // second attempt
 
@@ -514,7 +514,6 @@ protected:
     void startDying() const;
 
 protected:
-    DebuggerRunParameters &mutableRunParameters() const;
     ProjectExplorer::IDevice::ConstPtr device() const;
     DebuggerEngine *companionEngine() const;
 
@@ -531,7 +530,7 @@ public:
     CppDebuggerEngine() {}
     ~CppDebuggerEngine() override {}
 
-    void validateExecutable() override;
+    void validateRunParameters(DebuggerRunParameters &rp) override;
     Core::Context languageContext() const override;
 };