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

Give the values of BuildStep::OutputFormat better names

Browse Source 
The old ones did not convey their meaning very well. In particular,
NormalOutput and MessageOutput were easily confused.

Change-Id: Ia0a8c1b1c366ab3f5c59f751b37b8b1f68f6831d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Christian Kandeler
2017-01-12 10:59:12 +01:00
parent 0e874ba599
commit c05a3fdb3d
26 changed files with 100 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -130,7 +130,7 @@ IOutputParser *AbstractProcessStep::outputParser() const
void AbstractProcessStep::emitFaultyConfigurationMessage()
{
emit addOutput(tr("Configuration is faulty. Check the Issues view for details."),
BuildStep::MessageOutput);
BuildStep::OutputFormat::NormalMessage);
}
bool AbstractProcessStep::ignoreReturnValue()
@@ -173,7 +173,7 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
if (!wd.mkpath(wd.absolutePath())) {
emit addOutput(tr("Could not create directory \"%1\"")
.arg(QDir::toNativeSeparators(wd.absolutePath())),
BuildStep::ErrorMessageOutput);
BuildStep::OutputFormat::ErrorMessage);
reportRunResult(fi, false);
return;
}
@@ -238,7 +238,7 @@ void AbstractProcessStep::processStarted()
emit addOutput(tr("Starting: \"%1\" %2")
.arg(QDir::toNativeSeparators(m_param.effectiveCommand()),
m_param.prettyArguments()),
BuildStep::MessageOutput);
BuildStep::OutputFormat::NormalMessage);
}
/*!
@@ -255,13 +255,13 @@ void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus sta
QString command = QDir::toNativeSeparators(m_param.effectiveCommand());
if (status == QProcess::NormalExit && exitCode == 0) {
emit addOutput(tr("The process \"%1\" exited normally.").arg(command),
BuildStep::MessageOutput);
BuildStep::OutputFormat::NormalMessage);
} else if (status == QProcess::NormalExit) {
emit addOutput(tr("The process \"%1\" exited with code %2.")
.arg(command, QString::number(m_process->exitCode())),
BuildStep::ErrorMessageOutput);
BuildStep::OutputFormat::ErrorMessage);
} else {
emit addOutput(tr("The process \"%1\" crashed.").arg(command), BuildStep::ErrorMessageOutput);
emit addOutput(tr("The process \"%1\" crashed.").arg(command), BuildStep::OutputFormat::ErrorMessage);
}
}
@@ -276,7 +276,7 @@ void AbstractProcessStep::processStartupFailed()
emit addOutput(tr("Could not start process \"%1\" %2")
.arg(QDir::toNativeSeparators(m_param.effectiveCommand()),
m_param.prettyArguments()),
BuildStep::ErrorMessageOutput);
BuildStep::OutputFormat::ErrorMessage);
m_timer.stop();
}
@@ -313,7 +313,7 @@ void AbstractProcessStep::stdOutput(const QString &line)
{
if (m_outputParserChain)
m_outputParserChain->stdOutput(line);
emit addOutput(line, BuildStep::NormalOutput, BuildStep::DontAppendNewline);
emit addOutput(line, BuildStep::OutputFormat::Stdout, BuildStep::DontAppendNewline);
}
void AbstractProcessStep::processReadyReadStdError()
@@ -337,7 +337,7 @@ void AbstractProcessStep::stdError(const QString &line)
{
if (m_outputParserChain)
m_outputParserChain->stdError(line);
emit addOutput(line, BuildStep::ErrorOutput, BuildStep::DontAppendNewline);
emit addOutput(line, BuildStep::OutputFormat::Stderr, BuildStep::DontAppendNewline);
}
QFutureInterface<bool> *AbstractProcessStep::futureInterface() const