Use scoped enum for constants in QBluetoothUuid

QBluetoothUuid contains enums for ProtocolUuid, ServiceClassUuid,
CharacteristicType and DescriptorType. So far, they all
put their constants directly into the QBluetoothUuid
namespace, making it easy to mix them up. This patch changes
those to scoped enums. That way, each enum has its items in
its own namespace.

Change-Id: I86ea08ff31009dc8073d84cfe678e27920d693f7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
index 870f7cdf..a571de32 100644
--- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
@@ -170,8 +170,8 @@ void MyClass::btleSharedData()
 
     // waiting for connection
 
-    first = control.createServiceObject(QBluetoothUuid::BatteryService);
-    second = control.createServiceObject(QBluetoothUuid::BatteryService);
+    first = control.createServiceObject(QBluetoothUuid::ServiceClassUuid::BatteryService);
+    second = control.createServiceObject(QBluetoothUuid::ServiceClassUuid::BatteryService);
     Q_ASSERT(first->state() == QLowEnergyService::DiscoveryRequired);
     Q_ASSERT(first->state() == second->state());
 
@@ -190,7 +190,7 @@ void MyClass::enableCharNotifications()
     control->connectToDevice();
 
 
-    service = control->createServiceObject(QBluetoothUuid::BatteryService, this);
+    service = control->createServiceObject(QBluetoothUuid::ServiceClassUuid::BatteryService, this);
     if (!service)
         return;
 
@@ -201,12 +201,12 @@ void MyClass::enableCharNotifications()
 //! [enable_btle_notifications]
     //PreCondition: service details already discovered
     QLowEnergyCharacteristic batteryLevel = service->characteristic(
-                QBluetoothUuid::BatteryLevel);
+                QBluetoothUuid::CharacteristicType::BatteryLevel);
     if (!batteryLevel.isValid())
         return;
 
     QLowEnergyDescriptor notification = batteryLevel.descriptor(
-                QBluetoothUuid::ClientCharacteristicConfiguration);
+                QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration);
     if (!notification.isValid())
         return;