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

debugger: minor cleanup

Browse Source
This commit is contained in:
hjk
2010-12-10 09:37:31 +01:00
parent 1a3beebf23
commit 18986b8ccb
5 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,20 @@ using namespace ProjectExplorer;
using namespace Debugger::Internal;
namespace Debugger {
namespace Cdb {
DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *error);
bool isCdbEngineEnabled(); // Check the configuration page
}
/*
static QString toolChainName(int toolChainType)
{
return ToolChain::toolChainName(ProjectExplorer::ToolChainType(toolChainType));
}
*/
namespace Internal {
DebuggerEngine *createGdbEngine(const DebuggerStartParameters &);
@@ -105,20 +119,6 @@ bool checkCdbConfiguration(int, QString *, QString *)
#endif
} // namespace Internal
namespace Cdb {
DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *error);
bool isCdbEngineEnabled(); // Check the configuration page
}
static QString toolChainName(int toolChainType)
{
return ToolChain::toolChainName(ProjectExplorer::ToolChainType(toolChainType));
}
////////////////////////////////////////////////////////////////////////
//
// DebuggerRunControlFactory
@@ -251,7 +251,6 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget
return 0;
}
////////////////////////////////////////////////////////////////////////
//
// DebuggerRunControlPrivate
@@ -416,6 +415,9 @@ AbstractGdbAdapter *DebuggerRunControlPrivate::gdbAdapter() const
return engine->gdbAdapter();
}
} // namespace Internal
////////////////////////////////////////////////////////////////////////
//
// DebuggerRunControl
@@ -553,7 +555,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
debuggingFinished();
// Create Message box with possibility to go to settings.
const QString msg = tr("Cannot debug '%1' (tool chain: '%2'): %3")
.arg(sp.executable, toolChainName(sp.toolChainType), d->m_errorMessage);
.arg(sp.executable, sp.toolChainName(), d->m_errorMessage);
Core::ICore::instance()->showWarningWithOptions(tr("Warning"),
msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY),
d->m_settingsIdHint);
@@ -669,13 +671,6 @@ void DebuggerRunControl::start()
}
}
QString DebuggerRunControl::idString() const
{
return tr("Starting debugger '%1' for tool chain '%2'...")
.arg(d->m_engine->objectName())
.arg(toolChainName(d->m_engine->startParameters().toolChainType));
}
void DebuggerRunControl::startFailed()
{
emit addToOutputWindowInline(this, tr("Debugging has failed"), false);