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 /src/location | |
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 'src/location')
23 files changed, 26 insertions, 26 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 ¶meters, QObject *parent = Q_NULLPTR); + explicit QGeoCodingManagerEngine(const QVariantMap ¶meters, 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 ¶meters, QObject *parent = Q_NULLPTR); + explicit QGeoRoutingManagerEngine(const QVariantMap ¶meters, 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 ¶meters, QObject *parent = Q_NULLPTR); + explicit QNavigationManagerEngine(const QVariantMap ¶meters, 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 ¶meters, QObject *parent = Q_NULLPTR); + explicit QPlaceManagerEngine(const QVariantMap ¶meters, 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; |