Cleanup: More nullptr instead of 0

Change-Id: I6316384be07f1d0634860c3ddcbe85455e218fed
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 8f057784da92ee46c0fc64220aeb19aec0a6389e)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

69 files changed, 102 insertions, 94 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 5365e17b..3dcc9427 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -86,7 +86,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
+    QtLocationDeclarativeModule(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
     void registerTypes(const char *uri) override
     {
         if (QLatin1String(uri) == QLatin1String("QtLocation")) {
diff --git a/src/imports/locationlabs/locationlabssingleton_p.h b/src/imports/locationlabs/locationlabssingleton_p.h
index 42f4a21c..2d5accab 100644
--- a/src/imports/locationlabs/locationlabssingleton_p.h
+++ b/src/imports/locationlabs/locationlabssingleton_p.h
@@ -60,7 +60,7 @@ class LocationLabsSingleton : public QObject
     Q_OBJECT
 
 public:
-    explicit LocationLabsSingleton(QObject *parent = 0);
+    explicit LocationLabsSingleton(QObject *parent = nullptr);
 
     Q_INVOKABLE QList<QObject *> mapObjectsAt(const QGeoCoordinate &coordinate, QDeclarativeGeoMap *map) const;
 };
diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
index 134874c5..95385fb1 100644
--- a/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
@@ -115,7 +115,7 @@ public:
         LocationRole = Qt::UserRole + 1
     };
 
-    explicit QDeclarativeGeocodeModel(QObject *parent = 0);
+    explicit QDeclarativeGeocodeModel(QObject *parent = nullptr);
     virtual ~QDeclarativeGeocodeModel();
 
     // From QQmlParserStatus
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index 721406c7..cd3b6254 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -112,7 +112,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMap : public QQuickItem
 
 public:
 
-    explicit QDeclarativeGeoMap(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMap(QQuickItem *parent = nullptr);
     ~QDeclarativeGeoMap();
 
     void setPlugin(QDeclarativeGeoServiceProvider *plugin);
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
index 39a269f3..8031a204 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
@@ -86,7 +86,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemBase : public QQuickItem
     Q_PROPERTY(int lodThreshold READ lodThreshold WRITE setLodThreshold NOTIFY lodThresholdChanged REVISION 15)
 
 public:
-    explicit QDeclarativeGeoMapItemBase(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapItemBase(QQuickItem *parent = nullptr);
     virtual ~QDeclarativeGeoMapItemBase();
 
     virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map);
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h b/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
index 96ef18d7..c3e997ad 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
@@ -62,7 +62,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemGroup : public QQuickItem
 {
     Q_OBJECT
 public:
-    explicit QDeclarativeGeoMapItemGroup(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapItemGroup(QQuickItem *parent = nullptr);
     virtual ~QDeclarativeGeoMapItemGroup();
 
     void setParentGroup(QDeclarativeGeoMapItemGroup &parentGroup);
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
index 0b5e1274..25c54d48 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
@@ -90,7 +90,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemView : public QDeclarative
     Q_PROPERTY(bool incubateDelegates READ incubateDelegates WRITE setIncubateDelegates NOTIFY incubateDelegatesChanged REVISION 12)
 
 public:
-    explicit QDeclarativeGeoMapItemView(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapItemView(QQuickItem *parent = nullptr);
     ~QDeclarativeGeoMapItemView();
 
     QVariant model() const;
diff --git a/src/location/declarativemaps/qdeclarativegeomapparameter_p.h b/src/location/declarativemaps/qdeclarativegeomapparameter_p.h
index 994baccc..04ca3f64 100644
--- a/src/location/declarativemaps/qdeclarativegeomapparameter_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapparameter_p.h
@@ -64,7 +64,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapParameter : public QGeoMapPara
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeGeoMapParameter(QObject *parent = 0);
+    explicit QDeclarativeGeoMapParameter(QObject *parent = nullptr);
     virtual ~QDeclarativeGeoMapParameter();
 
     bool isComponentComplete() const;
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
index 4ffd5af6..b8e093af 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
@@ -82,7 +82,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapQuickItem : public QDeclarativ
     Q_PROPERTY(QQuickItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
 
 public:
-    explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = nullptr);
     ~QDeclarativeGeoMapQuickItem();
 
     void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
diff --git a/src/location/declarativemaps/qdeclarativegeomaptype_p.h b/src/location/declarativemaps/qdeclarativegeomaptype_p.h
index 7ef96d7b..a4ed7cf0 100644
--- a/src/location/declarativemaps/qdeclarativegeomaptype_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomaptype_p.h
@@ -89,7 +89,7 @@ public:
         CustomMap = 100
     };
 
-    QDeclarativeGeoMapType(const QGeoMapType &mapType, QObject *parent = 0);
+    QDeclarativeGeoMapType(const QGeoMapType &mapType, QObject *parent = nullptr);
     ~QDeclarativeGeoMapType();
 
     MapStyle style() const;
diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h
index 30264833..711cde44 100644
--- a/src/location/declarativemaps/qdeclarativegeoroute_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h
@@ -79,8 +79,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
     Q_PROPERTY(QObject *extendedAttributes READ extendedAttributes CONSTANT REVISION 13)
 
 public:
-    explicit QDeclarativeGeoRoute(QObject *parent = 0);
-    QDeclarativeGeoRoute(const QGeoRoute &route, QObject *parent = 0);
+    explicit QDeclarativeGeoRoute(QObject *parent = nullptr);
+    QDeclarativeGeoRoute(const QGeoRoute &route, QObject *parent = nullptr);
     ~QDeclarativeGeoRoute();
 
     QGeoRectangle bounds() const;
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index cc074e9f..19d2c6f0 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -115,7 +115,7 @@ public:
         MissingRequiredParameterError
     };
 
-    explicit QDeclarativeGeoRouteModel(QObject *parent = 0);
+    explicit QDeclarativeGeoRouteModel(QObject *parent = nullptr);
     ~QDeclarativeGeoRouteModel();
 
     // From QQmlParserStatus
@@ -206,7 +206,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoWaypoint : public QGeoCoordinateO
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    QDeclarativeGeoWaypoint(QObject *parent = 0);
+    QDeclarativeGeoWaypoint(QObject *parent = nullptr);
     virtual ~QDeclarativeGeoWaypoint();
 
     bool operator==(const QDeclarativeGeoWaypoint &other) const;
@@ -303,8 +303,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteQuery : public QObject, publ
 
 public:
 
-    explicit QDeclarativeGeoRouteQuery(QObject *parent = 0);
-    QDeclarativeGeoRouteQuery(const QGeoRouteRequest &request, QObject *parent = 0); // init from request. For instances intended to be read only
+    explicit QDeclarativeGeoRouteQuery(QObject *parent = nullptr);
+    QDeclarativeGeoRouteQuery(const QGeoRouteRequest &request, QObject *parent = nullptr); // init from request. For instances intended to be read only
     ~QDeclarativeGeoRouteQuery();
 
     // From QQmlParserStatus
diff --git a/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h b/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h
index a531b022..758542c3 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h
@@ -70,8 +70,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteSegment : public QObject
     Q_PROPERTY(QGeoManeuver maneuver READ maneuver CONSTANT)
 
 public:
-    explicit QDeclarativeGeoRouteSegment(QObject *parent = 0);
-    QDeclarativeGeoRouteSegment(const QGeoRouteSegment &segment, QObject *parent = 0);
+    explicit QDeclarativeGeoRouteSegment(QObject *parent = nullptr);
+    QDeclarativeGeoRouteSegment(const QGeoRouteSegment &segment, QObject *parent = nullptr);
     ~QDeclarativeGeoRouteSegment();
 
     int travelTime() const;
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index d2c56c0b..28df81da 100644
--- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -237,7 +237,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProviderRequirements : pub
                NOTIFY navigationRequirementsChanged)
 
 public:
-    explicit QDeclarativeGeoServiceProviderRequirements(QObject *parent = 0);
+    explicit QDeclarativeGeoServiceProviderRequirements(QObject *parent = nullptr);
     ~QDeclarativeGeoServiceProviderRequirements();
 
     QDeclarativeGeoServiceProvider::MappingFeatures mappingRequirements() const;
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index a754fa5e..238bc49c 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -71,7 +71,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeMapLineProperties : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
-    explicit QDeclarativeMapLineProperties(QObject *parent = 0);
+    explicit QDeclarativeMapLineProperties(QObject *parent = nullptr);
 
     QColor color() const;
     void setColor(const QColor &color);
@@ -105,7 +105,7 @@ public:
         OpenGLExtruded = 2,
     };
 
-    explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativePolylineMapItem(QQuickItem *parent = nullptr);
     ~QDeclarativePolylineMapItem();
 
     void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
diff --git a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
index 7e8d9667..bf2fc7e2 100644
--- a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
@@ -71,7 +71,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRouteMapItem : public QDeclarativePo
     Q_PROPERTY(QDeclarativeGeoRoute *route READ route WRITE setRoute NOTIFY routeChanged)
 
 public:
-    explicit QDeclarativeRouteMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativeRouteMapItem(QQuickItem *parent = nullptr);
     ~QDeclarativeRouteMapItem();
 
     QDeclarativeGeoRoute *route() const;
diff --git a/src/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h
index 57fb49b5..413342f3 100644
--- a/src/location/declarativeplaces/qdeclarativecategory_p.h
+++ b/src/location/declarativeplaces/qdeclarativecategory_p.h
@@ -86,8 +86,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCategory : public QObject, public QQ
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeCategory(QObject *parent = 0);
-    QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0);
+    explicit QDeclarativeCategory(QObject *parent = nullptr);
+    QDeclarativeCategory(const QPlaceCategory &category, QDeclarativeGeoServiceProvider *plugin, QObject *parent = nullptr);
     ~QDeclarativeCategory();
 
     enum Visibility {
diff --git a/src/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h
index 33e60bb5..8ffbc0e7 100644
--- a/src/location/declarativeplaces/qdeclarativecontactdetail_p.h
+++ b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h
@@ -64,7 +64,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetails : public QQmlProperty
     Q_OBJECT
 
 public:
-    explicit QDeclarativeContactDetails(QObject *parent = 0);
+    explicit QDeclarativeContactDetails(QObject *parent = nullptr);
     QVariant updateValue(const QString &key, const QVariant &input) override;
 };
 
