From a2d5ebccd2d28d339eda18d0d5c0ebbe698e381c Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 15 Jan 2019 15:48:01 +0100 Subject: ProjectExplorer: Simplify availableCreationIds(Target *parent) use 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 --- src/plugins/projectexplorer/deployconfiguration.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/plugins/projectexplorer/deployconfiguration.cpp') diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index f0c4e94b66..ff4853a820 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -151,11 +151,14 @@ DeployConfigurationFactory::~DeployConfigurationFactory() g_deployConfigurationFactories.removeOne(this); } -QList 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::find(Target *par { return Utils::filtered(g_deployConfigurationFactories, [&parent](DeployConfigurationFactory *factory) { - return !factory->availableCreationIds(parent).isEmpty(); + return factory->canOffer(parent); }); } -- cgit v1.2.3