diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 13:29:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 13:29:12 (GMT) |
| commit | f3e6effc3cea788c7fcf34fad33d58b1a19017f0 (patch) | |
| tree | 1b23288aa53631201fd3aabf0b4735d416cf55e7 /src | |
| parent | 64e1f888586f2c988b08bcc93579990e970b7206 (diff) | |
| parent | 8605f528930744b2afc594c39afb146bd7ad4b54 (diff) | |
| download | Qt-f3e6effc3cea788c7fcf34fad33d58b1a19017f0.zip Qt-f3e6effc3cea788c7fcf34fad33d58b1a19017f0.tar.gz Qt-f3e6effc3cea788c7fcf34fad33d58b1a19017f0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QIntValidator: provide default argument to parent
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qvalidator.h | 6 |
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; |