From 18a16533b9c8782c5ff642a37dd58f82c1eb881d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 16 May 2022 14:08:18 +0200 Subject: QString: don't use utf16() just to create a u16string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QString::utf16() will detach from QStringLiterals in order to ensure NUL-termination, we don't need the returned pointer NUL-terminated, because we pass the length explicitly to the u16string ctor, so just use data(). Task-number: QTBUG-98763 Pick-to: 6.3 Change-Id: If883901a41480f469162ff4ed5bef927a3bf060a Reviewed-by: Mårten Nordheim --- src/corelib/text/qstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/text') diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 484ce983a6..db2759f98b 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -1519,7 +1519,7 @@ inline QString QString::fromStdU16String(const std::u16string &s) { return fromUtf16(s.data(), int(s.size())); } inline std::u16string QString::toStdU16String() const -{ return std::u16string(reinterpret_cast(utf16()), length()); } +{ return std::u16string(reinterpret_cast(data()), length()); } inline QString QString::fromStdU32String(const std::u32string &s) { return fromUcs4(s.data(), int(s.size())); } -- cgit v1.2.3