Bluetooth: change prefix in Obj-C class names

As a follow-up of the recent file/namespace re-naming in QtBluetooth.

Previously, the prefix was 'OSXBT'. This prefix is needed because:
- Obj-C classes cannot be defined inside a C++ namespace, thus
- A very generic name like 'DeviceInquiry' is potentially problematic.
- We use QT_MANGLE_NAMESPACE, but for non-namespaced build it does not help.

To make these names somewhat unique, I've introduced 'OSXBT' prefix with
'OSX' for a platform and 'BT' for 'Bluetooth'. 'OSX' part of the prefix
is now outdated and I'm replacing it with 'Darwin'. Also, if a resulting
name is still ambiguous I add 'Classic' to the name ('LE' was already
in place where needed).

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_macos.mm b/src/bluetooth/qbluetoothlocaldevice_macos.mm
index f086710f..805c882a 100644
--- a/src/bluetooth/qbluetoothlocaldevice_macos.mm
+++ b/src/bluetooth/qbluetoothlocaldevice_macos.mm
@@ -99,12 +99,12 @@ private:
     using HostController = DarwinBluetooth::ObjCScopedPointer<IOBluetoothHostController>;
     HostController hostController;
 
-    using ObjCPairingRequest = QT_MANGLE_NAMESPACE(OSXBTPairing);
+    using ObjCPairingRequest = QT_MANGLE_NAMESPACE(DarwinBTClassicPairing);
     using PairingRequest = DarwinBluetooth::ObjCStrongReference<ObjCPairingRequest>;
     using RequestMap = QMap<QBluetoothAddress, PairingRequest>;
 
     RequestMap pairingRequests;
-    using ObjCConnectionMonitor = QT_MANGLE_NAMESPACE(OSXBTConnectionMonitor);
+    using ObjCConnectionMonitor = QT_MANGLE_NAMESPACE(DarwinBTConnectionMonitor);
     DarwinBluetooth::ObjCScopedPointer<ObjCConnectionMonitor> connectionMonitor;
     QList<QBluetoothAddress> discoveredDevices;
 };