Debugger: Make DebuggerRunTool (more) responsible for output

Make DebuggerRunTool accessible to downstream users, but remove
the non-standard handleApplicationOutput from the run control
itself to move it closer to the base run control.

LogChannel and Utils::OutputFormat should merge at some time.

Change-Id: I47b0f0067e1427b25e47036c3d4bc6ed5eed6189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-04-10 13:57:05 +02:00
parent a585a59f61
commit 49b98f1149
4 changed files with 84 additions and 82 deletions

View File

@@ -62,6 +62,7 @@ namespace Internal {
class DebuggerEnginePrivate;
class DebuggerPluginPrivate;
class DebuggerRunTool;
class DisassemblerAgent;
class MemoryAgent;
class WatchItem;
@@ -199,6 +200,7 @@ public:
const DebuggerRunParameters &runParameters() const;
DebuggerRunParameters &runParameters();
DebuggerRunTool *runTool() const;
enum {
// Remove need to qualify each use.
@@ -471,6 +473,21 @@ private:
DebuggerEnginePrivate *d;
};
class DebuggerRunTool : public ProjectExplorer::ToolRunner
{
public:
DebuggerRunTool(DebuggerRunControl *runControl, DebuggerEngine *engine);
~DebuggerRunTool();
void showMessage(const QString &msg, int channel, int timeout = -1);
void handleFinished();
DebuggerEngine *engine() const { return m_engine; }
private:
DebuggerEngine *m_engine; // Master engine
};
class LocationMark : public TextEditor::TextMark
{
public: