diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:32:50 +0000 |
commit | 08f6b38ec72f9358ce0f6270034b5a8a4baf2e14 (patch) | |
tree | d493c264867b1ee7335b5330f37ed0f65f2e14e0 /src/network/access | |
parent | 7c8b0c098a374540792e2e8b30c4221c6f68e3ec (diff) |
QtNetwork: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I9a05d375d2d9d3ed56079ad024c89a08a290619b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/access')
-rw-r--r-- | src/network/access/qabstractnetworkcache.h | 2 | ||||
-rw-r--r-- | src/network/access/qhttpmultipart.h | 4 | ||||
-rw-r--r-- | src/network/access/qnetworkaccessmanager.h | 6 | ||||
-rw-r--r-- | src/network/access/qnetworkcookiejar.h | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkdiskcache.h | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkreply.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 73f05176d4..326891b3dc 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -124,7 +124,7 @@ public Q_SLOTS: virtual void clear() = 0; protected: - explicit QAbstractNetworkCache(QObject *parent = 0); + explicit QAbstractNetworkCache(QObject *parent = Q_NULLPTR); QAbstractNetworkCache(QAbstractNetworkCachePrivate &dd, QObject *parent); private: diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index dd8b733426..5f865c059b 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -91,8 +91,8 @@ public: AlternativeType }; - explicit QHttpMultiPart(QObject *parent = 0); - explicit QHttpMultiPart(ContentType contentType, QObject *parent = 0); + explicit QHttpMultiPart(QObject *parent = Q_NULLPTR); + explicit QHttpMultiPart(ContentType contentType, QObject *parent = Q_NULLPTR); ~QHttpMultiPart(); void append(const QHttpPart &httpPart); diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 988eafa18b..c8df213ead 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -90,7 +90,7 @@ public: }; #endif - explicit QNetworkAccessManager(QObject *parent = 0); + explicit QNetworkAccessManager(QObject *parent = Q_NULLPTR); ~QNetworkAccessManager(); // ### Qt 6: turn into virtual @@ -120,7 +120,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 = 0); + QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = Q_NULLPTR); #ifndef QT_NO_BEARERMANAGEMENT void setConfiguration(const QNetworkConfiguration &config); @@ -157,7 +157,7 @@ Q_SIGNALS: protected: virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, - QIODevice *outgoingData = 0); + QIODevice *outgoingData = Q_NULLPTR); protected Q_SLOTS: QStringList supportedSchemesImplementation() const; diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index 59ba7f8738..3ac78ea1c3 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -47,7 +47,7 @@ class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { Q_OBJECT public: - explicit QNetworkCookieJar(QObject *parent = 0); + explicit QNetworkCookieJar(QObject *parent = Q_NULLPTR); virtual ~QNetworkCookieJar(); virtual QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const; diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index 568d34dc0f..533eabce9b 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -47,7 +47,7 @@ class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache Q_OBJECT public: - explicit QNetworkDiskCache(QObject *parent = 0); + explicit QNetworkDiskCache(QObject *parent = Q_NULLPTR); ~QNetworkDiskCache(); QString cacheDirectory() const; diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 672a69e12b..254dd3ff12 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -161,7 +161,7 @@ Q_SIGNALS: void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); protected: - explicit QNetworkReply(QObject *parent = 0); + explicit QNetworkReply(QObject *parent = Q_NULLPTR); QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent); virtual qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; |