diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-04-16 16:11:13 +0200 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-05-01 22:59:59 +0200 |
| commit | 71bbc35a3774ba7411970ff74068f5211b73e425 (patch) | |
| tree | e2ba143a7f719d2c45b83b50b6c13579ef6b97e7 /src/corelib/text | |
| parent | 88447a0c5367a23ac29d24a1bed642265c6ba0f1 (diff) | |
QLocale: use new comparison helper macros
Replace public friend operators operator==(), operator!=() of
QLocale to friend method comparesEqual() and
Q_DECLARE_EQUALITY_COMPARABLE macro.
Task-number: QTBUG-120304
Change-Id: I759ef08269abe3b40e0dce3fd408a86cc3f34857
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qlocale.h | 7 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.qdoc | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index cb3eb64193..abef24ea0e 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1173,8 +1173,11 @@ private: friend class QRomanCalendar; friend Q_CORE_EXPORT size_t qHash(const QLocale &key, size_t seed) noexcept; - friend bool operator==(const QLocale &lhs, const QLocale &rhs) { return lhs.equals(rhs); } - friend bool operator!=(const QLocale &lhs, const QLocale &rhs) { return !lhs.equals(rhs); } + friend bool comparesEqual(const QLocale &lhs, const QLocale &rhs) noexcept + { + return lhs.equals(rhs); + } + Q_DECLARE_EQUALITY_COMPARABLE(QLocale) QSharedDataPointer<QLocalePrivate> d; }; diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index f3f0a5cc2d..0cdacfd8e5 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -7,6 +7,7 @@ \brief The QLocale class converts between numbers and their string representations in various languages. + \compares equality \reentrant \ingroup i18n \ingroup string-processing |