From 9c23e37f5dec9c9d73334cf91435b9bcbbccaf62 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 15 Jan 2019 15:25:45 +0100 Subject: [PATCH] ProjectExplorer: Simplify DeployConfigFactory::availableBuildTargets It only ever returned either an empty list, or a list with a single empty string. Using a bool return value to distiguish the cases is less convoluted. This is a leftover from the time when a DeployConfigurationFactory could potentially create more than on DeployConfiguration, but this is not supported anymore, as factories are cheap nowadays. Change-Id: I4f2a91d3509d2b978949211ee709863d5ff460c7 Reviewed-by: Christian Kandeler --- src/plugins/android/androiddeployconfiguration.cpp | 8 +++----- src/plugins/android/androiddeployconfiguration.h | 2 +- src/plugins/projectexplorer/deployconfiguration.cpp | 12 +++++------- src/plugins/projectexplorer/deployconfiguration.h | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp index 7c8b9a36711..795ac09f3c9 100644 --- a/src/plugins/android/androiddeployconfiguration.cpp +++ b/src/plugins/android/androiddeployconfiguration.cpp @@ -60,20 +60,18 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory() setDefaultDisplayName(AndroidDeployConfiguration::tr("Deploy to Android device")); } -QList AndroidDeployConfigurationFactory::availableBuildTargets(Target *parent) const +bool AndroidDeployConfigurationFactory::hasAvailableBuildTargets(Target *parent) const { if (!parent->project()->id().name().startsWith("QmlProjectManager.QmlProject")) { // Avoid tool chain check for QML Project Core::Id cxxLangId(ProjectExplorer::Constants::CXX_LANGUAGE_ID); ToolChain *tc = ToolChainKitInformation::toolChain(parent->kit(), cxxLangId); if (!tc || tc->targetAbi().osFlavor() != Abi::AndroidLinuxFlavor) - return {}; + return false; } QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(parent->kit()); - if (!qt || qt->type() != Constants::ANDROIDQT) - return {}; - return {QString()}; + return qt && qt->type() == Constants::ANDROIDQT; } } // namespace Internal diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index f8b13fe1bc8..83970d5d483 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -44,7 +44,7 @@ class AndroidDeployConfigurationFactory : public ProjectExplorer::DeployConfigur public: AndroidDeployConfigurationFactory(); - QList availableBuildTargets(ProjectExplorer::Target *parent) const override; + bool hasAvailableBuildTargets(ProjectExplorer::Target *parent) const override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index cbac4040b50..16867591498 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -153,16 +153,14 @@ DeployConfigurationFactory::~DeployConfigurationFactory() QList DeployConfigurationFactory::availableCreationIds(Target *parent) const { - if (!canHandle(parent)) - return {}; - return Utils::transform(availableBuildTargets(parent), [this](const QString &suffix) { - return m_deployConfigBaseId.withSuffix(suffix); - }); + if (canHandle(parent) && hasAvailableBuildTargets(parent)) + return {m_deployConfigBaseId}; + return {}; } -QList DeployConfigurationFactory::availableBuildTargets(Target *) const +bool DeployConfigurationFactory::hasAvailableBuildTargets(Target *) const { - return {QString()}; + return true; } QString DeployConfigurationFactory::displayNameForBuildTarget(const QString &) const diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index e56e778579c..1b56c11d127 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -98,7 +98,7 @@ public: protected: virtual bool canHandle(ProjectExplorer::Target *target) const; - virtual QList availableBuildTargets(Target *parent) const; + virtual bool hasAvailableBuildTargets(Target *parent) const; virtual QString displayNameForBuildTarget(const QString &buildTarget) const; using DeployConfigurationCreator = std::function;