Replace Q_NULLPTR with nullptr

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

7 files changed, 8 insertions, 8 deletions

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;