From 213609fa5c8b4e701115cfbb117559bc5dba4a54 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Tue, 29 Mar 2011 15:44:38 +0200 Subject: Fixed checking for default arguments in QLocale::toCurrencyString() We should check whether we got the default argument or the empty string that was provided by the user as toCurrencyString(123, QString("")) Reviewed-by: Zeno Albisser --- src/corelib/tools/qlocale.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 197c742..d986b9b 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -3130,7 +3130,7 @@ QString QLocale::toCurrencyString(qlonglong value, const QString &symbol) const value = -value; } QString str = d->longLongToString(value); - QString sym = symbol.isEmpty() ? currencySymbol() : symbol; + QString sym = symbol.isNull() ? currencySymbol() : symbol; if (sym.isEmpty()) sym = currencySymbol(QLocale::CurrencyIsoCode); QString format = getLocaleData(currency_format_data + idx, size); @@ -3155,7 +3155,7 @@ QString QLocale::toCurrencyString(qulonglong value, const QString &symbol) const quint8 idx = d->m_currency_format_idx; quint8 size = d->m_currency_format_size; QString str = d->unsLongLongToString(value); - QString sym = symbol.isEmpty() ? currencySymbol() : symbol; + QString sym = symbol.isNull() ? currencySymbol() : symbol; if (sym.isEmpty()) sym = currencySymbol(QLocale::CurrencyIsoCode); QString format = getLocaleData(currency_format_data + idx, size); @@ -3186,7 +3186,7 @@ QString QLocale::toCurrencyString(double value, const QString &symbol) const } QString str = d->doubleToString(value, d->m_currency_digits, QLocalePrivate::DFDecimal); - QString sym = symbol.isEmpty() ? currencySymbol() : symbol; + QString sym = symbol.isNull() ? currencySymbol() : symbol; if (sym.isEmpty()) sym = currencySymbol(QLocale::CurrencyIsoCode); QString format = getLocaleData(currency_format_data + idx, size); -- cgit v0.12