diff options
Diffstat (limited to 'src/corelib/tools/qlocale.h')
-rw-r--r-- | src/corelib/tools/qlocale.h | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index bd89e48234..54b1a32946 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -913,6 +913,19 @@ public: CurrencyDisplayName }; + enum DataSizeFormat { + // Single-bit values, for internal use. + DataSizeBase1000 = 1, // use factors of 1000 instead of IEC's 1024; + DataSizeSIQuantifiers = 2, // use SI quantifiers instead of IEC ones. + + // Flags values for use in API: + DataSizeIecFormat = 0, // base 1024, KiB, MiB, GiB, ... + DataSizeTraditionalFormat = DataSizeSIQuantifiers, // base 1024, kB, MB, GB, ... + DataSizeSIFormat = DataSizeBase1000 | DataSizeSIQuantifiers // base 1000, kB, MB, GB, ... + }; + Q_DECLARE_FLAGS(DataSizeFormats, DataSizeFormat) + Q_FLAG(DataSizeFormats) + QLocale(); QLocale(const QString &name); QLocale(Language language, Country country = AnyCountry); @@ -935,6 +948,7 @@ public: QString nativeLanguageName() const; QString nativeCountryName() const; +#if QT_STRINGVIEW_LEVEL < 2 short toShort(const QString &s, bool *ok = Q_NULLPTR) const; ushort toUShort(const QString &s, bool *ok = Q_NULLPTR) const; int toInt(const QString &s, bool *ok = Q_NULLPTR) const; @@ -952,6 +966,16 @@ public: qulonglong toULongLong(const QStringRef &s, bool *ok = Q_NULLPTR) const; float toFloat(const QStringRef &s, bool *ok = Q_NULLPTR) const; double toDouble(const QStringRef &s, bool *ok = Q_NULLPTR) const; +#endif + + short toShort(QStringView s, bool *ok = nullptr) const; + ushort toUShort(QStringView s, bool *ok = nullptr) const; + int toInt(QStringView s, bool *ok = nullptr) const; + uint toUInt(QStringView s, bool *ok = nullptr) const; + qlonglong toLongLong(QStringView s, bool *ok = nullptr) const; + qulonglong toULongLong(QStringView s, bool *ok = nullptr) const; + float toFloat(QStringView s, bool *ok = nullptr) const; + double toDouble(QStringView s, bool *ok = nullptr) const; QString toString(qlonglong i) const; QString toString(qulonglong i) const; @@ -961,12 +985,18 @@ public: inline QString toString(uint i) const; QString toString(double i, char f = 'g', int prec = 6) const; 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 QDate &date, FormatType format = LongFormat) const; QString toString(const 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(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(const QDateTime &dateTime, FormatType format = LongFormat) const; - QString toString(const QDateTime &dateTime, const QString &format) const; QString dateFormat(FormatType format = LongFormat) const; QString timeFormat(FormatType format = LongFormat) const; @@ -1028,6 +1058,8 @@ public: { return toCurrencyString(double(i), symbol, precision); } #endif + QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat); + QStringList uiLanguages() const; bool operator==(const QLocale &other) const; |