AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate QLocaleId::fromIds() in favor of {...} construction

Browse Source 
It's a value type, we don't need a pseudo-constructor to bypass constructors.

Change-Id: Ic4774c82e43ab7e2c54ac743026ce087e34c150f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Edward Welbourne 2020-10-08 18:27:53 +02:00
parent 8b0e068847
commit 57455543c5
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/text/qlocale.cpp
View File

@ -232,13 +232,13 @@ QLocaleId QLocaleId::withLikelySubtagsAdded() const
{ {
// language_script_region // language_script_region
if (language_id || script_id || country_id) { if (language_id || script_id || country_id) {
QLocaleId id = QLocaleId::fromIds(language_id, script_id, country_id); QLocaleId id { language_id, script_id, country_id };
if (addLikelySubtags(id)) if (addLikelySubtags(id))
return id; return id;
} }
// language_region // language_region
if (script_id) { if (script_id) {
QLocaleId id = QLocaleId::fromIds(language_id, 0, country_id); QLocaleId id { language_id, 0, country_id };
if (addLikelySubtags(id)) { if (addLikelySubtags(id)) {
id.script_id = script_id; id.script_id = script_id;
return id; return id;
@ -246,7 +246,7 @@ QLocaleId QLocaleId::withLikelySubtagsAdded() const
} }
// language_script // language_script
if (country_id) { if (country_id) {
QLocaleId id = QLocaleId::fromIds(language_id, script_id, 0); QLocaleId id { language_id, script_id, 0 };
if (addLikelySubtags(id)) { if (addLikelySubtags(id)) {
id.country_id = country_id; id.country_id = country_id;
return id; return id;
@ -254,7 +254,7 @@ QLocaleId QLocaleId::withLikelySubtagsAdded() const
} }
// language // language
if (script_id && country_id) { if (script_id && country_id) {
QLocaleId id = QLocaleId::fromIds(language_id, 0, 0); QLocaleId id { language_id, 0, 0 };
if (addLikelySubtags(id)) { if (addLikelySubtags(id)) {
id.script_id = script_id; id.script_id = script_id;
id.country_id = country_id; id.country_id = country_id;
@ -263,7 +263,7 @@ QLocaleId QLocaleId::withLikelySubtagsAdded() const
} }
// und_script // und_script
if (language_id) { if (language_id) {
QLocaleId id = QLocaleId::fromIds(0, script_id, 0); QLocaleId id { 0, script_id, 0 };
if (addLikelySubtags(id)) { if (addLikelySubtags(id)) {
id.language_id = language_id; id.language_id = language_id;
return id; return id;
@ -277,19 +277,19 @@ QLocaleId QLocaleId::withLikelySubtagsRemoved() const
QLocaleId max = withLikelySubtagsAdded(); QLocaleId max = withLikelySubtagsAdded();
// language // language
{ {
QLocaleId id = QLocaleId::fromIds(language_id, 0, 0); QLocaleId id { language_id, 0, 0 };
if (id.withLikelySubtagsAdded() == max) if (id.withLikelySubtagsAdded() == max)
return id; return id;
} }
// language_region // language_region
if (country_id) { if (country_id) {
QLocaleId id = QLocaleId::fromIds(language_id, 0, country_id); QLocaleId id { language_id, 0, country_id };
if (id.withLikelySubtagsAdded() == max) if (id.withLikelySubtagsAdded() == max)
return id; return id;
} }
// language_script // language_script
if (script_id) { if (script_id) {
QLocaleId id = QLocaleId::fromIds(language_id, script_id, 0); QLocaleId id { language_id, script_id, 0 };
if (id.withLikelySubtagsAdded() == max) if (id.withLikelySubtagsAdded() == max)
return id; return id;
} }
@ -340,8 +340,7 @@ QByteArray QLocalePrivate::bcp47Name(char separator) const
if (m_data->m_language_id == QLocale::C) if (m_data->m_language_id == QLocale::C)
return QByteArrayLiteral("en"); return QByteArrayLiteral("en");
QLocaleId localeId = QLocaleId::fromIds(m_data->m_language_id, m_data->m_script_id, QLocaleId localeId { m_data->m_language_id, m_data->m_script_id, m_data->m_country_id };
m_data->m_country_id);
return localeId.withLikelySubtagsRemoved().name(separator); return localeId.withLikelySubtagsRemoved().name(separator);
} }
@ -406,7 +405,7 @@ static const QLocaleData *findLocaleDataById(const QLocaleId &lid)
const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script, const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script,
QLocale::Country country) QLocale::Country country)
{ {
QLocaleId localeId = QLocaleId::fromIds(language, script, country); QLocaleId localeId { language, script, country };
QLocaleId likelyId = localeId.withLikelySubtagsAdded(); QLocaleId likelyId = localeId.withLikelySubtagsAdded();
const uint idx = locale_index[likelyId.language_id]; const uint idx = locale_index[likelyId.language_id];
@ -427,7 +426,7 @@ const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLoca
// No match; try again with likely country // No match; try again with likely country
if (country != QLocale::AnyCountry if (country != QLocale::AnyCountry
&& (language != QLocale::AnyLanguage || script != QLocale::AnyScript)) { && (language != QLocale::AnyLanguage || script != QLocale::AnyScript)) {
localeId = QLocaleId::fromIds(language, script, QLocale::AnyCountry); localeId = QLocaleId { language, script, QLocale::AnyCountry };
likelyId = localeId.withLikelySubtagsAdded(); likelyId = localeId.withLikelySubtagsAdded();
if (!tried.contains(likelyId)) { if (!tried.contains(likelyId)) {
if (const QLocaleData *const data = findLocaleDataById(likelyId)) if (const QLocaleData *const data = findLocaleDataById(likelyId))
@ -446,7 +445,7 @@ const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLoca
// No match; try again with likely script // No match; try again with likely script
if (script != QLocale::AnyScript if (script != QLocale::AnyScript
&& (language != QLocale::AnyLanguage || country != QLocale::AnyCountry)) { && (language != QLocale::AnyLanguage || country != QLocale::AnyCountry)) {
localeId = QLocaleId::fromIds(language, QLocale::AnyScript, country); localeId = QLocaleId { language, QLocale::AnyScript, country };
likelyId = localeId.withLikelySubtagsAdded(); likelyId = localeId.withLikelySubtagsAdded();
if (!tried.contains(likelyId)) { if (!tried.contains(likelyId)) {
if (const QLocaleData *const data = findLocaleDataById(likelyId)) if (const QLocaleData *const data = findLocaleDataById(likelyId))
@ -4208,8 +4207,7 @@ QStringList QLocale::uiLanguages() const
} }
const auto data = locale.d->m_data; const auto data = locale.d->m_data;
QLocaleId id QLocaleId id { data->m_language_id, data->m_script_id, data->m_country_id };
= QLocaleId::fromIds(data->m_language_id, data->m_script_id, data->m_country_id);
const QLocaleId max = id.withLikelySubtagsAdded(); const QLocaleId max = id.withLikelySubtagsAdded();
const QLocaleId min = max.withLikelySubtagsRemoved(); const QLocaleId min = max.withLikelySubtagsRemoved();
id.script_id = 0; // For re-use as script-less variant. id.script_id = 0; // For re-use as script-less variant.

9
src/corelib/text/qlocale_p.h
View File

@ -148,13 +148,6 @@ namespace QIcu {
struct QLocaleId struct QLocaleId
{ {
// bypass constructors
static inline QLocaleId fromIds(ushort language, ushort script, ushort country)
{
const QLocaleId localeId = { language, script, country };
return localeId;
}
inline bool operator==(QLocaleId other) const inline bool operator==(QLocaleId other) const
{ return language_id == other.language_id && script_id == other.script_id && country_id == other.country_id; } { return language_id == other.language_id && script_id == other.script_id && country_id == other.country_id; }
inline bool operator!=(QLocaleId other) const inline bool operator!=(QLocaleId other) const
@ -165,7 +158,7 @@ struct QLocaleId
QByteArray name(char separator = '-') const; QByteArray name(char separator = '-') const;
ushort language_id, script_id, country_id; ushort language_id = 0, script_id = 0, country_id = 0;
}; };
Q_DECLARE_TYPEINFO(QLocaleId, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(QLocaleId, Q_PRIMITIVE_TYPE);