QtBluetooth - add LE device discovery timeout (OS X/iOS)

- Instead of hardcoded 10 second timeout use the latest Qt API enabling
  arbitrary or infinite length for LE device discovery.
- Since now scan can take long or unlimited time, the previous approach
  with detached CBCentralManager and DDA is not working anymore -
  we can not report devices only at the end of scan.
  Re-use LENotifier and signals/slots instead.
- Remove DDA timer, timeout logic is completely inside
  osxbtledeviceinquiry object now.

Change-Id: I07735581ac175d1d5e5d788aaf697dcb41429e31
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 20 insertions, 11 deletions

diff --git a/src/bluetooth/osx/osxbtledeviceinquiry_p.h b/src/bluetooth/osx/osxbtledeviceinquiry_p.h
index 24bf181e..d79272be 100644
--- a/src/bluetooth/osx/osxbtledeviceinquiry_p.h
+++ b/src/bluetooth/osx/osxbtledeviceinquiry_p.h
@@ -57,7 +57,6 @@
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qglobal.h>
-#include <QtCore/qatomic.h>
 #include <QtCore/qlist.h>
 
 #include <Foundation/Foundation.h>
@@ -69,8 +68,20 @@ QT_BEGIN_NAMESPACE
 
 class QBluetoothUuid;
 
+namespace OSXBluetooth
+{
+
+class LECBManagerNotifier;
+
+}
+
 QT_END_NAMESPACE
 
+// Ugly but all these QT_PREPEND_NAMESPACE etc. are even worse ...
+using OSXBluetooth::LECBManagerNotifier;
+using OSXBluetooth::ObjCScopedPointer;
+using QT_PREPEND_NAMESPACE(QElapsedTimer);
+
 enum LEInquiryState
 {
     InquiryStarting,
@@ -83,29 +94,27 @@ enum LEInquiryState
 
 @interface QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry) : NSObject
 {
-    QT_PREPEND_NAMESPACE(OSXBluetooth)::ObjCScopedPointer<NSMutableSet> uuids;
-    QT_PREPEND_NAMESPACE(OSXBluetooth)::ObjCScopedPointer<CBCentralManager> manager;
+    LECBManagerNotifier *notifier;
+    ObjCScopedPointer<NSMutableSet> uuids;
+    ObjCScopedPointer<CBCentralManager> manager;
 
     QList<QBluetoothDeviceInfo> devices;
-
     LEInquiryState internalState;
-    QT_PREPEND_NAMESPACE(QAtomicInt) state;
+    int inquiryTimeoutMS;
 
     // Timers to check if we can execute delayed callbacks:
     QT_PREPEND_NAMESPACE(QElapsedTimer) errorTimer;
     QT_PREPEND_NAMESPACE(QElapsedTimer) scanTimer;
 }
 
-- (id)init;
+- (id)initWithNotifier:(LECBManagerNotifier *)aNotifier;
 - (void)dealloc;
 
-// IMPORTANT: both 'start' and 'stop' are to be executed on the "Qt's LE queue".
-- (void)start;
+// IMPORTANT: both 'startWithTimeout' and 'stop'
+// can be executed only on the "Qt's LE queue".
+- (void)startWithTimeout:(int)timeout;
 - (void)stop;
 
-- (LEInquiryState)inquiryState;
-- (const QList<QBluetoothDeviceInfo> &)discoveredDevices;
-
 @end
 
 #endif