From 683e7aa6cff84171359384d861f160115921e632 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 12 Oct 2018 17:52:09 +0200 Subject: [PATCH] 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 --- src/plugins/android/androidbuildapkwidget.cpp | 13 +++---------- src/plugins/android/androidbuildapkwidget.h | 2 -- src/plugins/android/androiddeployqtwidget.cpp | 6 +----- src/plugins/android/androiddeployqtwidget.h | 1 - .../android/androidpackageinstallationstep.cpp | 6 +----- .../android/androidpackageinstallationstep.h | 1 - src/plugins/autotoolsprojectmanager/autogenstep.cpp | 5 ----- src/plugins/autotoolsprojectmanager/autogenstep.h | 1 - .../autotoolsprojectmanager/autoreconfstep.cpp | 5 ----- .../autotoolsprojectmanager/autoreconfstep.h | 1 - .../autotoolsprojectmanager/configurestep.cpp | 5 ----- src/plugins/autotoolsprojectmanager/configurestep.h | 1 - src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 7 ++----- src/plugins/cmakeprojectmanager/cmakebuildstep.h | 1 - src/plugins/ios/iosbuildstep.cpp | 7 ++----- src/plugins/ios/iosbuildstep.h | 1 - src/plugins/ios/iosdeploystepwidget.cpp | 6 +----- src/plugins/ios/iosdeploystepwidget.h | 1 - src/plugins/ios/iosdsymbuildstep.cpp | 5 ----- src/plugins/ios/iosdsymbuildstep.h | 1 - .../project/nimcompilerbuildstepconfigwidget.cpp | 7 ++----- .../nim/project/nimcompilerbuildstepconfigwidget.h | 1 - .../project/nimcompilercleanstepconfigwidget.cpp | 6 +----- .../nim/project/nimcompilercleanstepconfigwidget.h | 2 -- src/plugins/projectexplorer/buildstep.cpp | 6 ++++++ src/plugins/projectexplorer/buildstep.h | 5 ++++- src/plugins/projectexplorer/makestep.cpp | 5 ----- src/plugins/projectexplorer/makestep.h | 1 - src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 6 ------ src/plugins/qbsprojectmanager/qbscleanstep.cpp | 5 ----- src/plugins/qbsprojectmanager/qbscleanstep.h | 1 - src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 5 ----- src/plugins/qbsprojectmanager/qbsinstallstep.h | 1 - src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 ----- src/plugins/qmakeprojectmanager/qmakestep.h | 2 +- 35 files changed, 24 insertions(+), 110 deletions(-) diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp index e725c07b1e0..ac94aa487fa 100644 --- a/src/plugins/android/androidbuildapkwidget.cpp +++ b/src/plugins/android/androidbuildapkwidget.cpp @@ -62,6 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step m_step(step) { m_ui->setupUi(this); + setDisplayName(tr("Build Android APK")); // Target sdk combobox const int minApiSupported = AndroidManager::apiLevelRange().first; @@ -133,11 +134,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget() delete m_ui; } -QString AndroidBuildApkInnerWidget::displayName() const -{ - return tr("Build Android APK"); -} - QString AndroidBuildApkInnerWidget::summaryText() const { return displayName(); @@ -233,6 +229,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) : BuildStepConfigWidget(step), m_step(step) { + setDisplayName(tr("Build Android APK")); + m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this); auto base = new AndroidBuildApkInnerWidget(step); @@ -328,10 +326,5 @@ QString AndroidBuildApkWidget::summaryText() const return tr("Build Android APK"); } -QString AndroidBuildApkWidget::displayName() const -{ - return summaryText(); -} - } // Internal } // Android diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h index 47946298d26..ba3cdd55241 100644 --- a/src/plugins/android/androidbuildapkwidget.h +++ b/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; diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp index a5d609be14c..a61acfcbcde 100644 --- a/src/plugins/android/androiddeployqtwidget.cpp +++ b/src/plugins/android/androiddeployqtwidget.cpp @@ -41,6 +41,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step) m_step(step) { m_ui->setupUi(this); + setDisplayName(tr("Deploy configurations")); 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("Deploy configurations"); -} - QString AndroidDeployQtWidget::summaryText() const { return displayName(); diff --git a/src/plugins/android/androiddeployqtwidget.h b/src/plugins/android/androiddeployqtwidget.h index 949aee637ed..086d58d614e 100644 --- a/src/plugins/android/androiddeployqtwidget.h +++ b/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; diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 228bae79cf3..5e39dc5b0a8 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/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 "" + tr("Make install") + ""; } -QString AndroidPackageInstallationStepWidget::displayName() const -{ - return tr("Make install"); -} - // // AndroidPackageInstallationStepFactory // diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h index 5143ad021d8..b27e4ad71f0 100644 --- a/src/plugins/android/androidpackageinstallationstep.h +++ b/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 diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index 385c45ef11e..6635dc242af 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index a4659ebcbcc..e047c57ab6d 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/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: diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 3b55382f322..bdfb32e5a27 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 7aa345c1480..435b7d0579c 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/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: diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 923484b4f72..880547fb248 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index 0ab97fbae36..b87e5d7b94f 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/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: diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 81ae32126e1..0700461108f 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/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() { { diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index 098310f1ebf..17806f48f32 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/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: diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index dcaa67232b5..4a08afe5cfd 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/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(); diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 47de3d66518..e32b5b60c75 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 displayName() const override; QString summaryText() const override; private: diff --git a/src/plugins/ios/iosdeploystepwidget.cpp b/src/plugins/ios/iosdeploystepwidget.cpp index d2e5d1e6e07..f1bf2dc1b9a 100644 --- a/src/plugins/ios/iosdeploystepwidget.cpp +++ b/src/plugins/ios/iosdeploystepwidget.cpp @@ -39,6 +39,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) : ui(new Ui::IosDeployStepWidget), m_step(step) { + setDisplayName(QString::fromLatin1("%1").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("%1").arg(m_step->displayName()); -} - QString IosDeployStepWidget::summaryText() const { return displayName(); diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h index ad88e5f20de..54c03f33826 100644 --- a/src/plugins/ios/iosdeploystepwidget.h +++ b/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; diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index cfde8d50b34..bde3fbae1ca 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/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(); diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 58200826f28..d08ef6404d4 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 displayName() const override; QString summaryText() const override; private: diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp index cf7b91d6193..ccad62c503c 100644 --- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp +++ b/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(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); diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h index f2a115b63ed..4fbb3fcd644 100644 --- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h +++ b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h @@ -42,7 +42,6 @@ public: ~NimCompilerBuildStepConfigWidget(); QString summaryText() const override; - QString displayName() const override; private: void updateUi(); diff --git a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp index 4ab41189d6c..f1b3049f070 100644 --- a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp +++ b/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(); diff --git a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h index f051df46b87..462289b6c26 100644 --- a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h +++ b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h @@ -44,8 +44,6 @@ public: QString summaryText() const override; - QString displayName() const override; - private: void updateUi(); diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 06af9984341..1be569cd412 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/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 diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 9fabcf82d42..0694cbe7efb 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/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 diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 7e7c2c69600..90cd430aa8a 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/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) diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h index 8bc1e3f9fbf..678299a521f 100644 --- a/src/plugins/projectexplorer/makestep.h +++ b/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: diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 8231315aa7a..2540af57c30 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/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) { diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 16cadabc469..3a4d8d20af3 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/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()); diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 04d557aba4d..7f5f7e86f98 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/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(); diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 99a47b5effe..aa62ab2b004 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/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) { diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index e76763b2a70..06798957339 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/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(); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index d489870a9eb..52e2c58a2bf 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/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(); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index c83f453dae9..47cc65701eb 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/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();