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

Fix typos in qstring.cpp (noticed while reviewing other changes)

Browse Source 
Pick-to: 6.8
Change-Id: Ief8a9c429b5cdf424e0c3a57d15b1fcb4fdc963c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 5d5c8d277af77cba069b805074551254c0f0d9c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2024-12-09 13:53:35 +01:00 committed by Qt Cherry-pick Bot
parent 9d7fabb6c2
commit 7baf9d06b5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2476,7 +2476,7 @@ qsizetype QString::toUcs4_helper(const char16_t *uc, qsizetype length, char32_t
If \a unicode is 0, a null string is constructed. If \a unicode is 0, a null string is constructed.
If \a size is negative, \a unicode is assumed to point to a \\0'-terminated If \a size is negative, \a unicode is assumed to point to a '\\0'-terminated
array and its length is determined dynamically. The terminating array and its length is determined dynamically. The terminating
null character is not considered part of the string. null character is not considered part of the string.
@ -5848,10 +5848,10 @@ static QList<uint> qt_convert_to_ucs4(QStringView string);
UTF-32 is a Unicode codec and therefore it is lossless. All characters from UTF-32 is a Unicode codec and therefore it is lossless. All characters from
this string will be encoded in UTF-32. Any invalid sequence of code units in this string will be encoded in UTF-32. Any invalid sequence of code units in
this string is replaced by the Unicode's replacement character this string is replaced by the Unicode replacement character
(QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}). (QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}).
The returned list is not \\0'-terminated. The returned list is not 0-terminated.
\sa fromUtf8(), toUtf8(), toLatin1(), toLocal8Bit(), QStringEncoder, \sa fromUtf8(), toUtf8(), toLatin1(), toLocal8Bit(), QStringEncoder,
fromUcs4(), toWCharArray() fromUcs4(), toWCharArray()
@ -5881,10 +5881,10 @@ static QList<uint> qt_convert_to_ucs4(QStringView string)
UTF-32 is a Unicode codec and therefore it is lossless. All characters from UTF-32 is a Unicode codec and therefore it is lossless. All characters from
this string will be encoded in UTF-32. Any invalid sequence of code units in this string will be encoded in UTF-32. Any invalid sequence of code units in
this string is replaced by the Unicode's replacement character this string is replaced by the Unicode replacement character
(QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}). (QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}).
The returned list is not \\0'-terminated. The returned list is not 0-terminated.
\sa QString::toUcs4(), QStringView::toUcs4(), QtPrivate::convertToLatin1(), \sa QString::toUcs4(), QStringView::toUcs4(), QtPrivate::convertToLatin1(),
QtPrivate::convertToLocal8Bit(), QtPrivate::convertToUtf8() QtPrivate::convertToLocal8Bit(), QtPrivate::convertToUtf8()
@ -6066,7 +6066,7 @@ QString QString::fromUtf8(QByteArrayView ba)
Returns a QString initialized with the first \a size characters Returns a QString initialized with the first \a size characters
of the Unicode string \a unicode (ISO-10646-UTF-16 encoded). of the Unicode string \a unicode (ISO-10646-UTF-16 encoded).
If \a size is -1 (default), \a unicode must be \\0'-terminated. If \a size is -1 (default), \a unicode must be '\\0'-terminated.
This function checks for a Byte Order Mark (BOM). If it is missing, This function checks for a Byte Order Mark (BOM). If it is missing,
host byte order is assumed. host byte order is assumed.
@ -6105,7 +6105,7 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size)
Returns a QString initialized with the first \a size characters Returns a QString initialized with the first \a size characters
of the Unicode string \a unicode (encoded as UTF-32). of the Unicode string \a unicode (encoded as UTF-32).
If \a size is -1 (default), \a unicode must be \\0'-terminated. If \a size is -1 (default), \a unicode must be '\\0'-terminated.
\sa toUcs4(), fromUtf16(), utf16(), setUtf16(), fromWCharArray(), \sa toUcs4(), fromUtf16(), utf16(), setUtf16(), fromWCharArray(),
fromStdU32String() fromStdU32String()