Bluetooth heartrate-game example: Make simulation switcheable by command line arguments

Introduce QCommandLineParser for simulation and verbosity settings.

Change-Id: I00d01d2fa73db311944a2df68c6b116f0a31811b
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit f2d0f8709d17afac1d7d15ee746397eb17e948f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 21 insertions, 21 deletions

diff --git a/examples/bluetooth/heartrate-game/devicefinder.cpp b/examples/bluetooth/heartrate-game/devicefinder.cpp
index a45f4fba..1b7845c6 100644
--- a/examples/bluetooth/heartrate-game/devicefinder.cpp
+++ b/examples/bluetooth/heartrate-game/devicefinder.cpp
@@ -4,6 +4,7 @@
 #include "devicefinder.h"
 #include "devicehandler.h"
 #include "deviceinfo.h"
+#include "heartrate-global.h"
 
 DeviceFinder::DeviceFinder(DeviceHandler *handler, QObject *parent):
     BluetoothBaseClass(parent),
@@ -22,11 +23,11 @@ DeviceFinder::DeviceFinder(DeviceHandler *handler, QObject *parent):
     //! [devicediscovery-1]
 
 
-#ifdef SIMULATOR
-    m_demoTimer.setSingleShot(true);
-    m_demoTimer.setInterval(2000);
-    connect(&m_demoTimer, &QTimer::timeout, this, &DeviceFinder::scanFinished);
-#endif
+    if (simulator) {
+        m_demoTimer.setSingleShot(true);
+        m_demoTimer.setInterval(2000);
+        connect(&m_demoTimer, &QTimer::timeout, this, &DeviceFinder::scanFinished);
+    }
 }
 
 DeviceFinder::~DeviceFinder()
@@ -44,13 +45,14 @@ void DeviceFinder::startSearch()
 
     emit devicesChanged();
 
-#ifdef SIMULATOR
-    m_demoTimer.start();
-#else
-    //! [devicediscovery-2]
-    m_deviceDiscoveryAgent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
-    //! [devicediscovery-2]
-#endif
+    if (simulator) {
+        m_demoTimer.start();
+    }  else {
+        //! [devicediscovery-2]
+        m_deviceDiscoveryAgent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
+        //! [devicediscovery-2]
+    }
+
     emit scanningChanged();
     setInfo(tr("Scanning for devices..."));
 }
@@ -82,11 +84,11 @@ void DeviceFinder::scanError(QBluetoothDeviceDiscoveryAgent::Error error)
 
 void DeviceFinder::scanFinished()
 {
-#ifdef SIMULATOR
-    // Only for testing
-    for (int i = 0; i < 4; i++)
-        m_devices.append(new DeviceInfo(QBluetoothDeviceInfo()));
-#endif
+    if (simulator) {
+        // Only for testing
+        for (int i = 0; i < 4; i++)
+            m_devices.append(new DeviceInfo(QBluetoothDeviceInfo()));
+    }
 
     if (m_devices.isEmpty())
         setError(tr("No Low Energy devices found."));
@@ -118,11 +120,9 @@ void DeviceFinder::connectToService(const QString &address)
 
 bool DeviceFinder::scanning() const
 {
-#ifdef SIMULATOR
-    return m_demoTimer.isActive();
-#else
+    if (simulator)
+        return m_demoTimer.isActive();
     return m_deviceDiscoveryAgent->isActive();
-#endif
 }
 
 QVariant DeviceFinder::devices()