@@ -77,8 +77,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetail : public QObject
     Q_PROPERTY(QString value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    explicit QDeclarativeContactDetail(QObject *parent = 0);
-    explicit QDeclarativeContactDetail(const QPlaceContactDetail &src, QObject *parent = 0);
+    explicit QDeclarativeContactDetail(QObject *parent = nullptr);
+    explicit QDeclarativeContactDetail(const QPlaceContactDetail &src, QObject *parent = nullptr);
     ~QDeclarativeContactDetail();
 
     QPlaceContactDetail contactDetail() const;
diff --git a/src/location/declarativeplaces/qdeclarativeplace_p.h b/src/location/declarativeplaces/qdeclarativeplace_p.h
index c54e3ddf..f5ac8a27 100644
--- a/src/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplace_p.h
@@ -111,8 +111,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlace : public QObject, public QQmlP
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativePlace(QObject *parent = 0);
-    QDeclarativePlace(const QPlace &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0);
+    explicit QDeclarativePlace(QObject *parent = nullptr);
+    QDeclarativePlace(const QPlace &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = nullptr);
     ~QDeclarativePlace();
 
     enum Status {Ready, Saving, Fetching, Removing, Error};
diff --git a/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h
index eb651106..af559bc0 100644
--- a/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h
@@ -69,8 +69,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceAttribute : public QObject
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
 
 public:
-    explicit QDeclarativePlaceAttribute(QObject *parent = 0);
-    explicit QDeclarativePlaceAttribute(const QPlaceAttribute &src, QObject *parent = 0);
+    explicit QDeclarativePlaceAttribute(QObject *parent = nullptr);
+    explicit QDeclarativePlaceAttribute(const QPlaceAttribute &src, QObject *parent = nullptr);
     ~QDeclarativePlaceAttribute();
 
     QPlaceAttribute attribute() const;
diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
index 0b48039c..bf9e85f8 100644
--- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
@@ -79,7 +79,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceContentModel : public QAbstract
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativePlaceContentModel(QPlaceContent::Type type, QObject *parent = 0);
+    explicit QDeclarativePlaceContentModel(QPlaceContent::Type type, QObject *parent = nullptr);
     ~QDeclarativePlaceContentModel();
 
     QDeclarativePlace *place() const;
diff --git a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
index 3f50686f..c545f519 100644
--- a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
@@ -61,7 +61,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceEditorialModel : public QDeclar
     Q_OBJECT
 
 public:
-    explicit QDeclarativePlaceEditorialModel(QObject *parent = 0);
+    explicit QDeclarativePlaceEditorialModel(QObject *parent = nullptr);
     ~QDeclarativePlaceEditorialModel();
 
     QVariant data(const QModelIndex &index, int role) const override;
diff --git a/src/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/location/declarativeplaces/qdeclarativeplaceicon_p.h
index ea3808e8..2500ef36 100644
--- a/src/location/declarativeplaces/qdeclarativeplaceicon_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceicon_p.h
@@ -73,8 +73,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceIcon : public QObject
     Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged)
 
 public:
