diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-15 10:37:23 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-01 19:33:12 +0100 |
| commit | a3f7dd5260d1855e637d4a616a82c96b4e4cc77c (patch) | |
| tree | e558881ef63939c57555440f412ecb28d4ab53b7 /src/corelib/text/qlocale.cpp | |
| parent | 678548afe8b36b9c7b447443343a4ea713103363 (diff) | |
Allow brace initialization for some of QLatin1StringView constructors
Removed "explicit" keyword from constructors taking
(const char *, qsizetype) and (const char *, const char *).
Switched to using brace initialization for creating QLatin1StringView
in QtCore.
[ChangeLog][QtCore][QLatin1StringView] The (const char *, qsizetype)
and (const char *, const char *) constructors are no longer explicit.
Change-Id: I4f6760692e4df60fe4231e86a25f6ea03cd1bf82
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qlocale.cpp')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 6a191dfce6..926fa50bd8 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -228,16 +228,16 @@ QLatin1StringView QLocalePrivate::languageToCode(QLocale::Language language, const LanguageCodeEntry &i = languageCodeList[language]; if (codeTypes.testFlag(QLocale::ISO639Part1) && i.part1.isValid()) - return QLatin1StringView(i.part1.code, 2); + return {i.part1.code, 2}; if (codeTypes.testFlag(QLocale::ISO639Part2B) && i.part2B.isValid()) - return QLatin1StringView(i.part2B.code, 3); + return {i.part2B.code, 3}; if (codeTypes.testFlag(QLocale::ISO639Part2T) && i.part2T.isValid()) - return QLatin1StringView(i.part2T.code, 3); + return {i.part2T.code, 3}; if (codeTypes.testFlag(QLocale::ISO639Part3)) - return QLatin1StringView(i.part3.code, 3); + return {i.part3.code, 3}; return {}; } @@ -247,7 +247,7 @@ QLatin1StringView QLocalePrivate::scriptToCode(QLocale::Script script) if (script == QLocale::AnyScript || script > QLocale::LastScript) return {}; const unsigned char *c = script_code_list + 4 * script; - return QLatin1StringView(reinterpret_cast<const char *>(c), 4); + return {reinterpret_cast<const char *>(c), 4}; } QLatin1StringView QLocalePrivate::territoryToCode(QLocale::Territory territory) @@ -256,7 +256,7 @@ QLatin1StringView QLocalePrivate::territoryToCode(QLocale::Territory territory) return {}; const unsigned char *c = territory_code_list + 3 * territory; - return QLatin1StringView(reinterpret_cast<const char*>(c), c[2] == 0 ? 2 : 3); + return {reinterpret_cast<const char*>(c), c[2] == 0 ? 2 : 3}; } namespace { |