diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-07 10:10:44 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-07 23:15:25 +0000 |
| commit | b6ae9ee153e32e36f2a7c24f913ef74c14beb3f5 (patch) | |
| tree | da1213b7000915f6758a3b7f3ae7834f8b265fac | |
| parent | ff5003889e6e6c848f563d5a0c6f9cee009347e0 (diff) | |
QFlatMap: fix const iterator API
Iterators model pointer, so const must be shallow.
Change-Id: I90494c98762f1494efcca4965ee739540333f5d7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit a5b158ed6dd5e393eab78f4034a93ac1250850e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/tools/qflatmap_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/tools/qflatmap_p.h b/src/corelib/tools/qflatmap_p.h index 2f9fe87639..ac5f701e85 100644 --- a/src/corelib/tools/qflatmap_p.h +++ b/src/corelib/tools/qflatmap_p.h @@ -161,12 +161,12 @@ public: { } - reference operator*() + reference operator*() const { return { c->keys[i], c->values[i] }; } - pointer operator->() + pointer operator->() const { return { operator*() }; } @@ -242,7 +242,7 @@ public: return b.i - a.i; } - reference operator[](size_type n) + reference operator[](size_type n) const { size_type k = i + n; return { c->keys[k], c->values[k] }; @@ -269,7 +269,7 @@ public: } const Key &key() const { return c->keys[i]; } - T &value() { return c->values[i]; } + T &value() const { return c->values[i]; } private: containers *c = nullptr; @@ -298,12 +298,12 @@ public: { } - reference operator*() + reference operator*() const { return { c->keys[i], c->values[i] }; } - pointer operator->() + pointer operator->() const { return { operator*() }; } @@ -379,7 +379,7 @@ public: return b.i - a.i; } - reference operator[](size_type n) + reference operator[](size_type n) const { size_type k = i + n; return { c->keys[k], c->values[k] }; @@ -406,7 +406,7 @@ public: } const Key &key() const { return c->keys[i]; } - const T &value() { return c->values[i]; } + const T &value() const { return c->values[i]; } private: const containers *c = nullptr; |