diff options
Diffstat (limited to 'tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp')
-rw-r--r-- | tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp b/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp index c21608b3..e0c581ab 100644 --- a/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp +++ b/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp @@ -156,38 +156,38 @@ void tst_QGeoServiceProvider::tst_features() QCOMPARE(provider.placesFeatures(), placeFeatures); if (provider.mappingFeatures() == QGeoServiceProvider::NoMappingFeatures) { - QVERIFY(provider.mappingManager() == Q_NULLPTR); + QVERIFY(provider.mappingManager() == nullptr); } else { // some plugins require token/access parameter // they return 0 but set QGeoServiceProvider::MissingRequiredParameterError - if (provider.mappingManager() != Q_NULLPTR) + if (provider.mappingManager() != nullptr) QCOMPARE(provider.error(), QGeoServiceProvider::NoError); else QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError); } if (provider.geocodingFeatures() == QGeoServiceProvider::NoGeocodingFeatures) { - QVERIFY(provider.geocodingManager() == Q_NULLPTR); + QVERIFY(provider.geocodingManager() == nullptr); } else { - if (provider.geocodingManager() != Q_NULLPTR) - QVERIFY(provider.geocodingManager() != Q_NULLPTR); //pointless but we want a VERIFY here + if (provider.geocodingManager() != nullptr) + QVERIFY(provider.geocodingManager() != nullptr); //pointless but we want a VERIFY here else QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError); } if (provider.routingFeatures() == QGeoServiceProvider::NoRoutingFeatures) { - QVERIFY(provider.routingManager() == Q_NULLPTR); + QVERIFY(provider.routingManager() == nullptr); } else { - if (provider.routingManager() != Q_NULLPTR) + if (provider.routingManager() != nullptr) QCOMPARE(provider.error(), QGeoServiceProvider::NoError); else QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError); } if (provider.placesFeatures() == QGeoServiceProvider::NoPlacesFeatures) { - QVERIFY(provider.placeManager() == Q_NULLPTR); + QVERIFY(provider.placeManager() == nullptr); } else { - if (provider.placeManager() != Q_NULLPTR) + if (provider.placeManager() != nullptr) QCOMPARE(provider.error(), QGeoServiceProvider::NoError); else QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError); |