diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /src/network/socket/qtcpserver.h | |
parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) |
Replace Q_NULLPTR with nullptr where possible
Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
(definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/network/socket/qtcpserver.h')
-rw-r--r-- | src/network/socket/qtcpserver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 192cbce54c..37df12919f 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -58,7 +58,7 @@ class Q_NETWORK_EXPORT QTcpServer : public QObject { Q_OBJECT public: - explicit QTcpServer(QObject *parent = Q_NULLPTR); + explicit QTcpServer(QObject *parent = nullptr); virtual ~QTcpServer(); bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); @@ -75,7 +75,7 @@ public: qintptr socketDescriptor() const; bool setSocketDescriptor(qintptr socketDescriptor); - bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR); + bool waitForNewConnection(int msec = 0, bool *timedOut = nullptr); virtual bool hasPendingConnections() const; virtual QTcpSocket *nextPendingConnection(); @@ -95,7 +95,7 @@ protected: void addPendingConnection(QTcpSocket* socket); QTcpServer(QAbstractSocket::SocketType socketType, QTcpServerPrivate &dd, - QObject *parent = Q_NULLPTR); + QObject *parent = nullptr); Q_SIGNALS: void newConnection(); |