Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix system locale and defalt to C, not system locale

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-08-08 12:53:22 +00:00
parent fdacf22672
commit 1bc049b45a
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,14 +48,15 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_SYSTEMLOCALE #ifndef QT_NO_SYSTEMLOCALE
static QSystemLocale *_systemLocale = 0; static const qint16 systemLocaleIndex = localeTblSize + 1;
static QSystemLocale *_systemLocale = Q_NULLPTR;
class QSystemLocaleSingleton: public QSystemLocale class QSystemLocaleSingleton: public QSystemLocale
{ {
public: public:
QSystemLocaleSingleton() : QSystemLocale(true) {} QSystemLocaleSingleton() : QSystemLocale(true) {}
}; };
Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale) Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale)
static QLocalePrivate *system_lp = 0; static QLocalePrivate *system_lp = Q_NULLPTR;
Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate) Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate)
#endif #endif
@ -219,7 +220,7 @@ const QLocalePrivate *QLocalePrivate::findLocale(QLocale::Language language, QLo
return &localeTbl[i]; return &localeTbl[i];
} }
return defaultPrivate(); return &localeTbl[0];
} }
static bool parse_locale_tag(const QString &input, int &i, QString *result, const QString &separators) static bool parse_locale_tag(const QString &input, int &i, QString *result, const QString &separators)
@ -401,7 +402,7 @@ QSystemLocale::QSystemLocale(bool)
QSystemLocale::~QSystemLocale() QSystemLocale::~QSystemLocale()
{ {
if (_systemLocale == this) { if (_systemLocale == this) {
_systemLocale = 0; _systemLocale = Q_NULLPTR;
if (system_lp) if (system_lp)
system_lp->m_language = QLocale::AnyLanguage; system_lp->m_language = QLocale::AnyLanguage;
@ -497,6 +498,10 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
static quint16 localePrivateIndex(const QLocalePrivate *p) static quint16 localePrivateIndex(const QLocalePrivate *p)
{ {
#ifndef QT_NO_SYSTEMLOCALE
if (p && p == system_lp)
return systemLocaleIndex;
#endif
for (qint16 i = 0; i < localeTblSize; i++) { for (qint16 i = 0; i < localeTblSize; i++) {
if (p->m_language == localeTbl[i].m_language if (p->m_language == localeTbl[i].m_language
&& p->m_country == localeTbl[i].m_country && p->m_country == localeTbl[i].m_country
@ -638,11 +643,11 @@ QLocale::QLocale(const QLocale &other)
const QLocalePrivate *QLocale::d() const const QLocalePrivate *QLocale::d() const
{ {
#ifndef QT_NO_SYSTEMLOCALE #ifndef QT_NO_SYSTEMLOCALE
Q_ASSERT(p.index <= localeTblSize); Q_ASSERT(p.index <= systemLocaleIndex);
if (p.index == localeTblSize) if (p.index == systemLocaleIndex)
return system_lp; return system_lp;
#else #else
Q_ASSERT(p.index < localeTblSize); Q_ASSERT(p.index < systemLocaleIndex);
#endif #endif
return &localeTbl[p.index]; return &localeTbl[p.index];