diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-18 12:44:52 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-18 16:13:49 (GMT) |
commit | e0f3dc3ecedb220e5bfa6a54c7c06ef4d371bcc4 (patch) | |
tree | 02344e8258de366dabb1c60e8a604687279310d3 /src | |
parent | 9043d96ccbbe463b26c6d6f708a7859dffcca4fa (diff) | |
download | Qt-e0f3dc3ecedb220e5bfa6a54c7c06ef4d371bcc4.zip Qt-e0f3dc3ecedb220e5bfa6a54c7c06ef4d371bcc4.tar.gz Qt-e0f3dc3ecedb220e5bfa6a54c7c06ef4d371bcc4.tar.bz2 |
Improved locale data generator
the qlocalexml2cpp.py script takes a path to the Qt source tree and patches all
files with newly generated data automatically.
Reviewed-by: Zeno Albisser
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qlocale.h | 9 | ||||
-rw-r--r-- | src/corelib/tools/qlocale_data_p.h | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index af545f7..225ae9c 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -122,6 +122,8 @@ class Q_CORE_EXPORT QLocale friend class QTextStreamPrivate; public: +// GENERATED PART STARTS HERE +// see qlocale_data_p.h for more info on generated data enum Language { C = 1, Abkhazian = 2, @@ -208,7 +210,6 @@ public: NauruLanguage = 83, Nepali = 84, Norwegian = 85, - NorwegianBokmal = Norwegian, Occitan = 86, Oriya = 87, Pashto = 88, @@ -264,8 +265,7 @@ public: Yoruba = 138, Zhuang = 139, Zulu = 140, - NorwegianNynorsk = 141, - Nynorsk = NorwegianNynorsk, // ### obsolete + Nynorsk = 141, Bosnian = 142, Divehi = 143, Manx = 144, @@ -339,6 +339,8 @@ public: CentralMoroccoTamazight = 212, KoyraboroSenni = 213, Shambala = 214, + NorwegianBokmal = Norwegian, + NorwegianNynorsk = Nynorsk, LastLanguage = Shambala }; @@ -592,6 +594,7 @@ public: LatinAmericaAndTheCaribbean = 246, LastCountry = LatinAmericaAndTheCaribbean }; +// GENERATED PART ENDS HERE enum MeasurementSystem { MetricSystem, ImperialSystem }; diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index ea15efb..d2a31a5 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -72,8 +72,10 @@ static const CountryLanguage ImperialMeasurementSystems[] = { static const int ImperialMeasurementSystemsCount = sizeof(ImperialMeasurementSystems)/sizeof(ImperialMeasurementSystems[0]); +// GENERATED PART STARTS HERE + /* - This part of the file was generated on 2010-05-19 from the + This part of the file was generated on 2011-02-18 from the Common Locale Data Repository v1.8.1 http://www.unicode.org/cldr/ @@ -6124,6 +6126,8 @@ static const unsigned char country_code_list[] = "419" // LatinAmericaAndTheCaribbean ; +// GENERATED PART ENDS HERE + QT_END_NAMESPACE #endif |