From d6c605d84c1eb20e3614532aa0d535d8506da8dd Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 15 Oct 2018 17:52:15 +0200
Subject: ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()

From a virtual function to a normal one backed by a real data member.

That's essentially what several re-implementations did, the other
ones used a fixed value instead.

Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/ios/iosbuildstep.cpp        | 7 +------
 src/plugins/ios/iosbuildstep.h          | 2 --
 src/plugins/ios/iosdeploystepwidget.cpp | 6 +-----
 src/plugins/ios/iosdeploystepwidget.h   | 2 --
 src/plugins/ios/iosdsymbuildstep.cpp    | 7 +------
 src/plugins/ios/iosdsymbuildstep.h      | 2 --
 6 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/plugins/ios')

diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 4a08afe5cf..5bb6280638 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -259,13 +259,8 @@ void IosBuildStepConfigWidget::updateDetails()
     param.setEnvironment(bc->environment());
     param.setCommand(m_buildStep->buildCommand());
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments()));
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
-}
 
-QString IosBuildStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
+    setSummaryText(param.summary(displayName()));
 }
 
 void IosBuildStepConfigWidget::buildArgumentsChanged()
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index e32b5b60c7..35f3f5035c 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -77,7 +77,6 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     IosBuildStepConfigWidget(IosBuildStep *buildStep);
     ~IosBuildStepConfigWidget();
-    QString summaryText() const override;
 
 private:
     void buildArgumentsChanged();
@@ -87,7 +86,6 @@ private:
 
     Ui::IosBuildStep *m_ui;
     IosBuildStep *m_buildStep;
-    QString m_summaryText;
 };
 
 class IosBuildStepFactory : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/ios/iosdeploystepwidget.cpp b/src/plugins/ios/iosdeploystepwidget.cpp
index f1bf2dc1b9..d24b2d38b7 100644
--- a/src/plugins/ios/iosdeploystepwidget.cpp
+++ b/src/plugins/ios/iosdeploystepwidget.cpp
@@ -40,6 +40,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
     m_step(step)
 {
     setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
+    setSummaryText(displayName());
     ui->setupUi(this);
     connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
             this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
@@ -50,10 +51,5 @@ IosDeployStepWidget::~IosDeployStepWidget()
     delete ui;
 }
 
-QString IosDeployStepWidget::summaryText() const
-{
-    return displayName();
-}
-
 } // namespace Internal
 } // namespace Ios
diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h
index 54c03f3382..6ab40cc8dc 100644
--- a/src/plugins/ios/iosdeploystepwidget.h
+++ b/src/plugins/ios/iosdeploystepwidget.h
@@ -43,8 +43,6 @@ public:
     ~IosDeployStepWidget();
 
 private:
-    QString summaryText() const override;
-
     Ui::IosDeployStepWidget *ui;
     IosDeployStep *m_step;
 };
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index bde3fbae1c..c530b27ed5 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -277,13 +277,8 @@ void IosDsymBuildStepConfigWidget::updateDetails()
     param.setEnvironment(bc->environment());
     param.setCommand(m_buildStep->command());
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments()));
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
-}
 
-QString IosDsymBuildStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
+    setSummaryText(param.summary(displayName()));
 }
 
 void IosDsymBuildStepConfigWidget::commandChanged()
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index d08ef6404d..f75f1c863e 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -74,7 +74,6 @@ class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidg
 public:
     IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
     ~IosDsymBuildStepConfigWidget();
-    QString summaryText() const override;
 
 private:
     void commandChanged();
@@ -84,7 +83,6 @@ private:
 
     Ui::IosPresetBuildStep *m_ui;
     IosDsymBuildStep *m_buildStep;
-    QString m_summaryText;
 };
 
 class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
-- 
cgit v1.2.1