Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

assume locale BCP names use ASCII characters only

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-09-07 18:51:12 +03:00
parent 8e93e13f3f
commit ce935b34d5
6 changed files with 1180 additions and 1175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/genlocale.py
View file

@ -439,15 +439,15 @@ def printlocaledata(frommap, key):
def printaliastable(frommap, prefix):
print('''static const struct %sAliasTblData {
const QLatin1String original;
const QLatin1String substitute;
const char* original;
const char* substitute;
} %sAliasTbl[] = {''' % (prefix, prefix))
for key in sorted(frommap):
# territories and scripts entries can contain multiple replacements, add one for each
splitvalue = frommap[key].split(' ')
for value in splitvalue:
print(' { QLatin1String("%s"), QLatin1String("%s") },' % (key, value))
print(' { "%s", "%s" },' % (key, value))
print('};')
print('static const qint16 %sAliasTblSize = sizeof(%sAliasTbl) / sizeof(%sAliasTblData);\n' % (prefix, prefix, prefix))

1
src/core/io/qfilesystemengine_unix.cpp
View file

@ -561,7 +561,6 @@ void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry, const QFileSyst
case DT_SOCK: {
entryFlags = QFileSystemMetaData::SequentialType
| QFileSystemMetaData::ExistsAttribute;
break;
}
case DT_LNK: {

53
src/core/tools/qlocale.cpp
View file

@ -54,38 +54,37 @@ static QLocale::NumberOptions default_number_options = 0;
** Helpers for accessing Qt locale database
*/
static bool qt_splitLocaleName(const QString &name, QString &lang, QString &script, QString &cntry)
static bool qt_splitLocaleName(const QByteArray &name, QByteArray &lang, QByteArray &script, QByteArray &cntry)
{
const QByteArray latinname = name.toLatin1();
QSTACKARRAY(char, getbuffer, 20);
UErrorCode error = U_ZERO_ERROR;
const int langresult = uloc_getLanguage(latinname.constData(), getbuffer, sizeof(getbuffer), &error);
const int langresult = uloc_getLanguage(name.constData(), getbuffer, sizeof(getbuffer), &error);
if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("qt_splitLocaleName: uloc_getLanguage(%s) failed %s",
latinname.constData(), u_errorName(error));
name.constData(), u_errorName(error));
return false;
}
lang = QString::fromLatin1(getbuffer, langresult);
lang = QByteArray(getbuffer, langresult);
error = U_ZERO_ERROR;
::memset(getbuffer, '\0', sizeof(getbuffer) * sizeof(char));
const int scriptresult = uloc_getScript(latinname.constData(), getbuffer, sizeof(getbuffer), &error);
const int scriptresult = uloc_getScript(name.constData(), getbuffer, sizeof(getbuffer), &error);
if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("qt_splitLocaleName: uloc_getScript(%s) failed %s",
latinname.constData(), u_errorName(error));
name.constData(), u_errorName(error));
return false;
}
script = QString::fromLatin1(getbuffer, scriptresult);
script = QByteArray(getbuffer, scriptresult);
error = U_ZERO_ERROR;
::memset(getbuffer, '\0', sizeof(getbuffer) * sizeof(char));
const int countryresult = uloc_getCountry(latinname.constData(), getbuffer, sizeof(getbuffer), &error);
const int countryresult = uloc_getCountry(name.constData(), getbuffer, sizeof(getbuffer), &error);
if (Q_UNLIKELY(U_FAILURE(error))) {
qWarning("qt_splitLocaleName: uloc_getCountry(%s) failed %s",
latinname.constData(), u_errorName(error));
name.constData(), u_errorName(error));
return false;
}
cntry = QString::fromLatin1(getbuffer, countryresult);
cntry = QByteArray(getbuffer, countryresult);
return true;
}
@ -132,15 +131,15 @@ static int qt_repeatCount(const QString &s, int i)
return j - i;
}
static const QLocalePrivate *findLocale(const QString &name)
static const QLocalePrivate *findLocale(const QByteArray &name)
{
if (name.isEmpty()) {
return &localeTbl[0];
}
QString lang_code;
QString script_code;
QString cntry_code;
QByteArray lang_code;
QByteArray script_code;
QByteArray cntry_code;
if (Q_UNLIKELY(!qt_splitLocaleName(name, lang_code, script_code, cntry_code))) {
return &localeTbl[0];
}
@ -164,7 +163,7 @@ static const QLocalePrivate *defaultPrivate()
if (lang.isEmpty()) {
lang = qgetenv("LANG");
}
default_lp = findLocale(QString::fromLatin1(lang.constData()));
default_lp = findLocale(lang);
}
return default_lp;
}
@ -179,9 +178,9 @@ static inline QString getLocaleData(const char *data)
return QString::fromUtf8(data);
}
QLocale::Language QLocalePrivate::codeToLanguage(const QString &code)
QLocale::Language QLocalePrivate::codeToLanguage(const QByteArray &code)
{
QString lower = code.toLower();
QByteArray lower = code.toLower();
for (qint16 i = 0; i < languageAliasTblSize; i++) {
if (languageAliasTbl[i].original == lower) {
@ -191,19 +190,19 @@ QLocale::Language QLocalePrivate::codeToLanguage(const QString &code)
}
for (qint16 i = 0; i < languageTblSize; i++) {
if (QLatin1String(languageTbl[i].code) == lower)
if (languageTbl[i].code == lower)
return languageTbl[i].language;
}
return QLocale::C;
}
QLocale::Script QLocalePrivate::codeToScript(const QString &code)
QLocale::Script QLocalePrivate::codeToScript(const QByteArray &code)
{
// script is titlecased in our data
QString title = code.toLower();
QByteArray title = code.toLower();
if (title.size() > 0) {
title[0] = code.at(0).toUpper();
title[0] = qToUpper(code.at(0));
}
for (qint16 i = 0; i < scriptAliasTblSize; i++) {
@ -214,15 +213,15 @@ QLocale::Script QLocalePrivate::codeToScript(const QString &code)
}
for (qint16 i = 0; i < scriptTblSize; i++) {
if (QLatin1String(scriptTbl[i].code) == title)
if (scriptTbl[i].code == title)
return scriptTbl[i].script;
}
return QLocale::AnyScript;
}
QLocale::Country QLocalePrivate::codeToCountry(const QString &code)
QLocale::Country QLocalePrivate::codeToCountry(const QByteArray &code)
{
QString upper = code.toUpper();
QByteArray upper = code.toUpper();
for (qint16 i = 0; i < countryAliasTblSize; i++) {
if (countryAliasTbl[i].original == upper) {
@ -232,7 +231,7 @@ QLocale::Country QLocalePrivate::codeToCountry(const QString &code)
}
for (qint16 i = 0; i < countryTblSize; i++) {
if (QLatin1String(countryTbl[i].code) == upper)
if (countryTbl[i].code == upper)
return countryTbl[i].country;
}
@ -376,7 +375,7 @@ static quint16 localePrivateIndex(const QLocalePrivate *p)
QLocale::QLocale(const QString &name)
{
p.numberOptions = 0;
p.index = localePrivateIndex(findLocale(name));
p.index = localePrivateIndex(findLocale(name.toLatin1()));
}
/*!

2280
src/core/tools/qlocale_data_p.h
View file

File diff suppressed because it is too large Load diff

6
src/core/tools/qlocale_p.h
View file

@ -56,9 +56,9 @@ public:
QString bcp47Name() const;
static QLocale::Language codeToLanguage(const QString &code);
static QLocale::Script codeToScript(const QString &code);
static QLocale::Country codeToCountry(const QString &code);
static QLocale::Language codeToLanguage(const QByteArray &code);
static QLocale::Script codeToScript(const QByteArray &code);
static QLocale::Country codeToCountry(const QByteArray &code);
static const QLocalePrivate *findLocale(QLocale::Language language,
QLocale::Script script,
QLocale::Country country);

9
src/core/tools/qlocale_tools_p.h
View file

@ -78,7 +78,14 @@ static inline bool qIsDigit(char ch)
static inline char qToLower(char ch)
{
if (ch >= 'A' && ch <= 'Z')
return (ch - 'A' + 'a');
return (ch + 32);
return ch;
}
static inline char qToUpper(char ch)
{
if (ch >= 'a' && ch <= 'z')
return (ch - 32);
return ch;
}