Fix classic and LE devices discovery

Devices discovery was broken due to merging from 5.9 branch. Where were
introduced new QBluetoothDeviceDiscoveryAgent::DiscoveryMethods feature.

But now, this code is refactored and adjusted in completelly asynchronous
manner.

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

1 files changed, 12 insertions, 6 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 4d0e24eb..9eadfae4 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -168,19 +168,25 @@ private:
 public:
     static QString discoveredLeDeviceSystemPath(const QBluetoothAddress &deviceAddress);
 
-private slots:
-    void taskFinished();
-
 private:
+    void cancelDiscovery();
+    void restartDiscovery();
+    void finishDiscovery(QBluetoothDeviceDiscoveryAgent::Error errorCode, const QString &errorText);
+
+    void startLeDevicesDiscovery();
+    void completeLeDevicesDiscovery();
+    void startClassicDevicesDiscovery(Qt::HANDLE hSearch = nullptr);
+    void completeClassicDevicesDiscovery();
+
     void processDiscoveredDevice(const QBluetoothDeviceInfo &foundDevice);
 
     QBluetoothAddress adapterAddress;
     bool pendingCancel;
     bool pendingStart;
-    QFutureWatcher<QBluetoothDeviceInfo> *scanWatcher;
     bool active;
-    int systemErrorCode;
-    Qt::HANDLE hSearch;
+
+    QFutureWatcher<QVariant> *classicScanWatcher;
+    QFutureWatcher<QVariant> *lowenergyScanWatcher;
 #endif
 
 #ifdef QT_WINRT_BLUETOOTH