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 | |
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')
-rw-r--r-- | src/network/socket/qabstractsocket.h | 2 | ||||
-rw-r--r-- | src/network/socket/qlocalserver.h | 4 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket.h | 2 | ||||
-rw-r--r-- | src/network/socket/qtcpserver.h | 6 | ||||
-rw-r--r-- | src/network/socket/qtcpsocket.h | 6 | ||||
-rw-r--r-- | src/network/socket/qudpsocket.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index f3d7f13f48..b433c7e97f 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -213,7 +213,7 @@ protected: void setPeerAddress(const QHostAddress &address); void setPeerName(const QString &name); - QAbstractSocket(SocketType socketType, QAbstractSocketPrivate &dd, QObject *parent = 0); + QAbstractSocket(SocketType socketType, QAbstractSocketPrivate &dd, QObject *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QAbstractSocket) diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index a03cdb726d..24908db4aa 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -64,7 +64,7 @@ public: }; Q_DECLARE_FLAGS(SocketOptions, SocketOption) - explicit QLocalServer(QObject *parent = 0); + explicit QLocalServer(QObject *parent = Q_NULLPTR); ~QLocalServer(); void close(); @@ -80,7 +80,7 @@ public: static bool removeServer(const QString &name); QAbstractSocket::SocketError serverError() const; void setMaxPendingConnections(int numConnections); - bool waitForNewConnection(int msec = 0, bool *timedOut = 0); + bool waitForNewConnection(int msec = 0, bool *timedOut = Q_NULLPTR); void setSocketOptions(SocketOptions options); SocketOptions socketOptions() const; diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index a4d8405912..4b39a7c562 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -73,7 +73,7 @@ public: ClosingState = QAbstractSocket::ClosingState }; - QLocalSocket(QObject *parent = 0); + QLocalSocket(QObject *parent = Q_NULLPTR); ~QLocalSocket(); void connectToServer(OpenMode openMode = ReadWrite); 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(); diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index bf5370c976..8e3cb5946f 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -46,13 +46,13 @@ class Q_NETWORK_EXPORT QTcpSocket : public QAbstractSocket { Q_OBJECT public: - explicit QTcpSocket(QObject *parent = 0); + explicit QTcpSocket(QObject *parent = Q_NULLPTR); virtual ~QTcpSocket(); protected: - QTcpSocket(QTcpSocketPrivate &dd, QObject *parent = 0); + QTcpSocket(QTcpSocketPrivate &dd, QObject *parent = Q_NULLPTR); QTcpSocket(QAbstractSocket::SocketType socketType, QTcpSocketPrivate &dd, - QObject *parent = 0); + QObject *parent = Q_NULLPTR); private: Q_DISABLE_COPY(QTcpSocket) diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index fcf16fb345..e902984b4f 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -49,7 +49,7 @@ class Q_NETWORK_EXPORT QUdpSocket : public QAbstractSocket { Q_OBJECT public: - explicit QUdpSocket(QObject *parent = 0); + explicit QUdpSocket(QObject *parent = Q_NULLPTR); virtual ~QUdpSocket(); #ifndef QT_NO_NETWORKINTERFACE @@ -66,7 +66,7 @@ public: bool hasPendingDatagrams() const; qint64 pendingDatagramSize() const; - qint64 readDatagram(char *data, qint64 maxlen, QHostAddress *host = 0, quint16 *port = 0); + qint64 readDatagram(char *data, qint64 maxlen, QHostAddress *host = Q_NULLPTR, quint16 *port = Q_NULLPTR); qint64 writeDatagram(const char *data, qint64 len, const QHostAddress &host, quint16 port); inline qint64 writeDatagram(const QByteArray &datagram, const QHostAddress &host, quint16 port) { return writeDatagram(datagram.constData(), datagram.size(), host, port); } |