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>

31 files changed, 53 insertions, 68 deletions

diff --git a/src/bluetooth/darwin/btcentralmanager.mm b/src/bluetooth/darwin/btcentralmanager.mm
index 12be3ee7..dd3cbb73 100644
--- a/src/bluetooth/darwin/btcentralmanager.mm
+++ b/src/bluetooth/darwin/btcentralmanager.mm
@@ -106,7 +106,7 @@ QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTCentralManager) (PrivateAPI)
+@interface QT_MANGLE_NAMESPACE(DarwinBTCentralManager) (PrivateAPI)
 
 - (void)watchAfter:(id)object timeout:(DarwinBluetooth::OperationTimeout)type;
 - (bool)objectIsUnderWatch:(id)object operation:(DarwinBluetooth::OperationTimeout)type;
@@ -138,7 +138,7 @@ QT_USE_NAMESPACE
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTCentralManager)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTCentralManager)
 {
 @private
     CBCentralManager *manager;
diff --git a/src/bluetooth/darwin/btcentralmanager_p.h b/src/bluetooth/darwin/btcentralmanager_p.h
index ae2931ca..0b5c8fbb 100644
--- a/src/bluetooth/darwin/btcentralmanager_p.h
+++ b/src/bluetooth/darwin/btcentralmanager_p.h
@@ -132,9 +132,9 @@ typedef QHash<NSObject *, QByteArray> ValueHash;
 
 QT_END_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTCentralManager) : NSObject<CBCentralManagerDelegate,
-                                                               CBPeripheralDelegate,
-                                                               QT_MANGLE_NAMESPACE(GCDTimerDelegate)>
+@interface QT_MANGLE_NAMESPACE(DarwinBTCentralManager) : NSObject<CBCentralManagerDelegate,
+                                                                  CBPeripheralDelegate,
+                                                                  QT_MANGLE_NAMESPACE(GCDTimerDelegate)>
 - (id)initWith:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::LECBManagerNotifier *)notifier;
 - (void)dealloc;
 
diff --git a/src/bluetooth/darwin/btconnectionmonitor.mm b/src/bluetooth/darwin/btconnectionmonitor.mm
index 5110a0e1..f9adfde8 100644
--- a/src/bluetooth/darwin/btconnectionmonitor.mm
+++ b/src/bluetooth/darwin/btconnectionmonitor.mm
@@ -51,7 +51,7 @@ QT_END_NAMESPACE
 using namespace QT_NAMESPACE;
 #endif
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTConnectionMonitor)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTConnectionMonitor)
 {
     QT_PREPEND_NAMESPACE(DarwinBluetooth::ConnectionMonitor) *monitor;
     IOBluetoothUserNotification *discoveryNotification;
diff --git a/src/bluetooth/darwin/btconnectionmonitor_p.h b/src/bluetooth/darwin/btconnectionmonitor_p.h
index e2a2df0e..e3b7b90d 100644
--- a/src/bluetooth/darwin/btconnectionmonitor_p.h
+++ b/src/bluetooth/darwin/btconnectionmonitor_p.h
@@ -60,13 +60,7 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-@class QT_MANGLE_NAMESPACE(OSXBTConnectionMonitor);
-
-QT_BEGIN_NAMESPACE
-
-QT_END_NAMESPACE
-
-@interface QT_MANGLE_NAMESPACE(OSXBTConnectionMonitor) : NSObject
+@interface QT_MANGLE_NAMESPACE(DarwinBTConnectionMonitor) : NSObject
 
 - (id)initWithMonitor:(QT_PREPEND_NAMESPACE(DarwinBluetooth::ConnectionMonitor) *)monitor;
 - (void)connectionNotification:(id)notification withDevice:(IOBluetoothDevice *)device;
diff --git a/src/bluetooth/darwin/btdeviceinquiry.mm b/src/bluetooth/darwin/btdeviceinquiry.mm
index 68a804e9..ad59a4a4 100644
--- a/src/bluetooth/darwin/btdeviceinquiry.mm
+++ b/src/bluetooth/darwin/btdeviceinquiry.mm
@@ -45,7 +45,7 @@
 
 QT_USE_NAMESPACE
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTClassicDeviceInquiry)
 {
     IOBluetoothDeviceInquiry *m_inquiry;
     bool m_active;
diff --git a/src/bluetooth/darwin/btdeviceinquiry_p.h b/src/bluetooth/darwin/btdeviceinquiry_p.h
index 423fd481..fa4fd01c 100644
--- a/src/bluetooth/darwin/btdeviceinquiry_p.h
+++ b/src/bluetooth/darwin/btdeviceinquiry_p.h
@@ -60,7 +60,7 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-@interface QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry) : NSObject<IOBluetoothDeviceInquiryDelegate>
+@interface QT_MANGLE_NAMESPACE(DarwinBTClassicDeviceInquiry) : NSObject<IOBluetoothDeviceInquiryDelegate>
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::DeviceInquiryDelegate) *)delegate;
 - (void)dealloc;
