From 477d9f450a1e9767dbf10f4c040e994231674a1f Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 6 Feb 2014 13:03:58 +0100 Subject: Fix broken QBluetoothServiceInfo::serviceClassUuids() call It never returned a valid entry due to wrong QVariant conversion. The patch changes the public header with a potential to break BC. A formerly inline function was reimplemented and is no longer inline. This should be safe though as older header versions can still use the previous implementation. Change-Id: If786a366e625a56810b8d4cc682b25d07f72f4e5 Reviewed-by: Lars Knoll Reviewed-by: Thiago Macieira Reviewed-by: Alex Blasche --- src/bluetooth/qbluetoothserviceinfo.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/bluetooth/qbluetoothserviceinfo.h') diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 0e6555c0..4d3b8612 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -141,7 +141,7 @@ public: inline void setServiceUuid(const QBluetoothUuid &uuid); inline QBluetoothUuid serviceUuid() const; - inline QList serviceClassUuids() const; + QList serviceClassUuids() const; QBluetoothServiceInfo &operator=(const QBluetoothServiceInfo &other); @@ -228,12 +228,6 @@ inline QBluetoothUuid QBluetoothServiceInfo::serviceUuid() const { return attribute(ServiceId).value(); } - -inline QList QBluetoothServiceInfo::serviceClassUuids() const -{ - return attribute(ServiceClassIds).value >(); -} - QT_END_NAMESPACE #endif -- cgit v1.2.3