summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:05 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-26 17:13:59 +0000
commit75042d31d1d267d0a4091932c95579747a102e9d (patch)
tree36a4efdd96f66e86d5628dd859e98a3b5fc07c19 /tests
parent140764f01742931f27cc721992ea7877396d8c9b (diff)
downloadqtwebsockets-75042d31d1d267d0a4091932c95579747a102e9d.tar.gz
Replace Q_NULLPTR with nullptr
Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp2
-rw-r--r--tests/manual/compliance/tst_compliance.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
index dfa0ce5..e9062c0 100644
--- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
+++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
@@ -39,7 +39,7 @@ class EchoServer : public QObject
{
Q_OBJECT
public:
- explicit EchoServer(QObject *parent = Q_NULLPTR);
+ explicit EchoServer(QObject *parent = nullptr);
~EchoServer();
QHostAddress hostAddress() const { return m_pWebSocketServer->serverAddress(); }
diff --git a/tests/manual/compliance/tst_compliance.cpp b/tests/manual/compliance/tst_compliance.cpp
index 64bb335..478ca33 100644
--- a/tests/manual/compliance/tst_compliance.cpp
+++ b/tests/manual/compliance/tst_compliance.cpp
@@ -109,7 +109,7 @@ void tst_ComplianceTest::runTestCase(int nbr, int total)
spy.wait(60000);
pWebSocket->close();
delete pWebSocket;
- pWebSocket = Q_NULLPTR;
+ pWebSocket = nullptr;
runTestCase(nbr + 1, total);
}