summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-12-21 00:00:12 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-12-21 00:00:12 (GMT)
commitcb0dbc32c957fce25e36587d4f533a693b1e7735 (patch)
tree3bd1605000e9aba4d2470c6e52d65bb7a464c3e9 /src/gui/widgets
parent3a5aaa781547838ca824fbbf03333728aa68ed1a (diff)
parent9306ef3cdbaac0af0f3c0ad1209eb0ba935652df (diff)
downloadQt-cb0dbc32c957fce25e36587d4f533a693b1e7735.zip
Qt-cb0dbc32c957fce25e36587d4f533a693b1e7735.tar.gz
Qt-cb0dbc32c957fce25e36587d4f533a693b1e7735.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qvalidator.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h
index 63734ca..013387d 100644
--- a/src/gui/widgets/qvalidator.h
+++ b/src/gui/widgets/qvalidator.h
@@ -101,7 +101,7 @@ class Q_GUI_EXPORT QIntValidator : public QValidator
public:
explicit QIntValidator(QObject * parent = 0);
- QIntValidator(int bottom, int top, QObject * parent);
+ QIntValidator(int bottom, int top, QObject *parent = 0);
~QIntValidator();
QValidator::State validate(QString &, int &) const;
@@ -142,7 +142,7 @@ class Q_GUI_EXPORT QDoubleValidator : public QValidator
public:
explicit QDoubleValidator(QObject * parent = 0);
- QDoubleValidator(double bottom, double top, int decimals, QObject * parent);
+ QDoubleValidator(double bottom, double top, int decimals, QObject *parent = 0);
~QDoubleValidator();
enum Notation {
@@ -186,7 +186,7 @@ class Q_GUI_EXPORT QRegExpValidator : public QValidator
public:
explicit QRegExpValidator(QObject *parent = 0);
- QRegExpValidator(const QRegExp& rx, QObject *parent);
+ QRegExpValidator(const QRegExp& rx, QObject *parent = 0);
~QRegExpValidator();
virtual QValidator::State validate(QString& input, int& pos) const;