From 0770171dcda24a567d6f57b87fdd284011e56e16 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 24 Feb 2025 15:49:22 +0100 Subject: [PATCH] Docs: uppercase spelling of utf-8 It should be spelled UTF-8 (official name by the Unicode Consortium). Pick-to: 6.9 6.8 Change-Id: Ib358d0870e77f0cb4cdb920ed5ca829f100707a1 Reviewed-by: Thiago Macieira --- src/corelib/io/qsettings.cpp | 8 ++++---- src/corelib/text/qbytearray.cpp | 2 +- src/corelib/text/qchar.cpp | 2 +- src/corelib/text/qlatin1stringview.qdoc | 2 +- src/corelib/text/qstring.cpp | 2 +- src/corelib/text/qutf8stringview.qdoc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 95e07904797..e1725f0fcb2 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2463,11 +2463,11 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, "%General" section, \e not in the "General" section. \li In line with most implementations today, QSettings will assume that - \e values in the INI file are utf-8 encoded. This means that \e values - will be decoded as utf-8 encoded entries and written back as utf-8. + \e values in the INI file are UTF-8 encoded. This means that \e values + will be decoded as UTF-8 encoded entries and written back as UTF-8. To retain backward compatibility with older Qt versions, \e keys in the INI file are written in %-encoded format, but can be read in both - %-encoded and utf-8 formats. + %-encoded and UTF-8 formats. \endlist @@ -2478,7 +2478,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, however fully readable by a Qt 6 based application (unless a ini codec different from utf8 had been set). But INI files written with Qt 6 will only be readable by older Qt versions if you set the "iniCodec" to - a utf-8 textcodec. + a UTF-8 textcodec. \sa registerFormat(), setPath() */ diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index 70b44aa21f9..a333a86bef3 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -835,7 +835,7 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes) \endcompareswith \compareswith strong QChar char16_t QString QStringView QLatin1StringView \ QUtf8StringView - When comparing with string types, the content is interpreted as utf-8. + When comparing with string types, the content is interpreted as UTF-8. \endcompareswith QByteArray can be used to store both raw bytes (including '\\0's) diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index 02f9325f938..052dba39e9c 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE \compareswith strong char16_t QString QStringView QLatin1StringView QUtf8StringView \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The contents of the byte array is interpreted as utf-8. + The contents of the byte array is interpreted as UTF-8. \endcompareswith In Qt, Unicode characters are 16-bit entities without any markup diff --git a/src/corelib/text/qlatin1stringview.qdoc b/src/corelib/text/qlatin1stringview.qdoc index f6e5c172bd2..ce06c7dc634 100644 --- a/src/corelib/text/qlatin1stringview.qdoc +++ b/src/corelib/text/qlatin1stringview.qdoc @@ -16,7 +16,7 @@ {const char16_t *} \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The byte array data is interpreted as utf-8. + The byte array data is interpreted as UTF-8. \endcompareswith Many of QString's member functions are overloaded to accept diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 3e132cf155e..be7069c2e8e 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -1709,7 +1709,7 @@ void qtWarnAboutInvalidRegularExpression(const QString &pattern, const char *whe QStringView QUtf8StringView \endcompareswith \compareswith strong QByteArray QByteArrayView {const char *} - When comparing with byte arrays, their content is interpreted as utf-8. + When comparing with byte arrays, their content is interpreted as UTF-8. \endcompareswith QString stores a string of 16-bit \l{QChar}s, where each QChar diff --git a/src/corelib/text/qutf8stringview.qdoc b/src/corelib/text/qutf8stringview.qdoc index e5cc6407475..eba8f72fc15 100644 --- a/src/corelib/text/qutf8stringview.qdoc +++ b/src/corelib/text/qutf8stringview.qdoc @@ -16,7 +16,7 @@ QLatin1StringView \endcompareswith \compareswith strong {const char *} QByteArray QByteArrayView - The contents of byte arrays is interpreted as utf-8. + The contents of byte arrays is interpreted as UTF-8. \endcompareswith A QUtf8StringView references a contiguous portion of a UTF-8