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

Doc: normalize the {to,from}WCharArray text about encodings

Browse Source 
Properly capitalize the names UTF-16 and UCS-4 and make sure we talk
about UTF-16 and not UCS-2. UCS-2 is not the same and does not support
surrogate pairs.

Task-number: QTBUG-35287
Change-Id: If33270996bacc9ae5d04c87423fa1ee9ddaff230
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Thiago Macieira 2014-08-02 00:41:39 -03:00
parent 986230eef9
commit 9c22b5c30a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qstring.cpp
View File

@ -1347,8 +1347,8 @@ const QString::Null QString::null = { };
\since 4.2 \since 4.2
Returns a copy of the \a string, where the encoding of \a string depends on Returns a copy of the \a string, where the encoding of \a string depends on
the size of wchar. If wchar is 4 bytes, the \a string is interpreted as ucs-4, the size of wchar. If wchar is 4 bytes, the \a string is interpreted as UCS-4,
if wchar is 2 bytes it is interpreted as ucs-2. if wchar is 2 bytes it is interpreted as UTF-16.
If \a size is -1 (default), the \a string has to be 0 terminated. If \a size is -1 (default), the \a string has to be 0 terminated.
@ -1383,8 +1383,8 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out)
\since 4.2 \since 4.2
Fills the \a array with the data contained in this QString object. Fills the \a array with the data contained in this QString object.
The array is encoded in utf16 on platforms where The array is encoded in UTF-16 on platforms where
wchar_t is 2 bytes wide (e.g. windows) and in ucs4 on platforms wchar_t is 2 bytes wide (e.g. windows) and in UCS-4 on platforms
where wchar_t is 4 bytes wide (most Unix systems). where wchar_t is 4 bytes wide (most Unix systems).
\a array has to be allocated by the caller and contain enough space to \a array has to be allocated by the caller and contain enough space to