diff options
Diffstat (limited to 'src/corelib/text/qlocale.h')
-rw-r--r-- | src/corelib/text/qlocale.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 0dc9e1bd00..a4262a3ab8 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -614,6 +614,7 @@ public: LastScript = JamoScript }; + enum Country { AnyCountry = 0, Afghanistan = 1, @@ -1048,15 +1049,13 @@ public: # endif // 5.15 #endif - // ### Qt 6: We need to return QString from these function since - // UTF-16 may need surrogate pairs to represent these fields. - QChar decimalPoint() const; - QChar groupSeparator() const; - QChar percent() const; - QChar zeroDigit() const; - QChar negativeSign() const; - QChar positiveSign() const; - QChar exponential() const; + QString decimalPoint() const; + QString groupSeparator() const; + QString percent() const; + QString zeroDigit() const; + QString negativeSign() const; + QString positiveSign() const; + QString exponential() const; QString monthName(int, FormatType format = LongFormat) const; QString standaloneMonthName(int, FormatType format = LongFormat) const; |