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

Timestamp:

May 5, 2011, 5:36:53 AM (15 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.h (modified) (6 diffs)

trunk/src/corelib/tools/qlocale.h

@@ -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])
@@ -115 +115 @@
     friend class QByteArray;
     friend class QIntValidator;
-    friend class QDoubleValidator;
+    friend class QDoubleValidator;
     friend class QTextStream;
     friend class QTextStreamPrivate;
@@ -288 +288 @@
         Tyap = 164,
         Chewa = 165,
-        LastLanguage = Chewa
+        Filipino = 166,
+        SwissGerman = 167,
+        SichuanYi = 168,
+        Kpelle = 169,
+        LowGerman = 170,
+        SouthNdebele = 171,
+        NorthernSotho = 172,
+        NorthernSami = 173,
+        Taroko = 174,
+        Gusii = 175,
+        Taita = 176,
+        Fulah = 177,
+        Kikuyu = 178,
+        Samburu = 179,
+        Sena = 180,
+        NorthNdebele = 181,
+        Rombo = 182,
+        Tachelhit = 183,
+        Kabyle = 184,
+        Nyankole = 185,
+        Bena = 186,
+        Vunjo = 187,
+        Bambara = 188,
+        Embu = 189,
+        Cherokee = 190,
+        Morisyen = 191,
+        Makonde = 192,
+        Langi = 193,
+        Ganda = 194,
+        Bemba = 195,
+        Kabuverdianu = 196,
+        Meru = 197,
+        Kalenjin = 198,
+        Nama = 199,
+        Machame = 200,
+        Colognian = 201,
+        Masai = 202,
+        Soga = 203,
+        Luyia = 204,
+        Asu = 205,
+        Teso = 206,
+        Saho = 207,
+        KoyraChiini = 208,
+        Rwa = 209,
+        Luo = 210,
+        Chiga = 211,
+        CentralMoroccoTamazight = 212,
+        KoyraboroSenni = 213,
+        Shambala = 214,
+        LastLanguage = Shambala
     };
 
@@ -534 +583 @@
         Zimbabwe = 240,
         SerbiaAndMontenegro = 241,
-        LastCountry = SerbiaAndMontenegro
+        Montenegro = 242,
+        Serbia = 243,
+        SaintBarthelemy = 244,
+        SaintMartin = 245,
+        LatinAmericaAndTheCaribbean = 246,
+        LastCountry = LatinAmericaAndTheCaribbean
     };
 
@@ -613 +667 @@
     MeasurementSystem measurementSystem() const;
 
+
+
     inline bool operator==(const QLocale &other) const;
     inline bool operator!=(const QLocale &other) const;
@@ -632 +688 @@
         quint16 index;
         quint16 numberOptions;
-    }
-#if (defined(__arm__) || defined(__ARMEL__))
-        Q_PACKED
-#endif
-        ;
+    };
 private:
     friend struct QLocalePrivate;