diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 15:07:02 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-14 07:51:39 +0200 |
| commit | 751a003d1e99735fb77e6870a7672cb5c39a21f9 (patch) | |
| tree | 4f9451a3d67c0ac525a21f3fea913931b6c1c411 /src/corelib/text/qstringconverter_p.h | |
| parent | 1a6bf6c549bcad78f7918dc53c48e5db4fdf4c3d (diff) | |
Update QUtfFunctions and QUtfTraits to use qsizetype
Change-Id: Ic7d76513395645dba05f0023fdfcef0692c9b03b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstringconverter_p.h')
| -rw-r--r-- | src/corelib/text/qstringconverter_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h index 23e7b60a76..6f961259ef 100644 --- a/src/corelib/text/qstringconverter_p.h +++ b/src/corelib/text/qstringconverter_p.h @@ -72,13 +72,13 @@ struct QUtf8BaseTraits static void appendByte(uchar *&ptr, uchar b) { *ptr++ = b; } - static uchar peekByte(const uchar *ptr, int n = 0) + static uchar peekByte(const uchar *ptr, qsizetype n = 0) { return ptr[n]; } static qptrdiff availableBytes(const uchar *ptr, const uchar *end) { return end - ptr; } - static void advanceByte(const uchar *&ptr, int n = 1) + static void advanceByte(const uchar *&ptr, qsizetype n = 1) { ptr += n; } static void appendUtf16(ushort *&ptr, ushort uc) @@ -90,13 +90,13 @@ struct QUtf8BaseTraits appendUtf16(ptr, QChar::lowSurrogate(uc)); } - static ushort peekUtf16(const ushort *ptr, int n = 0) + static ushort peekUtf16(const ushort *ptr, qsizetype n = 0) { return ptr[n]; } static qptrdiff availableUtf16(const ushort *ptr, const ushort *end) { return end - ptr; } - static void advanceUtf16(const ushort *&ptr, int n = 1) + static void advanceUtf16(const ushort *&ptr, qsizetype n = 1) { ptr += n; } // it's possible to output to UCS-4 too @@ -182,9 +182,9 @@ namespace QUtf8Functions /// returns the number of characters consumed (including \a b) in case of success; /// returns negative in case of error: Traits::Error or Traits::EndOfString template <typename Traits, typename OutputPtr, typename InputPtr> inline - int fromUtf8(uchar b, OutputPtr &dst, InputPtr &src, InputPtr end) + qsizetype fromUtf8(uchar b, OutputPtr &dst, InputPtr &src, InputPtr end) { - int charsNeeded; + qsizetype charsNeeded; uint min_uc; uint uc; @@ -217,7 +217,7 @@ namespace QUtf8Functions return Traits::Error; } - int bytesAvailable = Traits::availableBytes(src, end); + qptrdiff bytesAvailable = Traits::availableBytes(src, end); if (Q_UNLIKELY(bytesAvailable < charsNeeded - 1)) { // it's possible that we have an error instead of just unfinished bytes if (bytesAvailable > 0 && !isContinuationByte(Traits::peekByte(src, 0))) |