summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 15:52:31 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 13:55:57 +0000
commit0ec852ed326efe9747bff1dcdef327c690a944b4 (patch)
treebaeb2a18559282629dd30520ee639ef4c1e8873c /src
parent2d8c94cf11097b61689757f8a0162bb7dd9d7d0b (diff)
downloadqtwebsockets-0ec852ed326efe9747bff1dcdef327c690a944b4.tar.gz
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: Id9621ffedaf190f8b97db613a7c6be2a45f117b3 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qmaskgenerator.h2
-rw-r--r--src/websockets/qwebsocket.h2
-rw-r--r--src/websockets/qwebsocketserver.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h
index 4a13b1d..b366abf 100644
--- a/src/websockets/qmaskgenerator.h
+++ b/src/websockets/qmaskgenerator.h
@@ -44,7 +44,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 7ee4bc6..0c2d9fb 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -62,7 +62,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 71a2ddc..abe654d 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -69,7 +69,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);