Replace Q_NULLPTR with nullptr

Change-Id: Icbebfaae93cc5827d80ef09323ec82868789838a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

35 files changed, 49 insertions, 49 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index c5d01ebd..9f53c4d8 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -342,7 +342,7 @@ static QDeclarativeGeoMapType *findMapType(const QList<QDeclarativeGeoMapType *>
     for (int i = 0; i < types.size(); ++i)
         if (types[i]->mapType() == type)
             return types[i];
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void QDeclarativeGeoMap::onSupportedMapTypesChanged()
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
index 1a8489eb..3e68ac97 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
@@ -123,7 +123,7 @@ void QDeclarativeGeoMapCopyrightNotice::setMapSource(QDeclarativeGeoMap *mapSour
         m_mapSource->m_map->disconnect(this);
         m_copyrightsHtml->clear();
         m_copyrightsImage = QImage();
-        m_mapSource = Q_NULLPTR;
+        m_mapSource = nullptr;
     }
 
     if (mapSource) {
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
index ade05c22..7189e65c 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
@@ -66,7 +66,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuic
     Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet NOTIFY styleSheetChanged)
 
 public:
-    QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent = Q_NULLPTR);
+    QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent = nullptr);
     ~QDeclarativeGeoMapCopyrightNotice();
 
     void setCopyrightsZ(int copyrightsZ);
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index 2add07dd..13768411 100644
--- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -113,7 +113,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProvider : public QObject,
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeGeoServiceProvider(QObject *parent = Q_NULLPTR);
+    explicit QDeclarativeGeoServiceProvider(QObject *parent = nullptr);
     ~QDeclarativeGeoServiceProvider();
 
     enum RoutingFeature {
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index c92bc606..c41e740d 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -63,7 +63,7 @@ public:
         UnknownError
     };
 
-    explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = nullptr);
     virtual ~QGeoCodeReply();
 
     bool isFinished() const;
@@ -84,7 +84,7 @@ Q_SIGNALS:
     void error(QGeoCodeReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QGeoCodeReply(QObject *parent = Q_NULLPTR);
+    explicit QGeoCodeReply(QObject *parent = nullptr);
 
     void setError(Error error, const QString &errorString);
     void setFinished(bool finished);
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index eb366f68..0d89b054 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -78,7 +78,7 @@ Q_SIGNALS:
     void error(QGeoCodeReply *reply, QGeoCodeReply::Error error, QString errorString = QString());
 
 private:
-    explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = nullptr);
 
     QGeoCodingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoCodingManager)
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index ce7021a0..eb3bd147 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -51,7 +51,7 @@ class Q_LOCATION_EXPORT QGeoCodingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    explicit QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QGeoCodingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qgeorouteparser_p.h b/src/location/maps/qgeorouteparser_p.h
index 3d966d65..33c3a4db 100644
--- a/src/location/maps/qgeorouteparser_p.h
+++ b/src/location/maps/qgeorouteparser_p.h
@@ -68,7 +68,7 @@ public:
     QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const;
 
 protected:
-    QGeoRouteParser(QGeoRouteParserPrivate &dd, QObject *parent = Q_NULLPTR);
+    QGeoRouteParser(QGeoRouteParserPrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DISABLE_COPY(QGeoRouteParser)
diff --git a/src/location/maps/qgeorouteparserosrmv4_p.h b/src/location/maps/qgeorouteparserosrmv4_p.h
index 97bb43ea..d58c0547 100644
--- a/src/location/maps/qgeorouteparserosrmv4_p.h
+++ b/src/location/maps/qgeorouteparserosrmv4_p.h
@@ -60,7 +60,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV4 : public QGeoRouteParser
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV4)
 
 public:
-    QGeoRouteParserOsrmV4(QObject *parent = Q_NULLPTR);
+    QGeoRouteParserOsrmV4(QObject *parent = nullptr);
     virtual ~QGeoRouteParserOsrmV4();
 
 private:
diff --git a/src/location/maps/qgeorouteparserosrmv5_p.h b/src/location/maps/qgeorouteparserosrmv5_p.h
index c6ad0367..598dcde7 100644
--- a/src/location/maps/qgeorouteparserosrmv5_p.h
+++ b/src/location/maps/qgeorouteparserosrmv5_p.h
@@ -60,7 +60,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV5)
 
 public:
-    QGeoRouteParserOsrmV5(QObject *parent = Q_NULLPTR, bool useServerText = false);
+    QGeoRouteParserOsrmV5(QObject *parent = nullptr, bool useServerText = false);
     virtual ~QGeoRouteParserOsrmV5();
 
     void setAccessToken(const QString &token);
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index c1d6e8d1..f873b999 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -60,7 +60,7 @@ public:
         UnknownError
     };
 
