summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Wilson <alex.wilson@nokia.com>2012-05-14 17:39:49 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-15 06:04:02 +0200
commitad49d485cfc92164f491ff3d6ed41a16ea7085c5 (patch)
tree4509dab34dfedf46f02c6a14c0e938765c60a5d9 /tests
parent91fef5b781609a0ccbccb9d282148fc04feca585 (diff)
downloadqtlocation-ad49d485cfc92164f491ff3d6ed41a16ea7085c5.tar.gz
Coding style fixes: use true/false rather than TRUE/FALSE macros
C-style bool macros are considered obselete. Change-Id: I6090f3509b1852fd14e1ac57a3a9fa3b3abe6e08 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp8
-rw-r--r--tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
index 8c715672..6039f431 100644
--- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
+++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
@@ -142,7 +142,7 @@ private slots:
{
monitor = QGeoAreaMonitor::createDefaultMonitor(0);
QVERIFY(monitor != 0);
- QVERIFY(monitor->center().isValid() == FALSE);
+ QVERIFY(monitor->center().isValid() == false);
}
//TC_ID_4_x_1
@@ -172,9 +172,9 @@ private slots:
QTest::addColumn<QGeoCoordinate>("coord");
QTest::addColumn<bool>("validity");
- QTest::newRow("valid coordinate") << QGeoCoordinate(34.56, -12.4, 56) << TRUE; //TC_ID_4_x_1
- QTest::newRow("invalid coordinate") << QGeoCoordinate(173.2, -195.8) << FALSE; //TC_ID_4_x_2
- QTest::newRow("uninitialised coordinate") << QGeoCoordinate() << FALSE; //TC_ID_4_x_3
+ QTest::newRow("valid coordinate") << QGeoCoordinate(34.56, -12.4, 56) << true; //TC_ID_4_x_1
+ QTest::newRow("invalid coordinate") << QGeoCoordinate(173.2, -195.8) << false; //TC_ID_4_x_2
+ QTest::newRow("uninitialised coordinate") << QGeoCoordinate() << false; //TC_ID_4_x_3
}
void setCenter_twice()
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
index 44c871d0..c6170ce9 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
@@ -383,7 +383,7 @@ void TestQGeoPositionInfoSource::lastKnownPosition()
QCOMPARE(isNaN1, isNaN2);
if (!isNaN1) {
QCOMPARE(qFuzzyCompare(info.attribute(QGeoPositionInfo::HorizontalAccuracy),
- lastPositioninfo.attribute(QGeoPositionInfo::HorizontalAccuracy)), TRUE);
+ lastPositioninfo.attribute(QGeoPositionInfo::HorizontalAccuracy)), true);
}
}
@@ -396,7 +396,7 @@ void TestQGeoPositionInfoSource::lastKnownPosition()
QCOMPARE(isNaN1, isNaN2);
if (!isNaN1) {
QCOMPARE(qFuzzyCompare(info.attribute(QGeoPositionInfo::VerticalAccuracy),
- lastPositioninfo.attribute(QGeoPositionInfo::VerticalAccuracy)), TRUE);
+ lastPositioninfo.attribute(QGeoPositionInfo::VerticalAccuracy)), true);
}
}
}