From 4cccd3d3dd4a72bf291c8cc273ce2966c68ce8ad Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Dec 2023 09:38:13 +0100 Subject: [PATCH] QByteArray: bring end() into idiomatic form For contiguous containers, end() is always begin() + size(), so use that instead of data() + size(). Centralizes what it means to be an iterator in just begin() now, which will simplify a follow-up commit of Thiago's. Pick-to: 6.5 Change-Id: I53ca1a335910bdea3d46b9496ba39bc1a2d3fd93 Reviewed-by: Thiago Macieira (cherry picked from commit 9dd19532187bd6a5465e6c98a554d24dad1d06d0) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qbytearray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index 3b99ef78b27..f90eeadc06e 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -429,8 +429,8 @@ public: const_iterator begin() const noexcept { return data(); } const_iterator cbegin() const noexcept { return begin(); } const_iterator constBegin() const noexcept { return begin(); } - iterator end() { return data() + size(); } - const_iterator end() const noexcept { return data() + size(); } + iterator end() { return begin() + size(); } + const_iterator end() const noexcept { return begin() + size(); } const_iterator cend() const noexcept { return end(); } const_iterator constEnd() const noexcept { return end(); } reverse_iterator rbegin() { return reverse_iterator(end()); }