-    explicit QDeclarativePlaceIcon(QObject *parent = 0);
-    QDeclarativePlaceIcon(const QPlaceIcon &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0);
+    explicit QDeclarativePlaceIcon(QObject *parent = nullptr);
+    QDeclarativePlaceIcon(const QPlaceIcon &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = nullptr);
     ~QDeclarativePlaceIcon();
 
     QPlaceIcon icon() const;
diff --git a/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
index 3e26c566..52155d3b 100644
--- a/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
@@ -63,7 +63,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceImageModel : public QDeclarativ
     Q_OBJECT
 
 public:
-    explicit QDeclarativePlaceImageModel(QObject *parent = 0);
+    explicit QDeclarativePlaceImageModel(QObject *parent = nullptr);
     ~QDeclarativePlaceImageModel();
 
     QVariant data(const QModelIndex &index, int role) const override;
diff --git a/src/location/declarativeplaces/qdeclarativeplaceuser_p.h b/src/location/declarativeplaces/qdeclarativeplaceuser_p.h
index 69f85167..14238e59 100644
--- a/src/location/declarativeplaces/qdeclarativeplaceuser_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceuser_p.h
@@ -67,8 +67,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceUser : public QObject
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 
 public:
-    explicit QDeclarativePlaceUser(QObject *parent = 0);
-    explicit QDeclarativePlaceUser(const QPlaceUser &src, QObject *parent = 0);
+    explicit QDeclarativePlaceUser(QObject *parent = nullptr);
+    explicit QDeclarativePlaceUser(const QPlaceUser &src, QObject *parent = nullptr);
     ~QDeclarativePlaceUser();
 
     QPlaceUser user() const;
