diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-01-18 16:36:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 03:47:28 +0100 |
| commit | a5e25459c631bad6cd2834a78080b50e429fa261 (patch) | |
| tree | 7d624eccbc7eb7b7481997ed6e48411decaf12cb /src/plugins/sensors/simulator/simulatorcommon.cpp | |
| parent | 52e96f616f903a430f8c47e6584c1254284f6132 (diff) | |
support for IR proximity sensor in the simulator
Also requires a change to the simulator.
Change-Id: I5086d3e49773975fc258f3f4481e643dbff33b15
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
Diffstat (limited to 'src/plugins/sensors/simulator/simulatorcommon.cpp')
| -rw-r--r-- | src/plugins/sensors/simulator/simulatorcommon.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/sensors/simulator/simulatorcommon.cpp b/src/plugins/sensors/simulator/simulatorcommon.cpp index ad7c50ed..47016239 100644 --- a/src/plugins/sensors/simulator/simulatorcommon.cpp +++ b/src/plugins/sensors/simulator/simulatorcommon.cpp @@ -53,6 +53,7 @@ Q_GLOBAL_STATIC(QtMobility::QAccelerometerReadingData, qtAccelerometerData) Q_GLOBAL_STATIC(QtMobility::QMagnetometerReadingData, qtMagnetometerData) Q_GLOBAL_STATIC(QtMobility::QCompassReadingData, qtCompassData) Q_GLOBAL_STATIC(QtMobility::QProximityReadingData, qtProximityData) +Q_GLOBAL_STATIC(QtMobility::QIRProximityReadingData, qtIRProximityData) Q_GLOBAL_STATIC(SensorsConnection, sensorsConnection) class SimulatorAsyncConnection: public QThread @@ -93,6 +94,7 @@ signals: void setMagnetometerData(const QtMobility::QMagnetometerReadingData &); void setCompassData(const QtMobility::QCompassReadingData &); void setProximityData(const QtMobility::QProximityReadingData &); + void setIRProximityData(const QtMobility::QIRProximityReadingData &); private slots: void doConnectToServer() @@ -133,6 +135,8 @@ SensorsConnection::SensorsConnection(QObject *parent) this, SLOT(setCompassData(QtMobility::QCompassReadingData))); connect(mConnection, SIGNAL(setProximityData(QtMobility::QProximityReadingData)), this, SLOT(setProximityData(QtMobility::QProximityReadingData))); + connect(mConnection, SIGNAL(setIRProximityData(QtMobility::QIRProximityReadingData)), + this, SLOT(setIRProximityData(QtMobility::QIRProximityReadingData))); mConnection->connectToServer(); } @@ -172,6 +176,11 @@ void SensorsConnection::setProximityData(const QtMobility::QProximityReadingData *qtProximityData() = data; } +void SensorsConnection::setIRProximityData(const QtMobility::QIRProximityReadingData &data) +{ + *qtIRProximityData() = data; +} + void SensorsConnection::initialSensorsDataSent() { mInitialDataSent = true; @@ -246,4 +255,9 @@ QtMobility::QProximityReadingData get_qtProximityData() return *qtProximityData(); } +QtMobility::QIRProximityReadingData get_qtIRProximityData() +{ + return *qtIRProximityData(); +} + #include "simulatorcommon.moc" |