diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-08-01 13:16:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-01 05:20:26 +0200 |
| commit | c5a4a7a7a9565a29fa70f1bc858f9a3628c237b4 (patch) | |
| tree | 197f96b96227cee741716075831ae42a9092e3c3 /src/sensors/qsensor.h | |
| parent | 22260646a9fa7dffbd506b6bdd2586ad3d4d3556 (diff) | |
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 <lorn.potter@nokia.com>
Diffstat (limited to 'src/sensors/qsensor.h')
| -rw-r--r-- | src/sensors/qsensor.h | 21 |
1 files changed, 3 insertions, 18 deletions
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<int,int> qrange; typedef QList<qrange> 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) |