From c5a4a7a7a9565a29fa70f1bc858f9a3628c237b4 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Mon, 1 Aug 2011 13:16:02 +1000 Subject: remove qtimestamp Just use a quint64. Not binary compatible but source compatible. Change-Id: I240baeef905744f844f3c37b2739fd9a6562af15 Reviewed-on: http://codereview.qt.nokia.com/2412 Reviewed-by: Lorn Potter --- .../sensors/simulator/simulatoraccelerometer.cpp | 2 +- .../simulator/simulatorambientlightsensor.cpp | 2 +- src/plugins/sensors/simulator/simulatorcompass.cpp | 2 +- .../sensors/simulator/simulatorlightsensor.cpp | 2 +- .../sensors/simulator/simulatormagnetometer.cpp | 2 +- .../sensors/simulator/simulatorproximitysensor.cpp | 2 +- src/sensors/qsensor.cpp | 34 ++++++++-------------- src/sensors/qsensor.h | 21 ++----------- src/sensors/qsensor_p.h | 2 +- src/sensors/qsensorbackend.cpp | 2 +- 10 files changed, 23 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp index ae09780b..572995c3 100644 --- a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp +++ b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp @@ -54,7 +54,7 @@ SimulatorAccelerometer::SimulatorAccelerometer(QSensor *sensor) void SimulatorAccelerometer::poll() { QtMobility::QAccelerometerReadingData data = get_qtAccelerometerData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp index 4e6fe66f..127a75b0 100644 --- a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp +++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp @@ -54,7 +54,7 @@ SimulatorAmbientLightSensor::SimulatorAmbientLightSensor(QSensor *sensor) void SimulatorAmbientLightSensor::poll() { QAmbientLightReadingData data = get_qtAmbientLightData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/plugins/sensors/simulator/simulatorcompass.cpp b/src/plugins/sensors/simulator/simulatorcompass.cpp index 31a7ed17..a5151e36 100644 --- a/src/plugins/sensors/simulator/simulatorcompass.cpp +++ b/src/plugins/sensors/simulator/simulatorcompass.cpp @@ -54,7 +54,7 @@ SimulatorCompass::SimulatorCompass(QSensor *sensor) void SimulatorCompass::poll() { QtMobility::QCompassReadingData data = get_qtCompassData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.cpp b/src/plugins/sensors/simulator/simulatorlightsensor.cpp index 084b33db..a6fe221b 100644 --- a/src/plugins/sensors/simulator/simulatorlightsensor.cpp +++ b/src/plugins/sensors/simulator/simulatorlightsensor.cpp @@ -54,7 +54,7 @@ SimulatorLightSensor::SimulatorLightSensor(QSensor *sensor) void SimulatorLightSensor::poll() { QLightReadingData data = get_qtLightData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.cpp b/src/plugins/sensors/simulator/simulatormagnetometer.cpp index a5066a47..1262004e 100644 --- a/src/plugins/sensors/simulator/simulatormagnetometer.cpp +++ b/src/plugins/sensors/simulator/simulatormagnetometer.cpp @@ -54,7 +54,7 @@ SimulatorMagnetometer::SimulatorMagnetometer(QSensor *sensor) void SimulatorMagnetometer::poll() { QtMobility::QMagnetometerReadingData data = get_qtMagnetometerData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp index 0e758790..eb0061ab 100644 --- a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp +++ b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp @@ -54,7 +54,7 @@ SimulatorProximitySensor::SimulatorProximitySensor(QSensor *sensor) void SimulatorProximitySensor::poll() { QtMobility::QProximityReadingData data = get_qtProximityData(); - qtimestamp newTimestamp; + quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); else diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 2658d22d..62691c85 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -49,24 +49,6 @@ QT_BEGIN_NAMESPACE -/*! - \typedef qtimestamp - \relates QSensor - - Sensor timestamps are represented by this typedef which is a 64 bit unsigned integer. - - Timestamps values are microseconds since a fixed point. - You can use timestamps to see how far apart two sensor readings are. - - Note that sensor timestamps from different sensors may not be directly - comparable (as they may choose different fixed points for their reference). - - \bold{Note that some platforms do not deliver timestamps correctly}. - Applications should be prepared for occasional issues that cause timestamps to jump - forwards or backwards. The \l{sensors-api.html#platform-notes}{platform notes} have - more details. -*/ - /*! \typedef qrange \relates QSensor @@ -161,7 +143,6 @@ QT_BEGIN_NAMESPACE */ // A bit of a hack to call qRegisterMetaType when the library is loaded. -static int qtimestamp_id = qRegisterMetaType("qtimestamp"); static int qrange_id = qRegisterMetaType("qrange"); static int qrangelist_id = qRegisterMetaType("qrangelist"); static int qoutputrangelist_id = qRegisterMetaType("qoutputrangelist"); @@ -837,13 +818,22 @@ QSensorReading::~QSensorReading() \property QSensorReading::timestamp \brief the timestamp of the reading. - \sa qtimestamp + Timestamps values are microseconds since a fixed point. + You can use timestamps to see how far apart two sensor readings are. + + Note that sensor timestamps from different sensors may not be directly + comparable (as they may choose different fixed points for their reference). + + \bold{Note that some platforms do not deliver timestamps correctly}. + Applications should be prepared for occasional issues that cause timestamps to jump + forwards or backwards. The \l{sensors-api.html#platform-notes}{platform notes} have + more details. */ /*! Returns the timestamp of the reading. */ -qtimestamp QSensorReading::timestamp() const +quint64 QSensorReading::timestamp() const { return d->timestamp; } @@ -851,7 +841,7 @@ qtimestamp QSensorReading::timestamp() const /*! Sets the \a timestamp of the reading. */ -void QSensorReading::setTimestamp(qtimestamp timestamp) +void QSensorReading::setTimestamp(quint64 timestamp) { d->timestamp = timestamp; } diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index f4d1a773..305315c2 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -56,20 +56,6 @@ class QSensorReading; class QSensorReadingPrivate; class QSensorFilter; -#ifdef Q_QDOC -typedef quint64 qtimestamp; -#else -class qtimestamp -{ -public: - qtimestamp() : value() {} - qtimestamp(quint64 timestamp) : value(timestamp) {} - operator quint64() const { return value; } -private: - quint64 value; -}; -#endif - typedef QPair qrange; typedef QList qrangelist; struct qoutputrange @@ -186,12 +172,12 @@ class Q_SENSORS_EXPORT QSensorReading : public QObject friend class QSensorBackend; Q_OBJECT - Q_PROPERTY(qtimestamp timestamp READ timestamp) + Q_PROPERTY(quint64 timestamp READ timestamp) public: virtual ~QSensorReading(); - qtimestamp timestamp() const; - void setTimestamp(qtimestamp timestamp); + quint64 timestamp() const; + void setTimestamp(quint64 timestamp); // Access properties of sub-classes by numeric index // For name-based access use QObject::property() @@ -243,7 +229,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(qtimestamp) Q_DECLARE_METATYPE(qrange) Q_DECLARE_METATYPE(qrangelist) Q_DECLARE_METATYPE(qoutputrangelist) diff --git a/src/sensors/qsensor_p.h b/src/sensors/qsensor_p.h index 1ca59b3c..3260e7f8 100644 --- a/src/sensors/qsensor_p.h +++ b/src/sensors/qsensor_p.h @@ -110,7 +110,7 @@ public: } // sensor data cache - qtimestamp timestamp; + quint64 timestamp; }; QT_END_NAMESPACE diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp index 7f4730d5..6d4317ab 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -175,7 +175,7 @@ QSensorReading *QSensorBackend::reading() const void poll() { - qtimestamp timestamp; + quint64 timestamp; qreal x, y, z; ... QAccelerometerReading *reading = static_cast(reading()); -- cgit v1.2.3