diff options
| -rw-r--r-- | src/websockets/qdefaultmaskgenerator_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/websockets/qdefaultmaskgenerator_p.h b/src/websockets/qdefaultmaskgenerator_p.h index 19387ad..3ad4990 100644 --- a/src/websockets/qdefaultmaskgenerator_p.h +++ b/src/websockets/qdefaultmaskgenerator_p.h @@ -61,7 +61,7 @@ class Q_AUTOTEST_EXPORT QDefaultMaskGenerator : public QMaskGenerator Q_DISABLE_COPY(QDefaultMaskGenerator) public: - explicit QDefaultMaskGenerator(QObject *parent = 0); + explicit QDefaultMaskGenerator(QObject *parent = nullptr); ~QDefaultMaskGenerator() override; bool seed() Q_DECL_NOEXCEPT override; 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; |