From f6312282f7cd83d00c49cc2de3dd0dfe42c728e7 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 2 May 2019 12:05:13 +0200 Subject: [PATCH] Qbs: Remove QbsBuildConfiguration::emitBuildTypeChanged The base BuildConfiguration::buildType() is accessible, and does not need the casts. Change-Id: I74bf9636901b99e3bf24a1a2ec8f46aabe707fbb Reviewed-by: Christian Kandeler --- .../qbsprojectmanager/qbsbuildconfiguration.cpp | 5 ----- src/plugins/qbsprojectmanager/qbsbuildconfiguration.h | 2 -- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 10 ++++------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index cc49cdb3c25..61c7aa5722b 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -220,11 +220,6 @@ QStringList QbsBuildConfiguration::products() const return m_products; } -void QbsBuildConfiguration::emitBuildTypeChanged() -{ - emit buildTypeChanged(); -} - QString QbsBuildConfiguration::configurationName() const { return m_configurationName->value(); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index 27e986600db..5f9c62140c5 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -69,8 +69,6 @@ public: void setProducts(const QStringList &products); QStringList products() const; - void emitBuildTypeChanged(); - QString configurationName() const; QString equivalentCommandLine(const ProjectExplorer::BuildStep *buildStep) const; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 490b462b781..1cd0b4f85fe 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -227,9 +227,8 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config) if (tmp == m_qbsConfiguration) return; m_qbsConfiguration = tmp; - auto bc = static_cast(buildConfiguration()); - if (bc) - bc->emitBuildTypeChanged(); + if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration()) + emit bc->buildTypeChanged(); emit qbsConfigurationChanged(); } @@ -417,9 +416,8 @@ void QbsBuildStep::setBuildVariant(const QString &variant) return; m_qbsConfiguration.insert(Constants::QBS_CONFIG_VARIANT_KEY, variant); emit qbsConfigurationChanged(); - auto bc = static_cast(buildConfiguration()); - if (bc) - bc->emitBuildTypeChanged(); + if (ProjectExplorer::BuildConfiguration *bc = buildConfiguration()) + emit bc->buildTypeChanged(); } QString QbsBuildStep::profile() const