From c9c598d4d76b703f84ace9d2d06b099e8bcf2b07 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 13 Aug 2020 13:17:07 +0200 Subject: Mark places where we missed conversion to unicode character types We should use char32_t for the toUcs4() methods of QString and QStringView and use char16_t for QString::utf16(), thereby matching QStringView. These naturally imply knock-on changes in various places. Unfortunately, we didn't make those changes in Qt 6, so they'll have to wait for Qt 7. Change-Id: I18451d4b31b76658092e19d3fcbc8bc0fe5ce307 Reviewed-by: Lars Knoll --- src/corelib/text/qstringalgorithms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/text/qstringalgorithms.h') diff --git a/src/corelib/text/qstringalgorithms.h b/src/corelib/text/qstringalgorithms.h index 870ae42af8..5805e4c439 100644 --- a/src/corelib/text/qstringalgorithms.h +++ b/src/corelib/text/qstringalgorithms.h @@ -144,7 +144,7 @@ namespace QtPrivate { [[nodiscard]] Q_CORE_EXPORT QByteArray convertToLatin1(QStringView str); [[nodiscard]] Q_CORE_EXPORT QByteArray convertToUtf8(QStringView str); [[nodiscard]] Q_CORE_EXPORT QByteArray convertToLocal8Bit(QStringView str); -[[nodiscard]] Q_CORE_EXPORT QList convertToUcs4(QStringView str); +[[nodiscard]] Q_CORE_EXPORT QList convertToUcs4(QStringView str); // ### Qt 7 char32_t [[nodiscard]] Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isRightToLeft(QStringView string) noexcept; -- cgit v1.2.3