1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update QUtfFunctions and QUtfTraits to use qsizetype

Browse Source 
Change-Id: Ic7d76513395645dba05f0023fdfcef0692c9b03b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-05-05 15:07:02 +02:00
parent 1a6bf6c549
commit 751a003d1e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qurlrecode.cpp
View File

@ -268,7 +268,7 @@ struct QUrlUtf8Traits : public QUtf8BaseTraitsNoAscii
*ptr++ = encodeNibble(b & 0xf); *ptr++ = encodeNibble(b & 0xf);
} }
static uchar peekByte(const ushort *ptr, int n = 0) static uchar peekByte(const ushort *ptr, qsizetype n = 0)
{ {
// decodePercentEncoding returns ushort(-1) if it can't decode, // decodePercentEncoding returns ushort(-1) if it can't decode,
// which means we return 0xff, which is not a valid continuation byte. // which means we return 0xff, which is not a valid continuation byte.

14
src/corelib/text/qstringconverter_p.h
View File

@ -72,13 +72,13 @@ struct QUtf8BaseTraits
static void appendByte(uchar *&ptr, uchar b) static void appendByte(uchar *&ptr, uchar b)
{ *ptr++ = b; } { *ptr++ = b; }
static uchar peekByte(const uchar *ptr, int n = 0) static uchar peekByte(const uchar *ptr, qsizetype n = 0)
{ return ptr[n]; } { return ptr[n]; }
static qptrdiff availableBytes(const uchar *ptr, const uchar *end) static qptrdiff availableBytes(const uchar *ptr, const uchar *end)
{ return end - ptr; } { return end - ptr; }
static void advanceByte(const uchar *&ptr, int n = 1) static void advanceByte(const uchar *&ptr, qsizetype n = 1)
{ ptr += n; } { ptr += n; }
static void appendUtf16(ushort *&ptr, ushort uc) static void appendUtf16(ushort *&ptr, ushort uc)
@ -90,13 +90,13 @@ struct QUtf8BaseTraits
appendUtf16(ptr, QChar::lowSurrogate(uc)); 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]; } { return ptr[n]; }
static qptrdiff availableUtf16(const ushort *ptr, const ushort *end) static qptrdiff availableUtf16(const ushort *ptr, const ushort *end)
{ return end - ptr; } { return end - ptr; }
static void advanceUtf16(const ushort *&ptr, int n = 1) static void advanceUtf16(const ushort *&ptr, qsizetype n = 1)
{ ptr += n; } { ptr += n; }
// it's possible to output to UCS-4 too // 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 the number of characters consumed (including \a b) in case of success;
/// returns negative in case of error: Traits::Error or Traits::EndOfString /// returns negative in case of error: Traits::Error or Traits::EndOfString
template <typename Traits, typename OutputPtr, typename InputPtr> inline 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 min_uc;
uint uc; uint uc;
@ -217,7 +217,7 @@ namespace QUtf8Functions
return Traits::Error; return Traits::Error;
} }
int bytesAvailable = Traits::availableBytes(src, end); qptrdiff bytesAvailable = Traits::availableBytes(src, end);
if (Q_UNLIKELY(bytesAvailable < charsNeeded - 1)) { if (Q_UNLIKELY(bytesAvailable < charsNeeded - 1)) {
// it's possible that we have an error instead of just unfinished bytes // it's possible that we have an error instead of just unfinished bytes
if (bytesAvailable > 0 && !isContinuationByte(Traits::peekByte(src, 0))) if (bytesAvailable > 0 && !isContinuationByte(Traits::peekByte(src, 0)))