diff options
Diffstat (limited to 'tests/auto/network/access')
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 4b392d867c..84a9787493 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -77,7 +77,7 @@ class NetworkDiskCache : public QNetworkDiskCache { Q_OBJECT public: - NetworkDiskCache(QObject *parent = 0) + NetworkDiskCache(QObject *parent = nullptr) : QNetworkDiskCache(parent) , tempDir(QDir::tempPath() + QLatin1String("/tst_qabstractnetworkcache.XXXXXX")) , gotData(false) diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index 00afdd8177..2204e9f2f4 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -734,7 +734,7 @@ void tst_QHttpNetworkConnection::getMultipleWithPipeliningAndMultiplePriorities( QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; if (i % 3) request = new QHttpNetworkRequest("http://" + httpServerName() + "/qtest/rfc3252.txt", QHttpNetworkRequest::Get); else @@ -812,7 +812,7 @@ void tst_QHttpNetworkConnection::getMultipleWithPriorities() QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; if (i % 3) request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); else @@ -867,7 +867,7 @@ void tst_QHttpNetworkConnection::getEmptyWithPipelining() QList<QHttpNetworkReply*> replies; for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); request->setPipeliningAllowed(true); @@ -914,7 +914,7 @@ void tst_QHttpNetworkConnection::getAndEverythingShouldBePipelined() GetAndEverythingShouldBePipelinedReceiver receiver(requestCount); for (int i = 0; i < requestCount; i++) { - QHttpNetworkRequest *request = 0; + QHttpNetworkRequest *request = nullptr; request = new QHttpNetworkRequest(url, QHttpNetworkRequest::Get); request->setPipeliningAllowed(true); requests.append(request); diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index 50f118a89f..cb94900660 100644 --- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -129,7 +129,7 @@ public slots: if (doClose) { client->disconnectFromHost(); disconnect(client, 0, this, 0); - client = 0; + client = nullptr; } } } @@ -155,7 +155,7 @@ public: { setCacheDirectory(path); - QIODevice *d = 0; + QIODevice *d = nullptr; if (metaData.isValid()) { d = prepare(metaData); } else { diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 365de831ab..08e9dd581d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -939,10 +939,10 @@ class SocketPair: public QObject public: QIODevice *endPoints[2]; - SocketPair(QObject *parent = 0) + SocketPair(QObject *parent = nullptr) : QObject(parent) { - endPoints[0] = endPoints[1] = 0; + endPoints[0] = endPoints[1] = nullptr; } bool create() @@ -976,7 +976,7 @@ class BlockingTcpServer : public QTcpServer { Q_OBJECT public: - BlockingTcpServer(bool ssl) : doSsl(ssl), sslSocket(0) {} + BlockingTcpServer(bool ssl) : doSsl(ssl), sslSocket(nullptr) {} QTcpSocket* waitForNextConnectionSocket() { |