Check for Q_GLOBAL_STATIC returning 0 (simulator plugin).

Consolidate all of the Q_GLOBAL_STATIC data into 1 class so we have one
lifetime to manage. Provide a static instance() method for use outside
of the .cpp file and check for this returning 0.

Change-Id: I243e2c5497e1c018ab7713bd9ef43ac22a658ff7
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/plugins/sensors/simulator/simulatorcommon.h b/src/plugins/sensors/simulator/simulatorcommon.h
index 21cacc00..6555f1fc 100644
--- a/src/plugins/sensors/simulator/simulatorcommon.h
+++ b/src/plugins/sensors/simulator/simulatorcommon.h
@@ -56,6 +56,7 @@ public:
     explicit SensorsConnection(QObject *parent = 0);
     virtual ~SensorsConnection();
 
+    static SensorsConnection *instance();
     bool safe() const { return mInitialDataSent; }
 
 public slots:
@@ -71,6 +72,15 @@ public slots:
 private:
     SimulatorAsyncConnection *mConnection;
     bool mInitialDataSent;
+
+public:
+    QtMobility::QAmbientLightReadingData qtAmbientLightData;
+    QtMobility::QLightReadingData qtLightData;
+    QtMobility::QAccelerometerReadingData qtAccelerometerData;
+    QtMobility::QMagnetometerReadingData qtMagnetometerData;
+    QtMobility::QCompassReadingData qtCompassData;
+    QtMobility::QProximityReadingData qtProximityData;
+    QtMobility::QIRProximityReadingData qtIRProximityData;
 };
 
 class SimulatorCommon : public QSensorBackend
@@ -87,13 +97,5 @@ private:
     int m_timerid;
 };
 
-QtMobility::QAccelerometerReadingData get_qtAccelerometerData();
-QtMobility::QMagnetometerReadingData get_qtMagnetometerData();
-QtMobility::QAmbientLightReadingData get_qtAmbientLightData();
-QtMobility::QLightReadingData get_qtLightData();
-QtMobility::QCompassReadingData get_qtCompassData();
-QtMobility::QProximityReadingData get_qtProximityData();
-QtMobility::QIRProximityReadingData get_qtIRProximityData();
-
 #endif