diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-27 18:18:10 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 00:34:25 +0100 |
| commit | ed7458a8a66416c106ad33871a288091058d01ea (patch) | |
| tree | 6098a3a4804561fe2392d2b7a654ee38069888bb /src/gui | |
| parent | 1b26ef0c0c894a720b163333396054a8571e2581 (diff) | |
QLocalePrivate: move the stringToXxx to QLocaleData
Along with some more helper functions.
There are two more functions used in QIntValidator
Change-Id: I469ef40426cbb73ab515454bd5ecb12d944f5c0a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index ed3b3b6dd6..dbb8575397 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -401,7 +401,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->m_data->validateChars(input, QLocaleData::IntegerMode, &buff)) { return Invalid; } @@ -418,7 +418,7 @@ QValidator::State QIntValidator::validate(QString & input, int&) const return Intermediate; bool ok, overflow; - qlonglong entered = QLocalePrivate::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); + qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); if (overflow || !ok) return Invalid; @@ -440,11 +440,11 @@ 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->m_data->validateChars(input, QLocaleData::IntegerMode, &buff)) { return; } bool ok, overflow; - qlonglong entered = QLocalePrivate::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); + qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); if (ok && !overflow) input = locale().toString(entered); } @@ -532,7 +532,7 @@ public: QDoubleValidator::Notation notation; - QValidator::State validateWithLocale(QString & input, QLocalePrivate::NumberMode numMode, const QLocale &locale) const; + QValidator::State validateWithLocale(QString & input, QLocaleData::NumberMode numMode, const QLocale &locale) const; }; @@ -639,24 +639,24 @@ QValidator::State QDoubleValidator::validate(QString & input, int &) const { Q_D(const QDoubleValidator); - QLocalePrivate::NumberMode numMode = QLocalePrivate::DoubleStandardMode; + QLocaleData::NumberMode numMode = QLocaleData::DoubleStandardMode; switch (d->notation) { case StandardNotation: - numMode = QLocalePrivate::DoubleStandardMode; + numMode = QLocaleData::DoubleStandardMode; break; case ScientificNotation: - numMode = QLocalePrivate::DoubleScientificMode; + numMode = QLocaleData::DoubleScientificMode; break; } return d->validateWithLocale(input, numMode, locale()); } -QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QLocalePrivate::NumberMode numMode, const QLocale &locale) const +QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QLocaleData::NumberMode numMode, const QLocale &locale) const { Q_Q(const QDoubleValidator); QByteArray buff; - if (!locale.d->validateChars(input, numMode, &buff, q->dec)) + if (!locale.d->m_data->validateChars(input, numMode, &buff, q->dec)) return QValidator::Invalid; if (buff.isEmpty()) @@ -669,7 +669,7 @@ QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QL return QValidator::Invalid; bool ok, overflow; - double i = QLocalePrivate::bytearrayToDouble(buff.constData(), &ok, &overflow); + double i = QLocaleData::bytearrayToDouble(buff.constData(), &ok, &overflow); if (overflow) return QValidator::Invalid; if (!ok) |