From 6fea5b4dd838bd8e49fdc445b851ba8cdd3635ef Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 17 Mar 2020 14:46:35 +0100 Subject: [PATCH] Make QCborValue::toCbor() const Those methods don't modify the CBOR value, they should be const. Change-Id: I213984ed82e43429413344999a22ad1c4c3beac8 Reviewed-by: Konstantin Ritt Reviewed-by: Thiago Macieira --- src/corelib/serialization/qcborvalue.cpp | 4 ++-- src/corelib/serialization/qcborvalue.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index db2840704c..5a59646233 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -2506,7 +2506,7 @@ QCborValue QCborValue::fromCbor(const QByteArray &ba, QCborParserError *error) \sa fromCbor(), fromVariant(), fromJsonValue() */ -QByteArray QCborValue::toCbor(EncodingOptions opt) +QByteArray QCborValue::toCbor(EncodingOptions opt) const { QByteArray result; QCborStreamWriter writer(&result); @@ -2543,7 +2543,7 @@ QByteArray QCborValue::toCbor(EncodingOptions opt) \sa fromCbor(), fromVariant(), fromJsonValue() */ -Q_NEVER_INLINE void QCborValue::toCbor(QCborStreamWriter &writer, EncodingOptions opt) +Q_NEVER_INLINE void QCborValue::toCbor(QCborStreamWriter &writer, EncodingOptions opt) const { if (isContainer() || isTag()) return encodeToCbor(writer, container, -type(), opt); diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index f7064ac6e1..bbe2774e69 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -298,8 +298,8 @@ public: { return fromCbor(QByteArray(reinterpret_cast(data), int(len)), error); } #endif // QT_CONFIG(cborstreamreader) #if QT_CONFIG(cborstreamwriter) - QByteArray toCbor(EncodingOptions opt = NoTransformation); - void toCbor(QCborStreamWriter &writer, EncodingOptions opt = NoTransformation); + QByteArray toCbor(EncodingOptions opt = NoTransformation) const; + void toCbor(QCborStreamWriter &writer, EncodingOptions opt = NoTransformation) const; #endif QString toDiagnosticNotation(DiagnosticNotationOptions opts = Compact) const;