diff options
| author | Kevin Funk <kfunk@kde.org> | 2018-01-31 14:35:47 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2018-02-05 13:14:53 +0000 |
| commit | 5c4c0cb58e29944bb7b01105a1f6a7a8a2d90369 (patch) | |
| tree | 767bea03ffa6f2a26d57ee6acbe42e6766576575 /tests | |
| parent | b4807a11e816feaa3b541b4e4b02f77c1fafbf48 (diff) | |
| download | qtlocation-5c4c0cb58e29944bb7b01105a1f6a7a8a2d90369.tar.gz | |
Replace Q_NULLPTR with nullptr
Change-Id: Icbebfaae93cc5827d80ef09323ec82868789838a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp | 18 | ||||
| -rw-r--r-- | tests/plugins/declarativetestplugin/testhelper.h | 2 |
2 files changed, 10 insertions, 10 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); diff --git a/tests/plugins/declarativetestplugin/testhelper.h b/tests/plugins/declarativetestplugin/testhelper.h index 83cb4721..164d183b 100644 --- a/tests/plugins/declarativetestplugin/testhelper.h +++ b/tests/plugins/declarativetestplugin/testhelper.h @@ -41,7 +41,7 @@ class TestHelper: public QObject { Q_OBJECT public: - TestHelper(QObject *parent = Q_NULLPTR):QObject(parent){} + TestHelper(QObject *parent = nullptr):QObject(parent){} Q_INVOKABLE bool waitForPolished(QQuickItem *item, int timeout = 10000) const { QSignalSpy spy(item->window(), &QQuickWindow::afterAnimating); |