Improve handling of QBluetoothUuid::CharacteristicType enum

- Sort enum values based on their hex values
- Add QBluetoothUuid::characteristicToString(CharacteristicType)
- Rename QBluetoothUuid::CharacteristicDescriptor -> DescriptorType
- Add a couple of missing \since tags

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

1 files changed, 70 insertions, 69 deletions

diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index e98bb5a5..c5f9224c 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -177,90 +177,90 @@ public:
     };
 
     enum CharacteristicType {
-        AlertCategoryID = 0x2a43,
-        AlertCategoryIDBitMask = 0x2a42,
-        AlertLevel = 0x2a06,
-        AlertNotificationControlPoint = 0x2a44,
-        AlertStatus = 0x2a3f,
+        DeviceName = 0x2a00,
         Appearance = 0x2a01,
-        BatteryLevel = 0x2a19,
-        BloodPressureFeature = 0x2a49,
-        BloodPressureMeasurement = 0x2a35,
-        BodySensorLocation = 0x2a38,
-        BootKeyboardInputReport = 0x2a22,
-        BootKeyboardOutputReport = 0x2a32,
-        BootMouseInputReport = 0x2a33,
-        CSCFeature = 0x2a5c,
-        CSCMeasurement = 0x2a5b,
-        CurrentTime = 0x2a2b,
-        CyclingPowerControlPoint = 0x2a66,
-        CyclingPowerFeature = 0x2a65,
-        CyclingPowerMeasurement = 0x2a63,
-        CyclingPowerVector = 0x2a64,
+        PeripheralPrivacyFlag = 0x2a02,
+        ReconnectionAddress = 0x2a03,
+        PeripheralPreferredConnectionParameters = 0x2a04,
+        ServiceChanged = 0x2a05,
+        AlertLevel = 0x2a06,
+        TxPowerLevel = 0x2a07,
         DateTime = 0x2a08,
-        DayDateTime = 0x2a0a,
         DayOfWeek = 0x2a09,
-        DeviceName = 0x2a00,
-        DSTOffset = 0x2a0d,
+        DayDateTime = 0x2a0a,
         ExactTime256 = 0x2a0c,
-        FirmwareRevisionString = 0x2a26,
-        GlucoseFeature = 0x2a51,
+        DSTOffset = 0x2a0d,
+        TimeZone = 0x2a0e,
+        LocalTimeInformation = 0x2a0f,
+        TimeWithDST = 0x2a11,
+        TimeAccuracy = 0x2a12,
+        TimeSource = 0x2a13,
+        ReferenceTimeInformation = 0x2a14,
+        TimeUpdateControlPoint = 0x2a16,
+        TimeUpdateState = 0x2a17,
         GlucoseMeasurement = 0x2a18,
-        GlucoseMeasurementContext = 0x2a34,
-        HardwareRevisionString = 0x2a27,
-        HeartRateControlPoint = 0x2a39,
-        HeartRateMeasurement = 0x2a37,
-        HIDControlPoint = 0x2a4c,
-        HIDInformation = 0x2a4a,
-        IEEE1107320601RegulatoryCertificationDataList = 0x2a2a,
-        IntermediateCuffPressure = 0x2a36,
+        BatteryLevel = 0x2a19,
+        TemperatureMeasurement = 0x2a1c,
+        TemperatureType = 0x2a1d,
         IntermediateTemperature = 0x2a1e,
-        LNControlPoint = 0x2a6b,
-        LNFeature = 0x2a6a,
-        LocalTimeInformation = 0x2a0f,
-        LocationAndSpeed = 0x2a67,
-        ManufacturerNameString = 0x2a29,
         MeasurementInterval = 0x2a21,
+        BootKeyboardInputReport = 0x2a22,
+        SystemID = 0x2a23,
         ModelNumberString = 0x2a24,
-        Navigation = 0x2a68,
+        SerialNumberString = 0x2a25,
+        FirmwareRevisionString = 0x2a26,
+        HardwareRevisionString = 0x2a27,
+        SoftwareRevisionString = 0x2a28,
+        ManufacturerNameString = 0x2a29,
+        IEEE1107320601RegulatoryCertificationDataList = 0x2a2a,
+        CurrentTime = 0x2a2b,
+        ScanRefresh = 0x2a31,
+        BootKeyboardOutputReport = 0x2a32,
+        BootMouseInputReport = 0x2a33,
+        GlucoseMeasurementContext = 0x2a34,
+        BloodPressureMeasurement = 0x2a35,
+        IntermediateCuffPressure = 0x2a36,
+        HeartRateMeasurement = 0x2a37,
+        BodySensorLocation = 0x2a38,
+        HeartRateControlPoint = 0x2a39,
+        AlertStatus = 0x2a3f,
+        RingerControlPoint = 0x2a40,
+        RingerSetting = 0x2a41,
+        AlertCategoryIDBitMask = 0x2a42,
+        AlertCategoryID = 0x2a43,
+        AlertNotificationControlPoint = 0x2a44,
+        UnreadAlertStatus = 0x2a45,
         NewAlert = 0x2a46,
-        PeripheralPreferredConnectionParameters = 0x2a04,
-        PeripheralPrivacyFlag = 0x2a02,
-        PnPID = 0x2a50,
-        PositionQuality = 0x2a69,
+        SupportedNewAlertCategory = 0x2a47,
+        SupportedUnreadAlertCategory = 0x2a48,
+        BloodPressureFeature = 0x2a49,
+        HIDInformation = 0x2a4a,
+        ReportMap = 0x2a4b,
+        HIDControlPoint = 0x2a4c,
+        Report = 0x2a4d,
         ProtocolMode = 0x2a4e,
-        ReconnectionAddress = 0x2a03,
+        ScanIntervalWindow = 0x2a4f,
+        PnPID = 0x2a50,
+        GlucoseFeature = 0x2a51,
         RecordAccessControlPoint = 0x2a52,
-        ReferenceTimeInformation = 0x2a14,
-        Report = 0x2a4d,
-        ReportMap = 0x2a4b,
-        RingerControlPoint = 0x2a40,
-        RingerSetting = 0x2a41,
-        RSCFeature = 0x2a54,
         RSCMeasurement = 0x2a53,
+        RSCFeature = 0x2a54,
         SCControlPoint = 0x2a55,
-        ScanIntervalWindow = 0x2a4f,
-        ScanRefresh = 0x2a31,
+        CSCMeasurement = 0x2a5b,
+        CSCFeature = 0x2a5c,
         SensorLocation = 0x2a5d,
-        SerialNumberString = 0x2a25,
-        ServiceChanged = 0x2a05,
-        SoftwareRevisionString = 0x2a28,
-        SupportedNewAlertCategory = 0x2a47,
-        SupportedUnreadAlertCategory = 0x2a48,
-        SystemID = 0x2a23,
-        TemperatureMeasurement = 0x2a1c,
-        TemperatureType = 0x2a1d,
-        TimeAccuracy = 0x2a12,
-        TimeSource = 0x2a13,
-        TimeUpdateControlPoint = 0x2a16,
-        TimeUpdateState = 0x2a17,
-        TimeWithDST = 0x2a11,
-        TimeZone = 0x2a0e,
-        TxPowerLevel = 0x2a07,
-        UnreadAlertStatus = 0x2a45
+        CyclingPowerMeasurement = 0x2a63,
+        CyclingPowerVector = 0x2a64,
+        CyclingPowerFeature = 0x2a65,
+        CyclingPowerControlPoint = 0x2a66,
+        LocationAndSpeed = 0x2a67,
+        Navigation = 0x2a68,
+        PositionQuality = 0x2a69,
+        LNFeature = 0x2a6a,
+        LNControlPoint = 0x2a6b,
     };
 
-    enum CharacteristicDescriptor {
+    enum DescriptorType {
         CharacteristicExtendedProperties = 0x2900,
         CharacteristicUserDescription = 0x2901,
         ClientCharacteristicConfiguration = 0x2902,
@@ -276,7 +276,7 @@ public:
     QBluetoothUuid(ProtocolUuid uuid);
     QBluetoothUuid(ServiceClassUuid uuid);
     QBluetoothUuid(CharacteristicType uuid);
-    QBluetoothUuid(CharacteristicDescriptor uuid);
+    QBluetoothUuid(DescriptorType uuid);
     explicit QBluetoothUuid(quint16 uuid);
     explicit QBluetoothUuid(quint32 uuid);
     explicit QBluetoothUuid(quint128 uuid);
@@ -295,6 +295,7 @@ public:
 
     static QString serviceClassToString(ServiceClassUuid uuid);
     static QString protocolToString(ProtocolUuid uuid);
+    static QString characteristicToString(CharacteristicType uuid);
 };
 
 #ifndef QT_NO_DEBUG_STREAM