Change QLowEnergyService::ServiceState enum to reflect future changes

In the future, discoverDetails() should become optional.
The state of a QLowEnergyService after its creation should have
a name which does not imply it is not functional yet. This patch
changes the name of the initial state from "DiscoveryRequired"
to the neutral "RemoteService".

Task-number: QTBUG-75340
Change-Id: Ib407e60f5fc7264a04a124561dacbcebb01bf252
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 9 insertions, 9 deletions

diff --git a/examples/bluetooth/heartrate-game/devicehandler.cpp b/examples/bluetooth/heartrate-game/devicehandler.cpp
index 16e94577..cf7020f6 100644
--- a/examples/bluetooth/heartrate-game/devicehandler.cpp
+++ b/examples/bluetooth/heartrate-game/devicehandler.cpp
@@ -202,10 +202,10 @@ void DeviceHandler::serviceScanDone()
 void DeviceHandler::serviceStateChanged(QLowEnergyService::ServiceState s)
 {
     switch (s) {
-    case QLowEnergyService::DiscoveringService:
+    case QLowEnergyService::RemoteServiceDiscovering:
         setInfo(tr("Discovering services..."));
         break;
-    case QLowEnergyService::ServiceDiscovered:
+    case QLowEnergyService::RemoteServiceDiscovered:
     {
         setInfo(tr("Service discovered."));
 
@@ -306,7 +306,7 @@ bool DeviceHandler::alive() const
 #endif
 
     if (m_service)
-        return m_service->state() == QLowEnergyService::ServiceDiscovered;
+        return m_service->state() == QLowEnergyService::RemoteServiceDiscovered;
 
     return false;
 }
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index be3f3103..22c475e4 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -252,7 +252,7 @@ void Device::connectToService(const QString &uuid)
     m_characteristics.clear();
     emit characteristicsUpdated();
 
-    if (service->state() == QLowEnergyService::DiscoveryRequired) {
+    if (service->state() == QLowEnergyService::RemoteService) {
         //! [les-service-3]
         connect(service, &QLowEnergyService::stateChanged,
                 this, &Device::serviceDetailsDiscovered);
@@ -314,12 +314,12 @@ void Device::deviceDisconnected()
 
 void Device::serviceDetailsDiscovered(QLowEnergyService::ServiceState newState)
 {
-    if (newState != QLowEnergyService::ServiceDiscovered) {
+    if (newState != QLowEnergyService::RemoteServiceDiscovered) {
         // do not hang in "Scanning for characteristics" mode forever
         // in case the service discovery failed
         // We have to queue the signal up to give UI time to even enter
         // the above mode
-        if (newState != QLowEnergyService::DiscoveringService) {
+        if (newState != QLowEnergyService::RemoteServiceDiscovering) {
             QMetaObject::invokeMethod(this, "characteristicsUpdated",
                                       Qt::QueuedConnection);
         }
diff --git a/examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc b/examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc
index 7df08b2c..a169aa99 100644
--- a/examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc
+++ b/examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc
@@ -110,9 +110,9 @@
     Change notifications can be triggered as a result of writing a value or due to an on-device
     update potentially triggered by the internal logic.
     During the initial detail search the service's \l {QLowEnergyService::state()}{state()} transitions
-    from \l {QLowEnergyService::DiscoveryRequired}{DiscoveryRequired} to
-    \l {QLowEnergyService::DiscoveringService}{DiscoveringService} and eventually ends with
-    \l {QLowEnergyService::ServiceDiscovered}{ServiceDiscovered}:
+    from \l {QLowEnergyService::RemoteService}{RemoteService} to
+    \l {QLowEnergyService::RemoteServiceDiscovering}{RemoteServiceDiscovering} and eventually ends with
+    \l {QLowEnergyService::RemoteServiceDiscovered}{RemoteServiceDiscovered}:
 
     \snippet lowenergyscanner/device.cpp les-service-3