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

ProjectExplorer: Remove pure ProjectConfiguration::isActive function

Browse Source 
It's never used polymorphically, and only caused an unused
implementation in BuildStep.

Change-Id: I5fbd34925788ca22960a2f522eef75be3137c67b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-21 15:18:40 +01:00
parent 63b0c79a46
commit d45e123b8e
6 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ public:
static QString buildTypeName(BuildType type); static QString buildTypeName(BuildType type);
bool isActive() const override; bool isActive() const;
static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env); static void prependCompilerPathToEnvironment(Kit *k, Utils::Environment &env);
void updateCacheAndEmitEnvironmentChanged(); void updateCacheAndEmitEnvironmentChanged();

5
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -217,11 +217,6 @@ void BuildStep::reportRunResult(QFutureInterface<bool> &fi, bool success)
fi.reportFinished(); fi.reportFinished();
} }
bool BuildStep::isActive() const
{
return projectConfiguration()->isActive();
}
bool BuildStep::widgetExpandedByDefault() const bool BuildStep::widgetExpandedByDefault() const
{ {
return m_widgetExpandedByDefault; return m_widgetExpandedByDefault;

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

@@ -87,8 +87,6 @@ public:
static void reportRunResult(QFutureInterface<bool> &fi, bool success); static void reportRunResult(QFutureInterface<bool> &fi, bool success);
bool isActive() const override;
bool widgetExpandedByDefault() const; bool widgetExpandedByDefault() const;
void setWidgetExpandedByDefault(bool widgetExpandedByDefault); void setWidgetExpandedByDefault(bool widgetExpandedByDefault);

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

@@ -56,7 +56,7 @@ public:
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;
bool isActive() const override; bool isActive() const;
bool usesCustomDeploymentData() const { return m_usesCustomDeploymentData; } bool usesCustomDeploymentData() const { return m_usesCustomDeploymentData; }
void setUseCustomDeploymentData(bool enabled) { m_usesCustomDeploymentData = enabled; } void setUseCustomDeploymentData(bool enabled) { m_usesCustomDeploymentData = enabled; }

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

@@ -194,8 +194,6 @@ public:
Target *target() const; Target *target() const;
Project *project() const; Project *project() const;
virtual bool isActive() const = 0;
static QString settingsIdKey(); static QString settingsIdKey();
template<class Aspect, typename ...Args> template<class Aspect, typename ...Args>

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

@@ -127,7 +127,7 @@ class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration
public: public:
~RunConfiguration() override; ~RunConfiguration() override;
bool isActive() const override; bool isActive() const;
virtual QString disabledReason() const; virtual QString disabledReason() const;
virtual bool isEnabled() const; virtual bool isEnabled() const;