diff options
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/text/qstring.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 85ee6710a0..da212ac291 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -5432,7 +5432,7 @@ QString QString::fromUcs4(const char32_t *unicode, qsizetype size) Resizes the string to \a size characters and copies \a unicode 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. \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 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. Note that unlike fromUtf16(), this function does not consider BOMs and diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 86f6d829d4..8926f6f3af 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -1448,8 +1448,8 @@ inline QString QString::fromStdU32String(const std::u32string &s) inline std::u32string QString::toStdU32String() const { std::u32string u32str(length(), char32_t(0)); - int len = toUcs4_helper(reinterpret_cast<const ushort *>(constData()), length(), - reinterpret_cast<uint*>(&u32str[0])); + qsizetype len = toUcs4_helper(reinterpret_cast<const ushort *>(constData()), + length(), reinterpret_cast<uint*>(&u32str[0])); u32str.resize(len); return u32str; } |