diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-06 13:07:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-14 14:52:08 +0200 |
| commit | 3809643093195e8750b13216ec6bf6e24d464814 (patch) | |
| tree | 4a81c5cad48b40df2f6e9bbc2b9fa9f15b9d5f8a | |
| parent | cd787dbac9e789e63d81f8ab7241ca734faffb44 (diff) | |
Simplify qlocale_win's currency formatting
Use QLocaleData::c()'s instance method, rather than QLocaleData's
static method, to format integers. This avoids the need to duplicate
various arguments as literals, that the C locale provides as default.
It also future-proofs against changes to the static methods.
Change-Id: I5bba407cfc29e3f33d1e9fa878ddf35fff3b113c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | src/corelib/text/qlocale_win.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index 9af37cb8d0..d1462917c0 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -522,29 +522,23 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS QString value; switch (arg.value.type()) { case QVariant::Int: - value = QLocaleData::longLongToString( - QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), QStringLiteral("-"), + value = QLocaleData::c()->longLongToString( arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator); break; case QVariant::UInt: - value = QLocaleData::unsLongLongToString( - QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), + value = QLocaleData::c()->unsLongLongToString( arg.value.toUInt(), -1, 10, -1, QLocale::OmitGroupSeparator); break; case QVariant::Double: - value = QLocaleData::doubleToString( - QStringLiteral("0"), QStringLiteral("+"), QStringLiteral("-"), - QStringLiteral(" "), QStringLiteral(","), QStringLiteral("."), + value = QLocaleData::c()->doubleToString( arg.value.toDouble(), -1, QLocaleData::DFDecimal, -1, QLocale::OmitGroupSeparator); break; case QVariant::LongLong: - value = QLocaleData::longLongToString( - QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), QStringLiteral("-"), + value = QLocaleData::c()->longLongToString( arg.value.toLongLong(), -1, 10, -1, QLocale::OmitGroupSeparator); break; case QVariant::ULongLong: - value = QLocaleData::unsLongLongToString( - QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), + value = QLocaleData::c()->unsLongLongToString( arg.value.toULongLong(), -1, 10, -1, QLocale::OmitGroupSeparator); break; default: |