summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2018-08-10 12:20:32 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2018-08-10 11:50:14 +0000
commit85e345a38709026d4d82c67b9016338675851249 (patch)
tree4ff4cc57ae6d76d33d0bd27605421b2f06d64d57
parent6c58fa8980a2c783d9eca34aa482b74ac60a940a (diff)
downloadqtwebsockets-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>
-rw-r--r--src/websockets/qdefaultmaskgenerator_p.h2
-rw-r--r--tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp2
-rw-r--r--tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp2
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;