From f5762cd4b3130a650044863c5be132056f05daa5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 9 Nov 2021 16:39:42 -0800 Subject: QJsonArray: use QJsonValueConstRef Change-Id: I5e52dc5b093c43a3b678fffd16b6086dcd1d3268 Reviewed-by: Edward Welbourne --- src/corelib/serialization/qjsonarray.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/corelib/serialization') diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 462a7c76d8..cf534103f9 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -126,7 +126,8 @@ public: } inline QJsonValueRef operator*() const { return item; } - inline QJsonValueRef *operator->() const { return &item; } + inline const QJsonValueConstRef *operator->() const { return &item; } + inline QJsonValueRef *operator->() { return &item; } inline QJsonValueRef operator[](qsizetype j) const { return { item.a, qsizetype(item.index) + j }; } @@ -161,7 +162,7 @@ public: inline qsizetype operator-(iterator j) const { return item.index - j.item.index; } private: - mutable QJsonValueRef item; + QJsonValueRef item; friend class QJsonArray; }; friend class iterator; @@ -187,11 +188,11 @@ public: return *this; } - inline const QJsonValueRef operator*() const { return item; } - inline const QJsonValueRef *operator->() const { return &item; } + inline const QJsonValueConstRef operator*() const { return item; } + inline const QJsonValueConstRef *operator->() const { return &item; } - inline QJsonValueRef operator[](qsizetype j) const - { return { item.a, qsizetype(item.index) + j }; } + inline QJsonValueConstRef operator[](qsizetype j) const + { return QJsonValueRef{ item.a, qsizetype(item.index) + j }; } inline bool operator==(const const_iterator &o) const { return item.a == o.item.a && item.index == o.item.index; } inline bool operator!=(const const_iterator &o) const { return !(*this == o); } @@ -214,7 +215,7 @@ public: inline qsizetype operator-(const_iterator j) const { return item.index - j.item.index; } private: - QJsonValueRef item; + QJsonValueConstRef item; friend class QJsonArray; }; friend class const_iterator; -- cgit v1.2.3