ProjectExplorer: Make BuildStepConfigWidget::displayName a value

Use BuildStep::displayName() as default.

This probably could be the only possibility, but currently there
are some discrepancies that are kept in this patch to make
the patch mechanical.

Change-Id: I2a1e5c2ff37ad95e25309eb16e07099e42191f60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/android/androidbuildapkwidget.cpp

@@ -62,6 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
       m_step(step)
 {
     m_ui->setupUi(this);
+    setDisplayName(tr("<b>Build Android APK</b>"));
 
     // Target sdk combobox
     const int minApiSupported = AndroidManager::apiLevelRange().first;
@@ -133,11 +134,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
     delete m_ui;
 }
 
-QString AndroidBuildApkInnerWidget::displayName() const
-{
-    return tr("<b>Build Android APK</b>");
-}
-
 QString AndroidBuildApkInnerWidget::summaryText() const
 {
     return displayName();
@@ -233,6 +229,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
     BuildStepConfigWidget(step),
     m_step(step)
 {
+    setDisplayName(tr("<b>Build Android APK</b>"));
+
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
 
     auto base = new AndroidBuildApkInnerWidget(step);
@@ -328,10 +326,5 @@ QString AndroidBuildApkWidget::summaryText() const
     return tr("<b>Build Android APK</b>");
 }
 
-QString AndroidBuildApkWidget::displayName() const
-{
-    return summaryText();
-}
-
 } // Internal
 } // Android

src/plugins/android/androidbuildapkwidget.h

@@ -64,7 +64,6 @@ private:
     void signPackageCheckBoxToggled(bool checked);
 
     QString summaryText() const override;
-    QString displayName() const override;
     void setCertificates();
 
     Ui::AndroidBuildApkWidget *m_ui;
@@ -87,7 +86,6 @@ private:
     void checkEnableRemoveButton();
 
     QString summaryText() const final;
-    QString displayName() const final;
 
 private:
     QListView *m_androidExtraLibsListView = nullptr;

src/plugins/android/androiddeployqtwidget.cpp

@@ -41,6 +41,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
       m_step(step)
 {
     m_ui->setupUi(this);
+    setDisplayName(tr("<b>Deploy configurations</b>"));
 
     m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
     m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
@@ -60,11 +61,6 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
     delete m_ui;
 }
 
-QString AndroidDeployQtWidget::displayName() const
-{
-    return tr("<b>Deploy configurations</b>");
-}
-
 QString AndroidDeployQtWidget::summaryText() const
 {
     return displayName();

src/plugins/android/androiddeployqtwidget.h

@@ -52,7 +52,6 @@ private:
     void resetDefaultDevices();
 
     QString summaryText() const override;
-    QString displayName() const override;
 
     Ui::AndroidDeployQtWidget *m_ui;
     AndroidDeployQtStep *m_step;

src/plugins/android/androidpackageinstallationstep.cpp

@@ -128,6 +128,7 @@ namespace Internal {
 AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
     : BuildStepConfigWidget(step, false)
 {
+    setDisplayName(tr("Make install"));
 }
 
 QString AndroidPackageInstallationStepWidget::summaryText() const
@@ -135,11 +136,6 @@ QString AndroidPackageInstallationStepWidget::summaryText() const
     return "<b>" + tr("Make install") + "</b>";
 }
 
-QString AndroidPackageInstallationStepWidget::displayName() const
-{
-    return tr("Make install");
-}
-
 //
 // AndroidPackageInstallationStepFactory
 //

src/plugins/android/androidpackageinstallationstep.h

@@ -60,7 +60,6 @@ public:
     AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
 
     QString summaryText() const override;
-    QString displayName() const override;
 };
 
 class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -176,11 +176,6 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
             this, &AutogenStepConfigWidget::updateDetails);
 }
 
