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

Rename QSystemLocale::fallbackLocale() to QSystemLocale::fallbackUiLocale() 

Suggested by Oswald Buddenhagen. This function is about the (main)
UI language, not about other locale features like number formatting etc.
It not in the public API anymore in Qt 5.0 so it can be renamed.

Change-Id: I2a23892c67e5813de4c0e57330749568777e9ee6
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Mike FABIAN 2012-06-04 17:08:27 +02:00 committed by Qt by Nokia
parent 897e19f95e
commit cc94a1c845
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,7 @@ void QLocalePrivate::updateSystemPrivate()
// tell the object that the system locale has changed.
sys_locale->query(QSystemLocale::LocaleChanged, QVariant());
*system_data = *sys_locale->fallbackLocale().d->m_data;
*system_data = *sys_locale->fallbackUiLocale().d->m_data;
QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant());
if (!res.isNull()) {
@ -518,7 +518,7 @@ void QLocalePrivate::updateSystemPrivate()
#ifdef QT_USE_ICU
if (!default_data)
qt_initIcu(sys_locale->fallbackLocale().bcp47Name());
qt_initIcu(sys_locale->fallbackUiLocale().bcp47Name());
#endif
}

2
src/corelib/tools/qlocale.qdoc
View File

@ -776,7 +776,7 @@
*/
/*!
\fn QLocale QSystemLocale::fallbackLocale() const
\fn QLocale QSystemLocale::fallbackUiLocale() const
\since 4.6
Returns the fallback locale obtained from the system.

2
src/corelib/tools/qlocale_mac.mm
View File

@ -370,7 +370,7 @@ static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &
#ifndef QT_NO_SYSTEMLOCALE
QLocale QSystemLocale::fallbackLocale() const
QLocale QSystemLocale::fallbackUiLocale() const
{
return QLocale(QString::fromUtf8(getMacLocaleName().constData()));
}

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

@ -118,7 +118,7 @@ public:
NativeCountryName // QString
};
virtual QVariant query(QueryType type, QVariant in) const;
virtual QLocale fallbackLocale() const;
virtual QLocale fallbackUiLocale() const;
private:
QSystemLocale(bool);

2
src/corelib/tools/qlocale_unix.cpp
View File

@ -110,7 +110,7 @@ Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData)
#ifndef QT_NO_SYSTEMLOCALE
QLocale QSystemLocale::fallbackLocale() const
QLocale QSystemLocale::fallbackUiLocale() const
{
QByteArray lang = qgetenv("LC_ALL");
if (lang.isEmpty())

4
src/corelib/tools/qlocale_win.cpp
View File

@ -653,7 +653,7 @@ QString QSystemLocalePrivate::winToQtFormat(const QString &sys_fmt)
return result;
}
QLocale QSystemLocale::fallbackLocale() const
QLocale QSystemLocale::fallbackUiLocale() const
{
return QLocale(QString::fromLatin1(getWinLocaleName()));
}
@ -714,7 +714,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
if (type == LanguageId)
return lang;
if (cntry == QLocale::AnyCountry)
return fallbackLocale().country();
return fallbackUiLocale().country();
return cntry;
}
case ScriptId: