diff options
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 935b7363cf4..1d1485d20f6 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -6143,7 +6143,16 @@ QString& QString::setUnicode(const QChar *unicode, qsizetype size) } /*! - \fn QString &QString::setUtf16(const ushort *unicode, qsizetype size) + \fn QString::setUnicode(const char16_t *unicode, qsizetype size) + \overload + \since 6.9 + + \sa unicode(), setUtf16() +*/ + +/*! + \fn QString::setUtf16(const char16_t *unicode, qsizetype size) + \since 6.9 Resizes the string to \a size characters and copies \a unicode into the string. @@ -6158,6 +6167,11 @@ QString& QString::setUnicode(const QChar *unicode, qsizetype size) */ /*! + \fn QString &QString::setUtf16(const ushort *unicode, qsizetype size) + \obsolete Use the \c char16_t overload instead. +*/ + +/*! \fn QString QString::simplified() const Returns a string that has whitespace removed from the start @@ -7586,8 +7600,8 @@ QString QString::vasprintf(const char *cformat, va_list ap) } case 's': { if (length_mod == lm_l) { - const ushort *buff = va_arg(ap, const ushort*); - const ushort *ch = buff; + const char16_t *buff = va_arg(ap, const char16_t*); + const auto *ch = buff; while (precision != 0 && *ch != 0) { ++ch; --precision; |