forked from qt-creator/qt-creator
Move OutputFormatter to Utils lib.
This commit is contained in:
@@ -55,10 +55,10 @@
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/outputformat.h>
|
||||
#include <projectexplorer/toolchain.h>
|
||||
#include <projectexplorer/applicationrunconfiguration.h> // For LocalApplication*
|
||||
|
||||
#include <utils/outputformat.h>
|
||||
#include <utils/synchronousprocess.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/fancymainwindow.h>
|
||||
@@ -241,7 +241,7 @@ void DebuggerRunControl::start()
|
||||
// User canceled input dialog asking for executable when working on library project.
|
||||
if (d->m_engine->startParameters().startMode == StartInternal
|
||||
&& d->m_engine->startParameters().executable.isEmpty()) {
|
||||
appendMessage(tr("No executable specified.\n"), ErrorMessageFormat);
|
||||
appendMessage(tr("No executable specified.\n"), Utils::ErrorMessageFormat);
|
||||
emit started();
|
||||
emit finished();
|
||||
return;
|
||||
@@ -257,12 +257,12 @@ void DebuggerRunControl::start()
|
||||
d->m_engine->startDebugger(this);
|
||||
|
||||
if (d->m_running)
|
||||
appendMessage(tr("Debugging starts\n"), NormalMessageFormat);
|
||||
appendMessage(tr("Debugging starts\n"), Utils::NormalMessageFormat);
|
||||
}
|
||||
|
||||
void DebuggerRunControl::startFailed()
|
||||
{
|
||||
appendMessage(tr("Debugging has failed\n"), NormalMessageFormat);
|
||||
appendMessage(tr("Debugging has failed\n"), Utils::NormalMessageFormat);
|
||||
d->m_running = false;
|
||||
emit finished();
|
||||
d->m_engine->handleStartFailed();
|
||||
@@ -270,7 +270,7 @@ void DebuggerRunControl::startFailed()
|
||||
|
||||
void DebuggerRunControl::handleFinished()
|
||||
{
|
||||
appendMessage(tr("Debugging has finished\n"), NormalMessageFormat);
|
||||
appendMessage(tr("Debugging has finished\n"), Utils::NormalMessageFormat);
|
||||
if (d->m_engine)
|
||||
d->m_engine->handleFinished();
|
||||
debuggerCore()->runControlFinished(d->m_engine);
|
||||
@@ -280,13 +280,13 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel)
|
||||
{
|
||||
switch (channel) {
|
||||
case AppOutput:
|
||||
appendMessage(msg, StdOutFormatSameLine);
|
||||
appendMessage(msg, Utils::StdOutFormatSameLine);
|
||||
break;
|
||||
case AppError:
|
||||
appendMessage(msg, StdErrFormatSameLine);
|
||||
appendMessage(msg, Utils::StdErrFormatSameLine);
|
||||
break;
|
||||
case AppStuff:
|
||||
appendMessage(msg, NormalMessageFormat);
|
||||
appendMessage(msg, Utils::NormalMessageFormat);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user