diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /tests/auto/network | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/network')
8 files changed, 17 insertions, 17 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() { diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index e172c255a7..fee44601cf 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -168,7 +168,7 @@ class LocalSocket : public QLocalSocket Q_OBJECT public: - LocalSocket(QObject *parent = 0) : QLocalSocket(parent) + LocalSocket(QObject *parent = nullptr) : QLocalSocket(parent) { connect(this, SIGNAL(connected()), this, SLOT(slotConnected())); @@ -935,7 +935,7 @@ void tst_QLocalSocket::processConnection_data() class ProcessOutputDumper { public: - ProcessOutputDumper(QProcess *p = 0) + ProcessOutputDumper(QProcess *p = nullptr) : process(p) {} @@ -947,7 +947,7 @@ public: void clear() { - process = 0; + process = nullptr; } private: diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h index 3e61456f75..5e6b2b9467 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h +++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h @@ -53,7 +53,7 @@ class My4Server : public QTcpServer { Q_OBJECT public: - My4Server(QObject *parent = 0); + My4Server(QObject *parent = nullptr); protected: void incomingConnection(qintptr socket) override; diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index b9108932f7..00fcf4afa4 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -271,7 +271,7 @@ class SocketPair: public QObject public: QTcpSocket *endPoints[2]; - SocketPair(QObject *parent = 0) + SocketPair(QObject *parent = nullptr) : QObject(parent) { endPoints[0] = endPoints[1] = 0; @@ -2163,7 +2163,7 @@ public: bool networkTimeout; int count; - inline Foo(QObject *parent = 0) : QObject(parent) + inline Foo(QObject *parent = nullptr) : QObject(parent) { attemptedToConnect = false; networkTimeout = false; diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index e968f5b0f1..e6fea87011 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3566,7 +3566,7 @@ public: QByteArray m_identity; QByteArray m_psk; - explicit PskProvider(QObject *parent = 0) + explicit PskProvider(QObject *parent = nullptr) : QObject(parent), m_server(false) { } |