diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-30 13:37:20 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-30 17:19:27 +0100 |
| commit | abc5b75d7f9c488660e964ffdd6b32e8eed3e483 (patch) | |
| tree | a6e5b67cb15491d52dc4b00cb960c245e7be42bd /src/network | |
| parent | 91140eb7268bc36efceef0459e7b124ce333829e (diff) | |
Hide comparison of QHostAddress with SpecialAddress from ADL
Make global operators hidden friends. No change to the member-operators.
Task-number: QTBUG-87976
Change-Id: If7b08a30700d4e2f1a304d4b6cc4b5d02ee5e251
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 6 | ||||
| -rw-r--r-- | src/network/kernel/qhostaddress.h | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 007608dd68..ea46d76ee0 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1272,8 +1272,7 @@ size_t qHash(const QHostAddress &key, size_t seed) noexcept } /*! - \fn bool operator==(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) - \relates QHostAddress + \fn bool QHostAddress::operator==(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) Returns \c true if special address \a lhs is the same as host address \a rhs; otherwise returns \c false. @@ -1282,8 +1281,7 @@ size_t qHash(const QHostAddress &key, size_t seed) noexcept */ /*! - \fn bool operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) - \relates QHostAddress + \fn bool QHostAddress::operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) \since 5.9 Returns \c false if special address \a lhs is the same as host address \a rhs; diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 82790fa28d..2b61cbba14 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -148,6 +148,12 @@ public: static QPair<QHostAddress, int> parseSubnet(const QString &subnet); friend Q_NETWORK_EXPORT size_t qHash(const QHostAddress &key, size_t seed) noexcept; + + friend bool operator ==(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) + { return rhs == lhs; } + friend bool operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) + { return rhs != lhs; } + protected: friend class QHostAddressPrivate; QExplicitlySharedDataPointer<QHostAddressPrivate> d; @@ -155,11 +161,6 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QHostAddress::ConversionMode) Q_DECLARE_SHARED(QHostAddress) -inline bool operator ==(QHostAddress::SpecialAddress address1, const QHostAddress &address2) -{ return address2 == address1; } -inline bool operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs) -{ return rhs != lhs; } - #ifndef QT_NO_DEBUG_STREAM Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QHostAddress &); #endif |