From 31cf0dfb74db072c7c39e4d119d1e7e6e3fe5326 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 25 Jul 2023 19:44:40 +0200 Subject: [PATCH] BuildStep: Hide some API in protected / private sections Change-Id: I3345afa871bbb900beb739b2a283145392262658 Reviewed-by: hjk Reviewed-by: Qt CI Bot Reviewed-by: --- src/plugins/projectexplorer/buildstep.cpp | 5 ---- src/plugins/projectexplorer/buildstep.h | 31 ++++++++++------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 61d26fe9632..8844a34604b 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -241,11 +241,6 @@ QVariant BuildStep::data(Id id) const return {}; } -void BuildStep::addMacroExpander() -{ - m_addMacroExpander = true; -} - void BuildStep::setEnabled(bool b) { if (m_enabled == b) diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index c5c82978223..8c37ff3ecde 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -49,17 +49,10 @@ public: BuildStepList *stepList() const; BuildConfiguration *buildConfiguration() const; - DeployConfiguration *deployConfiguration() const; - ProjectConfiguration *projectConfiguration() const; BuildSystem *buildSystem() const; - Utils::Environment buildEnvironment() const; - Utils::FilePath buildDirectory() const; BuildConfiguration::BuildType buildType() const; Utils::MacroExpander *macroExpander() const; - QString fallbackWorkingDirectory() const; - - virtual void setupOutputFormatter(Utils::OutputFormatter *formatter); enum class OutputFormat { Stdout, Stderr, // These are for forwarded output from external tools @@ -75,23 +68,12 @@ public: }; bool widgetExpandedByDefault() const; - void setWidgetExpandedByDefault(bool widgetExpandedByDefault); - bool hasUserExpansionState() const { return m_wasExpanded.has_value(); } bool wasUserExpanded() const { return m_wasExpanded.value_or(false); } void setUserExpanded(bool expanded) { m_wasExpanded = expanded; } - bool isImmutable() const { return m_immutable; } - void setImmutable(bool immutable) { m_immutable = immutable; } - virtual QVariant data(Utils::Id id) const; - void setSummaryUpdater(const std::function &summaryUpdater); - - void addMacroExpander(); - QString summaryText() const; - void setSummaryText(const QString &summaryText); - QWidget *doCreateConfigWidget(); signals: @@ -112,11 +94,24 @@ signals: void progress(int percentage, const QString &message); protected: + void setWidgetExpandedByDefault(bool widgetExpandedByDefault); + void setImmutable(bool immutable) { m_immutable = immutable; } + void setSummaryUpdater(const std::function &summaryUpdater); + void addMacroExpander() { m_addMacroExpander = true; } + void setSummaryText(const QString &summaryText); + + DeployConfiguration *deployConfiguration() const; + Utils::Environment buildEnvironment() const; + Utils::FilePath buildDirectory() const; + QString fallbackWorkingDirectory() const; + virtual QWidget *createConfigWidget(); + virtual void setupOutputFormatter(Utils::OutputFormatter *formatter); private: friend class BuildManager; virtual Tasking::GroupItem runRecipe() = 0; + ProjectConfiguration *projectConfiguration() const; BuildStepList * const m_stepList; bool m_enabled = true;