From d45e123b8e14cc63e1a5453a18ee976ecd5ff742 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 21 Feb 2020 15:18:40 +0100 Subject: [PATCH] ProjectExplorer: Remove pure ProjectConfiguration::isActive function It's never used polymorphically, and only caused an unused implementation in BuildStep. Change-Id: I5fbd34925788ca22960a2f522eef75be3137c67b Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/buildconfiguration.h | 2 +- src/plugins/projectexplorer/buildstep.cpp | 5 ----- src/plugins/projectexplorer/buildstep.h | 2 -- src/plugins/projectexplorer/deployconfiguration.h | 2 +- src/plugins/projectexplorer/projectconfiguration.h | 2 -- src/plugins/projectexplorer/runconfiguration.h | 2 +- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 00de9bb71e0..04058f4aa76 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -103,7 +103,7 @@ public: static QString buildTypeName(BuildType type); - bool isActive() const override; + bool isActive() const; static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env); void updateCacheAndEmitEnvironmentChanged(); diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index ba0bfa221a3..959e91d23ce 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -217,11 +217,6 @@ void BuildStep::reportRunResult(QFutureInterface &fi, bool success) fi.reportFinished(); } -bool BuildStep::isActive() const -{ - return projectConfiguration()->isActive(); -} - bool BuildStep::widgetExpandedByDefault() const { return m_widgetExpandedByDefault; diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 4c45fefb7f1..2b2cfe64a2c 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -87,8 +87,6 @@ public: static void reportRunResult(QFutureInterface &fi, bool success); - bool isActive() const override; - bool widgetExpandedByDefault() const; void setWidgetExpandedByDefault(bool widgetExpandedByDefault); diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 156fb526749..6cd85b62a3e 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -56,7 +56,7 @@ public: bool fromMap(const QVariantMap &map) override; QVariantMap toMap() const override; - bool isActive() const override; + bool isActive() const; bool usesCustomDeploymentData() const { return m_usesCustomDeploymentData; } void setUseCustomDeploymentData(bool enabled) { m_usesCustomDeploymentData = enabled; } diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index c6134f6ed8f..3702655e168 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -194,8 +194,6 @@ public: Target *target() const; Project *project() const; - virtual bool isActive() const = 0; - static QString settingsIdKey(); template diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 5a51508ccf7..053bd600136 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -127,7 +127,7 @@ class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration public: ~RunConfiguration() override; - bool isActive() const override; + bool isActive() const; virtual QString disabledReason() const; virtual bool isEnabled() const;