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

12
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -356,7 +356,7 @@ void QbsBuildStep::handleProgress(int value)
void QbsBuildStep::handleCommandDescriptionReport(const QString &highlight, const QString &message)
{
Q_UNUSED(highlight);
emit addOutput(message, NormalOutput);
emit addOutput(message, OutputFormat::Stdout);
}
void QbsBuildStep::handleProcessResultReport(const qbs::ProcessResult &result)
@@ -370,15 +370,15 @@ void QbsBuildStep::handleProcessResultReport(const qbs::ProcessResult &result)
QString commandline = result.executableFilePath() + QLatin1Char(' ')
+ Utils::QtcProcess::joinArgs(result.arguments());
addOutput(commandline, NormalOutput);
addOutput(commandline, OutputFormat::Stdout);
foreach (const QString &line, result.stdErr()) {
m_parser->stdError(line);
addOutput(line, ErrorOutput);
addOutput(line, OutputFormat::Stderr);
}
foreach (const QString &line, result.stdOut()) {
m_parser->stdOutput(line);
addOutput(line, NormalOutput);
addOutput(line, OutputFormat::Stdout);
}
m_parser->flush();
}
@@ -390,7 +390,7 @@ void QbsBuildStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, con
Utils::FileName::fromString(file), line,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
emit addTask(task, 1);
emit addOutput(message, NormalOutput);
emit addOutput(message, OutputFormat::Stdout);
}
QString QbsBuildStep::buildVariant() const
@@ -480,7 +480,7 @@ void QbsBuildStep::build()
QString error;
m_job = qbsProject()->build(options, m_products, error);
if (!m_job) {
emit addOutput(error, ErrorMessageOutput);
emit addOutput(error, OutputFormat::ErrorMessage);
reportRunResult(*m_fi, false);
return;
}

2
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -200,7 +200,7 @@ void QbsCleanStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, con
Utils::FileName::fromString(file), line,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
emit addTask(task, 1);
emit addOutput(message, NormalOutput);
emit addOutput(message, OutputFormat::Stdout);
}
void QbsCleanStep::setDryRun(bool dr)

2
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -219,7 +219,7 @@ void QbsInstallStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type,
Utils::FileName::fromString(file), line,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
emit addTask(task, 1);
emit addOutput(message, NormalOutput);
emit addOutput(message, OutputFormat::Stdout);
}
void QbsInstallStep::setInstallRoot(const QString &ir)