diff options
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 61 | ||||
| -rw-r--r-- | src/network/kernel/qhostaddress.h | 9 | ||||
| -rw-r--r-- | tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp | 16 |
3 files changed, 2 insertions, 84 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index c318766796..007608dd68 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -423,18 +423,6 @@ QHostAddress::QHostAddress(quint32 ip4Addr) } /*! - Constructs a host address object with the IPv6 address \a ip6Addr. - - \a ip6Addr must be a 16-byte array in network byte order (big - endian). -*/ -QHostAddress::QHostAddress(quint8 *ip6Addr) - : d(new QHostAddressPrivate) -{ - setAddress(ip6Addr); -} - -/*! \since 5.5 Constructs a host address object with the IPv6 address \a ip6Addr. @@ -519,20 +507,6 @@ QHostAddress &QHostAddress::operator=(const QHostAddress &address) return *this; } -#if QT_DEPRECATED_SINCE(5, 8) -/*! - Assigns the host address \a address to this object, and returns a - reference to this object. - - \sa setAddress() -*/ -QHostAddress &QHostAddress::operator=(const QString &address) -{ - setAddress(address); - return *this; -} -#endif - /*! \since 5.8 Assigns the special address \a address to this object, and returns a @@ -592,20 +566,6 @@ void QHostAddress::setAddress(quint32 ip4Addr) /*! \overload - - Set the IPv6 address specified by \a ip6Addr. - - \a ip6Addr must be an array of 16 bytes in network byte order - (high-order byte first). -*/ -void QHostAddress::setAddress(quint8 *ip6Addr) -{ - d.detach(); - d->setAddress(ip6Addr); -} - -/*! - \overload \since 5.5 Set the IPv6 address specified by \a ip6Addr. @@ -715,26 +675,7 @@ void QHostAddress::setAddress(SpecialAddress address) \l{QAbstractSocket::}{IPv4Protocol}, or if the protocol is \l{QAbstractSocket::}{IPv6Protocol}, - and the IPv6 address is an IPv4 mapped address. (RFC4291) - - \sa toString() -*/ -quint32 QHostAddress::toIPv4Address() const -{ - return toIPv4Address(nullptr); -} - -/*! - Returns the IPv4 address as a number. - - For example, if the address is 127.0.0.1, the returned value is - 2130706433 (i.e. 0x7f000001). - - This value is valid if the protocol() is - \l{QAbstractSocket::}{IPv4Protocol}, - or if the protocol is - \l{QAbstractSocket::}{IPv6Protocol}, - and the IPv6 address is an IPv4 mapped address. (RFC4291). In those + and the IPv6 address is an IPv4 mapped address (RFC4291). In those cases, \a ok will be set to true. Otherwise, it will be set to false. \sa toString() diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 6f83bdef05..82790fa28d 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -93,7 +93,6 @@ public: QHostAddress(); explicit QHostAddress(quint32 ip4Addr); - explicit QHostAddress(quint8 *ip6Addr); // ### Qt 6: remove me explicit QHostAddress(const quint8 *ip6Addr); explicit QHostAddress(const Q_IPV6ADDR &ip6Addr); explicit QHostAddress(const sockaddr *address); @@ -105,16 +104,11 @@ public: QHostAddress &operator=(QHostAddress &&other) noexcept { swap(other); return *this; } QHostAddress &operator=(const QHostAddress &other); -#if QT_DEPRECATED_SINCE(5, 8) - QT_DEPRECATED_X("use = QHostAddress(string) instead") - QHostAddress &operator=(const QString &address); -#endif QHostAddress &operator=(SpecialAddress address); void swap(QHostAddress &other) noexcept { d.swap(other.d); } void setAddress(quint32 ip4Addr); - void setAddress(quint8 *ip6Addr); // ### Qt 6: remove me void setAddress(const quint8 *ip6Addr); void setAddress(const Q_IPV6ADDR &ip6Addr); void setAddress(const sockaddr *address); @@ -122,8 +116,7 @@ public: void setAddress(SpecialAddress address); QAbstractSocket::NetworkLayerProtocol protocol() const; - quint32 toIPv4Address() const; // ### Qt6: merge with next overload - quint32 toIPv4Address(bool *ok) const; + quint32 toIPv4Address(bool *ok = nullptr) const; Q_IPV6ADDR toIPv6Address() const; QString toString() const; diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp index ad8c4a8d1c..6bfd40a580 100644 --- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp @@ -364,23 +364,9 @@ void tst_QHostAddress::isEqual() QCOMPARE(second.isEqual(first, QHostAddress::ConversionModeFlag(flags)), result); } -QT_WARNING_PUSH -#ifdef QT_WARNING_DISABLE_DEPRECATED -QT_WARNING_DISABLE_DEPRECATED -#endif - void tst_QHostAddress::assignment() { QHostAddress address; - -#if QT_DEPRECATED_SINCE(5, 8) - address = "127.0.0.1"; - QCOMPARE(address, QHostAddress("127.0.0.1")); - - address = "::1"; - QCOMPARE(address, QHostAddress("::1")); -#endif - QHostAddress addr("4.2.2.1"); sockaddr_in sockAddr; sockAddr.sin_family = AF_INET; @@ -389,8 +375,6 @@ void tst_QHostAddress::assignment() QCOMPARE(address, addr); } -QT_WARNING_POP - void tst_QHostAddress::scopeId() { QHostAddress address("fe80::2e0:4cff:fefb:662a%eth0"); |