feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: compile fix, minor cleanup

Browse Source
This commit is contained in:
hjk
2011-01-07 10:13:41 +01:00
parent f02a852f21
commit 0ee4011cfd
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggerengine.cpp
View File

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

2
src/plugins/debugger/debuggerengine.h
View File

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

6
src/plugins/debugger/debuggerplugin.cpp
View File

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

4
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -372,8 +372,10 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
// Could not find anything suitable. // Could not find anything suitable.
debuggingFinished(); debuggingFinished();
// Create Message box with possibility to go to settings. // 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") 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"), Core::ICore::instance()->showWarningWithOptions(tr("Warning"),
msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY), msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY),
d->m_settingsIdHint); d->m_settingsIdHint);