whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QString: fix a couple of integral narrowing warnings 

Change-Id: Ibc193665c4fe5458a4ba84a3993dcd67a6180048
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Ahmad Samir 2023-03-08 22:01:15 +02:00
parent 30de1f74de
commit 6e29632006
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/text/qstring.cpp
View File

@ -1200,7 +1200,7 @@ void qt_to_latin1_unchecked(uchar *dst, const char16_t *src, qsizetype length)
Q_NEVER_INLINE static int ucstricmp(qsizetype alen, const char16_t *a, qsizetype blen, const char16_t *b)
{
if (a == b)
return (alen - blen);
return qt_lencmp(alen, blen);
char32_t alast = 0;
char32_t blast = 0;
@ -6434,7 +6434,7 @@ int QString::compare_helper(const QChar *data1, qsizetype length1, const char *d
Q_ASSERT(length1 >= 0);
Q_ASSERT(data1 || length1 == 0);
if (!data2)
return length1;
return qt_lencmp(length1, 0);
if (Q_UNLIKELY(length2 < 0))
length2 = qsizetype(strlen(data2));
return QtPrivate::compareStrings(QStringView(data1, length1),
@ -7212,7 +7212,7 @@ QString QString::vasprintf(const char *cformat, va_list ap)
}
default: {
int *n = va_arg(ap, int*);
*n = result.size();
*n = int(result.size());
break;
}
}