diff options
author | hjk <hjk@qt.io> | 2019-01-16 12:08:20 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-01-17 12:10:24 +0000 |
commit | 8acd583d1085f5b09cf2bef61c95166083885425 (patch) | |
tree | bce43459c320824649a1d69e2e54aceeb0fb76a9 | |
parent | 2b8e4f5cc5ed734ca94f1d30afc3abc0b262dbde (diff) |
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 <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/projectexplorer/deployconfiguration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/deployconfiguration.h | 2 | ||||
-rw-r--r-- | 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 ff4853a820..1b020d65d4 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 *> DeployConfigurationFactory::find(Target *parent) +const QList<DeployConfigurationFactory *> 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 bfad9d8f12..38655c14fc 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<DeployConfigurationFactory *> find(Target *parent); + static const QList<DeployConfigurationFactory *> 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 9065d1edb5..9447353af8 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<DeployConfigurationFactory *> 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}; |