From 6dfcbd2ef321ecec1869aa6a7f2a8d881727ea3a Mon Sep 17 00:00:00 2001
From: Steven Ceuppens <steven.ceuppens@icloud.com>
Date: Thu, 10 Oct 2013 16:05:54 +0200
Subject: make use of the new Q_NULLPTR keyword & shorten if(ptr) conditions

Change-Id: I4a71909134032d10b398ede74c431964bce7d675
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---
 examples/echoclient/echoclient.h   | 2 +-
 examples/echoserver/echoserver.cpp | 8 ++++----
 examples/echoserver/echoserver.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples')

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:
 
-- 
cgit v1.2.1