diff options
Diffstat (limited to 'src/bluetooth/osx')
-rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry.mm | 8 | ||||
-rw-r--r-- | src/bluetooth/osx/osxbtsdpinquiry.mm | 6 | ||||
-rw-r--r-- | src/bluetooth/osx/osxbtsdpinquiry_p.h | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/osx/osxbtledeviceinquiry.mm index df0c26ad..70b96ab7 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry.mm +++ b/src/bluetooth/osx/osxbtledeviceinquiry.mm @@ -81,7 +81,7 @@ struct AdvertisementData { // For now, we "parse": QString localName; - QList<QBluetoothUuid> serviceUuids; + QVector<QBluetoothUuid> serviceUuids; QHash<quint16, QByteArray> manufacturerData; // TODO: other keys probably? AdvertisementData(NSDictionary *AdvertisementData); @@ -363,10 +363,8 @@ QT_USE_NAMESPACE if (RSSI) newDeviceInfo.setRssi([RSSI shortValue]); - if (qtAdvData.serviceUuids.size()) { - newDeviceInfo.setServiceUuids(qtAdvData.serviceUuids, - QBluetoothDeviceInfo::DataIncomplete); - } + if (qtAdvData.serviceUuids.size()) + newDeviceInfo.setServiceUuids(qtAdvData.serviceUuids); const QList<quint16> keys = qtAdvData.manufacturerData.keys(); for (quint16 key : keys) diff --git a/src/bluetooth/osx/osxbtsdpinquiry.mm b/src/bluetooth/osx/osxbtsdpinquiry.mm index 591d75a5..a7bdc2c4 100644 --- a/src/bluetooth/osx/osxbtsdpinquiry.mm +++ b/src/bluetooth/osx/osxbtsdpinquiry.mm @@ -179,9 +179,9 @@ void extract_service_record(IOBluetoothSDPServiceRecord *record, QBluetoothServi serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, sequence); } -QList<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device) +QVector<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device) { - QList<QBluetoothUuid> uuids; + QVector<QBluetoothUuid> uuids; // All "temporary" obj-c objects are autoreleased. QT_BT_MAC_AUTORELEASEPOOL; @@ -197,7 +197,7 @@ QList<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device) const QVector<QBluetoothUuid> idList(extract_service_class_ID_list(record)); if (idList.size()) - uuids.append(idList.toList()); + uuids.append(idList); } return uuids; diff --git a/src/bluetooth/osx/osxbtsdpinquiry_p.h b/src/bluetooth/osx/osxbtsdpinquiry_p.h index c63738bb..dd38a28b 100644 --- a/src/bluetooth/osx/osxbtsdpinquiry_p.h +++ b/src/bluetooth/osx/osxbtsdpinquiry_p.h @@ -57,6 +57,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qlist.h> +#include <QtCore/qvector.h> #include <Foundation/Foundation.h> @@ -81,7 +82,7 @@ public: void extract_service_record(IOBluetoothSDPServiceRecord *record, QBluetoothServiceInfo &serviceInfo); QVariant extract_attribute_value(IOBluetoothSDPDataElement *dataElement); -QList<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device); +QVector<QBluetoothUuid> extract_services_uuids(IOBluetoothDevice *device); } |