diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-03-12 20:33:15 +0100 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-03-20 15:21:00 +0100 |
| commit | e5ebb9022ab9e00ab01d0bce527755da77083217 (patch) | |
| tree | 0bed612324c53537eacfe296a34461c11d75d4c2 /src/corelib/compat | |
| parent | b7eb73b1f0b550c1697b70c3ab9ddb7480557faf (diff) | |
QCborMap: use new comparison helper macros
Replace public operators operator==(), operator!=(), operator<() of
QCborMap to friend methods comparesEqual() / compareThreeWay().
Use QT_CORE_REMOVED_SINCE to get rid of current comparison methods
and replace them with a friend.
Delete #if 0 && __has_include(<compare>) blocks,
since they are not required anymore.
Add friend methods comparesEqual(QCborMap, QCborValue) and
compareThreeWay(QCborMap, QCborValue) to the QCborMap
class, to support comparison between QCborMap
and QCborValue elements, see test-case mapSelfAssign() ->
QT_TEST_EQUALITY_OPS(it.key(), QCborMap({{0, v}}), true);
Task-number: QTBUG-120300
Change-Id: I9e33df255d16484efd3124cf0632db859408fb5d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/corelib/compat')
| -rw-r--r-- | src/corelib/compat/removed_api.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 372b647bf0..f10eba5f7a 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -934,6 +934,8 @@ QUrl QUrl::fromEncoded(const QByteArray &input, ParsingMode mode) #include "qcborarray.h" // inlined API +#include "qcbormap.h" // inlined API + #include "qcborvalue.h" // inlined API #include "qdatastream.h" // inlined API |