From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/gui/util/qvalidator.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/util') diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index a30f5bfa83..ad23092537 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -59,7 +59,7 @@ class Q_GUI_EXPORT QValidator : public QObject { Q_OBJECT public: - explicit QValidator(QObject * parent = Q_NULLPTR); + explicit QValidator(QObject * parent = nullptr); ~QValidator(); enum State { @@ -93,8 +93,8 @@ class Q_GUI_EXPORT QIntValidator : public QValidator Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) public: - explicit QIntValidator(QObject * parent = Q_NULLPTR); - QIntValidator(int bottom, int top, QObject *parent = Q_NULLPTR); + explicit QIntValidator(QObject * parent = nullptr); + QIntValidator(int bottom, int top, QObject *parent = nullptr); ~QIntValidator(); QValidator::State validate(QString &, int &) const override; @@ -130,8 +130,8 @@ class Q_GUI_EXPORT QDoubleValidator : public QValidator Q_PROPERTY(Notation notation READ notation WRITE setNotation NOTIFY notationChanged) public: - explicit QDoubleValidator(QObject * parent = Q_NULLPTR); - QDoubleValidator(double bottom, double top, int decimals, QObject *parent = Q_NULLPTR); + explicit QDoubleValidator(QObject * parent = nullptr); + QDoubleValidator(double bottom, double top, int decimals, QObject *parent = nullptr); ~QDoubleValidator(); enum Notation { @@ -174,8 +174,8 @@ class Q_GUI_EXPORT QRegExpValidator : public QValidator Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp NOTIFY regExpChanged) public: - explicit QRegExpValidator(QObject *parent = Q_NULLPTR); - explicit QRegExpValidator(const QRegExp& rx, QObject *parent = Q_NULLPTR); + explicit QRegExpValidator(QObject *parent = nullptr); + explicit QRegExpValidator(const QRegExp& rx, QObject *parent = nullptr); ~QRegExpValidator(); virtual QValidator::State validate(QString& input, int& pos) const override; @@ -204,8 +204,8 @@ class Q_GUI_EXPORT QRegularExpressionValidator : public QValidator Q_PROPERTY(QRegularExpression regularExpression READ regularExpression WRITE setRegularExpression NOTIFY regularExpressionChanged) public: - explicit QRegularExpressionValidator(QObject *parent = Q_NULLPTR); - explicit QRegularExpressionValidator(const QRegularExpression &re, QObject *parent = Q_NULLPTR); + explicit QRegularExpressionValidator(QObject *parent = nullptr); + explicit QRegularExpressionValidator(const QRegularExpression &re, QObject *parent = nullptr); ~QRegularExpressionValidator(); virtual QValidator::State validate(QString &input, int &pos) const override; -- cgit v1.2.3