whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLocalePrivate: Add convenience language/script/country to code helpers 

Change-Id: Id9126a95f1b3a75f510e642ab08c68cefaf3d142
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
bb10
Konstantin Ritt 2013-03-16 09:17:57 +02:00 committed by The Qt Project
parent 1148da5aa8
commit 0d866c35d6
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/tools/qlocale.cpp
View File

@ -164,14 +164,14 @@ QLocale::Country QLocalePrivate::codeToCountry(const QString &code)
return QLocale::AnyCountry;
}
QString QLocalePrivate::languageCode() const
QString QLocalePrivate::languageToCode(QLocale::Language language)
{
if (m_data->m_language_id == QLocale::AnyLanguage)
if (language == QLocale::AnyLanguage)
return QString();
if (m_data->m_language_id == QLocale::C)
if (language == QLocale::C)
return QLatin1String("C");
const unsigned char *c = language_code_list + 3*(uint(m_data->m_language_id));
const unsigned char *c = language_code_list + 3*(uint(language));
QString code(c[2] == 0 ? 2 : 3, Qt::Uninitialized);
@ -183,20 +183,20 @@ QString QLocalePrivate::languageCode() const
return code;
}
QString QLocalePrivate::scriptCode() const
QString QLocalePrivate::scriptToCode(QLocale::Script script)
{
if (m_data->m_script_id == QLocale::AnyScript || m_data->m_script_id > QLocale::LastScript)
if (script == QLocale::AnyScript || script > QLocale::LastScript)
return QString();
const unsigned char *c = script_code_list + 4*(uint(m_data->m_script_id));
const unsigned char *c = script_code_list + 4*(uint(script));
return QString::fromLatin1((const char *)c, 4);
}
QString QLocalePrivate::countryCode() const
QString QLocalePrivate::countryToCode(QLocale::Country country)
{
if (m_data->m_country_id == QLocale::AnyCountry)
if (country == QLocale::AnyCountry)
return QString();
const unsigned char *c = country_code_list + 3*(uint(m_data->m_country_id));
const unsigned char *c = country_code_list + 3*(uint(country));
QString code(c[2] == 0 ? 2 : 3, Qt::Uninitialized);

10
src/corelib/tools/qlocale_p.h
View File

@ -234,10 +234,14 @@ public:
QString bcp47Name() const;
QString languageCode() const; // ### QByteArray::fromRawData would be more optimal
QString scriptCode() const;
QString countryCode() const;
// ### QByteArray::fromRawData would be more optimal
inline QString languageCode() const { return QLocalePrivate::languageToCode(QLocale::Language(m_data->m_language_id)); }
inline QString scriptCode() const { return QLocalePrivate::scriptToCode(QLocale::Script(m_data->m_script_id)); }
inline QString countryCode() const { return QLocalePrivate::countryToCode(QLocale::Country(m_data->m_country_id)); }
static QString languageToCode(QLocale::Language language);
static QString scriptToCode(QLocale::Script script);
static QString countryToCode(QLocale::Country country);
static QLocale::Language codeToLanguage(const QString &code);
static QLocale::Script codeToScript(const QString &code);
static QLocale::Country codeToCountry(const QString &code);