summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp2
-rw-r--r--tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp2
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;