diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-08-10 12:20:32 +0200 |
---|---|---|
committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2018-08-10 11:50:14 +0000 |
commit | 85e345a38709026d4d82c67b9016338675851249 (patch) | |
tree | 4ff4cc57ae6d76d33d0bd27605421b2f06d64d57 /tests/auto | |
parent | 6c58fa8980a2c783d9eca34aa482b74ac60a940a (diff) | |
download | qtwebsockets-85e345a38709026d4d82c67b9016338675851249.tar.gz |
Use nullptr instead of 0
Change-Id: Ibad1bbb351d14ab0de140875d2969b7da483eb21
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp | 2 | ||||
-rw-r--r-- | tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp b/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp index 5f6cfba..f9a91d5 100644 --- a/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp +++ b/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp @@ -901,7 +901,7 @@ void tst_DataProcessor::frameTooBig_data() QTest::addColumn<QWebSocketProtocol::CloseCode>("expectedCloseCode"); quint64 swapped64 = 0; - const char *wireRepresentation = 0; + const char *wireRepresentation = nullptr; //only data frames are checked for being too big //control frames have explicit checking on a maximum payload size of 125, diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp index 4dc60c7..2bb5d16 100644 --- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp +++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp @@ -658,7 +658,7 @@ struct Warned origHandler(type, context, str); } }; -QtMessageHandler Warned::origHandler = 0; +QtMessageHandler Warned::origHandler = nullptr; bool Warned::warned = false; |