Use std::find_if to check for local adapter address

Change-Id: I53af8c2a5dc848d1f90221d036c59f17c44921dc
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
index 967aec8e..9f3eb84c 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
@@ -356,15 +356,13 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
     }
 
     // Check for the local adapter address.
-    bool foundLocalAdapter = false;
-    foreach (const QBluetoothHostInfo &adapterInfo, foundLocalAdapters) {
-        if (adapterAddress == QBluetoothAddress() || adapterAddress == adapterInfo.address()) {
-            foundLocalAdapter = true;
-            break;
-        }
-    }
-
-    if (!foundLocalAdapter) {
+    auto equals = [this](const QBluetoothHostInfo &adapterInfo) {
+        return adapterAddress == QBluetoothAddress()
+                || adapterAddress == adapterInfo.address();
+    };
+    const auto end = foundLocalAdapters.cend();
+    const auto it = std::find_if(foundLocalAdapters.cbegin(), end, equals);
+    if (it == end) {
         qCWarning(QT_BT_WINDOWS) << "Incorrect local adapter passed.";
         lastError = QBluetoothDeviceDiscoveryAgent::InvalidBluetoothAdapterError;
         errorString = QBluetoothDeviceDiscoveryAgent::tr("Passed address is not a local device.");