diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-09-26 15:30:47 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-10-08 09:29:08 +0200 |
| commit | 5f3cec5be9ea8f8ee7ac547d799c330c87453f88 (patch) | |
| tree | cdcbff7b15f9f07031c387c0c86bdc3322609649 /src/bluetooth/darwin/btobexsession_p.h | |
| parent | def63ee8702379928d9fc04e25d985538900d249 (diff) | |
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>
Diffstat (limited to 'src/bluetooth/darwin/btobexsession_p.h')
| -rw-r--r-- | src/bluetooth/darwin/btobexsession_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 - |