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

Minor tidy-up: two sizetype fixes, two \nullptr uses

Browse Source 
Change-Id: I6c4a1296350ecaf9a661dba22670fbb2ad23bd77
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2021-01-06 12:27:40 +01:00
parent c9c598d4d7
commit 4724d017ef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5432,7 +5432,7 @@ QString QString::fromUcs4(const char32_t *unicode, qsizetype size)
Resizes the string to \a size characters and copies \a unicode Resizes the string to \a size characters and copies \a unicode
into the string. into the string.
If \a unicode is 0, nothing is copied, but the string is still If \a unicode is \nullptr, nothing is copied, but the string is still
resized to \a size. resized to \a size.
\sa unicode(), setUtf16() \sa unicode(), setUtf16()
@ -5451,7 +5451,7 @@ QString& QString::setUnicode(const QChar *unicode, qsizetype size)
Resizes the string to \a size characters and copies \a unicode Resizes the string to \a size characters and copies \a unicode
into the string. into the string.
If \a unicode is 0, nothing is copied, but the string is still If \a unicode is \nullptr, nothing is copied, but the string is still
resized to \a size. resized to \a size.
Note that unlike fromUtf16(), this function does not consider BOMs and Note that unlike fromUtf16(), this function does not consider BOMs and

4
src/corelib/text/qstring.h
View File

@ -1448,8 +1448,8 @@ inline QString QString::fromStdU32String(const std::u32string &s)
inline std::u32string QString::toStdU32String() const inline std::u32string QString::toStdU32String() const
{ {
std::u32string u32str(length(), char32_t(0)); std::u32string u32str(length(), char32_t(0));
int len = toUcs4_helper(reinterpret_cast<const ushort *>(constData()), length(), qsizetype len = toUcs4_helper(reinterpret_cast<const ushort *>(constData()),
reinterpret_cast<uint*>(&u32str[0])); length(), reinterpret_cast<uint*>(&u32str[0]));
u32str.resize(len); u32str.resize(len);
return u32str; return u32str;
} }

2
src/network/kernel/qauthenticator.cpp
View File

@ -1442,7 +1442,7 @@ static bool qNtlmDecodePhase2(const QByteArray& data, QNtlmPhase2Block& ch)
ds >> ch.targetInfo; ds >> ch.targetInfo;
if (ch.targetName.len > 0) { if (ch.targetName.len > 0) {
if (ch.targetName.len + ch.targetName.offset > (unsigned)data.size()) if (qsizetype(ch.targetName.len + ch.targetName.offset) > data.size())
return false; return false;
ch.targetNameStr = qStringFromUcs2Le(data.mid(ch.targetName.offset, ch.targetName.len)); ch.targetNameStr = qStringFromUcs2Le(data.mid(ch.targetName.offset, ch.targetName.len));