Changeset 846 for trunk/src/gui/widgets/qvalidator.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qvalidator.cpp (modified) (6 diffs)

trunk/src/gui/widgets/qvalidator.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -401 +401 @@
     if (overflow || !ok)
         return Invalid;
-    if (entered >= b && entered <= t)
-        return Acceptable;
+    if (entered >= b && entered <= t) {
+        locale().toInt(input, &ok);
+        return ok ? Acceptable : Intermediate;
+    }
 
     if (entered >= 0) {
@@ -413 +415 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -484 +500 @@
 
     QDoubleValidator::Notation notation;
+
+
 };
 
@@ -508 +526 @@
     In addition, QDoubleValidator is always guaranteed to accept a number
     formatted according to the "C" locale. QDoubleValidator will not accept
-    numbers with thousand-seperators.
+    numbers with thousand-seprators.
 
     \sa QIntValidator, QRegExpValidator, {Line Edits Example}
@@ -639 +657 @@
     }
 
+
+
+
+
+
+
+
+
+
+
     QByteArray buff;
-    if (!locale().d()->validateChars(input, numMode, &buff, dec)) {
-        QLocale cl(QLocale::C);
-        if (!cl.d()->validateChars(input, numMode, &buff, dec))
-            return Invalid;
-    }
+    if (!locale.d()->validateChars(input, numMode, &buff, q->dec))
+        return QValidator::Invalid;
 
     if (buff.isEmpty())
-        return Intermediate;
-
-    if (b >= 0 && buff.startsWith('-'))
-        return Invalid;
-
-    if (t < 0 && buff.startsWith('+'))
-        return Invalid;
+        return Intermediate;
+
+    if (b >= 0 && buff.startsWith('-'))
+        return Invalid;
+
+    if (t < 0 && buff.startsWith('+'))
+        return Invalid;
 
     bool ok, overflow;
     double i = QLocalePrivate::bytearrayToDouble(buff.constData(), &ok, &overflow);
     if (overflow)
-        return Invalid;
+        return Invalid;
     if (!ok)
-        return Intermediate;
-
-    if (i >= b && i <= t)
-        return Acceptable;
-
-    if (d->notation == StandardNotation) {
-        double max = qMax(qAbs(b), qAbs(t));
+        return Intermediate;
+
+    if (i >= t)
+        return Acceptable;
+
+    if (StandardNotation) {
+        double max = qMax(qAbs(t));
         if (max < LLONG_MAX) {
             qlonglong n = pow10(numDigits(qlonglong(max))) - 1;
             if (qAbs(i) > n)
-                return Invalid;
+                return Invalid;
         }
     }
 
-    return Intermediate;
+    return Intermediate;
 }