From c0b001737cd14cca89d4522bab44ec1fa4d4eeab Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 11 Sep 2020 13:39:11 +0200
Subject: [PATCH] ProjectExplorer: Remove BuildStepConfigWidget::m_step

It's not needed centrally anymore.

Keep it in the only remaining user, QbsBuildStepConfigWidget. Also
there it will not be needed after aspectification anymore.

Change-Id: Ia29e1e1f5226832ecb62ca79675ce717c9e5ef9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/buildstep.cpp      | 3 +--
 src/plugins/projectexplorer/buildstep.h        | 2 --
 src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 8 +++++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index eb566cb3481..d477fd63f56 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -488,11 +488,10 @@ BuildStep *BuildStepFactory::restore(BuildStepList *parent, const QVariantMap &m
 // BuildStepConfigWidget
 
 BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step)
-    : m_step(step)
 {
     m_displayName = step->displayName();
     m_summaryText = "<b>" + m_displayName + "</b>";
-    connect(m_step, &ProjectConfiguration::displayNameChanged,
+    connect(step, &ProjectConfiguration::displayNameChanged,
             this, &BuildStepConfigWidget::updateSummary);
     for (auto aspect : step->aspects()) {
         connect(aspect, &BaseAspect::changed,
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 30698ca702c..7921f635e56 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -230,7 +230,6 @@ public:
 
     QString summaryText() const;
     QString displayName() const;
-    BuildStep *step() const { return m_step; }
 
     void setDisplayName(const QString &displayName);
     void setSummaryText(const QString &summaryText);
@@ -242,7 +241,6 @@ signals:
     void updateSummary();
 
 private:
-    BuildStep *m_step = nullptr;
     QString m_displayName;
     QString m_summaryText;
     std::function<QString()> m_summaryUpdater;
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 3f1f8983f98..750a6164465 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -116,6 +116,7 @@ private:
         QString effectiveValue;
     };
 
+    QbsBuildStep *m_qbsStep;
     QList<Property> m_propertyCache;
     bool m_ignoreChange = false;
 
@@ -542,6 +543,7 @@ void QbsBuildStep::dropSession()
 
 QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
     BuildStepConfigWidget(step),
+    m_qbsStep(step),
     m_ignoreChange(false)
 {
     connect(step, &ProjectConfiguration::displayNameChanged,
@@ -685,7 +687,7 @@ void QbsBuildStepConfigWidget::updateState()
     const QString buildVariant = qbsStep()->buildVariant();
     const int idx = (buildVariant == Constants::QBS_VARIANT_DEBUG) ? 0 : 1;
     buildVariantComboBox->setCurrentIndex(idx);
-    const auto qbsBuildConfig = static_cast<QbsBuildConfiguration *>(step()->buildConfiguration());
+    const auto qbsBuildConfig = static_cast<QbsBuildConfiguration *>(qbsStep()->buildConfiguration());
 
     QString command = qbsBuildConfig->equivalentCommandLine(qbsStep()->stepData());
 
@@ -846,7 +848,7 @@ void QbsBuildStepConfigWidget::applyCachedProperties()
 
 QbsBuildStep *QbsBuildStepConfigWidget::qbsStep() const
 {
-    return static_cast<QbsBuildStep *>(step());
+    return m_qbsStep;
 }
 
 bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QString *errorMessage)
@@ -861,7 +863,7 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
     }
 
     QList<Property> properties;
-    const MacroExpander * const expander = step()->macroExpander();
+    const MacroExpander * const expander = qbsStep()->macroExpander();
     foreach (const QString &rawArg, argList) {
         int pos = rawArg.indexOf(':');
         if (pos > 0) {