diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:32:50 +0000 |
commit | 08f6b38ec72f9358ce0f6270034b5a8a4baf2e14 (patch) | |
tree | d493c264867b1ee7335b5330f37ed0f65f2e14e0 /src/network/socket/qtcpserver.h | |
parent | 7c8b0c098a374540792e2e8b30c4221c6f68e3ec (diff) |
QtNetwork: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I9a05d375d2d9d3ed56079ad024c89a08a290619b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.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 8c7537a9b1..dd7b12c96a 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -51,7 +51,7 @@ class Q_NETWORK_EXPORT QTcpServer : public QObject { Q_OBJECT public: - explicit QTcpServer(QObject *parent = 0); + explicit QTcpServer(QObject *parent = Q_NULLPTR); virtual ~QTcpServer(); bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0); @@ -68,7 +68,7 @@ public: qintptr socketDescriptor() const; bool setSocketDescriptor(qintptr socketDescriptor); - bool waitForNewConnection(int msec = 0, bool *timedOut = 0); + bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR); virtual bool hasPendingConnections() const; virtual QTcpSocket *nextPendingConnection(); @@ -87,7 +87,7 @@ protected: virtual void incomingConnection(qintptr handle); void addPendingConnection(QTcpSocket* socket); - QTcpServer(QTcpServerPrivate &dd, QObject *parent = 0); + QTcpServer(QTcpServerPrivate &dd, QObject *parent = Q_NULLPTR); Q_SIGNALS: void newConnection(); |