-    explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
+    explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = nullptr);
     virtual ~QGeoRouteReply();
 
     bool isFinished() const;
@@ -78,7 +78,7 @@ Q_SIGNALS:
     void error(QGeoRouteReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = Q_NULLPTR);
+    explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = nullptr);
 
     void setError(Error error, const QString &errorString);
     void setFinished(bool finished);
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 56cd8e51..dd622385 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
 
 private:
-    explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = nullptr);
 
     QGeoRoutingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoRoutingManager)
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 21aef7ce..18356b7e 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -51,7 +51,7 @@ class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    explicit QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QGeoRoutingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qnavigationmanagerengine_p.h b/src/location/maps/qnavigationmanagerengine_p.h
index 5b8bd185..0aa5509e 100644
--- a/src/location/maps/qnavigationmanagerengine_p.h
+++ b/src/location/maps/qnavigationmanagerengine_p.h
@@ -64,7 +64,7 @@ class Q_LOCATION_PRIVATE_EXPORT QNavigationManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    explicit QNavigationManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QNavigationManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QNavigationManagerEngine();
 
     void setManagerName(const QString &name);
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index fa96a0e2..929d3384 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit QPlaceContentReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceContentReply(QObject *parent = nullptr);
     virtual ~QPlaceContentReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 09593a1e..6c3acca7 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceDetailsReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceDetailsReply(QObject *parent = nullptr);
     virtual ~QPlaceDetailsReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index ea44828b..6ecf12c8 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -55,7 +55,7 @@ public:
         RemoveCategory
     };
 
-    explicit QPlaceIdReply(OperationType operationType, QObject *parent = Q_NULLPTR);
+    explicit QPlaceIdReply(OperationType operationType, QObject *parent = nullptr);
     virtual ~QPlaceIdReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index bd4b1676..146bdd02 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
     void dataChanged();
 
 private:
-    explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = nullptr);
     Q_DISABLE_COPY(QPlaceManager)
 
     QPlaceManagerEngine *d;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 0c11278f..9528cc22 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -53,7 +53,7 @@ class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
     Q_OBJECT
 
 public:
-    explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QPlaceManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index df4b3fda..8e195663 100644
--- a/src/location/places/qplacematchreply.h
+++ b/src/location/places/qplacematchreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceMatchReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceMatchReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceMatchReply(QObject *parent = nullptr);
     ~QPlaceMatchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 3eb3d6cc..8fd34643 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -71,7 +71,7 @@ public:
         MatchReply
     };
 
-    explicit QPlaceReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceReply(QObject *parent = nullptr);
     ~QPlaceReply();
 
     bool isFinished() const;
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void error(QPlaceReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = Q_NULLPTR);
+    explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = nullptr);
     void setFinished(bool finished);
     void setError(QPlaceReply::Error error, const QString &errorString);
     QPlaceReplyPrivate *d_ptr;
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 52c88899..3562aede 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceSearchReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceSearchReply(QObject *parent = nullptr);
     ~QPlaceSearchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index 3909b14f..49088874 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchSuggestionReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceSearchSuggestionReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceSearchSuggestionReply(QObject *parent = nullptr);
     ~QPlaceSearchSuggestionReply();
 
     QStringList suggestions() const;
diff --git a/src/plugins/geoservices/esri/geocodereply_esri.h b/src/plugins/geoservices/esri/geocodereply_esri.h
index a857599b..76b416ce 100644
--- a/src/plugins/geoservices/esri/geocodereply_esri.h
+++ b/src/plugins/geoservices/esri/geocodereply_esri.h
@@ -57,7 +57,7 @@ public:
     };
 
 public:
-    GeoCodeReplyEsri(QNetworkReply *reply, OperationType operationType, QObject *parent = Q_NULLPTR);
+    GeoCodeReplyEsri(QNetworkReply *reply, OperationType operationType, QObject *parent = nullptr);
     ~GeoCodeReplyEsri();
 
     inline OperationType operationType() const;
diff --git a/src/plugins/geoservices/esri/georoutereply_esri.h b/src/plugins/geoservices/esri/georoutereply_esri.h
index 049dc3ba..960c90de 100644
--- a/src/plugins/geoservices/esri/georoutereply_esri.h
+++ b/src/plugins/geoservices/esri/georoutereply_esri.h
@@ -50,7 +50,7 @@ class GeoRouteReplyEsri : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    GeoRouteReplyEsri(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = Q_NULLPTR);
+    GeoRouteReplyEsri(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = nullptr);
     ~GeoRouteReplyEsri();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
