diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-02 15:38:05 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 16:17:00 +0000 |
commit | 0f60554207e5f7b17177875108d4de6fe73f2b7e (patch) | |
tree | bd800b8d63edd0806a13a322ae5ab99268b9685b /src | |
parent | 3d8a8799cc97aedb28f5046f096d4d35da6ef8ef (diff) | |
download | qtlocation-0f60554207e5f7b17177875108d4de6fe73f2b7e.tar.gz |
Add explicit and make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
Task-number: QTBUG-45291
Change-Id: I279fd100b61d3e2b2e46e7cbd30cc6b4bfb4d10e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/location/maps/qgeocodereply.h | 4 | ||||
-rw-r--r-- | src/location/maps/qgeocodingmanager.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeocodingmanagerengine.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeoroutereply.h | 4 | ||||
-rw-r--r-- | src/location/maps/qgeoroutingmanager.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeoroutingmanagerengine.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacecontentreply.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacedetailsreply.h | 2 | ||||
-rw-r--r-- | src/location/places/qplaceidreply.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacemanager.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacemanagerengine.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacematchreply.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacereply.h | 4 | ||||
-rw-r--r-- | src/location/places/qplacesearchreply.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacesearchsuggestionreply.h | 2 | ||||
-rw-r--r-- | src/positioning/qnmeapositioninfosource.h | 2 |
16 files changed, 19 insertions, 19 deletions
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h index f713e421..048493b4 100644 --- a/src/location/maps/qgeocodereply.h +++ b/src/location/maps/qgeocodereply.h @@ -63,7 +63,7 @@ public: UnknownError }; - QGeoCodeReply(Error error, const QString &errorString, QObject *parent = 0); + explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR); virtual ~QGeoCodeReply(); bool isFinished() const; @@ -83,7 +83,7 @@ Q_SIGNALS: void error(QGeoCodeReply::Error error, const QString &errorString = QString()); protected: - QGeoCodeReply(QObject *parent = 0); + explicit QGeoCodeReply(QObject *parent = Q_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 b33cda75..eb366f68 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: - QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = 0); + explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = Q_NULLPTR); QGeoCodingManagerPrivate *d_ptr; Q_DISABLE_COPY(QGeoCodingManager) diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h index 3e915758..ce7021a0 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: - QGeoCodingManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); + explicit QGeoCodingManagerEngine(const QVariantMap ¶meters, QObject *parent = Q_NULLPTR); virtual ~QGeoCodingManagerEngine(); QString managerName() const; diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 52f9133d..318d85f8 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -60,7 +60,7 @@ public: UnknownError }; - QGeoRouteReply(Error error, const QString &errorString, QObject *parent = 0); + explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR); virtual ~QGeoRouteReply(); bool isFinished() const; @@ -77,7 +77,7 @@ Q_SIGNALS: void error(QGeoRouteReply::Error error, const QString &errorString = QString()); protected: - QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = 0); + explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = Q_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 0648a15b..56cd8e51 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: - QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = 0); + explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = Q_NULLPTR); QGeoRoutingManagerPrivate *d_ptr; Q_DISABLE_COPY(QGeoRoutingManager) diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 9fa02727..21aef7ce 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: - QGeoRoutingManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); + explicit QGeoRoutingManagerEngine(const QVariantMap ¶meters, QObject *parent = Q_NULLPTR); virtual ~QGeoRoutingManagerEngine(); QString managerName() const; diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h index 1d824485..fa96a0e2 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 = 0); + explicit QPlaceContentReply(QObject *parent = Q_NULLPTR); virtual ~QPlaceContentReply(); QPlaceReply::Type type() const; diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h index c9530c34..09593a1e 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 = 0); + explicit QPlaceDetailsReply(QObject *parent = Q_NULLPTR); virtual ~QPlaceDetailsReply(); QPlaceReply::Type type() const; diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h index abdab7aa..ea44828b 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 = 0); + explicit QPlaceIdReply(OperationType operationType, QObject *parent = Q_NULLPTR); virtual ~QPlaceIdReply(); QPlaceReply::Type type() const; diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index 37e7c053..bd4b1676 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -112,7 +112,7 @@ Q_SIGNALS: void dataChanged(); private: - QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = 0); + explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = Q_NULLPTR); Q_DISABLE_COPY(QPlaceManager) QPlaceManagerEngine *d; diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h index aca0a875..0c11278f 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: - QPlaceManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); + explicit QPlaceManagerEngine(const QVariantMap ¶meters, QObject *parent = Q_NULLPTR); virtual ~QPlaceManagerEngine(); QString managerName() const; diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h index e5935e33..df4b3fda 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 = 0); + explicit QPlaceMatchReply(QObject *parent = Q_NULLPTR); ~QPlaceMatchReply(); QPlaceReply::Type type() const; diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h index 987ab446..374c68b3 100644 --- a/src/location/places/qplacereply.h +++ b/src/location/places/qplacereply.h @@ -71,7 +71,7 @@ public: MatchReply }; - explicit QPlaceReply(QObject *parent = 0); + explicit QPlaceReply(QObject *parent = Q_NULLPTR); ~QPlaceReply(); bool isFinished() const; @@ -89,7 +89,7 @@ Q_SIGNALS: void error(QPlaceReply::Error error, const QString &errorString = QString()); protected: - QPlaceReply(QPlaceReplyPrivate *, QObject *parent = 0); + explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = Q_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 ddf850bc..52c88899 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 = 0); + explicit QPlaceSearchReply(QObject *parent = Q_NULLPTR); ~QPlaceSearchReply(); QPlaceReply::Type type() const; diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index 6aee36cb..3909b14f 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 = 0); + explicit QPlaceSearchSuggestionReply(QObject *parent = Q_NULLPTR); ~QPlaceSearchSuggestionReply(); QStringList suggestions() const; diff --git a/src/positioning/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h index 9bb67c9f..5cb28aca 100644 --- a/src/positioning/qnmeapositioninfosource.h +++ b/src/positioning/qnmeapositioninfosource.h @@ -49,7 +49,7 @@ public: SimulationMode }; - explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = 0); + explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = Q_NULLPTR); ~QNmeaPositionInfoSource(); void setUserEquivalentRangeError(double uere); |