diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index 16867591498..f0c4e94b66c 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -163,16 +163,11 @@ bool DeployConfigurationFactory::hasAvailableBuildTargets(Target *) const return true; } -QString DeployConfigurationFactory::displayNameForBuildTarget(const QString &) const +QString DeployConfigurationFactory::defaultDisplayName() const { return m_defaultDisplayName; } -QString DeployConfigurationFactory::displayNameForId(Core::Id id) const -{ - return displayNameForBuildTarget(id.suffixAfter(m_deployConfigBaseId)); -} - bool DeployConfigurationFactory::canHandle(Target *target) const { if (m_supportedProjectType.isValid()) { diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 1b56c11d127..3874d7c0686 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -82,8 +82,8 @@ public: // used to show the list of possible additons to a target, returns a list of types QList availableCreationIds(Target *parent) const; - // used to translate the types to names to display to the user - QString displayNameForId(Core::Id id) const; + // the name to display to the user + QString defaultDisplayName() const; bool canCreate(Target *parent, Core::Id id) const; virtual DeployConfiguration *create(Target *parent, Core::Id id); @@ -99,7 +99,6 @@ public: protected: virtual bool canHandle(ProjectExplorer::Target *target) const; virtual bool hasAvailableBuildTargets(Target *parent) const; - virtual QString displayNameForBuildTarget(const QString &buildTarget) const; using DeployConfigurationCreator = std::function; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 992b2cbcc72..29c8ed3c7d8 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -369,7 +369,7 @@ void RunSettingsWidget::aboutToShowDeployMenu() foreach (DeployConfigurationFactory *factory, factories) { QList ids = factory->availableCreationIds(m_target); foreach (Core::Id id, ids) { - QAction *action = m_addDeployMenu->addAction(factory->displayNameForId(id)); + QAction *action = m_addDeployMenu->addAction(factory->defaultDisplayName()); DeployFactoryAndId data = {factory, id}; action->setData(QVariant::fromValue(data)); connect(action, &QAction::triggered, [factory, id, this]() {