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

ProjectExplorer: Simplify availableCreationIds(Target *parent) use

Browse Source 
Similarly to before, it's either an empty list, or a single id.

So use a function with bool return saying whether an id is returned
and a plain accessor the the id.

Change-Id: Ied2900f23bdb4c264d9fb1944c60bed734d1d8bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-01-15 15:48:01 +01:00
parent 32ced72511
commit a2d5ebccd2
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,11 +151,14 @@ DeployConfigurationFactory::~DeployConfigurationFactory()
g_deployConfigurationFactories.removeOne(this);
}
QList<Core::Id> DeployConfigurationFactory::availableCreationIds(Target *parent) const
bool DeployConfigurationFactory::canOffer(Target *parent) const
{
if (canHandle(parent) && hasAvailableBuildTargets(parent))
return {m_deployConfigBaseId};
return {};
return canHandle(parent) && hasAvailableBuildTargets(parent);
}
Core::Id DeployConfigurationFactory::creationId() const
{
return m_deployConfigBaseId;
}
bool DeployConfigurationFactory::hasAvailableBuildTargets(Target *) const
@@ -239,7 +242,7 @@ QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *par
{
return Utils::filtered(g_deployConfigurationFactories,
[&parent](DeployConfigurationFactory *factory) {
return !factory->availableCreationIds(parent).isEmpty();
return factory->canOffer(parent);
});
}