diff options
| author | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-10-10 16:05:54 +0200 |
|---|---|---|
| committer | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-10-11 10:46:56 +0200 |
| commit | 6dfcbd2ef321ecec1869aa6a7f2a8d881727ea3a (patch) | |
| tree | 9f9139a2528ae5971bf1655604658a1bb7117449 /examples | |
| parent | b86f2949f63e0ae904c19fb6d39dc6793b164db9 (diff) | |
| download | qtwebsockets-6dfcbd2ef321ecec1869aa6a7f2a8d881727ea3a.tar.gz | |
make use of the new Q_NULLPTR keyword & shorten if(ptr) conditions
Change-Id: I4a71909134032d10b398ede74c431964bce7d675
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/echoclient/echoclient.h | 2 | ||||
| -rw-r--r-- | examples/echoserver/echoserver.cpp | 8 | ||||
| -rw-r--r-- | examples/echoserver/echoserver.h | 2 |
3 files changed, 6 insertions, 6 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: |