diff --git a/src/location/declarativeplaces/qdeclarativeratings_p.h b/src/location/declarativeplaces/qdeclarativeratings_p.h
index b31aa83d..148f915e 100644
--- a/src/location/declarativeplaces/qdeclarativeratings_p.h
+++ b/src/location/declarativeplaces/qdeclarativeratings_p.h
@@ -69,8 +69,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRatings : public QObject
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
 
 public:
-    explicit QDeclarativeRatings(QObject *parent = 0);
-    explicit QDeclarativeRatings(const QPlaceRatings &src, QObject *parent = 0);
+    explicit QDeclarativeRatings(QObject *parent = nullptr);
+    explicit QDeclarativeRatings(const QPlaceRatings &src, QObject *parent = nullptr);
     ~QDeclarativeRatings();
 
     QPlaceRatings ratings() const;
diff --git a/src/location/declarativeplaces/qdeclarativereviewmodel_p.h b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h
index ec5aa549..63da95d6 100644
--- a/src/location/declarativeplaces/qdeclarativereviewmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h
@@ -61,7 +61,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeReviewModel : public QDeclarativePla
     Q_OBJECT
 
 public:
-    explicit QDeclarativeReviewModel(QObject *parent = 0);
+    explicit QDeclarativeReviewModel(QObject *parent = nullptr);
     ~QDeclarativeReviewModel();
 
     QVariant data(const QModelIndex &index, int role) const override;
diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
index c46639ae..f9683636 100644
--- a/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
@@ -89,7 +89,7 @@ public:
         Error
     };
 
-    explicit QDeclarativeSearchModelBase(QObject *parent = 0);
+    explicit QDeclarativeSearchModelBase(QObject *parent = nullptr);
     ~QDeclarativeSearchModelBase();
 
     QDeclarativeGeoServiceProvider *plugin() const;
diff --git a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index 4ecd36ec..636bf177 100644
--- a/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -92,7 +92,7 @@ public:
         LexicalPlaceNameHint = QPlaceSearchRequest::LexicalPlaceNameHint
     };
 
-    explicit QDeclarativeSearchResultModel(QObject *parent = 0);
+    explicit QDeclarativeSearchResultModel(QObject *parent = nullptr);
     ~QDeclarativeSearchResultModel();
 
     QString searchTerm() const;
diff --git a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
index f5b0415b..cb8c1da4 100644
--- a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
@@ -69,7 +69,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchSuggestionModel : public QDecl
     Q_PROPERTY(QStringList suggestions READ suggestions NOTIFY suggestionsChanged)
 
 public:
-    explicit QDeclarativeSearchSuggestionModel(QObject *parent = 0);
+    explicit QDeclarativeSearchSuggestionModel(QObject *parent = nullptr);
     ~QDeclarativeSearchSuggestionModel();
 
     QString searchTerm() const;
diff --git a/src/location/declarativeplaces/qdeclarativesupplier_p.h b/src/location/declarativeplaces/qdeclarativesupplier_p.h
index 0c807218..3be4b31a 100644
--- a/src/location/declarativeplaces/qdeclarativesupplier_p.h
+++ b/src/location/declarativeplaces/qdeclarativesupplier_p.h
@@ -75,8 +75,8 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSupplier : public QObject, public QQ
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeSupplier(QObject *parent = 0);
-    explicit QDeclarativeSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = 0);
+    explicit QDeclarativeSupplier(QObject *parent = nullptr);
+    explicit QDeclarativeSupplier(const QPlaceSupplier &src, QDeclarativeGeoServiceProvider *plugin, QObject *parent = nullptr);
     ~QDeclarativeSupplier();
 
     // From QQmlParserStatus
diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index 2686deeb..6ae71b08 100644
--- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -93,7 +93,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSupportedCategoriesModel : public QA
     Q_ENUMS(Roles) //The Roles enum is for internal usage only.
 
 public:
-    explicit QDeclarativeSupportedCategoriesModel(QObject *parent = 0);
+    explicit QDeclarativeSupportedCategoriesModel(QObject *parent = nullptr);
     virtual ~QDeclarativeSupportedCategoriesModel();
 
     // From QQmlParserStatus
diff --git a/src/location/maps/qabstractgeotilecache_p.h b/src/location/maps/qabstractgeotilecache_p.h
index 46a92254..a22ab9ab 100644
--- a/src/location/maps/qabstractgeotilecache_p.h
+++ b/src/location/maps/qabstractgeotilecache_p.h
@@ -130,7 +130,7 @@ public:
     static QString baseLocationCacheDirectory();
 
 protected:
-    QAbstractGeoTileCache(QObject *parent = 0);
+    QAbstractGeoTileCache(QObject *parent = nullptr);
     virtual void printStats() = 0;
 
     friend class QGeoTiledMappingManagerEngine;
