Use 0 instead of Q_NULLPTR in public headers.

Otherwise Q_NULLPTR appears in documentation, which is inconsistent.

Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 2e02f33..907506b 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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);