From 8acd583d1085f5b09cf2bef61c95166083885425 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 16 Jan 2019 12:08:20 +0100 Subject: [PATCH] ProjectExplorer: simplify RunSettingsWidget::aboutToShowDeployMenu() Constify return type DeployConfigurationFactory::find() to avoid the use of qAsConst, and remove unncessary isEmpty() check. Change-Id: I82ddfefe4252fd9ceb798f06a66b43426d7a0723 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/deployconfiguration.cpp | 2 +- src/plugins/projectexplorer/deployconfiguration.h | 2 +- src/plugins/projectexplorer/runsettingspropertiespage.cpp | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index ff4853a8207..1b020d65d4f 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -238,7 +238,7 @@ DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const Q return dc; } -QList DeployConfigurationFactory::find(Target *parent) +const QList DeployConfigurationFactory::find(Target *parent) { return Utils::filtered(g_deployConfigurationFactories, [&parent](DeployConfigurationFactory *factory) { diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index bfad9d8f124..38655c14fc6 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -89,7 +89,7 @@ public: bool canCreate(Target *parent, Core::Id id) const; virtual DeployConfiguration *create(Target *parent, Core::Id id); - static QList find(Target *parent); + static const QList find(Target *parent); static DeployConfiguration *restore(Target *parent, const QVariantMap &map); static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc); diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 9065d1edb52..9447353af88 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -362,11 +362,8 @@ void RunSettingsWidget::currentDeployConfigurationChanged(int index) void RunSettingsWidget::aboutToShowDeployMenu() { m_addDeployMenu->clear(); - QList factories = DeployConfigurationFactory::find(m_target); - if (factories.isEmpty()) - return; - foreach (DeployConfigurationFactory *factory, factories) { + for (DeployConfigurationFactory *factory : DeployConfigurationFactory::find(m_target)) { QAction *action = m_addDeployMenu->addAction(factory->defaultDisplayName()); const Core::Id id = factory->creationId(); DeployFactoryAndId data = {factory, id};