Windows: Simplify code related to enumerating of a local radios

It is the first stage to cleaning of the 'windows' directory.

A shared code related to enumerating of a local adapters are
moved to the QBluetoothLocalDevicePrivate class.

Change-Id: I208b79c29cd1f906b6fed627d25c7b1310718581
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
index 05f7091d..937bc2a4 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
@@ -36,6 +36,7 @@
 #include "qbluetoothdevicediscoveryagent_p.h"
 #include "qbluetoothaddress.h"
 #include "qbluetoothuuid.h"
+#include "qbluetoothlocaldevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -171,20 +172,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::initialize(
 bool QBluetoothDeviceDiscoveryAgentPrivate::isClassicAdapterValid(
         const QBluetoothAddress &deviceAdapter)
 {
-    const WinClassicBluetooth::LocalRadiosDiscoveryResult result =
-            WinClassicBluetooth::enumerateLocalRadios();
-
-    if (!isDiscoveredSuccessfully(result.error)) {
-        qCWarning(QT_BT_WINDOWS) << "Occurred error during search of classic local radios";
-        return false;
-    } else if (result.radios.isEmpty()) {
-        qCWarning(QT_BT_WINDOWS) << "No any classic local radio found";
-        return false;
-    }
-
-    foreach (const BLUETOOTH_RADIO_INFO &radio, result.radios) {
+    foreach (const QBluetoothHostInfo &adapterInfo, QBluetoothLocalDevicePrivate::localAdapters()) {
         if (deviceAdapter == QBluetoothAddress()
-                || deviceAdapter == QBluetoothAddress(radio.address.ullLong)) {
+                || deviceAdapter == adapterInfo.address()) {
             return true;
         }
     }