-QString AutogenStepConfigWidget::displayName() const
-{
-    return tr("Autogen", "AutotoolsProjectManager::AutogenStepConfigWidget display name.");
-}
-
 QString AutogenStepConfigWidget::summaryText() const
 {
     return m_summaryText;

src/plugins/autotoolsprojectmanager/autogenstep.h

@@ -111,7 +111,6 @@ class AutogenStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     AutogenStepConfigWidget(AutogenStep *autogenStep);
 
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -169,11 +169,6 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
             this, &AutoreconfStepConfigWidget::updateDetails);
 }
 
-QString AutoreconfStepConfigWidget::displayName() const
-{
-    return tr("Autoreconf", "AutotoolsProjectManager::AutoreconfStepConfigWidget display name.");
-}
-
 QString AutoreconfStepConfigWidget::summaryText() const
 {
     return m_summaryText;

src/plugins/autotoolsprojectmanager/autoreconfstep.h

@@ -110,7 +110,6 @@ class AutoreconfStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
 
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/autotoolsprojectmanager/configurestep.cpp

@@ -194,11 +194,6 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
             this, &ConfigureStepConfigWidget::updateDetails);
 }
 
-QString ConfigureStepConfigWidget::displayName() const
-{
-    return tr("Configure", "AutotoolsProjectManager::ConfigureStepConfigWidget display name.");
-}
-
 QString ConfigureStepConfigWidget::summaryText() const
 {
     return m_summaryText;

src/plugins/autotoolsprojectmanager/configurestep.h

@@ -111,7 +111,6 @@ class ConfigureStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     ConfigureStepConfigWidget(ConfigureStep *configureStep);
 
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -415,6 +415,8 @@ CMakeBuildStepConfigWidget::CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep
     m_toolArguments(new QLineEdit),
     m_buildTargetsList(new QListWidget)
 {
+    setDisplayName(tr("Build", "CMakeProjectManager::CMakeBuildStepConfigWidget display name."));
+
     auto fl = new QFormLayout(this);
     fl->setMargin(0);
     fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
@@ -470,11 +472,6 @@ void CMakeBuildStepConfigWidget::itemChanged(QListWidgetItem *item)
     updateDetails();
 }
 
-QString CMakeBuildStepConfigWidget::displayName() const
-{
-    return tr("Build", "CMakeProjectManager::CMakeBuildStepConfigWidget display name.");
-}
-
 void CMakeBuildStepConfigWidget::buildTargetsChanged()
 {
     {

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -120,7 +120,6 @@ class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
     Q_OBJECT
 public:
     CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/ios/iosbuildstep.cpp

@@ -211,6 +211,8 @@ IosBuildStepConfigWidget::IosBuildStepConfigWidget(IosBuildStep *buildStep)
     m_ui = new Ui::IosBuildStep;
     m_ui->setupUi(this);
 
+    setDisplayName(tr("iOS build", "iOS BuildStep display name."));
+
     Project *pro = m_buildStep->target()->project();
 
     m_ui->buildArgumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs(
@@ -247,11 +249,6 @@ IosBuildStepConfigWidget::~IosBuildStepConfigWidget()
     delete m_ui;
 }
 
-QString IosBuildStepConfigWidget::displayName() const
-{
-    return tr("iOS build", "iOS BuildStep display name.");
-}
-
 void IosBuildStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_buildStep->buildConfiguration();

src/plugins/ios/iosbuildstep.h

@@ -77,7 +77,6 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     IosBuildStepConfigWidget(IosBuildStep *buildStep);
     ~IosBuildStepConfigWidget();
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/ios/iosdeploystepwidget.cpp

@@ -39,6 +39,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
     ui(new Ui::IosDeployStepWidget),
     m_step(step)
 {
+    setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
     ui->setupUi(this);
     connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
             this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
@@ -49,11 +50,6 @@ IosDeployStepWidget::~IosDeployStepWidget()
     delete ui;
 }
 
-QString IosDeployStepWidget::displayName() const
-{
-    return QString::fromLatin1("<b>%1</b>").arg(m_step->displayName());
-}
-
 QString IosDeployStepWidget::summaryText() const
 {
     return displayName();

src/plugins/ios/iosdeploystepwidget.h

@@ -44,7 +44,6 @@ public:
 
 private:
     QString summaryText() const override;
-    QString displayName() const override;
 
     Ui::IosDeployStepWidget *ui;
     IosDeployStep *m_step;

src/plugins/ios/iosdsymbuildstep.cpp

@@ -267,11 +267,6 @@ IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget()
     delete m_ui;
 }
 
-QString IosDsymBuildStepConfigWidget::displayName() const
-{
-    return m_buildStep->displayName();
-}
-
 void IosDsymBuildStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_buildStep->buildConfiguration();

src/plugins/ios/iosdsymbuildstep.h

@@ -74,7 +74,6 @@ class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidg
 public:
     IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
     ~IosDsymBuildStepConfigWidget();
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp

@@ -45,6 +45,8 @@ NimCompilerBuildStepConfigWidget::NimCompilerBuildStepConfigWidget(NimCompilerBu
 {
     m_ui->setupUi(this);
 
+    setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_DISPLAY));
+
     // Connect the project signals
     auto project = static_cast<NimProject *>(m_buildStep->project());
     connect(project, &NimProject::fileListChanged,
@@ -72,11 +74,6 @@ QString NimCompilerBuildStepConfigWidget::summaryText() const
     return tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_SUMMARY);
 }
 
-QString NimCompilerBuildStepConfigWidget::displayName() const
-{
-    return tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_DISPLAY);
-}
-
 void NimCompilerBuildStepConfigWidget::onTargetChanged(int index)
 {
     Q_UNUSED(index);

src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h

@@ -42,7 +42,6 @@ public:
     ~NimCompilerBuildStepConfigWidget();
 
     QString summaryText() const override;
-    QString displayName() const override;
 
 private:
     void updateUi();

src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp

@@ -40,6 +40,7 @@ NimCompilerCleanStepConfigWidget::NimCompilerCleanStepConfigWidget(NimCompilerCl
     , m_ui(new Ui::NimCompilerCleanStepConfigWidget())
 {
     m_ui->setupUi(this);
+    setDisplayName(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_DISPLAY));
     connect(cleanStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
             this, &NimCompilerCleanStepConfigWidget::updateUi);
     updateUi();
@@ -52,11 +53,6 @@ QString NimCompilerCleanStepConfigWidget::summaryText() const
     return tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_SUMMARY);
 }
 
-QString NimCompilerCleanStepConfigWidget::displayName() const
-{
-    return tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_DISPLAY);
-}
-
 void NimCompilerCleanStepConfigWidget::updateUi()
 {
     auto buildDiretory = step()->buildConfiguration()->buildDirectory();

src/plugins/nim/project/nimcompilercleanstepconfigwidget.h

@@ -44,8 +44,6 @@ public:
 
     QString summaryText() const override;
 
-    QString displayName() const override;
-
 private:
     void updateUi();
 

src/plugins/projectexplorer/buildstep.cpp

@@ -368,6 +368,7 @@ BuildStep *BuildStepFactory::restore(BuildStepList *parent, const QVariantMap &m
 BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step, bool showWidget)
     : m_step(step), m_showWidget(showWidget)
 {
+    m_displayName = step->displayName();
     connect(m_step, &ProjectConfiguration::displayNameChanged,
             this, &BuildStepConfigWidget::updateSummary);
 }
@@ -382,4 +383,9 @@ QString BuildStepConfigWidget::displayName() const
     return m_step->displayName();
 }
 
