diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-08 21:44:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 12:46:45 +0200 |
commit | 8ed88d8d14ae9aed41029afe8bf4a6c42678c6b5 (patch) | |
tree | 14aa8bca38d156ddc6ff72d9a85fbead0a134655 /src/corelib/codecs | |
parent | c3d2e0e60adbe436a1c3f7a5b7501cad5af7fc82 (diff) |
Port qt_from_latin1() from ushort to char16_t
Change-Id: I054e2f604be7253d3322751d55d03b5bac09aefc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/codecs')
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index c221e51ecc..8fef9ccfba 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1075,7 +1075,7 @@ QString QTextDecoder::toUnicode(const char *chars, int len) } // in qstring.cpp: -void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept; +void qt_from_latin1(char16_t *dst, const char *str, size_t size) noexcept; /*! \overload @@ -1090,7 +1090,7 @@ void QTextDecoder::toUnicode(QString *target, const char *chars, int len) break; case 4: // latin1 target->resize(len); - qt_from_latin1((ushort*)target->data(), chars, len); + qt_from_latin1((char16_t*)target->data(), chars, len); break; default: *target = c->toUnicode(chars, len, &state); |