diff options
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbscleanstep.cpp')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbscleanstep.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index b47610a4466..9ddf533395c 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -59,7 +59,7 @@ QbsCleanStep::~QbsCleanStep() cancel(); if (m_job) { m_job->deleteLater(); - m_job = 0; + m_job = nullptr; } } @@ -69,9 +69,7 @@ bool QbsCleanStep::init(QList<const BuildStep *> &earlierSteps) if (project()->isParsing() || m_job) return false; - QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration()); - if (!bc) - bc = static_cast<QbsBuildConfiguration *>(target()->activeBuildConfiguration()); + auto bc = static_cast<QbsBuildConfiguration *>(buildConfiguration()); if (!bc) return false; @@ -84,7 +82,7 @@ void QbsCleanStep::run(QFutureInterface<bool> &fi) { m_fi = &fi; - QbsProject *pro = static_cast<QbsProject *>(project()); + auto pro = static_cast<QbsProject *>(project()); qbs::CleanOptions options(m_qbsCleanOptions); QString error; @@ -166,9 +164,9 @@ void QbsCleanStep::cleaningDone(bool success) QTC_ASSERT(m_fi, return); reportRunResult(*m_fi, success); - m_fi = 0; // do not delete, it is not ours + m_fi = nullptr; // do not delete, it is not ours m_job->deleteLater(); - m_job = 0; + m_job = nullptr; } void QbsCleanStep::handleTaskStarted(const QString &desciption, int max) @@ -297,7 +295,7 @@ QbsCleanStepFactory::QbsCleanStepFactory() registerStep<QbsCleanStep>(Constants::QBS_CLEANSTEP_ID); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); setSupportedConfiguration(Constants::QBS_BC_ID); - setDisplayName(tr("Qbs Clean")); + setDisplayName(QbsCleanStep::tr("Qbs Clean")); } } // namespace Internal |