diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-04-25 09:19:35 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2017-04-27 04:35:30 +0000 |
commit | 940b36850d8b825493615ac6cf1a7c382a76a214 (patch) | |
tree | d05fe14a16a3e194a3f31162f1d2c344c63ee58f /src/gui/util | |
parent | 629422607f265865cec8a010de4a5c2ffd664603 (diff) |
QLocaleData: remove unused bool *overflow arguments
... from bytearrayToDouble() and bytearrayToLongLong()
(bytearrayToUnsLongLong() didn't have one).
The only user, QIntValidator, always checked them in conjunction with
'ok'. Since 'overflow' was true only if 'ok' was false, too, there's
no point in carrying both.
We can bring this code back with QParsedNumber, when it will not cost
anything anymore. I actually was hoping that the overflow argument
would inform the design of QParsedNumber, but it turned out to be
unused, leading to this commit instead.
Change-Id: I841d0d1cc36c13c5425ac0338323721d90b3b24c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qvalidator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index fb9dfc9f69..1709012291 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -420,9 +420,9 @@ QValidator::State QIntValidator::validate(QString & input, int&) const if (buff.size() == 1 && (buff.at(0) == '+' || buff.at(0) == '-')) return Intermediate; - bool ok, overflow; - qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); - if (overflow || !ok) + bool ok; + qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok); + if (!ok) return Invalid; if (entered >= b && entered <= t) { @@ -447,9 +447,9 @@ void QIntValidator::fixup(QString &input) const locale().numberOptions())) { return; } - bool ok, overflow; - qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); - if (ok && !overflow) + bool ok; + qlonglong entered = QLocaleData::bytearrayToLongLong(buff.constData(), 10, &ok); + if (ok) input = locale().toString(entered); } |