debugger: simplify DebuggerEngine construction

The master engine pointer can be given later.

Change-Id: I4d72679dcbd5fe7291067a5e78c984d26cc187aa
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-15 14:33:39 +02:00
parent 081fb1f062
commit 8184d8e703
27 changed files with 76 additions and 130 deletions

View File

@@ -237,9 +237,8 @@ private:
//
///////////////////////////////////////////////////////////////////////
GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters,
DebuggerEngine *masterEngine)
: DebuggerEngine(startParameters, masterEngine)
GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters)
: DebuggerEngine(startParameters)
{
setObjectName(_("GdbEngine"));
@@ -5399,27 +5398,24 @@ void GdbEngine::interruptLocalInferior(qint64 pid)
// Factory
//
DebuggerEngine *createGdbEngine(const DebuggerStartParameters &sp,
DebuggerEngine *masterEngine)
DebuggerEngine *createGdbEngine(const DebuggerStartParameters &sp)
{
if (sp.toolChainAbi.os() == Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks.
return new GdbCodaEngine(sp, masterEngine);
}
if (sp.toolChainAbi.os() == Abi::SymbianOS)
return new GdbCodaEngine(sp);
switch (sp.startMode) {
case AttachCore:
return new GdbCoreEngine(sp, masterEngine);
return new GdbCoreEngine(sp);
case AttachToRemoteServer:
return new GdbRemoteServerEngine(sp, masterEngine);
return new GdbRemoteServerEngine(sp);
case StartRemoteGdb:
return new GdbRemotePlainEngine(sp, masterEngine);
return new GdbRemotePlainEngine(sp);
case AttachExternal:
return new GdbAttachEngine(sp, masterEngine);
return new GdbAttachEngine(sp);
default:
if (sp.useTerminal)
return new GdbTermEngine(sp, masterEngine);
return new GdbLocalPlainEngine(sp, masterEngine);
return new GdbTermEngine(sp);
return new GdbLocalPlainEngine(sp);
}
}