Merge remote-tracking branch 'origin/5.10' into dev

* origin/5.10:

  iot-sensortag: Add Uuid fallback for device id
  iot-sensortag: Use double-click to select connection
  iot-sensortag: Add logging window
  iot-sensortag: Do not enable MQTT by default
  Merge remote-tracking branch 'origin/5.9' into 5.10
  iot-sensortag: Disable dateview in portrait mode
  iot-sensortag: Show fullscreen on Android
  iot-sensortag: Align font sizes
  iot-sensortag: Add support for MQTT
  iot-sensortag: Redesign of example
  Fix typo
  Doc: Bump version to 5.10.0
  Doc: Bump version to 5.9.2

Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c

1 files changed, 22 insertions, 32 deletions

diff --git a/tradeshow/iot-sensortag/bluetoothdevice.h b/tradeshow/iot-sensortag/bluetoothdevice.h
index ed74866..5f114ea 100644
--- a/tradeshow/iot-sensortag/bluetoothdevice.h
+++ b/tradeshow/iot-sensortag/bluetoothdevice.h
@@ -63,28 +63,16 @@
 class MotionSensorData
 {
 public:
-    double gyroScope_x;
-    double gyroScope_y;
-    double gyroScope_z;
-    double accelometer_x;
-    double accelometer_y;
-    double accelometer_z;
-    double magnetometer_x;
-    double magnetometer_y;
-    double magnetometer_z;
-    quint64 msSincePreviousData;
-    MotionSensorData() {
-        gyroScope_x = 0;
-        gyroScope_y = 0;
-        gyroScope_z = 0;
-        accelometer_x = 0;
-        accelometer_y = 0;
-        accelometer_z = 0;
-        magnetometer_x = 0;
-        magnetometer_y = 0;
-        magnetometer_z = 0;
-        msSincePreviousData = 0;
-    }
+    double gyroScope_x{};
+    double gyroScope_y{};
+    double gyroScope_z{};
+    double accelometer_x{};
+    double accelometer_y{};
+    double accelometer_z{};
+    double magnetometer_x{};
+    double magnetometer_y{};
+    double magnetometer_z{};
+    quint64 msSincePreviousData{};
 };
 
 typedef enum CharacteristicType {
@@ -105,7 +93,12 @@ class BluetoothDevice: public QObject
     Q_PROPERTY(DeviceState state READ state NOTIFY stateChanged)
 
 public:
-    enum DeviceState {Disconnected = 0, Scanning, Connected, Error};
+    enum DeviceState {
+        Disconnected = 0,
+        Scanning,
+        Connected,
+        Error
+    };
     Q_ENUM(DeviceState)
 
     BluetoothDevice();
@@ -124,7 +117,7 @@ signals:
     void barometerChanged(double temperature, double barometer);
     void humidityChanged(double humidity);
     void lightIntensityChanged(double intensity);
-    void motionChanged(MotionSensorData& data);
+    void motionChanged(MotionSensorData data);
     void statusUpdated(QString statusMsg);
 
 public slots:
@@ -170,11 +163,11 @@ private:
     void updateServiceDetails();
 
     QLowEnergyController *m_controller;
-    QLowEnergyService* m_irTemperatureService;
-    QLowEnergyService* m_baroService;
-    QLowEnergyService* m_humidityService;
-    QLowEnergyService* m_lightService;
-    QLowEnergyService* m_motionService;
+    QLowEnergyService *m_irTemperatureService;
+    QLowEnergyService *m_baroService;
+    QLowEnergyService *m_humidityService;
+    QLowEnergyService *m_lightService;
+    QLowEnergyService *m_motionService;
     DeviceState m_deviceState;
     bool m_temperatureMeasurementStarted;
     bool m_barometerMeasurementStarted;
@@ -182,11 +175,8 @@ private:
     bool m_lightIntensityMeasurementStarted;
     bool m_motionMeasurementStarted;
     quint64 m_lastMilliseconds;
-
     QBluetoothDeviceInfo m_deviceInfo;
-
     SensorTagDataProvider *m_dataProvider;
-
     QTimer *m_serviceDetailsTimer;
 };