From ca03374390c4d5f4e8f2156f3b2038f984ed39d4 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Tue, 8 Jul 2014 11:11:52 +0100 Subject: Use 0 instead of Q_NULLPTR in public headers. Otherwise Q_NULLPTR appears in documentation, which is inconsistent. Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954 Reviewed-by: hjk Reviewed-by: Jerome Pasion --- src/imports/qmlwebsockets/qqmlwebsocket.h | 2 +- src/websockets/qmaskgenerator.h | 2 +- src/websockets/qwebsocket.h | 2 +- src/websockets/qwebsocketserver.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h index 2e02f33..907506b 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.h +++ b/src/imports/qmlwebsockets/qqmlwebsocket.h @@ -63,7 +63,7 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) public: - explicit QQmlWebSocket(QObject *parent = Q_NULLPTR); + explicit QQmlWebSocket(QObject *parent = 0); virtual ~QQmlWebSocket(); enum Status diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h index 6714930..a93ed01 100644 --- a/src/websockets/qmaskgenerator.h +++ b/src/websockets/qmaskgenerator.h @@ -52,7 +52,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject Q_DISABLE_COPY(QMaskGenerator) public: - explicit QMaskGenerator(QObject *parent = Q_NULLPTR); + explicit QMaskGenerator(QObject *parent = 0); virtual ~QMaskGenerator(); virtual bool seed() = 0; diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index bf85cc0..77d3973 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -69,7 +69,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject public: explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::VersionLatest, - QObject *parent = Q_NULLPTR); + QObject *parent = 0); virtual ~QWebSocket(); void abort(); diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 1f89ca9..930f344 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -77,7 +77,7 @@ public: }; explicit QWebSocketServer(const QString &serverName, SslMode secureMode, - QObject *parent = Q_NULLPTR); + QObject *parent = 0); virtual ~QWebSocketServer(); bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); -- cgit v1.2.1