summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-25 11:13:46 (GMT)
committeraxis <qt-info@nokia.com>2009-08-25 11:44:30 (GMT)
commitb9ea05481c1628a701910f3749db12e785d5229c (patch)
tree314426f7b3d05aa7986fee848b0c25efaa24db02 /src/corelib/tools
parenta8087d61442acb8cfbc90b79bdd10ad192c6c06a (diff)
downloadQt-b9ea05481c1628a701910f3749db12e785d5229c.zip
Qt-b9ea05481c1628a701910f3749db12e785d5229c.tar.gz
Qt-b9ea05481c1628a701910f3749db12e785d5229c.tar.bz2
Removed redundant QLocale code from QCoeFepInputContext.
We export one extra private symbol from QtCore instead, and use that. RevBy: Miikka Heikkinen
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qlocale_symbian.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index a534560..3103ba1 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -156,7 +156,7 @@ static const symbianToISO symbian_to_iso_list[] = {
/*!
Returns ISO name corresponding to the Symbian locale code \a sys_fmt.
*/
-static QByteArray symbianLocaleName(int code)
+QByteArray qt_symbianLocaleName(int code)
{
//Number of Symbian to ISO locale mappings
static const int symbian_to_iso_count
@@ -797,7 +797,7 @@ QLocale QSystemLocale::fallbackLocale() const
}
TLanguage lang = User::Language();
- QString locale = symbianLocaleName(lang);
+ QString locale = qt_symbianLocaleName(lang);
return QLocale(locale);
}
@@ -853,7 +853,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
case LanguageId:
case CountryId: {
TLanguage language = User::Language();
- QString locale = symbianLocaleName(language);
+ QString locale = qt_symbianLocaleName(language);
QLocale::Language lang;
QLocale::Country cntry;
getLangAndCountry(locale, lang, cntry);