diff --git a/src/location/maps/qgeofiletilecache_p.h b/src/location/maps/qgeofiletilecache_p.h
index d0e860e8..13c03393 100644
--- a/src/location/maps/qgeofiletilecache_p.h
+++ b/src/location/maps/qgeofiletilecache_p.h
@@ -93,7 +93,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoFileTileCache : public QAbstractGeoTileCache
 {
     Q_OBJECT
 public:
-    QGeoFileTileCache(const QString &directory = QString(), QObject *parent = 0);
+    QGeoFileTileCache(const QString &directory = QString(), QObject *parent = nullptr);
     ~QGeoFileTileCache();
 
     void setMaxDiskUsage(int diskUsage) override;
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 9d0c04ee..db9ca2d2 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -166,7 +166,7 @@ public:
     QRectF visibleArea() const;
 
 protected:
-    QGeoMap(QGeoMapPrivate &dd, QObject *parent = 0);
+    QGeoMap(QGeoMapPrivate &dd, QObject *parent = nullptr);
     void setCameraData(const QGeoCameraData &cameraData);
     void setCameraCapabilities(const QGeoCameraCapabilities &cameraCapabilities);
     virtual QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) = 0;
diff --git a/src/location/maps/qgeomapparameter_p.h b/src/location/maps/qgeomapparameter_p.h
index ab3bc9c3..b10ab648 100644
--- a/src/location/maps/qgeomapparameter_p.h
+++ b/src/location/maps/qgeomapparameter_p.h
@@ -64,8 +64,8 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoMapParameter : public QObject
 
     Q_PROPERTY(QString type READ type WRITE setType)
 public:
-    explicit QGeoMapParameter(QObject *parent = 0);
-    QGeoMapParameter(const QList<QPair<QLatin1String, QVariant>> &properties, QObject *parent = 0);
+    explicit QGeoMapParameter(QObject *parent = nullptr);
+    QGeoMapParameter(const QList<QPair<QLatin1String, QVariant>> &properties, QObject *parent = nullptr);
     virtual ~QGeoMapParameter();
 
     bool operator==(const QGeoMapParameter &other) const;
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index 053670ae..4ab095fe 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -91,7 +91,7 @@ Q_SIGNALS:
     void supportedMapTypesChanged();
 
 protected:
-    QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = 0);
+    QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = nullptr);
 
 private:
     QGeoMappingManagerPrivate *d_ptr;
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index a5b9463f..315ce557 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -75,7 +75,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoMappingManagerEngine : public QObject
     Q_OBJECT
 
 public:
-    explicit QGeoMappingManagerEngine(QObject *parent = 0);
+    explicit QGeoMappingManagerEngine(QObject *parent = nullptr);
     virtual ~QGeoMappingManagerEngine();
 
     virtual QGeoMap *createMap() = 0;
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index f46bf71a..5b3a6879 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -71,7 +71,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMappingManagerEngine : public QGeoMappi
     Q_OBJECT
 
 public:
-    explicit QGeoTiledMappingManagerEngine(QObject *parent = 0);
+    explicit QGeoTiledMappingManagerEngine(QObject *parent = nullptr);
     virtual ~QGeoTiledMappingManagerEngine();
 
     QGeoTileFetcher *tileFetcher();
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index 5b0cff0a..4d22e55b 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -72,8 +72,8 @@ public:
         UnknownError
     };
 
-    QGeoTiledMapReply(const QGeoTileSpec &spec, QObject *parent = 0);
-    QGeoTiledMapReply(Error error, const QString &errorString, QObject *parent = 0);
+    QGeoTiledMapReply(const QGeoTileSpec &spec, QObject *parent = nullptr);
+    QGeoTiledMapReply(Error error, const QString &errorString, QObject *parent = nullptr);
     virtual ~QGeoTiledMapReply();
 
     bool isFinished() const;
diff --git a/src/location/maps/qgeotiledmapscene_p.h b/src/location/maps/qgeotiledmapscene_p.h
index 5738b270..c41e56b9 100644
--- a/src/location/maps/qgeotiledmapscene_p.h
+++ b/src/location/maps/qgeotiledmapscene_p.h
@@ -68,7 +68,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapScene : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoTiledMapScene)
 public:
