summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-05-04 11:45:27 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-05-09 19:47:53 +0000
commita213011a53f12f101d08a04afc8fdacd2d54a232 (patch)
treed4db99fdee7b9e3a62a5b3f5219726ac06fb70fa /src/gui/util
parente8995de22a0ccca932e24994c6e1861ef062983b (diff)
QtGui: Introduce delegating constructors.
Reduce code duplication by chaining constructors. Change-Id: Ida25105e33cc3ef870f416931212e2216e9c6dfb Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qvalidator.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 90c6e7a7b8..fb9dfc9f69 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -216,7 +216,7 @@ public:
*/
QValidator::QValidator(QObject * parent)
- : QObject(*new QValidatorPrivate, parent)
+ : QValidator(*new QValidatorPrivate, parent)
{
}
@@ -337,10 +337,8 @@ void QValidator::fixup(QString &) const
*/
QIntValidator::QIntValidator(QObject * parent)
- : QValidator(parent)
+ : QIntValidator(INT_MIN, INT_MAX, parent)
{
- b = INT_MIN;
- t = INT_MAX;
}
@@ -589,11 +587,8 @@ public:
*/
QDoubleValidator::QDoubleValidator(QObject * parent)
- : QValidator(*new QDoubleValidatorPrivate , parent)
+ : QDoubleValidator(-HUGE_VAL, HUGE_VAL, 1000, parent)
{
- b = -HUGE_VAL;
- t = HUGE_VAL;
- dec = 1000;
}
@@ -845,7 +840,7 @@ QDoubleValidator::Notation QDoubleValidator::notation() const
*/
QRegExpValidator::QRegExpValidator(QObject *parent)
- : QValidator(parent), r(QString::fromLatin1(".*"))
+ : QRegExpValidator(QRegExp(QString::fromLatin1(".*")), parent)
{
}
@@ -982,7 +977,7 @@ QRegularExpressionValidator::QRegularExpressionValidator(QObject *parent)
*/
QRegularExpressionValidator::QRegularExpressionValidator(const QRegularExpression &re, QObject *parent)
- : QValidator(*new QRegularExpressionValidatorPrivate, parent)
+ : QRegularExpressionValidator(parent)
{
Q_D(QRegularExpressionValidator);
d->setRegularExpression(re);