diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-09 16:39:42 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-15 17:00:03 -0800 |
commit | f5762cd4b3130a650044863c5be132056f05daa5 (patch) | |
tree | d86f4bd52564628812b23c3f7776fef65e4a9ee5 /src/corelib/serialization | |
parent | 51fc3170417d02d1a27ce68ec561c31a131f2d75 (diff) |
QJsonArray: use QJsonValueConstRef
Change-Id: I5e52dc5b093c43a3b678fffd16b6086dcd1d3268
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qjsonarray.h | 15 |
1 files changed, 8 insertions, 7 deletions
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; |