Debugger: Streamline error string handling

Let the workers keep track of errors instead of passing around
string pointers in some but not all interesting places.

Change-Id: I3956bc947a50747dd3a0c9302b9f9873d192e9c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-07-07 17:20:16 +02:00
parent 8637d04c1d
commit 6f0a600bcf
9 changed files with 46 additions and 60 deletions

View File

@@ -506,26 +506,25 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
});
}
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerStartParameters &sp, QString *errorMessage)
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerStartParameters &sp)
: DebuggerRunTool(runControl)
{
setStartParameters(sp, errorMessage);
setStartParameters(sp);
}
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerRunParameters &rp, QString *errorMessage)
DebuggerRunTool::DebuggerRunTool(RunControl *runControl, const DebuggerRunParameters &rp)
: DebuggerRunTool(runControl)
{
setRunParameters(rp, errorMessage);
setRunParameters(rp);
}
void DebuggerRunTool::setStartParameters(const DebuggerStartParameters &sp, QString *errorMessage)
void DebuggerRunTool::setStartParameters(const DebuggerStartParameters &sp)
{
setRunParameters(sp, errorMessage);
setRunParameters(sp);
}
void DebuggerRunTool::setRunParameters(const DebuggerRunParameters &rp, QString *errorMessage)
void DebuggerRunTool::setRunParameters(const DebuggerRunParameters &rp)
{
Q_UNUSED(errorMessage);
m_runParameters = rp;
}
@@ -618,15 +617,13 @@ public:
: IRunControlFactory(parent)
{}
RunControl *create(RunConfiguration *runConfig,
Core::Id mode, QString *errorMessage) override
RunControl *create(RunConfiguration *runConfig, Core::Id mode, QString *) override
{
QTC_ASSERT(runConfig, return 0);
QTC_ASSERT(mode == DebugRunMode || mode == DebugRunModeWithBreakOnMain, return 0);
DebuggerStartParameters sp;
auto runControl = new RunControl(runConfig, mode);
(void) new DebuggerRunTool(runControl, sp, errorMessage);
(void) new DebuggerRunTool(runControl);
return runControl;
}