From 9377039fe5efaf2d0e55a978cf63e902faf353eb Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Mon, 18 Mar 2024 15:06:09 +0100 Subject: [PATCH] QCborValue: use new comparison helper macros Add qcborvalue.h header to removed_api.cpp file Ammends from 15da9c75d0a05b7451a35b5b6a3c940f9cb85143 Task-number: QTBUG-120300 Change-Id: Ic33bf80298730f2c3fd408ffb45f0e1b32f531fc Reviewed-by: Ivan Solovev --- src/corelib/compat/removed_api.cpp | 2 ++ src/corelib/serialization/qcborvalue.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 3d11fc1b51..e7b34ceec4 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -932,6 +932,8 @@ QUrl QUrl::fromEncoded(const QByteArray &input, ParsingMode mode) #include "qbytearray.h" // inlined API +#include "qcborvalue.h" // inlined API + #include "qdatastream.h" // inlined API QDataStream &QDataStream::operator<<(bool i) diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index 03861bf527..f9ade611bb 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -223,7 +223,7 @@ public: bool operator==(const QCborValue &other) const noexcept { return compare(other) == 0; } bool operator!=(const QCborValue &other) const noexcept - { return !(*this == other); } + { return !operator==(other); } bool operator<(const QCborValue &other) const { return compare(other) < 0; } #endif