diff --git a/src/bluetooth/darwin/btdevicepair.mm b/src/bluetooth/darwin/btdevicepair.mm
index 14fcebe3..2c212c2d 100644
--- a/src/bluetooth/darwin/btdevicepair.mm
+++ b/src/bluetooth/darwin/btdevicepair.mm
@@ -63,7 +63,7 @@ QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTPairing)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTClassicPairing)
 {
     QT_PREPEND_NAMESPACE(QBluetoothAddress) m_targetAddress;
 
diff --git a/src/bluetooth/darwin/btdevicepair_p.h b/src/bluetooth/darwin/btdevicepair_p.h
index e3e58ba0..1b361258 100644
--- a/src/bluetooth/darwin/btdevicepair_p.h
+++ b/src/bluetooth/darwin/btdevicepair_p.h
@@ -61,8 +61,6 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-@class QT_MANGLE_NAMESPACE(OSXBTPairing);
-
 QT_BEGIN_NAMESPACE
 
 namespace DarwinBluetooth {
@@ -73,7 +71,7 @@ ObjCStrongReference<IOBluetoothDevice> device_with_address(const QBluetoothAddre
 
 QT_END_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTPairing) : NSObject<IOBluetoothDevicePairDelegate>
+@interface QT_MANGLE_NAMESPACE(DarwinBTClassicPairing) : NSObject<IOBluetoothDevicePairDelegate>
 
 - (id)initWithTarget:(const QBluetoothAddress &)address
       delegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::PairingDelegate) *)object;
