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 /tests | |
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 'tests')
-rw-r--r-- | tests/auto/qsensor/tst_qsensor.cpp | 10 | ||||
-rw-r--r-- | tests/manual/sensor_explorer/explorer.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 3198f80c..51c05ef6 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -272,7 +272,7 @@ private slots: sensor.connectToBackend(); QVERIFY(sensor.reading() != 0); quint64 timestamp = sensor.reading()->timestamp(); - QVERIFY(timestamp == qtimestamp()); + QVERIFY(timestamp == quint64()); sensor.setProperty("doThis", "setOne"); sensor.start(); timestamp = sensor.reading()->timestamp(); @@ -509,13 +509,13 @@ private slots: sensor.setProperty("doThis", "setOne"); sensor.start(); - QCOMPARE(sensor.reading()->timestamp(), qtimestamp(1)); + QCOMPARE(sensor.reading()->timestamp(), quint64(1)); QCOMPARE(sensor.reading()->test(), 1); sensor.stop(); sensor.setProperty("doThis", "setTwo"); sensor.start(); - QCOMPARE(sensor.reading()->timestamp(), qtimestamp(2)); + QCOMPARE(sensor.reading()->timestamp(), quint64(2)); QCOMPARE(sensor.reading()->test(), 2); sensor.stop(); } @@ -889,13 +889,13 @@ private slots: sensor.setProperty("doThis", "setOne"); sensor.start(); - QCOMPARE(sensor.reading()->timestamp(), qtimestamp(1)); + QCOMPARE(sensor.reading()->timestamp(), quint64(1)); QCOMPARE(sensor.reading()->test(), 1); sensor.stop(); sensor.setProperty("doThis", "setTwo"); sensor.start(); - QCOMPARE(sensor.reading()->timestamp(), qtimestamp(2)); + QCOMPARE(sensor.reading()->timestamp(), quint64(2)); QCOMPARE(sensor.reading()->test(), 2); sensor.stop(); } diff --git a/tests/manual/sensor_explorer/explorer.cpp b/tests/manual/sensor_explorer/explorer.cpp index 31308379..d16908e8 100644 --- a/tests/manual/sensor_explorer/explorer.cpp +++ b/tests/manual/sensor_explorer/explorer.cpp @@ -389,9 +389,7 @@ bool Explorer::filter(QSensorReading *reading) QLatin1String name(mo->property(i).name()); QTableWidgetItem *value = ui.reading->item(row, 3); QVariant val = mo->property(i).read(reading); - if (typeName == "qtimestamp") { - value->setText(QString("%1").arg(val.value<qtimestamp>())); - } else if (typeName == "LightLevel") { + if (typeName == "LightLevel") { QString text; switch (val.toInt()) { case 1: |