summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qlocale.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/text/qlocale.h')
-rw-r--r--src/corelib/text/qlocale.h33
1 files changed, 16 insertions, 17 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h
index 0dc9e1bd00..3f1a8f2679 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,
@@ -1006,22 +1007,22 @@ public:
inline QString toString(float i, char f = 'g', int prec = 6) const;
#if QT_STRINGVIEW_LEVEL < 2
- QString toString(const QDate &date, const QString &formatStr) const;
- QString toString(const QTime &time, const QString &formatStr) const;
+ QString toString(QDate date, const QString &formatStr) const;
+ QString toString(QTime time, const QString &formatStr) const;
QString toString(const QDateTime &dateTime, const QString &format) const;
#endif
- QString toString(const QDate &date, QStringView formatStr) const;
- QString toString(const QTime &time, QStringView formatStr) const;
+ QString toString(QDate date, QStringView formatStr) const;
+ QString toString(QTime time, QStringView formatStr) const;
QString toString(const QDateTime &dateTime, QStringView format) const;
- QString toString(const QDate &date, FormatType format = LongFormat) const;
- QString toString(const QTime &time, FormatType format = LongFormat) const;
+ QString toString(QDate date, FormatType format = LongFormat) const;
+ QString toString(QTime time, FormatType format = LongFormat) const;
QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
/* Removing default value for `format' is done intentionally,
* after all tests we will remove non-calendar-aware version of these functions,
* and add a default value for both calendar instance, and format
*/
- QString toString(const QDate &date, QStringView formatStr, QCalendar cal) const;
- QString toString(const QDate &date, FormatType format, QCalendar cal) const;
+ QString toString(QDate date, QStringView formatStr, QCalendar cal) const;
+ QString toString(QDate date, FormatType format, QCalendar cal) const;
QString toString(const QDateTime &dateTime, FormatType format, QCalendar cal) const;
QString toString(const QDateTime &dateTime, QStringView formatStr, QCalendar cal) const;
@@ -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;