diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-22 16:15:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-05 17:29:26 +0000 |
| commit | 830dc40cd063f1db67c06a360de43bd2e2972b29 (patch) | |
| tree | 9bd1847dad6ad62f730c272232525f803017affd | |
| parent | 64ed6174af39413312456275b54b1f9c72fea8f4 (diff) | |
Port QUtf8BaseTraits to qsizetype
It's unclear why the the char8_t overloads have int sizes. At the time
60aa0d086886aea58d6b7a09484645ad1d92a220 added these, the uchar
overloads were already using qsizetype.
Task-number: QTBUG-103531
Change-Id: I8ed4c5462de29a7d48255e440e34bcd5114755fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ab512adf12a2ba36b51f36d7c998d1cbdcf6505a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/text/qstringconverter_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h index 2ad59af23c..fda4cb1ea7 100644 --- a/src/corelib/text/qstringconverter_p.h +++ b/src/corelib/text/qstringconverter_p.h @@ -79,7 +79,7 @@ struct QUtf8BaseTraits static uchar peekByte(const uchar *ptr, qsizetype n = 0) { return ptr[n]; } - static uchar peekByte(const char8_t *ptr, int n = 0) + static uchar peekByte(const char8_t *ptr, qsizetype n = 0) { return ptr[n]; } static qptrdiff availableBytes(const uchar *ptr, const uchar *end) @@ -91,7 +91,7 @@ struct QUtf8BaseTraits static void advanceByte(const uchar *&ptr, qsizetype n = 1) { ptr += n; } - static void advanceByte(const char8_t *&ptr, int n = 1) + static void advanceByte(const char8_t *&ptr, qsizetype n = 1) { ptr += n; } static void appendUtf16(char16_t *&ptr, char16_t uc) |