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

Debugger: Simplify DebuggerRunControl construction

Browse Source 
The indirection was to prevent "others" to create "wrong"
DebuggerRunControls, but this is getting into the way now when
making the DebuggerRunControls/DebuggerEngine a ToolRunner.

Change-Id: I6c45e28affebc6b8db16c5d4bbc77325ef63604f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-04-05 16:51:53 +02:00
parent fa3d597e5f
commit 8e56c5be3e
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,11 +105,6 @@ static QLatin1String engineTypeName(DebuggerEngineType et)
return QLatin1String("No engine");
}
DebuggerRunControl *createHelper(RunConfiguration *runConfig, Internal::DebuggerEngine *engine)
{
return new DebuggerRunControl(runConfig, engine);
}
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngine *engine)
: RunControl(runConfig, DebugRunMode),
m_engine(engine)
@@ -356,8 +351,8 @@ DebuggerEngine *createEngine(DebuggerEngineType et, const DebuggerRunParameters
return 0;
}
static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *runConfig,
const Kit *kit, Core::Id runMode, QStringList *errors)
static DebuggerEngine *doCreate(DebuggerRunParameters rp, RunConfiguration *const runConfig,
const Kit *kit, Core::Id runMode, QStringList *errors)
{
QTC_ASSERT(kit, return nullptr);
@@ -557,7 +552,7 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *
return nullptr;
}
return createHelper(runConfig, engine);
return engine;
}
////////////////////////////////////////////////////////////////////////
@@ -588,8 +583,9 @@ public:
// We cover only local setup here. Remote setups are handled by the
// RunControl factories in the target specific plugins.
QStringList errors;
DebuggerRunControl *runControl = doCreate(DebuggerRunParameters(), runConfig,
runConfig->target()->kit(), mode, &errors);
DebuggerEngine *engine = doCreate(DebuggerRunParameters(), runConfig,
runConfig->target()->kit(), mode, &errors);
auto runControl = new DebuggerRunControl(runConfig, engine);
if (errorMessage)
*errorMessage = errors.join('\n');
return runControl;
@@ -636,8 +632,9 @@ DebuggerRunControl *createAndScheduleRun(const DebuggerRunParameters &rp, const
{
QTC_ASSERT(kit, return 0); // Caller needs to look for a suitable kit.
QStringList errors;
DebuggerRunControl *runControl = doCreate(rp, 0, kit, DebugRunMode, &errors);
if (!runControl) {
DebuggerEngine *engine = doCreate(rp, nullptr, kit, DebugRunMode, &errors);
auto runControl = new DebuggerRunControl(nullptr, engine);
if (!engine) {
ProjectExplorerPlugin::showRunErrorMessage(errors.join('\n'));
return 0;
}
@@ -658,7 +655,8 @@ DebuggerRunControl *createDebuggerRunControl(const DebuggerStartParameters &sp,
{
QTC_ASSERT(runConfig, return 0);
QStringList errors;
DebuggerRunControl *runControl = doCreate(sp, runConfig, runConfig->target()->kit(), runMode, &errors);
DebuggerEngine *engine = doCreate(sp, runConfig, runConfig->target()->kit(), runMode, &errors);
auto runControl = new DebuggerRunControl(runConfig, engine);
QString msg = errors.join('\n');
if (errorMessage)
*errorMessage = msg;