diff options
Diffstat (limited to 'src/network/kernel')
-rw-r--r-- | src/network/kernel/qdnslookup.h | 6 | ||||
-rw-r--r-- | src/network/kernel/qhostaddress.cpp | 2 | ||||
-rw-r--r-- | src/network/kernel/qnetworkdatagram.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index ead5e650f5..cd424b0cb9 100644 --- a/src/network/kernel/qdnslookup.h +++ b/src/network/kernel/qdnslookup.h @@ -218,9 +218,9 @@ public: }; Q_ENUM(Type) - explicit QDnsLookup(QObject *parent = Q_NULLPTR); - QDnsLookup(Type type, const QString &name, QObject *parent = Q_NULLPTR); - QDnsLookup(Type type, const QString &name, const QHostAddress &nameserver, QObject *parent = Q_NULLPTR); + explicit QDnsLookup(QObject *parent = nullptr); + QDnsLookup(Type type, const QString &name, QObject *parent = nullptr); + QDnsLookup(Type type, const QString &name, const QHostAddress &nameserver, QObject *parent = nullptr); ~QDnsLookup(); Error error() const; diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 1b7061d050..7d8de71421 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -740,7 +740,7 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr) */ quint32 QHostAddress::toIPv4Address() const { - return toIPv4Address(Q_NULLPTR); + return toIPv4Address(nullptr); } /*! diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h index fa994d6170..c7605d67ba 100644 --- a/src/network/kernel/qnetworkdatagram.h +++ b/src/network/kernel/qnetworkdatagram.h @@ -63,7 +63,7 @@ public: QNetworkDatagram(QNetworkDatagram &&other) Q_DECL_NOTHROW : d(other.d) - { other.d = Q_NULLPTR; } + { other.d = nullptr; } QNetworkDatagram &operator=(QNetworkDatagram &&other) Q_DECL_NOTHROW { swap(other); return *this; } |