diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-08-02 00:41:39 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-08-05 19:23:29 +0200 |
| commit | 9c22b5c30a1c9f519f571ff997991804e096c586 (patch) | |
| tree | 85c078725be4b1b510fac5f1329a68dd2a30b494 /src/corelib | |
| parent | 986230eef9720ad720e352baeec7f70f7c848903 (diff) | |
Doc: normalize the {to,from}WCharArray text about encodings
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index fdde0955dd..d3cb62429f 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -1347,8 +1347,8 @@ const QString::Null QString::null = { }; \since 4.2 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, - if wchar is 2 bytes it is interpreted as ucs-2. + 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 UTF-16. 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 Fills the \a array with the data contained in this QString object. - The array is encoded in utf16 on platforms where - wchar_t is 2 bytes wide (e.g. windows) and in ucs4 on platforms + The array is encoded in UTF-16 on platforms where + 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). \a array has to be allocated by the caller and contain enough space to |