index 5277cde3..0a54e008 100644
--- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
+++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
@@ -80,7 +80,7 @@ QPlaceManagerEngine *GeoServiceProviderFactoryEsri::createPlaceManagerEngine(
     Q_UNUSED(error)
     Q_UNUSED(errorString)
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geotiledmap_esri.h b/src/plugins/geoservices/esri/geotiledmap_esri.h
index 07f461d2..e8b26152 100644
--- a/src/plugins/geoservices/esri/geotiledmap_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmap_esri.h
@@ -51,7 +51,7 @@ class GeoTiledMapEsri: public QGeoTiledMap
     Q_OBJECT
 
 public:
-    explicit GeoTiledMapEsri(GeoTiledMappingManagerEngineEsri *engine, QObject *parent = Q_NULLPTR);
+    explicit GeoTiledMapEsri(GeoTiledMappingManagerEngineEsri *engine, QObject *parent = nullptr);
     virtual ~GeoTiledMapEsri();
 
 protected:
diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
index ac8f8450..3fa9a177 100644
--- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
+++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
@@ -298,7 +298,7 @@ GeoMapSource *GeoTiledMappingManagerEngineEsri::mapSource(int mapId) const
             return mapSource;
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geotiledmapreply_esri.h b/src/plugins/geoservices/esri/geotiledmapreply_esri.h
index b459e943..572431dd 100644
--- a/src/plugins/geoservices/esri/geotiledmapreply_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmapreply_esri.h
@@ -51,7 +51,7 @@ class GeoTiledMapReplyEsri : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    GeoTiledMapReplyEsri(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = Q_NULLPTR);
+    GeoTiledMapReplyEsri(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = nullptr);
     ~GeoTiledMapReplyEsri();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
index 8c5778d1..135654a9 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
@@ -146,14 +146,14 @@ QGeoTiledMapReply *QGeoTileFetcherOsm::getTileImage(const QGeoTileSpec &spec)
     if (id < 1 || id > m_providers.size()) {
         qWarning("Unknown map id %d\n", spec.mapId());
         if (m_providers.isEmpty())
-            return Q_NULLPTR;
+            return nullptr;
         else
             id = 1;
     }
     id -= 1; // TODO: make OSM map ids start from 0.
 
     if (spec.zoom() > m_providers[id]->maximumZoomLevel() || spec.zoom() < m_providers[id]->minimumZoomLevel())
-        return Q_NULLPTR;
+        return nullptr;
 
     const QUrl url = m_providers[id]->tileAddress(spec.x(), spec.y(), spec.zoom());
     QNetworkRequest request;
diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
index 1d1a6f4f..58092ea3 100644
--- a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
+++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
@@ -111,17 +111,17 @@ NmeaSource::NmeaSource(QObject *parent)
 QGeoPositionInfoSource *QGeoPositionInfoSourceFactorySerialNmea::positionInfoSource(QObject *parent)
 {
     QScopedPointer<NmeaSource> src(new NmeaSource(parent));
-    return src->isValid() ? src.take() : Q_NULLPTR;
+    return src->isValid() ? src.take() : nullptr;
 }
 
 QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactorySerialNmea::satelliteInfoSource(QObject *parent)
 {
     Q_UNUSED(parent);
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QGeoAreaMonitorSource *QGeoPositionInfoSourceFactorySerialNmea::areaMonitor(QObject *parent)
 {
     Q_UNUSED(parent);
-    return Q_NULLPTR;
+    return nullptr;
 }
diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h
index 77b3e5b9..aaa0b27b 100644
--- a/src/positioning/qdoublematrix4x4_p.h
+++ b/src/positioning/qdoublematrix4x4_p.h
@@ -89,7 +89,7 @@ public:
     inline void fill(double value);
 
     double determinant() const;
-    QDoubleMatrix4x4 inverted(bool *invertible = Q_NULLPTR) const;
+    QDoubleMatrix4x4 inverted(bool *invertible = nullptr) const;
     QDoubleMatrix4x4 transposed() const;
 
     inline QDoubleMatrix4x4& operator+=(const QDoubleMatrix4x4& other);
diff --git a/src/positioning/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h
index d951f577..6bbc7181 100644
--- a/src/positioning/qnmeapositioninfosource.h
+++ b/src/positioning/qnmeapositioninfosource.h
@@ -55,7 +55,7 @@ public:
         SimulationMode
     };
 
-    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = Q_NULLPTR);
+    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = nullptr);
     ~QNmeaPositionInfoSource();
 
     void setUserEquivalentRangeError(double uere);
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);