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

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

trunk/src/gui/widgets/qvalidator.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -55 +55 @@
     \class QValidator
     \brief The QValidator class provides validation of input text.
-
-    \ingroup misc
-    \mainclass
 
     The class itself is abstract. Two subclasses, \l QIntValidator and
@@ -91 +88 @@
 
     \i For an editable combobox that accepts URLs, any well-formed URL
-    is \l Acceptable, "http://qtsoftware.com/," is \l Intermediate
+    is \l Acceptable, "http://example.com/," is \l Intermediate
     (it might be a cut and paste action that accidentally took in a
     comma at the end), the empty string is \l Intermediate (the user
@@ -99 +96 @@
     \i For a spin box that accepts lengths, "11cm" and "1in" are \l
     Acceptable, "11" and the empty string are \l Intermediate, and
-    "http://qtsoftware.com" and "hour" are \l Invalid.
+    "http://example.com" and "hour" are \l Invalid.
 
     \endlist
@@ -247 +244 @@
     a string contains a valid integer within a specified range.
 
-    \ingroup misc
-
     Example of use:
 
@@ -371 +366 @@
         return 1;
     return (int)log10(double(n)) + 1;
-};
+}
 
 static qlonglong pow10(int exp)
@@ -497 +492 @@
     \brief The QDoubleValidator class provides range checking of
     floating-point numbers.
-
-    \ingroup misc
 
     QDoubleValidator provides an upper bound, a lower bound, and a
@@ -644 +637 @@
             numMode = QLocalePrivate::DoubleScientificMode;
             break;
-    };
+    }
 
     QByteArray buff;
@@ -767 +760 @@
     \brief The QRegExpValidator class is used to check a string
     against a regular expression.
-
-    \ingroup misc
 
     QRegExpValidator uses a regular expression (regexp) to