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, 5 insertions, 19 deletions

diff --git a/src/bluetooth/osx/osxbtdeviceinquiry.mm b/src/bluetooth/osx/osxbtdeviceinquiry.mm
index 57cd73e1..3a77c1f7 100644
--- a/src/bluetooth/osx/osxbtdeviceinquiry.mm
+++ b/src/bluetooth/osx/osxbtdeviceinquiry.mm
@@ -43,30 +43,16 @@
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qdebug.h>
 
-QT_BEGIN_NAMESPACE
-
-namespace OSXBluetooth {
-
-DeviceInquiryDelegate::~DeviceInquiryDelegate()
-{
-}
-
-}
-
-
-QT_END_NAMESPACE
-
 QT_USE_NAMESPACE
 
-
 @implementation QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry)
 {
     IOBluetoothDeviceInquiry *m_inquiry;
     bool m_active;
-    QT_PREPEND_NAMESPACE(OSXBluetooth::DeviceInquiryDelegate) *m_delegate;//C++ "delegate"
+    DarwinBluetooth::DeviceInquiryDelegate *m_delegate;//C++ "delegate"
 }
 
-- (id)initWithDelegate:(OSXBluetooth::DeviceInquiryDelegate *)delegate
+- (id)initWithDelegate:(DarwinBluetooth::DeviceInquiryDelegate *)delegate
 {
     if (self = [super init]) {
         Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid device inquiry delegate (null)");
@@ -158,9 +144,9 @@ QT_USE_NAMESPACE
         // QtBluetooth has not too many error codes, 'UnknownError' is not really
         // useful, report the actual error code here:
         qCWarning(QT_BT_OSX) << "IOKit error code: " << error;
-        m_delegate->error(sender, error);
+        m_delegate->error(error);
     } else {
-        m_delegate->inquiryFinished(sender);
+        m_delegate->inquiryFinished();
     }
 }
 
@@ -171,7 +157,7 @@ QT_USE_NAMESPACE
         return;
 
     Q_ASSERT_X(m_delegate, Q_FUNC_INFO, "invalid device inquiry delegate (null)");
-    m_delegate->deviceFound(sender, device);
+    m_delegate->classicDeviceFound(device);
 }
 
 - (void)deviceInquiryStarted:(IOBluetoothDeviceInquiry *)sender