summaryrefslogtreecommitdiff
path: root/tests/auto/sensors2qmlapi
diff options
context:
space:
mode:
authorWolfgang Beck <wolfgang.beck@nokia.com>2012-01-19 10:14:00 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-19 04:30:59 +0100
commitecbca762a7390ee255593f932c90b5abd4318ece (patch)
tree3180aa3660d07041cbdd197884d3821e6dd3a5a0 /tests/auto/sensors2qmlapi
parenta5e25459c631bad6cd2834a78080b50e429fa261 (diff)
downloadqtsensors-ecbca762a7390ee255593f932c90b5abd4318ece.tar.gz
Remove friend class tst_Sesnsors2QMLAPI
Change-Id: I24772c90fc20cd02d6b442b5e80bddc226a736ee Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'tests/auto/sensors2qmlapi')
-rw-r--r--tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
index 00ee95e..4983b67 100644
--- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
+++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
@@ -428,48 +428,48 @@ void tst_Sensors2QMLAPI::testTiltRunningMode()
if (!_tilt)
_tilt = new QSensor2Tilt(this);
QDeclAccelerometer* accel = _plugin.stAccel;
- QCOMPARE(_tilt->_dataRate.count(), 0);
+ QCOMPARE(_tilt->dataRate().count(), 0);
accel->addDataRate(13, 15);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 13);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 13);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 15);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 13);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 13);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 15);
accel->addDataRate(1, 8);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 8);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 15);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 8);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 15);
accel->addDataRate(11, 12);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 11);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 15);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 11);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 15);
accel->addDataRate(13, 18);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 11);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 18);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 11);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 18);
accel->addDataRate(21, 31);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 11);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 21);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 11);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 21);
accel->addDataRate(19, 20);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 11);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 20);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 11);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 20);
accel->addDataRate(9, 10);
_tilt->createRunModeDataRateMap();
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Slow), 2);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Medium), 10);
- QCOMPARE(_tilt->_dataRate.value(QSensor2Tilt::Fast), 20);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Slow), 2);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Medium), 10);
+ QCOMPARE(_tilt->dataRate().value(QSensor2Tilt::Fast), 20);
QSensor2Tilt::Speed speed = static_cast<QSensor2Tilt::Speed>(_tilt->property("speed").toInt());
QCOMPARE(speed, QSensor2Tilt::Slow);