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, 4 insertions, 3 deletions

diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index ee3477ac..e98bb5a5 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -176,7 +176,7 @@ public:
         LocationAndNavigation = 0x1819,
     };
 
-    enum CharacteristicId {
+    enum CharacteristicType {
         AlertCategoryID = 0x2a43,
         AlertCategoryIDBitMask = 0x2a42,
         AlertLevel = 0x2a06,
@@ -260,7 +260,7 @@ public:
         UnreadAlertStatus = 0x2a45
     };
 
-    enum DescriptorID {
+    enum CharacteristicDescriptor {
         CharacteristicExtendedProperties = 0x2900,
         CharacteristicUserDescription = 0x2901,
         ClientCharacteristicConfiguration = 0x2902,
@@ -275,7 +275,8 @@ public:
     QBluetoothUuid();
     QBluetoothUuid(ProtocolUuid uuid);
     QBluetoothUuid(ServiceClassUuid uuid);
-    QBluetoothUuid(CharacteristicId uuid);
+    QBluetoothUuid(CharacteristicType uuid);
+    QBluetoothUuid(CharacteristicDescriptor uuid);
     explicit QBluetoothUuid(quint16 uuid);
     explicit QBluetoothUuid(quint32 uuid);
     explicit QBluetoothUuid(quint128 uuid);