diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-27 09:27:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-27 16:43:12 +0100 |
| commit | 72ccb4fa7b88243064867b23713384e14cef6087 (patch) | |
| tree | 6ea2897c72d9453ed238a848e51aa5ae2adbd05b /src/corelib/tools/qversionnumber.h | |
| parent | 331a200b9746177d84deb06675be5f31bd1ae079 (diff) | |
Make QVersionNumber and QArrayDataPointer comparisons hidden
Change-Id: I8de0407843103b49877621534c14046e3a7d1b2f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/tools/qversionnumber.h')
| -rw-r--r-- | src/corelib/tools/qversionnumber.h | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index 392efc7462..dc34c12ca2 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -277,6 +277,25 @@ public: [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QLatin1String string, int *suffixIndex = nullptr); [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QStringView string, int *suffixIndex = nullptr); + [[nodiscard]] friend bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) > 0; } + + [[nodiscard]] friend bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) >= 0; } + + [[nodiscard]] friend bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) < 0; } + + [[nodiscard]] friend bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) <= 0; } + + [[nodiscard]] friend bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) == 0; } + + [[nodiscard]] friend bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept + { return compare(lhs, rhs) != 0; } + + private: #ifndef QT_NO_DATASTREAM friend Q_CORE_EXPORT QDataStream& operator>>(QDataStream &in, QVersionNumber &version); @@ -290,24 +309,6 @@ Q_DECLARE_TYPEINFO(QVersionNumber, Q_MOVABLE_TYPE); Q_CORE_EXPORT QDebug operator<<(QDebug, const QVersionNumber &version); #endif -[[nodiscard]] inline bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) > 0; } - -[[nodiscard]] inline bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) >= 0; } - -[[nodiscard]] inline bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) < 0; } - -[[nodiscard]] inline bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) <= 0; } - -[[nodiscard]] inline bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) == 0; } - -[[nodiscard]] inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept -{ return QVersionNumber::compare(lhs, rhs) != 0; } - class QTypeRevision; Q_CORE_EXPORT size_t qHash(const QTypeRevision &key, size_t seed = 0); |