-    explicit QGeoTiledMapScene(QObject *parent = 0);
+    explicit QGeoTiledMapScene(QObject *parent = nullptr);
     virtual ~QGeoTiledMapScene();
 
     void setScreenSize(const QSize &size);
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index 4b0d1602..915c1031 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -193,7 +193,7 @@ class RetryFuture : public QObject
 {
     Q_OBJECT
 public:
-    RetryFuture(const QGeoTileSpec &tile, QGeoTiledMap *map, QGeoTiledMappingManagerEngine* engine, QObject *parent = 0);
+    RetryFuture(const QGeoTileSpec &tile, QGeoTiledMap *map, QGeoTiledMappingManagerEngine* engine, QObject *parent = nullptr);
 
 public Q_SLOTS:
     void retry();
diff --git a/src/plugins/geoservices/esri/placecategoriesreply_esri.h b/src/plugins/geoservices/esri/placecategoriesreply_esri.h
index 14efcfea..5093b9cd 100644
--- a/src/plugins/geoservices/esri/placecategoriesreply_esri.h
+++ b/src/plugins/geoservices/esri/placecategoriesreply_esri.h
@@ -49,7 +49,7 @@ class PlaceCategoriesReplyEsri : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit PlaceCategoriesReplyEsri(QObject *parent = 0);
+    explicit PlaceCategoriesReplyEsri(QObject *parent = nullptr);
     ~PlaceCategoriesReplyEsri();
 
     void emitFinished();
diff --git a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.h b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.h
index 156299fa..165bb840 100644
--- a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.h
@@ -50,7 +50,7 @@ class QGeoCodeReplyMapbox : public QGeoCodeReply
     Q_OBJECT
 
 public:
-    explicit QGeoCodeReplyMapbox(QNetworkReply *reply, QObject *parent = 0);
+    explicit QGeoCodeReplyMapbox(QNetworkReply *reply, QObject *parent = nullptr);
     ~QGeoCodeReplyMapbox();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
index 997900b4..8adb62ba 100644
--- a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
@@ -50,7 +50,7 @@ class QGeoFileTileCacheMapbox : public QGeoFileTileCache
 {
     Q_OBJECT
 public:
-    QGeoFileTileCacheMapbox(const QList<QGeoMapType> &mapTypes, int scaleFactor, const QString &directory = QString(), QObject *parent = 0);
+    QGeoFileTileCacheMapbox(const QList<QGeoMapType> &mapTypes, int scaleFactor, const QString &directory = QString(), QObject *parent = nullptr);
     ~QGeoFileTileCacheMapbox();
 
 protected:
diff --git a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.h b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.h
index a7de878b..bef3cd05 100644
--- a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.h
@@ -51,7 +51,7 @@ class QGeoMapReplyMapbox : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    explicit QGeoMapReplyMapbox(QNetworkReply *reply, const QGeoTileSpec &spec, const QString &format, QObject *parent = 0);
+    explicit QGeoMapReplyMapbox(QNetworkReply *reply, const QGeoTileSpec &spec, const QString &format, QObject *parent = nullptr);
     ~QGeoMapReplyMapbox();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
index 302ed2dc..660a7a80 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
@@ -51,7 +51,7 @@ class QGeoRouteReplyMapbox : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0);
+    QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = nullptr);
     ~QGeoRouteReplyMapbox();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.h b/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.h
index c4618c00..367e429f 100644
--- a/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.h
+++ b/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.h
@@ -49,7 +49,7 @@ class QPlaceCategoriesReplyMapbox : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit QPlaceCategoriesReplyMapbox(QObject *parent = 0);
+    explicit QPlaceCategoriesReplyMapbox(QObject *parent = nullptr);
     ~QPlaceCategoriesReplyMapbox();
 
 public slots:
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h
index 16d88446..2a8836ad 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h
@@ -49,7 +49,7 @@ class QPlaceCategoriesReplyHere : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit QPlaceCategoriesReplyHere(QObject *parent = 0);
+    explicit QPlaceCategoriesReplyHere(QObject *parent = nullptr);
     ~QPlaceCategoriesReplyHere();
 
     void emitFinished();
diff --git a/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.h
index 12086c5c..0fa40497 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.h
@@ -49,7 +49,7 @@ class QPlaceIdReplyImpl : public QPlaceIdReply
     Q_OBJECT
 
 public:
-    QPlaceIdReplyImpl(QPlaceIdReply::OperationType type, QObject *parent = 0);
+    QPlaceIdReplyImpl(QPlaceIdReply::OperationType type, QObject *parent = nullptr);
     ~QPlaceIdReplyImpl();
 
     void setId(const QString &id);
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
index 0cf2486d..b90d1913 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
@@ -50,7 +50,7 @@ class QPlaceSearchSuggestionReplyImpl : public QPlaceSearchSuggestionReply
     Q_OBJECT
 
 public:
-    explicit QPlaceSearchSuggestionReplyImpl(QNetworkReply *reply, QObject *parent = 0);
+    explicit QPlaceSearchSuggestionReplyImpl(QNetworkReply *reply, QObject *parent = nullptr);
     ~QPlaceSearchSuggestionReplyImpl();
 
 private slots:
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
index d4ff5e7b..b1448be4 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
@@ -49,7 +49,8 @@ class QGeoCodeReplyNokia : public QGeoCodeReply
 {
     Q_OBJECT
 public:
-    QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, bool manualBoundsRequired, QObject *parent = 0);
+    QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport,
+                       bool manualBoundsRequired, QObject *parent = nullptr);
     ~QGeoCodeReplyNokia();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
