make use of the new Q_NULLPTR keyword & shorten if(ptr) conditions

Change-Id: I4a71909134032d10b398ede74c431964bce7d675
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

12 files changed, 24 insertions, 25 deletions

diff --git a/examples/echoclient/echoclient.h b/examples/echoclient/echoclient.h
index f7a0c12..7d3033e 100644
--- a/examples/echoclient/echoclient.h
+++ b/examples/echoclient/echoclient.h
@@ -8,7 +8,7 @@ class EchoClient : public QObject
 {
     Q_OBJECT
 public:
-    explicit EchoClient(const QUrl &url, QObject *parent = 0);
+    explicit EchoClient(const QUrl &url, QObject *parent = Q_NULLPTR);
 
 Q_SIGNALS:
 
diff --git a/examples/echoserver/echoserver.cpp b/examples/echoserver/echoserver.cpp
index ca4be81..e93265a 100644
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
@@ -6,7 +6,7 @@
 //! [constructor]
 EchoServer::EchoServer(quint16 port, QObject *parent) :
     QObject(parent),
-    m_pWebSocketServer(0),
+    m_pWebSocketServer(Q_NULLPTR),
     m_clients()
 {
     m_pWebSocketServer = new QWebSocketServer("Echo Server", this);
@@ -36,7 +36,7 @@ void EchoServer::onNewConnection()
 void EchoServer::processMessage(QString message)
 {
     QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
-    if (pClient != 0)
+    if (pClient)
     {
         pClient->write(message);
     }
@@ -47,7 +47,7 @@ void EchoServer::processMessage(QString message)
 void EchoServer::processBinaryMessage(QByteArray message)
 {
     QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
-    if (pClient != 0)
+    if (pClient)
     {
         pClient->write(message);
     }
@@ -58,7 +58,7 @@ void EchoServer::processBinaryMessage(QByteArray message)
 void EchoServer::socketDisconnected()
 {
     QWebSocket *pClient = qobject_cast<QWebSocket *>(sender());
-    if (pClient != 0)
+    if (pClient)
     {
         m_clients.removeAll(pClient);
         pClient->deleteLater();
diff --git a/examples/echoserver/echoserver.h b/examples/echoserver/echoserver.h
index 227e398..0dc3d58 100644
--- a/examples/echoserver/echoserver.h
+++ b/examples/echoserver/echoserver.h
@@ -12,7 +12,7 @@ class EchoServer : public QObject
 {
     Q_OBJECT
 public:
-    explicit EchoServer(quint16 port, QObject *parent = 0);
+    explicit EchoServer(quint16 port, QObject *parent = Q_NULLPTR);
 
 Q_SIGNALS:
 
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 9b95c28..191911d 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -30,7 +30,7 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QQmlWebSocket(QObject *parent = 0);
+    explicit QQmlWebSocket(QObject *parent = Q_NULLPTR);
 
 public:
     void classBegin() Q_DECL_OVERRIDE;
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp
index 6c7f0b1..d209f37 100644
--- a/src/websockets/qwebsocket.cpp
+++ b/src/websockets/qwebsocket.cpp
@@ -196,7 +196,6 @@ QWebSocket::QWebSocket(const QString &origin, QWebSocketProtocol::Version versio
 QWebSocket::~QWebSocket()
 {
     delete d_ptr;
-    //d_ptr = 0;
 }
 
 /*!
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index 1087878..c1b3db7 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -40,7 +40,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject
     Q_DECLARE_PRIVATE(QWebSocket)
 
 public:
-    explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::V_LATEST, QObject *parent = 0);
+    explicit QWebSocket(const QString &origin = QString(), QWebSocketProtocol::Version version = QWebSocketProtocol::V_LATEST, QObject *parent = Q_NULLPTR);
     virtual ~QWebSocket();
 
     void abort();
@@ -105,7 +105,7 @@ Q_SIGNALS:
     void pong(quint64 elapsedTime, QByteArray payload);
 
 private:
-    QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent = 0);
+    QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent = Q_NULLPTR);
     QWebSocketPrivate * const d_ptr;
 };
 
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 1e8684e..43cca86 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -64,7 +64,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol::
     m_pingTimer(),
     m_dataProcessor()
 {
-    Q_ASSERT(pWebSocket != 0);
+    Q_ASSERT(pWebSocket);
     makeConnections(m_pSocket);
     qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch()));
 }
@@ -91,7 +91,7 @@ QWebSocketPrivate::QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol:
     m_pingTimer(),
     m_dataProcessor()
 {
-    Q_ASSERT(pWebSocket != 0);
+    Q_ASSERT(pWebSocket);
     makeConnections(m_pSocket);
 }
 
@@ -106,7 +106,7 @@ QWebSocketPrivate::~QWebSocketPrivate()
     }
     releaseConnections(m_pSocket);
     m_pSocket->deleteLater();
-    m_pSocket = 0;
+    m_pSocket = Q_NULLPTR;
 }
 
 /*!
@@ -679,7 +679,7 @@ QString readLine(QTcpSocket *pSocket)
 void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
 {
     Q_Q(QWebSocket);
-    if (pSocket == 0)
+    if (!pSocket)
     {
         return;
     }
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index a6b8e7d..b2dcdb8 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -57,7 +57,7 @@ public:
     explicit QWebSocketPrivate(const QString &origin,
                                QWebSocketProtocol::Version version,
                                QWebSocket * const pWebSocket,
-                               QObject *parent = 0);
+                               QObject *parent = Q_NULLPTR);
     virtual ~QWebSocketPrivate();
 
     void abort();
@@ -114,7 +114,7 @@ private Q_SLOTS:
 private:
     QWebSocket * const q_ptr;
 
-    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent = 0);
+    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent = Q_NULLPTR);
     void setVersion(QWebSocketProtocol::Version version);
     void setResourceName(const QString &resourceName);
     void setRequestUrl(const QUrl &requestUrl);
@@ -143,7 +143,7 @@ private:
     static QWebSocket *upgradeFrom(QTcpSocket *tcpSocket,
                                    const QWebSocketHandshakeRequest &request,
                                    const QWebSocketHandshakeResponse &response,
-                                   QObject *parent = 0);
+                                   QObject *parent = Q_NULLPTR);
 
     quint32 generateMaskingKey() const;
     QByteArray generateKey() const;
diff --git a/src/websockets/qwebsocketdataprocessor_p.h b/src/websockets/qwebsocketdataprocessor_p.h
index 117a6cf..a7e2685 100644
--- a/src/websockets/qwebsocketdataprocessor_p.h
+++ b/src/websockets/qwebsocketdataprocessor_p.h
@@ -48,7 +48,7 @@ class Q_AUTOTEST_EXPORT QWebSocketDataProcessor : public QObject
     Q_DISABLE_COPY(QWebSocketDataProcessor)
 
 public:
-    explicit QWebSocketDataProcessor(QObject *parent = 0);
+    explicit QWebSocketDataProcessor(QObject *parent = Q_NULLPTR);
     virtual ~QWebSocketDataProcessor();
 
     static quint64 maxMessageSize();
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 0b2842c..92db91b 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -40,7 +40,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocketServer : public QObject
     Q_DECLARE_PRIVATE(QWebSocketServer)
 
 public:
-    explicit QWebSocketServer(const QString &serverName, QObject *parent = 0);
+    explicit QWebSocketServer(const QString &serverName, QObject *parent = Q_NULLPTR);
     virtual ~QWebSocketServer();
 
     bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0);
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index 47796c2..e611fec 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -37,11 +37,11 @@ QT_BEGIN_NAMESPACE
 QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWebSocketServer * const pWebSocketServer, QObject *parent) :
     QObject(parent),
     q_ptr(pWebSocketServer),
-    m_pTcpServer(0),
+    m_pTcpServer(Q_NULLPTR),
     m_serverName(serverName),
     m_pendingConnections()
 {
-    Q_ASSERT(pWebSocketServer != 0);
+    Q_ASSERT(pWebSocketServer);
     m_pTcpServer = new QTcpServer(this);
     connect(m_pTcpServer, SIGNAL(acceptError(QAbstractSocket::SocketError)), q_ptr, SIGNAL(acceptError(QAbstractSocket::SocketError)));
     connect(m_pTcpServer, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
@@ -125,7 +125,7 @@ void QWebSocketServerPrivate::addPendingConnection(QWebSocket *pWebSocket)
  */
 QWebSocket *QWebSocketServerPrivate::nextPendingConnection()
 {
-    QWebSocket *pWebSocket = 0;
+    QWebSocket *pWebSocket = Q_NULLPTR;
     if (!m_pendingConnections.isEmpty())
     {
         pWebSocket = m_pendingConnections.dequeue();
@@ -281,7 +281,7 @@ void QWebSocketServerPrivate::onNewConnection()
 void QWebSocketServerPrivate::onCloseConnection()
 {
     QTcpSocket *pTcpSocket = qobject_cast<QTcpSocket*>(sender());
-    if (pTcpSocket != 0)
+    if (pTcpSocket)
     {
         pTcpSocket->close();
     }
@@ -294,7 +294,7 @@ void QWebSocketServerPrivate::handshakeReceived()
 {
     Q_Q(QWebSocketServer);
     QTcpSocket *pTcpSocket = qobject_cast<QTcpSocket*>(sender());
-    if (pTcpSocket != 0)
+    if (pTcpSocket)
     {
         bool success = false;
         bool isSecure = false;
diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h
index 6d84160..defad46 100644
--- a/src/websockets/qwebsocketserver_p.h
+++ b/src/websockets/qwebsocketserver_p.h
@@ -48,7 +48,7 @@ class QWebSocketServerPrivate : public QObject
     Q_DECLARE_PUBLIC(QWebSocketServer)
 
 public:
-    explicit QWebSocketServerPrivate(const QString &serverName, QWebSocketServer * const pWebSocketServer, QObject *parent = 0);
+    explicit QWebSocketServerPrivate(const QString &serverName, QWebSocketServer * const pWebSocketServer, QObject *parent = Q_NULLPTR);
     virtual ~QWebSocketServerPrivate();
 
     void close();