Streamline some of the QLowEnergyDescriptorInfo related code

1. QLowEnergyDescriptorInfo::type() added
2. QLowEnergyDescriptorInfo ctor signature modified
3. QBluetoothUuid::DescriptorId enum renamed
4. QLowEnergyDescriptorInfo::uuid() changed its meaning
5. QBluetoothUuid(CharacteristicDescriptor) ctor added

Starting from this change QNX is going to be broken. In particular
point 2 cause breaks or bug. The focus is on santizing the API at
this point in time.

Change-Id: I7838f550410b6a0f94026b68ecf0751533eba3cb
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 17 insertions, 4 deletions

diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 730a58e3..89f14440 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -375,9 +375,11 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
 */
 
 /*!
-    \enum QBluetoothUuid::DescriptorID
+    \enum QBluetoothUuid::CharacteristicDescriptor
 
-    This enum is a convienience type for Bluetooth low energy service descriptor class UUIDs. Values of this type
+    Descriptors are attributes that describe Bluetooth Low Energy characteristic values.
+
+    This enum is a convienience type for descriptor class UUIDs. Values of this type
     will be implicitly converted into a QBluetoothUuid when necessary.
 
     \value CharacteristicExtendedProperties  Descriptor defines additional Characteristic Properties.
@@ -426,9 +428,9 @@ QBluetoothUuid::QBluetoothUuid(ServiceClassUuid uuid)
 }
 
 /*!
-    Constructs a new Bluetooth UUID from the characteristic id \a uuid.
+    Constructs a new Bluetooth UUID from the characteristic type \a uuid.
 */
-QBluetoothUuid::QBluetoothUuid(CharacteristicId uuid)
+QBluetoothUuid::QBluetoothUuid(CharacteristicType uuid)
 :   QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1],
           baseUuid()->data4[2], baseUuid()->data4[3], baseUuid()->data4[4], baseUuid()->data4[5],
           baseUuid()->data4[6], baseUuid()->data4[7])
@@ -436,6 +438,17 @@ QBluetoothUuid::QBluetoothUuid(CharacteristicId uuid)
 }
 
 /*!
+    Constructs a new Bluetooth UUID from the descriptor type \a uuid.
+*/
+QBluetoothUuid::QBluetoothUuid(QBluetoothUuid::CharacteristicDescriptor uuid)
+    :   QUuid(uuid, baseUuid()->data2, baseUuid()->data3, baseUuid()->data4[0], baseUuid()->data4[1],
+              baseUuid()->data4[2], baseUuid()->data4[3], baseUuid()->data4[4], baseUuid()->data4[5],
+              baseUuid()->data4[6], baseUuid()->data4[7])
+{
+
+}
+
+/*!
     Constructs a new Bluetooth UUID from the 16 bit \a uuid.
 */
 QBluetoothUuid::QBluetoothUuid(quint16 uuid)