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

Debugger: Remove messaging indirection in DebuggerRunControl

Browse Source 
The base functionality is good enough.

Change-Id: Ie39398828733245e0e74ca9a2941c069116014f0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-10-17 13:06:37 +02:00
parent 7e5bad4905
commit 216b950124
6 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/debuggerengine.cpp
View File

@@ -315,7 +315,6 @@ public:
bool m_isStateDebugging;
Utils::FileInProjectFinder m_fileFinder;
};
@@ -495,10 +494,21 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
consoleManager->printToConsolePane(QmlJS::ConsoleItem::UndefinedType, msg);
debuggerCore()->showMessage(msg, channel, timeout);
if (d->m_runControl)
d->m_runControl->showMessage(msg, channel);
else
if (d->m_runControl) {
switch (channel) {
case AppOutput:
d->m_runControl->appendMessage(msg, Utils::StdOutFormatSameLine);
break;
case AppError:
d->m_runControl->appendMessage(msg, Utils::StdErrFormatSameLine);
break;
case AppStuff:
d->m_runControl->appendMessage(msg, Utils::DebugFormat);
break;
}
} else {
qWarning("Warning: %s (no active run control)", qPrintable(msg));
}
}
void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)