summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/socket')
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp6
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/Test.h2
-rw-r--r--tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp4
3 files changed, 6 insertions, 6 deletions
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;