From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/network/access/qabstractnetworkcache.h | 2 +- src/network/access/qhttpmultipart.h | 4 ++-- src/network/access/qhttpnetworkconnection.cpp | 2 +- src/network/access/qnetworkaccessmanager.h | 6 +++--- src/network/access/qnetworkcookiejar.h | 2 +- src/network/access/qnetworkdiskcache.h | 2 +- src/network/access/qnetworkreply.h | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/network/access') diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 33b0bc4ce3..678bae2d6e 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -131,7 +131,7 @@ public Q_SLOTS: virtual void clear() = 0; protected: - explicit QAbstractNetworkCache(QObject *parent = Q_NULLPTR); + explicit QAbstractNetworkCache(QObject *parent = nullptr); QAbstractNetworkCache(QAbstractNetworkCachePrivate &dd, QObject *parent); private: diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index 6d4531b099..9e95e82a77 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -98,8 +98,8 @@ public: AlternativeType }; - explicit QHttpMultiPart(QObject *parent = Q_NULLPTR); - explicit QHttpMultiPart(ContentType contentType, QObject *parent = Q_NULLPTR); + explicit QHttpMultiPart(QObject *parent = nullptr); + explicit QHttpMultiPart(ContentType contentType, QObject *parent = nullptr); ~QHttpMultiPart(); void append(const QHttpPart &httpPart); diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 107d22f14d..09e5e1c1ef 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -123,7 +123,7 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate() { for (int i = 0; i < channelCount; ++i) { if (channels[i].socket) { - QObject::disconnect(channels[i].socket, Q_NULLPTR, &channels[i], Q_NULLPTR); + QObject::disconnect(channels[i].socket, nullptr, &channels[i], nullptr); channels[i].socket->close(); delete channels[i].socket; } diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 4806ec0475..9cbf8a48d5 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -100,7 +100,7 @@ public: Q_ENUM(NetworkAccessibility) #endif - explicit QNetworkAccessManager(QObject *parent = Q_NULLPTR); + explicit QNetworkAccessManager(QObject *parent = nullptr); ~QNetworkAccessManager(); // ### Qt 6: turn into virtual @@ -139,7 +139,7 @@ public: QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data); QNetworkReply *put(const QNetworkRequest &request, QHttpMultiPart *multiPart); QNetworkReply *deleteResource(const QNetworkRequest &request); - QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = Q_NULLPTR); + QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = nullptr); QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data); QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QHttpMultiPart *multiPart); @@ -181,7 +181,7 @@ Q_SIGNALS: protected: virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, - QIODevice *outgoingData = Q_NULLPTR); + QIODevice *outgoingData = nullptr); protected Q_SLOTS: QStringList supportedSchemesImplementation() const; diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index f9c1549e20..c3b2200443 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -54,7 +54,7 @@ class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { Q_OBJECT public: - explicit QNetworkCookieJar(QObject *parent = Q_NULLPTR); + explicit QNetworkCookieJar(QObject *parent = nullptr); virtual ~QNetworkCookieJar(); virtual QList cookiesForUrl(const QUrl &url) const; diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index 4f1bbe44e7..ffdfd0fd1b 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -54,7 +54,7 @@ class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache Q_OBJECT public: - explicit QNetworkDiskCache(QObject *parent = Q_NULLPTR); + explicit QNetworkDiskCache(QObject *parent = nullptr); ~QNetworkDiskCache(); QString cacheDirectory() const; diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 0912294a10..63c2752caf 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -169,7 +169,7 @@ Q_SIGNALS: void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); protected: - explicit QNetworkReply(QObject *parent = Q_NULLPTR); + explicit QNetworkReply(QObject *parent = nullptr); QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent); virtual qint64 writeData(const char *data, qint64 len) override; -- cgit v1.2.3