index 52318d9b..f9c11b71 100644
--- a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
+++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
@@ -48,11 +48,13 @@ class QGeoFileTileCacheNokia : public QGeoFileTileCache
 {
     Q_OBJECT
 public:
-    QGeoFileTileCacheNokia(int ppi, const QString &directory = QString(), QObject *parent = 0);
+    QGeoFileTileCacheNokia(int ppi, const QString &directory = QString(),
+                           QObject *parent = nullptr);
     ~QGeoFileTileCacheNokia();
 
 protected:
-    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format,
+                               const QString &directory) const override;
     QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QString m_ppi;
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
index dc45a7af..ad337e8a 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
@@ -51,8 +51,9 @@ class QNetworkAccessManager;
 class QGeoIntrinsicNetworkAccessManager : public QGeoNetworkAccessManager
 {
 public:
-    explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0);
-    QGeoIntrinsicNetworkAccessManager(const QVariantMap &parameters, const QString &token = QString(), QObject *parent = 0);
+    explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = nullptr);
+    QGeoIntrinsicNetworkAccessManager(const QVariantMap &parameters,
+                                      const QString &token = QString(), QObject *parent = nullptr);
 
     QNetworkReply *get(const QNetworkRequest &request) override;
     QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) override;
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index 83aa29f8..af26556f 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -52,7 +52,7 @@ class QGeoMapReplyNokia : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = 0);
+    QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = nullptr);
     ~QGeoMapReplyNokia();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
index 7f6e7de5..44c29d8a 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
@@ -51,7 +51,8 @@ class QGeoRouteReplyNokia : public QGeoRouteReply
 {
     Q_OBJECT
 public:
-    QGeoRouteReplyNokia(const QGeoRouteRequest &request, const QList<QNetworkReply*> &replies, QObject *parent = 0);
+    QGeoRouteReplyNokia(const QGeoRouteRequest &request, const QList<QNetworkReply*> &replies,
+                        QObject *parent = nullptr);
     ~QGeoRouteReplyNokia();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
index 7822ff99..549c9699 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
@@ -58,7 +58,7 @@ class QGeoTiledMapNokia: public Map
 {
 Q_OBJECT
 public:
-    QGeoTiledMapNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent = 0);
+    QGeoTiledMapNokia(QGeoTiledMappingManagerEngineNokia *engine, QObject *parent = nullptr);
     ~QGeoTiledMapNokia();
 
     QString getViewCopyright() const;
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.h b/src/plugins/geoservices/osm/qgeocodereplyosm.h
index a82d3e71..acca6764 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.h
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.h
@@ -51,7 +51,8 @@ class QGeoCodeReplyOsm : public QGeoCodeReply
     Q_OBJECT
 
 public:
-    explicit QGeoCodeReplyOsm(QNetworkReply *reply, bool includeExtraData = false, QObject *parent = 0);
+    explicit QGeoCodeReplyOsm(QNetworkReply *reply, bool includeExtraData = false,
+                              QObject *parent = nullptr);
     ~QGeoCodeReplyOsm();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
index 018a8bfe..9f043ec8 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
@@ -54,7 +54,7 @@ class QGeoFileTileCacheOsm : public QGeoFileTileCache
 public:
     QGeoFileTileCacheOsm(const QList<QGeoTileProviderOsm *> &providers,
                          const QString &offlineDirectory = QString(),
-                         const QString &directory = QString(), QObject *parent = 0);
+                         const QString &directory = QString(), QObject *parent = nullptr);
     ~QGeoFileTileCacheOsm();
 
     QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) override;
diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.h b/src/plugins/geoservices/osm/qgeomapreplyosm.h
index ef0cbb15..46d5cd01 100644
--- a/src/plugins/geoservices/osm/qgeomapreplyosm.h
+++ b/src/plugins/geoservices/osm/qgeomapreplyosm.h
@@ -50,7 +50,8 @@ class QGeoMapReplyOsm : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    QGeoMapReplyOsm(QNetworkReply *reply, const QGeoTileSpec &spec, const QString &imageFormat, QObject *parent = 0);
+    QGeoMapReplyOsm(QNetworkReply *reply, const QGeoTileSpec &spec, const QString &imageFormat,
+                    QObject *parent = nullptr);
     ~QGeoMapReplyOsm();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.h b/src/plugins/geoservices/osm/qgeoroutereplyosm.h
index 964046c5..77e943c7 100644
--- a/src/plugins/geoservices/osm/qgeoroutereplyosm.h
+++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.h
@@ -50,7 +50,8 @@ class QGeoRouteReplyOsm : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0);
+    QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteRequest &request,
+                      QObject *parent = nullptr);
     ~QGeoRouteReplyOsm();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/osm/qgeotiledmaposm.h b/src/plugins/geoservices/osm/qgeotiledmaposm.h
index cc349793..02c80eac 100644
--- a/src/plugins/geoservices/osm/qgeotiledmaposm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmaposm.h
@@ -58,7 +58,7 @@ class QGeoTiledMapOsm: public Map
     Q_OBJECT
 
 public:
-    QGeoTiledMapOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent = 0);
+    QGeoTiledMapOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent = nullptr);
     ~QGeoTiledMapOsm();
 
 protected:
diff --git a/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h
index af2919d9..cb837613 100644
--- a/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h
+++ b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h
@@ -49,7 +49,7 @@ class QPlaceCategoriesReplyOsm : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit QPlaceCategoriesReplyOsm(QObject *parent = 0);
+    explicit QPlaceCategoriesReplyOsm(QObject *parent = nullptr);
     ~QPlaceCategoriesReplyOsm();
 
     void emitFinished();