diff --git a/src/bluetooth/darwin/btgcdtimer.mm b/src/bluetooth/darwin/btgcdtimer.mm
index 0307ce84..9105a8fb 100644
--- a/src/bluetooth/darwin/btgcdtimer.mm
+++ b/src/bluetooth/darwin/btgcdtimer.mm
@@ -47,7 +47,7 @@
 QT_USE_NAMESPACE
 using namespace DarwinBluetooth;
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTGCDTimer) {
+@implementation QT_MANGLE_NAMESPACE(DarwinBTGCDTimer) {
 @private
     qint64 timeoutMS;
     qint64 timeoutStepMS;
diff --git a/src/bluetooth/darwin/btgcdtimer_p.h b/src/bluetooth/darwin/btgcdtimer_p.h
index 277cf7ca..dd67d6e8 100644
--- a/src/bluetooth/darwin/btgcdtimer_p.h
+++ b/src/bluetooth/darwin/btgcdtimer_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTGCDTIMER_P_H
-#define OSXBTGCDTIMER_P_H
+#ifndef BTGCDTIMER_P_H
+#define BTGCDTIMER_P_H
 
 //
 //  W A R N I N G
@@ -83,7 +83,7 @@ QT_END_NAMESPACE
 - (void)timeout:(id)sender;
 @end
 
-@interface QT_MANGLE_NAMESPACE(OSXBTGCDTimer) : NSObject
+@interface QT_MANGLE_NAMESPACE(DarwinBTGCDTimer) : NSObject
 - (instancetype)initWithDelegate:(id<QT_MANGLE_NAMESPACE(GCDTimerDelegate)>)delegate;
 - (void)watchAfter:(id)object withTimeoutType:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::OperationTimeout)type;
 - (void)startWithTimeout:(qint64)ms step:(qint64)stepMS;
@@ -97,12 +97,12 @@ QT_BEGIN_NAMESPACE
 
 namespace DarwinBluetooth {
 
-using GCDTimerObjC = QT_MANGLE_NAMESPACE(OSXBTGCDTimer);
+using GCDTimerObjC = QT_MANGLE_NAMESPACE(DarwinBTGCDTimer);
 using GCDTimer = ObjCStrongReference<GCDTimerObjC>;
 
 } // namespace DarwinBluetooth
 
 QT_END_NAMESPACE
 
-#endif // OSXBTGCDTIMER_P_H
+#endif // BTGCDTIMER_P_H
 
diff --git a/src/bluetooth/darwin/btl2capchannel.mm b/src/bluetooth/darwin/btl2capchannel.mm
index 6a4eb0ce..e440a0ee 100644
--- a/src/bluetooth/darwin/btl2capchannel.mm
+++ b/src/bluetooth/darwin/btl2capchannel.mm
@@ -47,7 +47,7 @@
 
 QT_USE_NAMESPACE
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTL2CAPChannel)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTL2CAPChannel)
 {
     QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *delegate;
     IOBluetoothDevice *device;
diff --git a/src/bluetooth/darwin/btl2capchannel_p.h b/src/bluetooth/darwin/btl2capchannel_p.h
index 74bfaf78..32122fe8 100644
--- a/src/bluetooth/darwin/btl2capchannel_p.h
+++ b/src/bluetooth/darwin/btl2capchannel_p.h
@@ -71,7 +71,7 @@ class ChannelDelegate;
 
 QT_END_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTL2CAPChannel) : NSObject<IOBluetoothL2CAPChannelDelegate>
+@interface QT_MANGLE_NAMESPACE(DarwinBTL2CAPChannel) : NSObject<IOBluetoothL2CAPChannelDelegate>
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *)aDelegate;
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *)aDelegate
diff --git a/src/bluetooth/darwin/btledeviceinquiry.mm b/src/bluetooth/darwin/btledeviceinquiry.mm
index c12af39d..b3f29035 100644
--- a/src/bluetooth/darwin/btledeviceinquiry.mm
+++ b/src/bluetooth/darwin/btledeviceinquiry.mm
@@ -121,12 +121,12 @@ QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-@interface  QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry)(PrivateAPI)
+@interface  QT_MANGLE_NAMESPACE(DarwinBTLEDeviceInquiry)(PrivateAPI)
 - (void)stopScanSafe;
 - (void)stopNotifier;
 @end
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTLEDeviceInquiry)
 {
     LECBManagerNotifier *notifier;
     ObjCScopedPointer<CBCentralManager> manager;
diff --git a/src/bluetooth/darwin/btledeviceinquiry_p.h b/src/bluetooth/darwin/btledeviceinquiry_p.h
index 026f7a88..58c66e56 100644
--- a/src/bluetooth/darwin/btledeviceinquiry_p.h
+++ b/src/bluetooth/darwin/btledeviceinquiry_p.h
@@ -89,7 +89,7 @@ enum LEInquiryState
     ErrorLENotSupported
 };
 
-@interface QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry) : NSObject<CBCentralManagerDelegate, QT_MANGLE_NAMESPACE(GCDTimerDelegate)>
+@interface QT_MANGLE_NAMESPACE(DarwinBTLEDeviceInquiry) : NSObject<CBCentralManagerDelegate, QT_MANGLE_NAMESPACE(GCDTimerDelegate)>
 - (id)initWithNotifier:(LECBManagerNotifier *)aNotifier;
 - (void)dealloc;
 
