From 4a1a008babfc64684e111b5e08df7b2fa5621857 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 21 Feb 2019 10:54:49 +0100
Subject: [PATCH] ProjectExplorer/Qnx: Replace
 DeviceTypeKitAspect::deviceTypePredicate

There was just a single user that can achieve the same result with
less code and no temporary list.

Change-Id: I2e4260d19b281618a2e87117635ef4419246d3fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/kitinformation.cpp |  5 -----
 src/plugins/projectexplorer/kitinformation.h   |  2 --
 src/plugins/qnx/qnxplugin.cpp                  | 14 +++++---------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index ce8796e7862..ddf2d8c6d4b 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -859,11 +859,6 @@ void DeviceTypeKitAspect::setDeviceTypeId(Kit *k, Core::Id type)
     k->setValue(DeviceTypeKitAspect::id(), type.toSetting());
 }
 
-Kit::Predicate DeviceTypeKitAspect::deviceTypePredicate(Core::Id type)
-{
-    return [type](const Kit *kit) { return type.isValid() && deviceTypeId(kit) == type; };
-}
-
 QSet<Core::Id> DeviceTypeKitAspect::supportedPlatforms(const Kit *k) const
 {
     return {deviceTypeId(k)};
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index f3c170e1957..d3355812316 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -126,8 +126,6 @@ public:
     static const Core::Id deviceTypeId(const Kit *k);
     static void setDeviceTypeId(Kit *k, Core::Id type);
 
-    static Kit::Predicate deviceTypePredicate(Core::Id type);
-
     QSet<Core::Id> supportedPlatforms(const Kit *k) const override;
     QSet<Core::Id> availableFeatures(const Kit *k) const override;
 };
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 65b62a675c0..2e4c170ff77 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -173,15 +173,11 @@ void QnxPlugin::extensionsInitialized()
 
 void QnxPluginPrivate::updateDebuggerActions()
 {
-    bool hasValidQnxKit = false;
-
-    auto matcher = DeviceTypeKitAspect::deviceTypePredicate(Constants::QNX_QNX_OS_TYPE);
-    foreach (Kit *qnxKit, KitManager::kits(matcher)) {
-        if (qnxKit->isValid() && !DeviceKitAspect::device(qnxKit).isNull()) {
-            hasValidQnxKit = true;
-            break;
-        }
-    }
+    const bool hasValidQnxKit = KitManager::kit([](const Kit *kit) {
+        return kit->isValid()
+                && DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
+                && !DeviceKitAspect::device(kit).isNull();
+    }) != nullptr;
 
     m_attachToQnxApplication.setVisible(hasValidQnxKit);
     m_debugSeparator->setVisible(hasValidQnxKit);