+void BuildStepConfigWidget::setDisplayName(const QString &displayName)
+{
+    m_displayName = displayName;
+}
+
 } // ProjectExplorer

src/plugins/projectexplorer/buildstep.h

@@ -175,11 +175,13 @@ public:
 
     virtual QString summaryText() const;
     virtual QString additionalSummaryText() const { return QString(); }
-    virtual QString displayName() const;
 
+    QString displayName() const;
     BuildStep *step() const { return m_step; }
     bool showWidget() const { return m_showWidget; }
 
+    void setDisplayName(const QString &displayName);
+
 signals:
     void updateSummary();
     void updateAdditionalSummary();
@@ -187,6 +189,7 @@ signals:
 private:
     BuildStep *m_step = nullptr;
     const bool m_showWidget = true;
+    QString m_displayName;
 };
 
 } // namespace ProjectExplorer

src/plugins/projectexplorer/makestep.cpp

@@ -406,11 +406,6 @@ MakeStepConfigWidget::~MakeStepConfigWidget()
     delete m_ui;
 }
 
-QString MakeStepConfigWidget::displayName() const
-{
-    return m_makeStep->displayName();
-}
-
 void MakeStepConfigWidget::setSummaryText(const QString &text)
 {
     if (text == m_summaryText)

src/plugins/projectexplorer/makestep.h

@@ -100,7 +100,6 @@ public:
     explicit MakeStepConfigWidget(MakeStep *makeStep);
     ~MakeStepConfigWidget() override;
 
-    QString displayName() const override;
     QString summaryText() const override;
 
 private:

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -69,7 +69,6 @@ public:
     QbsBuildStepConfigWidget(QbsBuildStep *step);
     ~QbsBuildStepConfigWidget() override;
     QString summaryText() const override;
-    QString displayName() const override;
 
 private:
     void updateState();
@@ -602,11 +601,6 @@ QString QbsBuildStepConfigWidget::summaryText() const
     return m_summary;
 }
 