diff --git a/src/bluetooth/darwin/btobexsession.mm b/src/bluetooth/darwin/btobexsession.mm
index 933f94a7..ba48aab0 100644
--- a/src/bluetooth/darwin/btobexsession.mm
+++ b/src/bluetooth/darwin/btobexsession.mm
@@ -407,7 +407,7 @@ QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTOBEXSession) (PrivateAPI)
+@interface QT_MANGLE_NAMESPACE(DarwinBTOBEXSession) (PrivateAPI)
 
 // OBEXDisconnect returns void - it's considered to be always
 // successful. These methods are "private API" - no need to expose them,
@@ -417,7 +417,7 @@ QT_USE_NAMESPACE
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTOBEXSession)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTOBEXSession)
 {
     QT_PREPEND_NAMESPACE(DarwinBluetooth)::OBEXSessionDelegate *delegate;
     IOBluetoothDevice *device;
@@ -509,7 +509,7 @@ QT_USE_NAMESPACE
     currentRequest = DarwinBluetooth::OBEXConnect;
 
     const OBEXError status = [session OBEXConnect:kOBEXConnectFlagNone
-                                      maxPacketLength:[QT_MANGLE_NAMESPACE(OSXBTOBEXSession) maxPacketLength]
+                                      maxPacketLength:[QT_MANGLE_NAMESPACE(DarwinBTOBEXSession) maxPacketLength]
                                       optionalHeaders:nullptr
                                       optionalHeadersLength:0
                                       eventSelector:@selector(OBEXConnectHandler:)
diff --git a/src/bluetooth/darwin/btobexsession_p.h b/src/bluetooth/darwin/btobexsession_p.h
index ab8388e5..11c6d226 100644
--- a/src/bluetooth/darwin/btobexsession_p.h
+++ b/src/bluetooth/darwin/btobexsession_p.h
@@ -60,7 +60,7 @@
 
 // TODO: all this code must be removed in Qt 6?
 
-@class QT_MANGLE_NAMESPACE(OSXBTOBEXSession);
+@class QT_MANGLE_NAMESPACE(DarwinBTOBEXSession);
 
 QT_BEGIN_NAMESPACE
 
@@ -74,7 +74,7 @@ namespace DarwinBluetooth
 class OBEXSessionDelegate
 {
 public:
-    typedef QT_MANGLE_NAMESPACE(OSXBTOBEXSession) ObjCOBEXSession;
+    typedef QT_MANGLE_NAMESPACE(DarwinBTOBEXSession) ObjCOBEXSession;
 
     virtual ~OBEXSessionDelegate();
 
@@ -105,7 +105,7 @@ QT_END_NAMESPACE
 // OBEX Session, it's a "single-shot" operation as our QBluetoothTransferReply is
 // (it does not have an interface to re-send data or re-use the same transfer reply).
 // It either succeeds or fails and tries to cleanup in any case.
-@interface QT_MANGLE_NAMESPACE(OSXBTOBEXSession) : NSObject
+@interface QT_MANGLE_NAMESPACE(DarwinBTOBEXSession) : NSObject
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::OBEXSessionDelegate) *)aDelegate
       remoteDevice:(const QBluetoothAddress &)deviceAddress channelID:(quint16)port;
@@ -136,4 +136,3 @@ QT_END_NAMESPACE
 @end
 
 #endif
-
diff --git a/src/bluetooth/darwin/btperipheralmanager.mm b/src/bluetooth/darwin/btperipheralmanager.mm
index a500966c..d4713ace 100644
--- a/src/bluetooth/darwin/btperipheralmanager.mm
+++ b/src/bluetooth/darwin/btperipheralmanager.mm
@@ -159,7 +159,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
 
 }
 
-@interface QT_MANGLE_NAMESPACE(OSXBTPeripheralManager) (PrivateAPI)
+@interface QT_MANGLE_NAMESPACE(DarwinBTPeripheralManager) (PrivateAPI)
 
 - (void)addConnectedCentral:(CBCentral *)central;
 - (void)removeConnectedCentral:(CBCentral *)central;
