debugger: compile fix, minor cleanup

src/plugins/debugger/debuggerengine.cpp

@@ -95,11 +95,6 @@ using namespace TextEditor;
 
 namespace Debugger {
 
-QString toolChainName(const DebuggerStartParameters &sp)
-{
-    return ToolChain::toolChainName(ProjectExplorer::ToolChainType(sp.toolChainType));
-}
-
 QDebug operator<<(QDebug d, DebuggerState state)
 {
     //return d << DebuggerEngine::stateName(state) << '(' << int(state) << ')';

src/plugins/debugger/debuggerengine.h

@@ -128,8 +128,6 @@ private:
     quint64 m_address;
 };
 
-QString toolChainName(const DebuggerStartParameters &sp);
-
 } // namespace Internal
 
 

src/plugins/debugger/debuggerplugin.cpp

@@ -94,6 +94,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchaintype.h>
 
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
@@ -2499,9 +2500,10 @@ void DebuggerPluginPrivate::createNewDock(QWidget *widget)
 void DebuggerPluginPrivate::runControlStarted(DebuggerEngine *engine)
 {
     activateDebugMode();
+    QString toolChainName = ToolChain::toolChainName(
+        ProjectExplorer::ToolChainType((engine->startParameters().toolChainType)));
     const QString message = tr("Starting debugger '%1' for tool chain '%2'...")
-            .arg(engine->objectName())
-            .arg(toolChainName(engine->startParameters()));
+            .arg(engine->objectName()).arg(toolChainName);
     showMessage(message, StatusBar);
     showMessage(m_debuggerSettings->dump(), LogDebug);
     m_snapshotHandler->appendSnapshot(engine);

src/plugins/debugger/debuggerrunner.cpp

@@ -372,8 +372,10 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
         // Could not find anything suitable.
         debuggingFinished();
         // Create Message box with possibility to go to settings.
+        QString toolChainName =
+            ToolChain::toolChainName(ProjectExplorer::ToolChainType(sp.toolChainType));
         const QString msg = tr("Cannot debug '%1' (tool chain: '%2'): %3")
-            .arg(sp.executable, toolChainName(sp), d->m_errorMessage);
+            .arg(sp.executable, toolChainName, d->m_errorMessage);
         Core::ICore::instance()->showWarningWithOptions(tr("Warning"),
             msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY),
             d->m_settingsIdHint);