-QString QbsBuildStepConfigWidget::displayName() const
-{
-    return step()->displayName();
-}
-
 void QbsBuildStepConfigWidget::updateState()
 {
     if (!m_ignoreChange) {

src/plugins/qbsprojectmanager/qbscleanstep.cpp

@@ -250,11 +250,6 @@ QString QbsCleanStepConfigWidget::summaryText() const
     return m_summary;
 }
 
-QString QbsCleanStepConfigWidget::displayName() const
-{
-    return m_step->displayName();
-}
-
 void QbsCleanStepConfigWidget::updateState()
 {
     m_ui->dryRunCheckBox->setChecked(m_step->dryRun());

src/plugins/qbsprojectmanager/qbscleanstep.h

@@ -97,7 +97,6 @@ public:
     QbsCleanStepConfigWidget(QbsCleanStep *step);
     ~QbsCleanStepConfigWidget() override;
     QString summaryText() const override;
-    QString displayName() const override;
 
 private:
     void updateState();

src/plugins/qbsprojectmanager/qbsinstallstep.cpp

@@ -288,11 +288,6 @@ QString QbsInstallStepConfigWidget::summaryText() const
     return m_summary;
 }
 
-QString QbsInstallStepConfigWidget::displayName() const
-{
-    return m_step->displayName();
-}
-
 void QbsInstallStepConfigWidget::updateState()
 {
     if (!m_ignoreChange) {

src/plugins/qbsprojectmanager/qbsinstallstep.h

@@ -100,7 +100,6 @@ public:
     QbsInstallStepConfigWidget(QbsInstallStep *step);
     ~QbsInstallStepConfigWidget() override;
     QString summaryText() const override;
-    QString displayName() const override;
 
 private:
     void updateState();

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -626,11 +626,6 @@ QString QMakeStepConfigWidget::additionalSummaryText() const
     return m_additionalSummaryText;
 }
 
-QString QMakeStepConfigWidget::displayName() const
-{
-    return m_step->displayName();
-}
-
 void QMakeStepConfigWidget::qtVersionChanged()
 {
     updateSummaryLabel();

src/plugins/qmakeprojectmanager/qmakestep.h

@@ -200,7 +200,7 @@ public:
     ~QMakeStepConfigWidget() override;
     QString summaryText() const override;
     QString additionalSummaryText() const override;
-    QString displayName() const override;
+
 private:
     // slots for handling buildconfiguration/step signals
     void qtVersionChanged();