@@ -177,7 +177,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
 
 @end
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTPeripheralManager)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTPeripheralManager)
 {
     ObjCScopedPointer<CBPeripheralManager> manager;
     LECBManagerNotifier *notifier;
diff --git a/src/bluetooth/darwin/btperipheralmanager_p.h b/src/bluetooth/darwin/btperipheralmanager_p.h
index 4c5a5a45..e09165ac 100644
--- a/src/bluetooth/darwin/btperipheralmanager_p.h
+++ b/src/bluetooth/darwin/btperipheralmanager_p.h
@@ -121,7 +121,7 @@ struct UpdateRequest
 
 using ValueRange = QPair<NSUInteger, NSUInteger>;
 
-@interface QT_MANGLE_NAMESPACE(OSXBTPeripheralManager) : NSObject<CBPeripheralManagerDelegate>
+@interface QT_MANGLE_NAMESPACE(DarwinBTPeripheralManager) : NSObject<CBPeripheralManagerDelegate>
 
 - (id)initWith:(LECBManagerNotifier *)notifier;
 - (void)dealloc;
diff --git a/src/bluetooth/darwin/btrfcommchannel.mm b/src/bluetooth/darwin/btrfcommchannel.mm
index 5e9d5e51..0cac3c6d 100644
--- a/src/bluetooth/darwin/btrfcommchannel.mm
+++ b/src/bluetooth/darwin/btrfcommchannel.mm
@@ -44,7 +44,7 @@
 
 QT_USE_NAMESPACE
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTRFCOMMChannel)
 {
     QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *delegate;
     IOBluetoothDevice *device;
diff --git a/src/bluetooth/darwin/btrfcommchannel_p.h b/src/bluetooth/darwin/btrfcommchannel_p.h
index 8f14fe9f..25299092 100644
--- a/src/bluetooth/darwin/btrfcommchannel_p.h
+++ b/src/bluetooth/darwin/btrfcommchannel_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXBTRFCOMMCHANNEL_P_H
-#define OSXBTRFCOMMCHANNEL_P_H
+#ifndef BTRFCOMMCHANNEL_P_H
+#define BTRFCOMMCHANNEL_P_H
 
 //
 //  W A R N I N G
@@ -57,8 +57,6 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-@class QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel);
-
 QT_BEGIN_NAMESPACE
 
 class QBluetoothAddress;
@@ -71,7 +69,7 @@ class ChannelDelegate;
 
 QT_END_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel) : NSObject<IOBluetoothRFCOMMChannelDelegate>
+@interface QT_MANGLE_NAMESPACE(DarwinBTRFCOMMChannel) : NSObject<IOBluetoothRFCOMMChannelDelegate>
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *)aDelegate;
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *)aDelegate
diff --git a/src/bluetooth/darwin/btsdpinquiry.mm b/src/bluetooth/darwin/btsdpinquiry.mm
index fc653831..336d7541 100644
--- a/src/bluetooth/darwin/btsdpinquiry.mm
+++ b/src/bluetooth/darwin/btsdpinquiry.mm
@@ -208,7 +208,7 @@ QT_USE_NAMESPACE
 
 using namespace DarwinBluetooth;
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTSDPInquiry)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTSDPInquiry)
 {
     QT_PREPEND_NAMESPACE(DarwinBluetooth::SDPInquiryDelegate) *delegate;
     IOBluetoothDevice *device;
diff --git a/src/bluetooth/darwin/btsdpinquiry_p.h b/src/bluetooth/darwin/btsdpinquiry_p.h
index 80d3e66c..6cce5703 100644
--- a/src/bluetooth/darwin/btsdpinquiry_p.h
+++ b/src/bluetooth/darwin/btsdpinquiry_p.h
@@ -62,7 +62,7 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-@class QT_MANGLE_NAMESPACE(OSXBTSDPInquiry);
+@class QT_MANGLE_NAMESPACE(DarwinBTSDPInquiry);
 
 QT_BEGIN_NAMESPACE
 
@@ -81,7 +81,7 @@ QVector<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device);
 
 QT_END_NAMESPACE
 