diff --git a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
index 3c7c019a..92587c83 100644
--- a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
+++ b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h
@@ -62,7 +62,7 @@ class QDeclarativeLocationTestModel : public QAbstractListModel, public QQmlPars
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    QDeclarativeLocationTestModel(QObject* parent = 0);
+    QDeclarativeLocationTestModel(QObject* parent = nullptr);
     ~QDeclarativeLocationTestModel();
 
     enum Roles {
diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.h b/tests/auto/geotestplugin/qgeotiledmap_test.h
index a6299efe..7bb1ea27 100644
--- a/tests/auto/geotestplugin/qgeotiledmap_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.h
@@ -48,7 +48,7 @@ class QGeoTiledMapTest: public QGeoTiledMap
 public:
     QGeoTiledMapTest(QGeoTiledMappingManagerEngine *engine,
                      const QGeoTiledMapTestOptions &options,
-                     QObject *parent = 0);
+                     QObject *parent = nullptr);
 
 protected slots:
     void onCameraCenter_testChanged(QGeoMapParameter *param, const char *propertyName);
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 44aee74e..04ef0735 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -105,7 +105,7 @@ class PlaceReply : public QPlaceReply
     friend class QPlaceManagerEngineTest;
 
 public:
-    PlaceReply(QObject *parent = 0)
+    PlaceReply(QObject *parent = nullptr)
     :   QPlaceReply(parent)
     { }
 
@@ -122,7 +122,7 @@ class ContentReply : public QPlaceContentReply
     friend class QPlaceManagerEngineTest;
 
 public:
-    ContentReply(QObject *parent = 0)
+    ContentReply(QObject *parent = nullptr)
     : QPlaceContentReply(parent)
     {}
 
@@ -144,7 +144,7 @@ class DetailsReply : public QPlaceDetailsReply
     friend class QPlaceManagerEngineTest;
 
 public:
-    DetailsReply(QObject *parent = 0)
+    DetailsReply(QObject *parent = nullptr)
     :   QPlaceDetailsReply(parent)
     { }
 
@@ -166,7 +166,7 @@ class IdReply : public QPlaceIdReply
     friend class QPlaceManagerEngineTest;
 
 public:
-    IdReply(QPlaceIdReply::OperationType type, QObject *parent = 0)
+    IdReply(QPlaceIdReply::OperationType type, QObject *parent = nullptr)
     :   QPlaceIdReply(type, parent)
     { }
 
@@ -186,7 +186,7 @@ class PlaceSearchReply : public QPlaceSearchReply
     Q_OBJECT
 
 public:
-    PlaceSearchReply(const QList<QPlaceSearchResult> &results, QObject *parent = 0)
+    PlaceSearchReply(const QList<QPlaceSearchResult> &results, QObject *parent = nullptr)
     :   QPlaceSearchReply(parent)
     {
         setResults(results);
@@ -208,7 +208,7 @@ class SuggestionReply : public QPlaceSearchSuggestionReply
     Q_OBJECT
 
 public:
-    SuggestionReply(const QStringList &suggestions, QObject *parent = 0)
+    SuggestionReply(const QStringList &suggestions, QObject *parent = nullptr)
     :   QPlaceSearchSuggestionReply(parent)
     {
         setSuggestions(suggestions);
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index d653576a..3a516139 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -47,7 +47,7 @@ QT_USE_NAMESPACE
 class MockGeoNetworkReply : public QNetworkReply
 {
 public:
-    MockGeoNetworkReply( QObject* parent = 0);
+    MockGeoNetworkReply( QObject* parent = nullptr);
     void abort() override;
 
     void setFile(QFile* file);
@@ -111,7 +111,7 @@ void MockGeoNetworkReply::complete()
 class MockGeoNetworkAccessManager : public QGeoNetworkAccessManager
 {
 public:
-    MockGeoNetworkAccessManager(QObject* parent = 0);
+    MockGeoNetworkAccessManager(QObject* parent = nullptr);
     QNetworkReply *get(const QNetworkRequest& request) override;
     QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) override;
 
diff --git a/tests/auto/placemanager_utils/placemanager_utils.h b/tests/auto/placemanager_utils/placemanager_utils.h
index 982bd858..960f0a2e 100644
--- a/tests/auto/placemanager_utils/placemanager_utils.h
+++ b/tests/auto/placemanager_utils/placemanager_utils.h
@@ -64,7 +64,7 @@ class PlaceManagerUtils : public QObject
 {
     Q_OBJECT
 public:
-    PlaceManagerUtils(QObject *parent = 0);
+    PlaceManagerUtils(QObject *parent = nullptr);
 
     static bool doSavePlace(QPlaceManager *manager,
                      const QPlace &place,
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index c9fe8349..e6cc7236 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -43,7 +43,7 @@ class GeocodeReplyTest : public QGeoCodeReply
 {
     Q_OBJECT
 public:
-    GeocodeReplyTest(QObject *parent = 0) : QGeoCodeReply(parent) {}
+    GeocodeReplyTest(QObject *parent = nullptr) : QGeoCodeReply(parent) {}
 
     void  callAddLocation ( const QGeoLocation & location ) {addLocation(location);}
     void  callSetError ( Error error, const QString & errorString ) {setError(error, errorString);}