Changeset 846 for trunk/src/corelib/tools/qlocale.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qlocale.cpp (modified) (30 diffs)

trunk/src/corelib/tools/qlocale.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
 #include <time.h>
 
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#if defined() && !defined(__UCLIBC__)
 #    include <fenv.h>
 #endif
@@ -134 +134 @@
 #endif
 
+
+
+
+
+
 /******************************************************************************
 ** Helpers for accessing Qt locale database
@@ -175 +180 @@
 
 // Assumes that code is a
-// QChar code[2];
+// QChar code[];
 static QLocale::Country codeToCountry(const QChar *code)
 {
     ushort uc1 = code[0].unicode();
     ushort uc2 = code[1].unicode();
+
 
     const unsigned char *c = country_code_list;
-    for (; *c != 0; c += 2) {
-        if (uc1 == c[0] && uc2 == c[1])
-            return QLocale::Country((c - country_code_list)/2);
+    for (; *c != 0; c += ) {
+        if (uc1 == c[0] && uc2 == c[1])
+            return QLocale::Country((c - country_code_list)/);
     }
 
@@ -212 +218 @@
         return QString();
 
-    QString code(2, Qt::Uninitialized);
-    const unsigned char *c = country_code_list + 2*(uint(country));
+    const unsigned char *c = country_code_list + 3*(uint(country));
+
+    QString code(c[2] == 0 ? 2 : 3, Qt::Uninitialized);
+
     code[0] = ushort(c[0]);
     code[1] = ushort(c[1]);
+
+
+
     return code;
 }
@@ -251 +262 @@
     for (int i = 0; i < 3; ++i)
         lang_begin[i] = 0;
-    for (int i = 0; i < 2; ++i)
+    for (int i = 0; i < ; ++i)
         cntry_begin[i] = 0;
 
@@ -282 +293 @@
             case 1:
                 // parsing country
-                if (cntry - cntry_begin == 2) {
+                if (cntry - cntry_begin == ) {
                     cntry_begin[0] = 0;
                     break;
@@ -306 +317 @@
 
     QChar lang_code[3];
-    QChar cntry_code[2];
+    QChar cntry_code[];
     if (!splitLocaleName(name, lang_code, cntry_code))
         return;
@@ -450 +461 @@
         result = envVarLocale();
         QChar lang[3];
-        QChar cntry[2];
+        QChar cntry[];
         if ( result == "C" || (!result.isEmpty()
                 && splitLocaleName(QString::fromLocal8Bit(result), lang, cntry)) ) {
@@ -496 +507 @@
                 result += QLatin1String("''");
             else
-                result += QLatin1Char('\'') + text + QLatin1Char('\'');
+                result += Q);
             continue;
         }
@@ -712 +723 @@
     case DateTimeFormatLong:
     case DateTimeFormatShort:
-        return query(type == DateTimeFormatLong ? DateFormatLong : DateFormatShort).toString()
-            + QLatin1Char(' ') + query(type == DateTimeFormatLong ? TimeFormatLong : TimeFormatShort).toString();
+        return query(type == DateTimeFormatLong ? DateFormatLong : DateFormatShort).toString()
+            + QLatin1Char(' ') + query(type == DateTimeFormatLong ? TimeFormatLong : TimeFormatShort).toString();
     case DayNameLong:
     case DayNameShort:
@@ -729 +740 @@
     case DateTimeToStringLong: {
         const QDateTime dt = in.toDateTime();
-        return winDateToString(dt.date(), type == DateTimeToStringShort ? DATE_SHORTDATE : DATE_LONGDATE)
-            + QLatin1Char(' ') + winTimeToString(dt.time()); }
+        return winDateToString(dt.date(), type == DateTimeToStringShort ? DATE_SHORTDATE : DATE_LONGDATE)
+            + QLatin1Char(' ') + winTimeToString(dt.time()); }
 
     case ZeroDigit:
@@ -1196 +1207 @@
 
     QChar lang[3];
-    QChar cntry[2];
+    QChar cntry[];
     if (result.isEmpty() || result != "C"
             && !splitLocaleName(QString::fromLocal8Bit(result), lang, cntry)) {
@@ -1466 +1477 @@
     case CountryId: {
         QString preferredLanguage;
-        QString preferredCountry;
+        QString preferredCountry
         getMacPreferredLanguageAndCountry(&preferredLanguage, &preferredCountry);
         QLocale::Language languageCode = (preferredLanguage.isEmpty() ? QLocale::C : codeToLanguage(preferredLanguage.data()));
@@ -1658 +1669 @@
     if (_systemLocale)
         return _systemLocale;
+
+
+
     return QSystemLocale_globalSystemLocale();
 }
@@ -1667 +1681 @@
         system_lp = globalLocalePrivate();
     *system_lp = *sys_locale->fallbackLocale().d();
+
+
+
+
 
     QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant());
@@ -1808 +1826 @@
     \endlist
 
-    The "C" locale is identical in behavior to \l{English}/\l{UnitedStates}.
-
     Use language() and country() to determine the actual language and
     country values used.
@@ -1821 +1837 @@
     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..1.
 
     The double-to-string and string-to-double conversion functions are
@@ -2022 +2038 @@
     \value Tyap
     \value Chewa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     \omitvalue LastLanguage
 
@@ -2274 +2339 @@
     \value Zambia
     \value Zimbabwe
+
+
+
+
+
+
     \omitvalue LastCountry
 
@@ -3168 +3239 @@
 QDateTime QLocale::toDateTime(const QString &string, FormatType format) const
 {
-    return toDateTime(string, dateFormat(format));
+    return toDateTime(string, dateFormat(format));
 }
 #endif
@@ -3398 +3469 @@
     formats specified in the system configuration panel.
 
-    \sa QTextCodec::locale() c()
+    \sa c()
 */
 
@@ -3654 +3725 @@
     return meas;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -4544 +4634 @@
     const bool scientific = numMode == DoubleScientificMode;
     bool lastWasE = false;
+
     int eCnt = 0;
     int decPointCnt = 0;
@@ -4558 +4649 @@
                     return false;
             }
+
         } else {
             switch (c) {
@@ -4595 +4687 @@
 
                 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':
@@ -4613 +4708 @@
                     return false;
             }
+
         }
 
         lastWasE = c == 'e';
-        buff->append(c);
+        if (c != ',')
+            buff->append(c);
     }
 
@@ -6788 +6885 @@
 #endif
 
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#if defined() && !defined(__UCLIBC__)
     fenv_t envp;
     feholdexcept(&envp);
@@ -6804 +6901 @@
 #endif //Q_OS_WIN
 
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#if defined() && !defined(__UCLIBC__)
     fesetenv(&envp);
 #endif
@@ -7459 +7556 @@
 Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok)
 {
+
     double ret = strtod((char*)s00, (char**)se);
     if (ok) {