-@interface QT_MANGLE_NAMESPACE(OSXBTSDPInquiry) : NSObject
+@interface QT_MANGLE_NAMESPACE(DarwinBTSDPInquiry) : NSObject
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::SDPInquiryDelegate) *)aDelegate;
 - (void)dealloc;
diff --git a/src/bluetooth/darwin/btsocketlistener.mm b/src/bluetooth/darwin/btsocketlistener.mm
index 046c683b..505fec14 100644
--- a/src/bluetooth/darwin/btsocketlistener.mm
+++ b/src/bluetooth/darwin/btsocketlistener.mm
@@ -45,7 +45,7 @@
 
 QT_USE_NAMESPACE
 
-@implementation QT_MANGLE_NAMESPACE(OSXBTSocketListener)
+@implementation QT_MANGLE_NAMESPACE(DarwinBTSocketListener)
 {
     IOBluetoothUserNotification *connectionNotification;
     QT_PREPEND_NAMESPACE(DarwinBluetooth::SocketListener) *delegate;
diff --git a/src/bluetooth/darwin/btsocketlistener_p.h b/src/bluetooth/darwin/btsocketlistener_p.h
index 236207b8..4b9b267a 100644
--- a/src/bluetooth/darwin/btsocketlistener_p.h
+++ b/src/bluetooth/darwin/btsocketlistener_p.h
@@ -57,10 +57,6 @@
 
 #include <IOBluetooth/IOBluetooth.h>
 
-// TODO: use the special macros we have to create an
-// alias for a mangled name.
-@class QT_MANGLE_NAMESPACE(OSXBTSocketListener);
-
 QT_BEGIN_NAMESPACE
 
 namespace DarwinBluetooth {
@@ -71,10 +67,10 @@ class SocketListener;
 
 QT_END_NAMESPACE
 
-// A single OSXBTSocketListener can be started only once with
+// A single DarwinBTSocketListener can be started only once with
 // RFCOMM or L2CAP protocol. It must be deleted to stop listening.
 
-@interface QT_MANGLE_NAMESPACE(OSXBTSocketListener) : NSObject
+@interface QT_MANGLE_NAMESPACE(DarwinBTSocketListener) : NSObject
 
 - (id)initWithListener:(QT_PREPEND_NAMESPACE(DarwinBluetooth::SocketListener) *)aDelegate;
 - (void)dealloc;
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
index e333a4de..9053e564 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
@@ -85,10 +85,10 @@ void registerQDeviceDiscoveryMetaType()
     }
 }
 #ifdef Q_OS_MACOS
-using InquiryObjC = QT_MANGLE_NAMESPACE(OSXBTDeviceInquiry);
+using InquiryObjC = QT_MANGLE_NAMESPACE(DarwinBTClassicDeviceInquiry);
 #endif // Q_OS_MACOS
 
-using LEInquiryObjC = QT_MANGLE_NAMESPACE(OSXBTLEDeviceInquiry);
+using LEInquiryObjC = QT_MANGLE_NAMESPACE(DarwinBTLEDeviceInquiry);
 
 } //namespace
 
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;
 };
