diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp index c715acd8..37a93b1c 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp @@ -311,7 +311,7 @@ int QGeoPositionInfoSourceGeoclueMaster::configurePositionSource() if (!geoclue_master_client_set_requirements (m_client, m_preferredAccuracy, // min_accuracy 0, // min_time - TRUE, // require_updates (signals) + true, // require_updates (signals) m_preferredResources, &error)){ qCritical ("QGeoPositionInfoSourceGeoclueMaster geoclue set_requirements failed."); 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); } } } |