Give the values of BuildStep::OutputFormat better names

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

View File

@@ -63,24 +63,24 @@ bool NimCompilerCleanStep::init(QList<const BuildStep *> &)
void NimCompilerCleanStep::run(QFutureInterface<bool> &fi)
{
if (!m_buildDir.exists()) {
emit addOutput(tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), BuildStep::ErrorMessageOutput);
emit addOutput(tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), BuildStep::OutputFormat::ErrorMessage);
reportRunResult(fi, false);
return;
}
if (!removeCacheDirectory()) {
emit addOutput(tr("Failed to delete the cache directory."), BuildStep::ErrorMessageOutput);
emit addOutput(tr("Failed to delete the cache directory."), BuildStep::OutputFormat::ErrorMessage);
reportRunResult(fi, false);
return;
}
if (!removeOutFilePath()) {
emit addOutput(tr("Failed to delete the out file."), BuildStep::ErrorMessageOutput);
emit addOutput(tr("Failed to delete the out file."), BuildStep::OutputFormat::ErrorMessage);
reportRunResult(fi, false);
return;
}
emit addOutput(tr("Clean step completed successfully."), BuildStep::MessageOutput);
emit addOutput(tr("Clean step completed successfully."), BuildStep::OutputFormat::NormalMessage);
reportRunResult(fi, true);
}