diff --git a/src/bluetooth/qbluetoothserver_macos.mm b/src/bluetooth/qbluetoothserver_macos.mm
index f7d4a0d8..4c0210c8 100644
--- a/src/bluetooth/qbluetoothserver_macos.mm
+++ b/src/bluetooth/qbluetoothserver_macos.mm
@@ -69,7 +69,7 @@ namespace {
 
 using DarwinBluetooth::RetainPolicy;
 using ServiceInfo = QBluetoothServiceInfo;
-using ObjCListener = QT_MANGLE_NAMESPACE(OSXBTSocketListener);
+using ObjCListener = QT_MANGLE_NAMESPACE(DarwinBTSocketListener);
 
 QMap<quint16, QBluetoothServerPrivate *> &busyPSMs()
 {
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
index fc852dce..f6bee6bf 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 namespace {
 
 using DarwinBluetooth::RetainPolicy;
-using ObjCServiceInquiry = QT_MANGLE_NAMESPACE(OSXBTSDPInquiry);
+using ObjCServiceInquiry = QT_MANGLE_NAMESPACE(DarwinBTSDPInquiry);
 
 }
 
diff --git a/src/bluetooth/qbluetoothsocket_macos.mm b/src/bluetooth/qbluetoothsocket_macos.mm
index a275e292..dd347e21 100644
--- a/src/bluetooth/qbluetoothsocket_macos.mm
+++ b/src/bluetooth/qbluetoothsocket_macos.mm
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
 namespace {
 
 using DarwinBluetooth::RetainPolicy;
-using ObjCL2CAPChannel = QT_MANGLE_NAMESPACE(OSXBTL2CAPChannel);
-using ObjCRFCOMMChannel = QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel);
+using ObjCL2CAPChannel = QT_MANGLE_NAMESPACE(DarwinBTL2CAPChannel);
+using ObjCRFCOMMChannel = QT_MANGLE_NAMESPACE(DarwinBTRFCOMMChannel);
 
 } // unnamed namespace
 
diff --git a/src/bluetooth/qbluetoothtransferreply_macos.mm b/src/bluetooth/qbluetoothtransferreply_macos.mm
index 9ca1d817..986d5e15 100644
--- a/src/bluetooth/qbluetoothtransferreply_macos.mm
+++ b/src/bluetooth/qbluetoothtransferreply_macos.mm
@@ -186,7 +186,7 @@ void QBluetoothTransferReplyOSXPrivate::sendConnect(const QBluetoothAddress &dev
     OBEXSession newSession([[ObjCOBEXSession alloc] initWithDelegate:this
                             remoteDevice:device channelID:channelID]);
     if (!newSession) {
-        qCWarning(QT_BT_DARWIN) << "failed to allocate OSXBTOBEXSession object";
+        qCWarning(QT_BT_DARWIN) << "failed to allocate DarwinBTOBEXSession object";
 
         setReplyError(QBluetoothTransferReply::UnknownError,
                       QCoreApplication::translate(TRANSFER_REPLY, TR_SESSION_NO_START));
diff --git a/src/bluetooth/qlowenergycontroller_darwin.mm b/src/bluetooth/qlowenergycontroller_darwin.mm
index af75926f..34e6cab4 100644
--- a/src/bluetooth/qlowenergycontroller_darwin.mm
+++ b/src/bluetooth/qlowenergycontroller_darwin.mm
@@ -122,10 +122,10 @@ UUIDList qt_servicesUuids(NSArray *services)
 } // unnamed namespace
 
 #ifndef Q_OS_TVOS
-using ObjCPeripheralManager = QT_MANGLE_NAMESPACE(OSXBTPeripheralManager);
+using ObjCPeripheralManager = QT_MANGLE_NAMESPACE(DarwinBTPeripheralManager);
 #endif // Q_OS_TVOS
 
-using ObjCCentralManager = QT_MANGLE_NAMESPACE(OSXBTCentralManager);
+using ObjCCentralManager = QT_MANGLE_NAMESPACE(DarwinBTCentralManager);
 
 QLowEnergyControllerPrivateDarwin::QLowEnergyControllerPrivateDarwin()
 {
@@ -391,7 +391,7 @@ void QLowEnergyControllerPrivateDarwin::_q_serviceDiscoveryFinished()
     NSArray *const services = [centralManager.getAs<ObjCCentralManager>() peripheral].services;
     // Now we have to traverse the discovered services tree.
     // Essentially it's an iterative version of more complicated code from the
-    // OSXBTCentralManager's code.
+    // DarwinBTCentralManager's code.
     // All Obj-C entities either auto-release, or guarded by ObjCScopedReferences.
     if (services && [services count]) {
         QMap<QBluetoothUuid, CBService *> discoveredCBServices;