From 0060b44d7045434583f14b5787211bafd045dd54 Mon Sep 17 00:00:00 2001 From: John Layt Date: Mon, 26 Mar 2012 17:23:21 +0100 Subject: QLocale: Clean up QLocalePrivate implementation In Qt4 QLocalePrivate is a struct returned by a d() method. This will be unsuitable for the planned change to use ICU and may cause BIC issues. This change makes QLocalePrivate a class and creates a new struct QLocaleData to hold the data index. Further clean-ups are possible but are left for later. Change-Id: Ie316a07790f74674a3b520b735dff72695cc4060 Reviewed-by: Lars Knoll Reviewed-by: Jason McDonald Reviewed-by: Thiago Macieira --- src/corelib/tools/qbytearray.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/tools/qbytearray.cpp') diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index b5e7f285ad..b67d655a9d 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -3633,7 +3633,7 @@ QByteArray &QByteArray::setNum(qlonglong n, int base) } #endif QLocale locale(QLocale::C); - *this = locale.d()->longLongToString(n, -1, base).toLatin1(); + *this = locale.d->longLongToString(n, -1, base).toLatin1(); return *this; } @@ -3652,7 +3652,7 @@ QByteArray &QByteArray::setNum(qulonglong n, int base) } #endif QLocale locale(QLocale::C); - *this = locale.d()->unsLongLongToString(n, -1, base).toLatin1(); + *this = locale.d->unsLongLongToString(n, -1, base).toLatin1(); return *this; } @@ -3711,7 +3711,7 @@ QByteArray &QByteArray::setNum(double n, char f, int prec) } QLocale locale(QLocale::C); - *this = locale.d()->doubleToString(n, prec, form, -1, flags).toLatin1(); + *this = locale.d->doubleToString(n, prec, form, -1, flags).toLatin1(); return *this; } -- cgit v1.2.3