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

Debugger: Simplify CdbEngine construction

Browse Source 
Moving the knowledge that this won't work well outside windows
kind of decreases encapsulation, but that's not really worth the
complication of the error handling here.

Change-Id: Idcb6f6d64f33ee8c49a01e62e20aad16d3f01b86
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-28 11:27:43 +02:00
parent 6d919cd85a
commit af63f488c2
2 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -194,22 +194,10 @@ public:
CdbEngine::CommandHandler handler;
};
static inline bool validMode(DebuggerStartMode sm)
// Accessed by DebuggerRunTool
DebuggerEngine *createCdbEngine()
{
return sm != NoStartMode;
}
// Accessed by RunControlFactory
DebuggerEngine *createCdbEngine(QStringList *errors, DebuggerStartMode sm)
{
if (HostOsInfo::isWindowsHost()) {
if (validMode(sm))
return new CdbEngine();
errors->append(CdbEngine::tr("Internal error: Invalid start parameters passed for the CDB engine."));
} else {
errors->append(CdbEngine::tr("Unsupported CDB host system."));
}
return 0;
return new CdbEngine;
}
void addCdbOptionPages(QList<Core::IOptionsPage *> *opts)

47
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -76,7 +76,7 @@ enum { debug = 0 };
namespace Debugger {
namespace Internal {
DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm);
DebuggerEngine *createCdbEngine();
DebuggerEngine *createGdbEngine();
DebuggerEngine *createPdbEngine();
DebuggerEngine *createQmlEngine(bool useTerminal);
@@ -479,29 +479,28 @@ void DebuggerRunTool::start()
runControl()->setDisplayName(m_runParameters.displayName);
DebuggerEngine *cppEngine = nullptr;
switch (m_runParameters.cppEngineType) {
case GdbEngineType:
cppEngine = createGdbEngine();
break;
case CdbEngineType: {
QStringList errors;
cppEngine = createCdbEngine(&errors, m_runParameters.startMode);
if (!errors.isEmpty()) {
reportFailure(errors.join('\n'));
return;
}
}
break;
case LldbEngineType:
cppEngine = createLldbEngine();
break;
case PdbEngineType: // FIXME: Yes, Python counts as C++...
cppEngine = createPdbEngine();
break;
default:
QTC_CHECK(false);
break;
if (!m_engine) {
switch (m_runParameters.cppEngineType) {
case GdbEngineType:
cppEngine = createGdbEngine();
break;
case CdbEngineType:
if (!HostOsInfo::isWindowsHost()) {
reportFailure(tr("Unsupported CDB host system."));
return;
}
cppEngine = createCdbEngine();
break;
case LldbEngineType:
cppEngine = createLldbEngine();
break;
case PdbEngineType: // FIXME: Yes, Python counts as C++...
cppEngine = createPdbEngine();
break;
default:
QTC_CHECK(false);
break;
}
}
switch (m_runParameters.masterEngineType) {