feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: simplify RunSettingsWidget::aboutToShowDeployMenu()

Browse Source 
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>
This commit is contained in:
hjk
2019-01-16 12:08:20 +01:00
parent 2b8e4f5cc5
commit 8acd583d10
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -238,7 +238,7 @@ DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const Q
return dc; return dc;
} }
QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *parent) const QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *parent)
{ {
return Utils::filtered(g_deployConfigurationFactories, return Utils::filtered(g_deployConfigurationFactories,
[&parent](DeployConfigurationFactory *factory) { [&parent](DeployConfigurationFactory *factory) {

2
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -89,7 +89,7 @@ public:
bool canCreate(Target *parent, Core::Id id) const; bool canCreate(Target *parent, Core::Id id) const;
virtual DeployConfiguration *create(Target *parent, Core::Id id); 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 *restore(Target *parent, const QVariantMap &map);
static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc); static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc);

5
src/plugins/projectexplorer/runsettingspropertiespage.cpp
View File

@@ -362,11 +362,8 @@ void RunSettingsWidget::currentDeployConfigurationChanged(int index)
void RunSettingsWidget::aboutToShowDeployMenu() void RunSettingsWidget::aboutToShowDeployMenu()
{ {
m_addDeployMenu->clear(); 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()); QAction *action = m_addDeployMenu->addAction(factory->defaultDisplayName());
const Core::Id id = factory->creationId(); const Core::Id id = factory->creationId();
DeployFactoryAndId data = {factory, id}; DeployFactoryAndId data = {factory, id};