diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2023-08-22 18:11:56 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-23 04:54:01 +0000 |
commit | e21ff1f3fc8767963b18966d7d36de4a4a2aa785 (patch) | |
tree | c1590678adf218f3df8deda17e0a1dc2b465175f | |
parent | 629b06549a05a3f9dd22c4ed3305c1143b54ba9c (diff) |
Bluetooth: remove custom implementations of qbswap(QUuid::Id128Bytes)
Starting from qtbase/470b2b8ad9f28eaf24518dfa3f48cc13fcdc421f qbswap()
is provided as a hidden friend for this type, so the custom
implementations for Windows and Android backends in Qt Bluetooth are
no longer required.
Fixes: QTBUG-116341
Change-Id: I451de4249a082331f75c1db93ad420cf96d0e3cc
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 98cddeeb4a9e0c8686e505e5e6b9165970ec3060)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/bluetooth/android/devicediscoverybroadcastreceiver.cpp | 9 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp index f0746a4c..fff92e33 100644 --- a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp +++ b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp @@ -221,15 +221,6 @@ enum ADType { // .. more will be added when required }; -// Endianness conversion for QUuid::Id128Bytes doesn't exist in qtendian.h -inline QUuid::Id128Bytes qbswap(const QUuid::Id128Bytes src) -{ - QUuid::Id128Bytes dst; - for (int i = 0; i < 16; i++) - dst.data[i] = src.data[15 - i]; - return dst; -} - QBluetoothDeviceInfo::CoreConfigurations qtBtTypeForJavaBtType(jint javaType) { const JCachedBtTypes::iterator it = cachedBtTypes()->find(javaType); diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp index 48929d35..298f720c 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp @@ -38,15 +38,6 @@ QT_IMPL_METATYPE_EXTERN(ServiceData) Q_DECLARE_LOGGING_CATEGORY(QT_BT_WINDOWS) -// Endianness conversion for QUuid::Id128Bytes doesn't exist in qtendian.h -inline QUuid::Id128Bytes qbswap(const QUuid::Id128Bytes src) -{ - QUuid::Id128Bytes dst; - for (int i = 0; i < 16; i++) - dst.data[i] = src.data[15 - i]; - return dst; -} - static QByteArray byteArrayFromBuffer(const IBuffer &buffer) { const uint8_t *data = buffer.data(); |