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

BuildManager: Modernize

Browse Source 
Change-Id: I414748be50c74133f64e525d72ffcabc404c1e51
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2019-04-06 22:00:02 +02:00
committed by André Hartmann
parent a10a35d9eb
commit 4fae51c9d4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -225,8 +225,8 @@ void BuildManager::updateTaskCount()
void BuildManager::finish() void BuildManager::finish()
{ {
const QTime format = QTime(0, 0, 0, 0).addMSecs(d->m_elapsed.elapsed() + 500); const QTime format = QTime(0, 0, 0, 0).addMSecs(d->m_elapsed.elapsed() + 500);
QString time = format.toString(QLatin1String("h:mm:ss")); QString time = format.toString("h:mm:ss");
if (time.startsWith(QLatin1String("0:"))) if (time.startsWith("0:"))
time.remove(0, 2); // Don't display zero hours time.remove(0, 2); // Don't display zero hours
m_instance->addToOutputWindow(tr("Elapsed time: %1.") .arg(time), BuildStep::OutputFormat::NormalMessage); m_instance->addToOutputWindow(tr("Elapsed time: %1.") .arg(time), BuildStep::OutputFormat::NormalMessage);
@@ -240,7 +240,7 @@ void BuildManager::emitCancelMessage()
void BuildManager::clearBuildQueue() void BuildManager::clearBuildQueue()
{ {
foreach (BuildStep *bs, d->m_buildQueue) { for (BuildStep *bs : qAsConst(d->m_buildQueue)) {
decrementActiveBuildSteps(bs); decrementActiveBuildSteps(bs);
disconnectOutput(bs); disconnectOutput(bs);
} }
@@ -345,11 +345,11 @@ void BuildManager::addToOutputWindow(const QString &string, BuildStep::OutputFor
QString stringToWrite; QString stringToWrite;
if (format == BuildStep::OutputFormat::NormalMessage || format == BuildStep::OutputFormat::ErrorMessage) { if (format == BuildStep::OutputFormat::NormalMessage || format == BuildStep::OutputFormat::ErrorMessage) {
stringToWrite = QTime::currentTime().toString(); stringToWrite = QTime::currentTime().toString();
stringToWrite += QLatin1String(": "); stringToWrite += ": ";
} }
stringToWrite += string; stringToWrite += string;
if (newlineSettings == BuildStep::DoAppendNewline) if (newlineSettings == BuildStep::DoAppendNewline)
stringToWrite += QLatin1Char('\n'); stringToWrite += '\n';
d->m_outputWindow->appendText(stringToWrite, format); d->m_outputWindow->appendText(stringToWrite, format);
} }
@@ -482,7 +482,7 @@ bool BuildManager::buildQueueAppend(const QList<BuildStep *> &steps, QStringList
TaskHub::clearTasks(Constants::TASK_CATEGORY_AUTOTEST); TaskHub::clearTasks(Constants::TASK_CATEGORY_AUTOTEST);
} }
foreach (const QString &str, preambleMessage) for (const QString &str : preambleMessage)
addToOutputWindow(str, BuildStep::OutputFormat::NormalMessage, BuildStep::DontAppendNewline); addToOutputWindow(str, BuildStep::OutputFormat::NormalMessage, BuildStep::DontAppendNewline);
} }
@@ -533,11 +533,11 @@ bool BuildManager::buildList(BuildStepList *bsl)
return buildLists({bsl}); return buildLists({bsl});
} }
bool BuildManager::buildLists(QList<BuildStepList *> bsls, const QStringList &preambelMessage) bool BuildManager::buildLists(const QList<BuildStepList *> bsls, const QStringList &preambelMessage)
{ {
QList<BuildStep *> steps; QList<BuildStep *> steps;
QStringList stepListNames; QStringList stepListNames;
foreach (BuildStepList *list, bsls) { for (BuildStepList *list : bsls) {
steps.append(list->steps()); steps.append(list->steps());
stepListNames.append(ProjectExplorerPlugin::displayNameForStepId(list->id())); stepListNames.append(ProjectExplorerPlugin::displayNameForStepId(list->id()));
d->m_isDeploying = d->m_isDeploying || list->id() == Constants::BUILDSTEPS_DEPLOY; d->m_isDeploying = d->m_isDeploying || list->id() == Constants::BUILDSTEPS_DEPLOY;

2
src/plugins/projectexplorer/buildmanager.h
View File

@@ -52,7 +52,7 @@ public:
static bool isDeploying(); static bool isDeploying();
static bool tasksAvailable(); static bool tasksAvailable();
static bool buildLists(QList<BuildStepList *> bsls, static bool buildLists(const QList<BuildStepList *> bsls,
const QStringList &preambelMessage = QStringList()); const QStringList &preambelMessage = QStringList());
static bool buildList(BuildStepList *bsl); static bool buildList(BuildStepList *bsl);