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

Debugger: Remove output processor from RunControl

Browse Source 
The same functionality is available by using signals of the RunControl.
This reverts ca3bcd81 partially.

Change-Id: Id1d4d6e8326be60cdbe7c862dab46f49dbc6abe7
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2017-04-06 15:42:09 +02:00
parent 4b9320d86e
commit 1024d25e93
3 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,10 +123,6 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi
DebuggerRunControl::~DebuggerRunControl()
{
disconnect();
if (m_outputProcessor) {
delete m_outputProcessor;
m_outputProcessor = 0;
}
if (m_engine) {
DebuggerEngine *engine = m_engine;
m_engine = 0;
@@ -161,16 +157,7 @@ void DebuggerRunControl::handleApplicationOutput(const QString &msg, int channel
{
OutputFormat format = outputFormatForChannelType(channel);
QTC_ASSERT(format != NumberOfFormats, return);
if (m_outputProcessor) {
if (m_outputProcessor->logToAppOutputPane)
appendMessage(msg, format);
if (m_outputProcessor->process) {
m_outputProcessor->process(msg, channel == AppError ? OutputProcessor::StandardError
: OutputProcessor::StandardOut);
}
} else {
appendMessage(msg, format);
}
appendMessage(msg, format);
}
void DebuggerRunControl::start()
@@ -292,12 +279,6 @@ DebuggerStartParameters &DebuggerRunControl::startParameters()
return m_engine->runParameters();
}
void DebuggerRunControl::setOutputProcessor(OutputProcessor *processor)
{
delete m_outputProcessor;
m_outputProcessor = processor;
}
void DebuggerRunControl::notifyInferiorIll()
{
m_engine->notifyInferiorIll();