diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:20 +0100 |
commit | c6d19a89046763f680d7f67c6f9989b4f51fc71e (patch) | |
tree | ec0441f55801a77085c1737101305580d3073acf | |
parent | c00241ac0389cc4ee03252030e6de1257a9b50fd (diff) | |
parent | 0ec852ed326efe9747bff1dcdef327c690a944b4 (diff) | |
download | qtwebsockets-c6d19a89046763f680d7f67c6f9989b4f51fc71e.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I57c01d5a8836903352d7edadc4a10972f57399eb
-rw-r--r-- | src/websockets/qmaskgenerator.h | 2 | ||||
-rw-r--r-- | src/websockets/qwebsocket.h | 2 | ||||
-rw-r--r-- | src/websockets/qwebsocketserver.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h index f617389..55cd237 100644 --- a/src/websockets/qmaskgenerator.h +++ b/src/websockets/qmaskgenerator.h @@ -50,7 +50,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject Q_DISABLE_COPY(QMaskGenerator) public: - explicit QMaskGenerator(QObject *parent = 0); + explicit QMaskGenerator(QObject *parent = Q_NULLPTR); virtual ~QMaskGenerator(); virtual bool seed() = 0; diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index 27b58c4..e6c2473 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -68,7 +68,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject public: explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::VersionLatest, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); virtual ~QWebSocket(); void abort(); diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 95c23d2..58a3d54 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -75,7 +75,7 @@ public: }; explicit QWebSocketServer(const QString &serverName, SslMode secureMode, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); virtual ~QWebSocketServer(); bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); |