From 0ee4011cfdad25553373bc8a74a2fd7652ec4e9c Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 7 Jan 2011 10:13:41 +0100
Subject: [PATCH] debugger: compile fix, minor cleanup
---
src/plugins/debugger/debuggerengine.cpp | 5 -----
src/plugins/debugger/debuggerengine.h | 2 --
src/plugins/debugger/debuggerplugin.cpp | 6 ++++--
src/plugins/debugger/debuggerrunner.cpp | 4 +++-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 567f90a36a8..3458de14a86 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/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) << ')';
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 5fa1a4d0d01..42673f8bd98 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -128,8 +128,6 @@ private:
quint64 m_address;
};
-QString toolChainName(const DebuggerStartParameters &sp);
-
} // namespace Internal
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 68e33e02339..e918e521d27 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/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);
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 4e5748154bc..65a00bbe82b 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/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);
--
GitLab