aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:05 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-26 17:13:59 +0000
commit75042d31d1d267d0a4091932c95579747a102e9d (patch)
tree36a4efdd96f66e86d5628dd859e98a3b5fc07c19 /examples
parent140764f01742931f27cc721992ea7877396d8c9b (diff)
Replace Q_NULLPTR with nullptr
Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/websockets/echoclient/echoclient.h2
-rw-r--r--examples/websockets/echoserver/echoserver.h2
-rw-r--r--examples/websockets/simplechat/chatserver.cpp2
-rw-r--r--examples/websockets/simplechat/chatserver.h2
-rw-r--r--examples/websockets/sslechoclient/sslechoclient.h2
-rw-r--r--examples/websockets/sslechoserver/sslechoserver.cpp2
-rw-r--r--examples/websockets/sslechoserver/sslechoserver.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/websockets/echoclient/echoclient.h b/examples/websockets/echoclient/echoclient.h
index a0f0d37..a7fd234 100644
--- a/examples/websockets/echoclient/echoclient.h
+++ b/examples/websockets/echoclient/echoclient.h
@@ -57,7 +57,7 @@ class EchoClient : public QObject
{
Q_OBJECT
public:
- explicit EchoClient(const QUrl &url, bool debug = false, QObject *parent = Q_NULLPTR);
+ explicit EchoClient(const QUrl &url, bool debug = false, QObject *parent = nullptr);
Q_SIGNALS:
void closed();
diff --git a/examples/websockets/echoserver/echoserver.h b/examples/websockets/echoserver/echoserver.h
index 593a8c8..3681917 100644
--- a/examples/websockets/echoserver/echoserver.h
+++ b/examples/websockets/echoserver/echoserver.h
@@ -61,7 +61,7 @@ class EchoServer : public QObject
{
Q_OBJECT
public:
- explicit EchoServer(quint16 port, bool debug = false, QObject *parent = Q_NULLPTR);
+ explicit EchoServer(quint16 port, bool debug = false, QObject *parent = nullptr);
~EchoServer();
Q_SIGNALS:
diff --git a/examples/websockets/simplechat/chatserver.cpp b/examples/websockets/simplechat/chatserver.cpp
index ae207f5..50d2625 100644
--- a/examples/websockets/simplechat/chatserver.cpp
+++ b/examples/websockets/simplechat/chatserver.cpp
@@ -57,7 +57,7 @@ QT_USE_NAMESPACE
//! [constructor]
ChatServer::ChatServer(quint16 port, QObject *parent) :
QObject(parent),
- m_pWebSocketServer(Q_NULLPTR)
+ m_pWebSocketServer(nullptr)
{
m_pWebSocketServer = new QWebSocketServer(QStringLiteral("Chat Server"),
QWebSocketServer::NonSecureMode,
diff --git a/examples/websockets/simplechat/chatserver.h b/examples/websockets/simplechat/chatserver.h
index 4c652a3..43ce306 100644
--- a/examples/websockets/simplechat/chatserver.h
+++ b/examples/websockets/simplechat/chatserver.h
@@ -61,7 +61,7 @@ class ChatServer : public QObject
{
Q_OBJECT
public:
- explicit ChatServer(quint16 port, QObject *parent = Q_NULLPTR);
+ explicit ChatServer(quint16 port, QObject *parent = nullptr);
virtual ~ChatServer();
private Q_SLOTS:
diff --git a/examples/websockets/sslechoclient/sslechoclient.h b/examples/websockets/sslechoclient/sslechoclient.h
index 5b87557..6634a44 100644
--- a/examples/websockets/sslechoclient/sslechoclient.h
+++ b/examples/websockets/sslechoclient/sslechoclient.h
@@ -63,7 +63,7 @@ class SslEchoClient : public QObject
{
Q_OBJECT
public:
- explicit SslEchoClient(const QUrl &url, QObject *parent = Q_NULLPTR);
+ explicit SslEchoClient(const QUrl &url, QObject *parent = nullptr);
private Q_SLOTS:
void onConnected();
diff --git a/examples/websockets/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp
index ae5d9ad..00bc6c1 100644
--- a/examples/websockets/sslechoserver/sslechoserver.cpp
+++ b/examples/websockets/sslechoserver/sslechoserver.cpp
@@ -60,7 +60,7 @@ QT_USE_NAMESPACE
//! [constructor]
SslEchoServer::SslEchoServer(quint16 port, QObject *parent) :
QObject(parent),
- m_pWebSocketServer(Q_NULLPTR)
+ m_pWebSocketServer(nullptr)
{
m_pWebSocketServer = new QWebSocketServer(QStringLiteral("SSL Echo Server"),
QWebSocketServer::SecureMode,
diff --git a/examples/websockets/sslechoserver/sslechoserver.h b/examples/websockets/sslechoserver/sslechoserver.h
index 109a78b..8064476 100644
--- a/examples/websockets/sslechoserver/sslechoserver.h
+++ b/examples/websockets/sslechoserver/sslechoserver.h
@@ -62,7 +62,7 @@ class SslEchoServer : public QObject
{
Q_OBJECT
public:
- explicit SslEchoServer(quint16 port, QObject *parent = Q_NULLPTR);
+ explicit SslEchoServer(quint16 port, QObject *parent = nullptr);
virtual ~SslEchoServer();
private Q_SLOTS: