Rewrite ::getObjects usage to use predicate version

This makes the code easier to read and shorter.

Change-Id: I6d582bd9861aa0208565301f61f098e9313b6c89
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Daniel Teske
2014-05-08 11:58:23 +02:00
parent ce1a691abe
commit 3c413fc358
18 changed files with 120 additions and 179 deletions

View File

@@ -227,36 +227,26 @@ DeployConfiguration *DeployConfigurationFactory::clone(Target *parent, DeployCon
DeployConfigurationFactory *DeployConfigurationFactory::find(Target *parent, const QVariantMap &map)
{
QList<DeployConfigurationFactory *> factories
= ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
foreach (DeployConfigurationFactory *factory, factories) {
if (factory->canRestore(parent, map))
return factory;
}
return 0;
return ExtensionSystem::PluginManager::getObject<DeployConfigurationFactory>(
[&parent, &map](DeployConfigurationFactory *factory) {
return factory->canRestore(parent, map);
});
}
QList<DeployConfigurationFactory *> DeployConfigurationFactory::find(Target *parent)
{
QList<DeployConfigurationFactory *> result;
QList<DeployConfigurationFactory *> factories
= ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
foreach (DeployConfigurationFactory *factory, factories) {
if (!factory->availableCreationIds(parent).isEmpty())
result << factory;
}
return result;
return ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>(
[&parent](DeployConfigurationFactory *factory) {
return !factory->availableCreationIds(parent).isEmpty();
});
}
DeployConfigurationFactory *DeployConfigurationFactory::find(Target *parent, DeployConfiguration *dc)
{
QList<DeployConfigurationFactory *> factories
= ExtensionSystem::PluginManager::getObjects<DeployConfigurationFactory>();
foreach (DeployConfigurationFactory *factory, factories) {
if (factory->canClone(parent, dc))
return factory;
}
return 0;
return ExtensionSystem::PluginManager::getObject<DeployConfigurationFactory>(
[&parent, &dc](DeployConfigurationFactory *factory) {
return factory->canClone(parent, dc);
});
}
bool DeployConfigurationFactory::canHandle(Target *parent) const