FCL/sf/mw/qt: comparison src/corelib/tools/qlocale.cpp

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 {
 return (c >= 0 && c <=127);
 }
 #endif
+#if defined(Q_OS_SYMBIAN)
+void qt_symbianUpdateSystemPrivate();
+void qt_symbianInitSystemLocale();
+#endif
 /******************************************************************************
 ** Helpers for accessing Qt locale database
 */
 QT_BEGIN_INCLUDE_NAMESPACE
 if (sys_fmt.at(i).unicode() == QLatin1Char('\'')) {
 QString text = readEscapedFormatString(sys_fmt, &i);
 if (text == QLatin1String("'"))
 result += QLatin1String("''");
 else
-result += QLatin1Char('\'') + text + QLatin1Char('\'');
+result += QString(QLatin1Char('\'') + text + QLatin1Char('\''));
 continue;
 }
 QChar c = sys_fmt.at(i);
 int repeat = repeatCount(sys_fmt, i);
 format_string = true;
 break;
 case DateTimeFormatLong:
 case DateTimeFormatShort:
-return query(type == DateTimeFormatLong ? DateFormatLong : DateFormatShort).toString()
+return QString(query(type == DateTimeFormatLong ? DateFormatLong : DateFormatShort).toString()
-+ QLatin1Char(' ') + query(type == DateTimeFormatLong ? TimeFormatLong : TimeFormatShort).toString();
++ QLatin1Char(' ') + query(type == DateTimeFormatLong ? TimeFormatLong : TimeFormatShort).toString());
 case DayNameLong:
 case DayNameShort:
 return winDayName(in.toInt(), (type == DayNameShort));
 case MonthNameLong:
 case MonthNameShort:
 case TimeToStringLong:
 return winTimeToString(in.toTime());
 case DateTimeToStringShort:
 case DateTimeToStringLong: {
 const QDateTime dt = in.toDateTime();
-return winDateToString(dt.date(), type == DateTimeToStringShort ? DATE_SHORTDATE : DATE_LONGDATE)
+return QString(winDateToString(dt.date(), type == DateTimeToStringShort ? DATE_SHORTDATE : DATE_LONGDATE)
-+ QLatin1Char(' ') + winTimeToString(dt.time()); }
++ QLatin1Char(' ') + winTimeToString(dt.time())); }
 case ZeroDigit:
 locale_info = LOCALE_SNATIVEDIGITS;
 break;
 struct WindowsToISOListElt {
 ushort windows_code;
 char iso_name[6];
 };
-/* NOTE: This array should be sorted by the first column! */
 static const WindowsToISOListElt windows_to_iso_list[] = {
 { 0x0401, "ar_SA" },
 { 0x0402, "bg\0  " },
 { 0x0403, "ca\0  " },
 { 0x0404, "zh_TW" },
 static const QSystemLocale *systemLocale()
 {
 if (_systemLocale)
 return _systemLocale;
+#if defined(Q_OS_SYMBIAN)
+qt_symbianInitSystemLocale();
+#endif
 return QSystemLocale_globalSystemLocale();
 }
 void QLocalePrivate::updateSystemPrivate()
 {
 const QSystemLocale *sys_locale = systemLocale();
 if (!system_lp)
 system_lp = globalLocalePrivate();
 *system_lp = *sys_locale->fallbackLocale().d();
+#if defined(Q_OS_SYMBIAN)
+qt_symbianUpdateSystemPrivate();
+#endif
 QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant());
 if (!res.isNull())
 system_lp->m_language_id = res.toInt();
 res = sys_locale->query(QSystemLocale::CountryId, QVariant());
 \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 2
 This constructor converts the locale name to a language/country
 pair; it does not use the system locale database.
-QLocale's data is based on Common Locale Data Repository v1.6.1.
+QLocale's data is based on Common Locale Data Repository v1.8.1.
 The double-to-string and string-to-double conversion functions are
 covered by the following licenses:
 \legalese
 \value Ewe
 \value Walamo
 \value Hawaiian
 \value Tyap
 \value Chewa
+\value Filipino
+\value SwissGerman
+\value SichuanYi
+\value Kpelle
+\value LowGerman
+\value SouthNdebele
+\value NorthernSotho
+\value NorthernSami
+\value Taroko
+\value Gusii
+\value Taita
+\value Fulah
+\value Kikuyu
+\value Samburu
+\value Sena
+\value NorthNdebele
+\value Rombo
+\value Tachelhit
+\value Kabyle
+\value Nyankole
+\value Bena
+\value Vunjo
+\value Bambara
+\value Embu
+\value Cherokee
+\value Morisyen
+\value Makonde
+\value Langi
+\value Ganda
+\value Bemba
+\value Kabuverdianu
+\value Meru
+\value Kalenjin
+\value Nama
+\value Machame
+\value Colognian
+\value Masai
+\value Soga
+\value Luyia
+\value Asu
+\value Teso
+\value Saho
+\value KoyraChiini
+\value Rwa
+\value Luo
+\value Chiga
+\value CentralMoroccoTamazight
+\value KoyraboroSenni
+\value Shambala
 \omitvalue LastLanguage
 \sa language()
 */
 \value WesternSahara
 \value Yemen
 \value Yugoslavia
 \value Zambia
 \value Zimbabwe
+\value SerbiaAndMontenegro
+\value Montenegro
+\value Serbia
+\value SaintBarthelemy
+\value SaintMartin
 \omitvalue LastCountry
 \sa country()
 */
 */
 #ifndef QT_NO_DATESTRING
 QDateTime QLocale::toDateTime(const QString &string, FormatType format) const
 {
-return toDateTime(string, dateFormat(format));
+return toDateTime(string, dateTimeFormat(format));
 }
 #endif
 /*!
 \since 4.4
 Returns a QLocale object initialized to the system locale.
 On Windows and Mac, this locale will use the decimal/grouping characters and date/time
 formats specified in the system configuration panel.
-\sa QTextCodec::locale() c()
+\sa c()
 */
 QLocale QLocale::system()
 {
 QLocale result(C);
 buff->clear();
 buff->reserve(str.length());
 const bool scientific = numMode == DoubleScientificMode;
 bool lastWasE = false;
+bool lastWasDigit = false;
 int eCnt = 0;
 int decPointCnt = 0;
 bool dec = false;
 int decDigitCnt = 0;
 if (numMode != IntegerMode) {
 // If a double has too many digits after decpt, it shall be Invalid.
 if (dec && decDigits != -1 && decDigits < ++decDigitCnt)
 return false;
 }
+lastWasDigit = true;
 } else {
 switch (c) {
 case '.':
 if (numMode == IntegerMode) {
 // If an integer has a decimal point, it shall be Invalid.
 return false;
 }
 break;
 case ',':
-return false;
+//it can only be placed after a digit which is before the decimal point
+if (!lastWasDigit || decPointCnt > 0)
+return false;
+break;
 case 'e':
 if (scientific) {
 // If a scientific has more than one 'e', it shall be Invalid.
 if (++eCnt > 1)
 default:
 // If it's not a valid digit, it shall be Invalid.
 return false;
 }
+lastWasDigit = false;
 }
 lastWasE = c == 'e';
-buff->append(c);
+if (c != ',')
+buff->append(c);
 }
 return true;
 }

changeset 30	5dc02b23752f
parent 29	b72c6db6890b
child 33	3e2da88830cd