diff options
| author | John Layt <jlayt@kde.org> | 2012-03-26 17:23:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 16:37:11 +0200 |
| commit | 0060b44d7045434583f14b5787211bafd045dd54 (patch) | |
| tree | 7a515509cb1c904ada365e2e1aef4c6038f96e56 /src/gui/util | |
| parent | feb736ef27deb5afc4b8739b3f831b1a94004163 (diff) | |
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 <lars.knoll@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index ce16785d1d..d0bd1cfc6d 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -400,7 +400,7 @@ static qlonglong pow10(int exp) QValidator::State QIntValidator::validate(QString & input, int&) const { QByteArray buff; - if (!locale().d()->validateChars(input, QLocalePrivate::IntegerMode, &buff)) { + if (!locale().d->validateChars(input, QLocalePrivate::IntegerMode, &buff)) { return Invalid; } @@ -439,7 +439,7 @@ QValidator::State QIntValidator::validate(QString & input, int&) const void QIntValidator::fixup(QString &input) const { QByteArray buff; - if (!locale().d()->validateChars(input, QLocalePrivate::IntegerMode, &buff)) { + if (!locale().d->validateChars(input, QLocalePrivate::IntegerMode, &buff)) { return; } bool ok, overflow; @@ -655,7 +655,7 @@ QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QL { Q_Q(const QDoubleValidator); QByteArray buff; - if (!locale.d()->validateChars(input, numMode, &buff, q->dec)) + if (!locale.d->validateChars(input, numMode, &buff, q->dec)) return QValidator::Invalid; if (buff.isEmpty()) |