diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index f418de9..043d6a3 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -147,7 +147,7 @@ void QCryptographicHash::addData(const char *data, int length) } /*! - /overload + \overload addData() */ void QCryptographicHash::addData(const QByteArray &data) { diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index cc90b3a..7589f59 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3735,7 +3735,7 @@ QByteArray QString::toUtf8() const Returns a UCS-4/UTF-32 representation of the string as a QVector<uint>. UCS-4 is a Unicode codec and is lossless. All characters from this string - can be encoded in UCS-4. + can be encoded in UCS-4. The vector is not null terminated. \sa fromUtf8(), toAscii(), toLatin1(), toLocal8Bit(), QTextCodec, fromUcs4(), toWCharArray() */ @@ -3965,8 +3965,8 @@ QString QString::fromUtf8(const char *str, int size) This function checks for a Byte Order Mark (BOM). If it is missing, host byte order is assumed. - This function is comparatively slow. - Use QString(const ushort *, int) or QString(const ushort *) if possible. + This function is slow compared to the other Unicode conversions. + Use QString(const QChar *, int) or QString(const QChar *) if possible. QString makes a deep copy of the Unicode data. |