diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-09 13:33:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 11:10:43 +0200 |
| commit | e6097f5be7450fd043f5b5c13d8c953e2e79fa39 (patch) | |
| tree | 837c8f77832030c3577dfba77f3075b3fbd5e67e /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | 291a62a8150164c8b848b8dd5c6f26ef19a51246 (diff) | |
Simplify detection of Bluetooth Base UUID derived uuids
This avoids unnecessary code duplication.
Change-Id: I9e49cf3c5e524cf7b3ef811b4640d5248c2ba1b0
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index a65b99f6..89d93200 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -71,8 +71,6 @@ static inline void convertAddress(quint64 from, quint8 (&to)[6]) to[5] = (from >> 40) & 0xff; } -Q_GLOBAL_STATIC_WITH_ARGS(QUuid, btBaseUuid, ("{00000000-0000-1000-8000-00805F9B34FB}")); - QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) : error(QBluetoothServiceDiscoveryAgent::NoError), m_deviceAdapterAddress(deviceAdapter), state(Inactive), deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery), singleDevice(false), @@ -609,20 +607,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::performMinimalServiceDiscovery(cons if (!uuidFilter.isEmpty() && !uuidFilter.contains(uuid)) continue; - bool isBaseUuid = false; - if (btBaseUuid()->data2 == uuid.data2 && btBaseUuid()->data3 == uuid.data3 - && btBaseUuid()->data4[0] == uuid.data4[0] && btBaseUuid()->data4[1] == uuid.data4[1] - && btBaseUuid()->data4[2] == uuid.data4[2] && btBaseUuid()->data4[3] == uuid.data4[3] - && btBaseUuid()->data4[4] == uuid.data4[4] && btBaseUuid()->data4[5] == uuid.data4[5] - && btBaseUuid()->data4[6] == uuid.data4[6] && btBaseUuid()->data4[7] == uuid.data4[7]) - { - isBaseUuid = true; - } - QBluetoothServiceInfo serviceInfo; serviceInfo.setDevice(discoveredDevices.at(0)); - if (!isBaseUuid) { + if (uuid.minimumSize() == 16) { // not derived from Bluetooth Base UUID serviceInfo.setServiceUuid(uuid); serviceInfo.setServiceName(QBluetoothServiceDiscoveryAgent::tr("Custom Service")); } else { |