De-duplicate device discovery code (Darwin)

- use the shared *._p.h file/class declaration for the private class
- use the shared *.cpp with the public class implementation
- get rid of *_ios.mm - iOS/tvOS/watchOS specific implementation
  and use the shared (by macOS, iOS, tvOS, watchOS) *_darwin.mm source.
- get rid of somewhat weird 'isValid' in the private class, it is
  is not taken care of in the public API anyway and today its
  whole concept/usage looks (quite) buggy to me. I only have to
  check that the default controller is not nil and has the
  state 'ON'.

Task-number: QTBUG-75348
Change-Id: I5383e4f8df02ac12f069c2f59e252cb8a200800b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
 

1 files changed, 61 insertions, 2 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 3e76c13d..a59c6a94 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -58,6 +58,11 @@
 #include <QtCore/QTimer>
 #endif
 
+#ifdef Q_OS_DARWIN
+#include "osx/btdelegates_p.h"
+#include "osx/btraii_p.h"
+#endif // Q_OS_DARWIN
+
 #include <QtCore/QVariantMap>
 
 #include <QtBluetooth/QBluetoothAddress>
@@ -93,11 +98,14 @@ class QWinRTBluetoothDeviceDiscoveryWorker;
 #endif
 
 class QBluetoothDeviceDiscoveryAgentPrivate
-#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH)
+#if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) || defined(Q_OS_DARWIN)
     : public QObject
+#if defined(Q_OS_MACOS)
+    , public DarwinBluetooth::DeviceInquiryDelegate
+#endif // Q_OS_MACOS
 {
     Q_OBJECT
-#else
+#else // BlueZ
 {
 #endif
     Q_DECLARE_PUBLIC(QBluetoothDeviceDiscoveryAgent)
@@ -180,6 +188,57 @@ private:
     QTimer *leScanTimer;
 #endif
 
+#ifdef Q_OS_DARWIN
+
+    void startLE();
+
+#ifdef Q_OS_MACOS
+
+    void startClassic();
+
+    // Classic (IOBluetooth) inquiry delegate's methods:
+    void inquiryFinished() override;
+    void error(IOReturn error) override;
+    void classicDeviceFound(void *device) override;
+    // Classic (IOBluetooth) errors:
+    void setError(IOReturn error, const QString &text = QString());
+
+#endif // Q_OS_MACOS
+
+    // LE scan delegates (CoreBluetooth, all Darwin OSes):
+    void LEinquiryFinished();
+    void LEinquiryError(QBluetoothDeviceDiscoveryAgent::Error error);
+    void LEnotSupported();
+
+    // LE errors:
+    void setError(QBluetoothDeviceDiscoveryAgent::Error,
+                  const QString &text = QString());
+
+    // Both LE and Classic devices go there:
+    void deviceFound(const QBluetoothDeviceInfo &newDeviceInfo);
+
+    enum AgentState {
+        NonActive,
+        ClassicScan, // macOS (IOBluetooth) only
+        LEScan
+    } agentState;
+
+    QBluetoothAddress adapterAddress;
+
+    bool startPending;
+    bool stopPending;
+
+#ifdef Q_OS_MACOS
+
+    DarwinBluetooth::ScopedPointer controller;
+    DarwinBluetooth::ScopedPointer inquiry;
+
+#endif // Q_OS_MACOS
+
+    DarwinBluetooth::ScopedPointer inquiryLE;
+
+#endif // Q_OS_DARWIN
+
     int lowEnergySearchTimeout;
     QBluetoothDeviceDiscoveryAgent::DiscoveryMethods requestedMethods;
     QBluetoothDeviceDiscoveryAgent *q_ptr;