equal
deleted
inserted
replaced
664 QString amText() const; |
664 QString amText() const; |
665 QString pmText() const; |
665 QString pmText() const; |
666 |
666 |
667 MeasurementSystem measurementSystem() const; |
667 MeasurementSystem measurementSystem() const; |
668 |
668 |
|
669 Qt::LayoutDirection textDirection() const; |
|
670 |
669 inline bool operator==(const QLocale &other) const; |
671 inline bool operator==(const QLocale &other) const; |
670 inline bool operator!=(const QLocale &other) const; |
672 inline bool operator!=(const QLocale &other) const; |
671 |
673 |
672 static QString languageToString(Language language); |
674 static QString languageToString(Language language); |
673 static QString countryToString(Country country); |
675 static QString countryToString(Country country); |
683 |
685 |
684 //private: // this should be private, but can't be |
686 //private: // this should be private, but can't be |
685 struct Data { |
687 struct Data { |
686 quint16 index; |
688 quint16 index; |
687 quint16 numberOptions; |
689 quint16 numberOptions; |
688 } |
690 }; |
689 #if (defined(__arm__) || defined(__ARMEL__)) |
|
690 Q_PACKED |
|
691 #endif |
|
692 ; |
|
693 private: |
691 private: |
694 friend struct QLocalePrivate; |
692 friend struct QLocalePrivate; |
695 // ### We now use this field to pack an index into locale_data and NumberOptions. |
693 // ### We now use this field to pack an index into locale_data and NumberOptions. |
696 // ### Qt 5: change to a QLocaleData *d; uint numberOptions. |
694 // ### Qt 5: change to a QLocaleData *d; uint numberOptions. |
697 union { |
695 union { |