diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-06 08:17:55 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-13 12:48:09 +0100 |
commit | ccfcf7760c1e8d8c075dc062c9f529d219ebd09d (patch) | |
tree | 042ef1a7d953cfba4580604190c52c793ecd607c | |
parent | 164e559c8a7a34aa46ef7563a19100f81a1cade4 (diff) |
Remove custom operator<(QTypeRevision, QTypeRevision)
We have global comparison operators now.
Change-Id: I5e7461c8442591f139642379f8889445dfaa8431
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | src/qml/qml/qqml.cpp | 11 | ||||
-rw-r--r-- | src/qmltyperegistrar/qmltypescreator.h | 15 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index c732818bd9..c71e6b68b8 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -104,17 +104,6 @@ QObject *QQmlPrivate::RegisterSingletonFunctor::operator()(QQmlEngine *qeng, QJS return m_object; }; -// We cannot generally assume that the unspecified version is smaller than any specified one. -// Therefore, this operator< should not move to QtCore. -static bool operator<(QTypeRevision lhs, QTypeRevision rhs) -{ - return lhs.hasMajorVersion() - ? (rhs.hasMajorVersion() - && lhs.toEncodedVersion<quint16>() < rhs.toEncodedVersion<quint16>()) - : (rhs.hasMajorVersion() - || lhs.minorVersion() < rhs.minorVersion()); -} - static QVector<QTypeRevision> availableRevisions(const QMetaObject *metaObject) { QVector<QTypeRevision> revisions; diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h index 2ef4e8ff4b..808c189323 100644 --- a/src/qmltyperegistrar/qmltypescreator.h +++ b/src/qmltyperegistrar/qmltypescreator.h @@ -65,19 +65,4 @@ private: QTypeRevision m_version = QTypeRevision::zero(); }; -QT_BEGIN_NAMESPACE - -// We cannot generally assume that the unspecified version is smaller than any specified one. -// Therefore, this operator< should not move to QtCore. -inline bool operator<(QTypeRevision lhs, QTypeRevision rhs) -{ - return lhs.hasMajorVersion() - ? (rhs.hasMajorVersion() - && lhs.toEncodedVersion<quint16>() < rhs.toEncodedVersion<quint16>()) - : (rhs.hasMajorVersion() - || lhs.minorVersion() < rhs.minorVersion()); -} - -QT_END_NAMESPACE - #endif // QMLTYPESCREATOR_H |