diff options
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index a9373d79df..65b52f3229 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -5582,7 +5582,7 @@ QString &QString::vsprintf(const char* cformat, va_list ap) case lm_t: i = va_arg(ap, int); break; default: i = 0; break; } - subst = locale.d()->longLongToString(i, precision, 10, width, flags); + subst = locale.d->longLongToString(i, precision, 10, width, flags); ++c; break; } @@ -5614,7 +5614,7 @@ QString &QString::vsprintf(const char* cformat, va_list ap) base = 16; break; default: break; } - subst = locale.d()->unsLongLongToString(u, precision, base, width, flags); + subst = locale.d->unsLongLongToString(u, precision, base, width, flags); ++c; break; } @@ -5643,7 +5643,7 @@ QString &QString::vsprintf(const char* cformat, va_list ap) case 'g': form = QLocalePrivate::DFSignificantDigits; break; default: break; } - subst = locale.d()->doubleToString(d, precision, form, width, flags); + subst = locale.d->doubleToString(d, precision, form, width, flags); ++c; break; } @@ -5677,7 +5677,7 @@ QString &QString::vsprintf(const char* cformat, va_list ap) quint64 i = reinterpret_cast<unsigned long>(arg); #endif flags |= QLocalePrivate::Alternate; - subst = locale.d()->unsLongLongToString(i, precision, 16, width, flags); + subst = locale.d->unsLongLongToString(i, precision, 16, width, flags); ++c; break; } @@ -5762,7 +5762,7 @@ qint64 QString::toLongLong(bool *ok, int base) const #endif QLocale c_locale(QLocale::C); - return c_locale.d()->stringToLongLong(*this, base, ok, QLocalePrivate::FailOnGroupSeparators); + return c_locale.d->stringToLongLong(*this, base, ok, QLocalePrivate::FailOnGroupSeparators); } /*! @@ -5797,7 +5797,7 @@ quint64 QString::toULongLong(bool *ok, int base) const #endif QLocale c_locale(QLocale::C); - return c_locale.d()->stringToUnsLongLong(*this, base, ok, QLocalePrivate::FailOnGroupSeparators); + return c_locale.d->stringToUnsLongLong(*this, base, ok, QLocalePrivate::FailOnGroupSeparators); } /*! @@ -6036,7 +6036,7 @@ ushort QString::toUShort(bool *ok, int base) const double QString::toDouble(bool *ok) const { QLocale c_locale(QLocale::C); - return c_locale.d()->stringToDouble(*this, ok, QLocalePrivate::FailOnGroupSeparators); + return c_locale.d->stringToDouble(*this, ok, QLocalePrivate::FailOnGroupSeparators); } /*! @@ -6113,7 +6113,7 @@ QString &QString::setNum(qlonglong n, int base) } #endif QLocale locale(QLocale::C); - *this = locale.d()->longLongToString(n, -1, base); + *this = locale.d->longLongToString(n, -1, base); return *this; } @@ -6129,7 +6129,7 @@ QString &QString::setNum(qulonglong n, int base) } #endif QLocale locale(QLocale::C); - *this = locale.d()->unsLongLongToString(n, -1, base); + *this = locale.d->unsLongLongToString(n, -1, base); return *this; } @@ -6186,7 +6186,7 @@ QString &QString::setNum(double n, char f, int prec) } QLocale locale(QLocale::C); - *this = locale.d()->doubleToString(n, prec, form, -1, flags); + *this = locale.d->doubleToString(n, prec, form, -1, flags); return *this; } @@ -6984,14 +6984,14 @@ QString QString::arg(qlonglong a, int fieldWidth, int base, QChar fillChar) cons QString arg; if (d.occurrences > d.locale_occurrences) - arg = QLocale::c().d()->longLongToString(a, -1, base, fieldWidth, flags); + arg = QLocale::c().d->longLongToString(a, -1, base, fieldWidth, flags); QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; if (!locale.numberOptions() & QLocale::OmitGroupSeparator) flags |= QLocalePrivate::ThousandsGroup; - locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); + locale_arg = locale.d->longLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -7028,14 +7028,14 @@ QString QString::arg(qulonglong a, int fieldWidth, int base, QChar fillChar) con QString arg; if (d.occurrences > d.locale_occurrences) - arg = QLocale::c().d()->unsLongLongToString(a, -1, base, fieldWidth, flags); + arg = QLocale::c().d->unsLongLongToString(a, -1, base, fieldWidth, flags); QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; if (!locale.numberOptions() & QLocale::OmitGroupSeparator) flags |= QLocalePrivate::ThousandsGroup; - locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); + locale_arg = locale.d->unsLongLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -7162,7 +7162,7 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, QChar fillCha QString arg; if (d.occurrences > d.locale_occurrences) - arg = QLocale::c().d()->doubleToString(a, prec, form, fieldWidth, flags); + arg = QLocale::c().d->doubleToString(a, prec, form, fieldWidth, flags); QString locale_arg; if (d.locale_occurrences > 0) { @@ -7170,7 +7170,7 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, QChar fillCha if (!locale.numberOptions() & QLocale::OmitGroupSeparator) flags |= QLocalePrivate::ThousandsGroup; - locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); + locale_arg = locale.d->doubleToString(a, prec, form, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); |