diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
| commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
| tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/gui/util | |
| parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) | |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qvalidator.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index eba4b54672..a30f5bfa83 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -97,8 +97,8 @@ public: QIntValidator(int bottom, int top, QObject *parent = Q_NULLPTR); ~QIntValidator(); - QValidator::State validate(QString &, int &) const Q_DECL_OVERRIDE; - void fixup(QString &input) const Q_DECL_OVERRIDE; + QValidator::State validate(QString &, int &) const override; + void fixup(QString &input) const override; void setBottom(int); void setTop(int); @@ -139,7 +139,7 @@ public: ScientificNotation }; Q_ENUM(Notation) - QValidator::State validate(QString &, int &) const Q_DECL_OVERRIDE; + QValidator::State validate(QString &, int &) const override; virtual void setRange(double bottom, double top, int decimals = 0); void setBottom(double); @@ -178,7 +178,7 @@ public: explicit QRegExpValidator(const QRegExp& rx, QObject *parent = Q_NULLPTR); ~QRegExpValidator(); - virtual QValidator::State validate(QString& input, int& pos) const Q_DECL_OVERRIDE; + virtual QValidator::State validate(QString& input, int& pos) const override; void setRegExp(const QRegExp& rx); const QRegExp& regExp() const { return r; } @@ -208,7 +208,7 @@ public: explicit QRegularExpressionValidator(const QRegularExpression &re, QObject *parent = Q_NULLPTR); ~QRegularExpressionValidator(); - virtual QValidator::State validate(QString &input, int &pos) const Q_DECL_OVERRIDE; + virtual QValidator::State validate(QString &input, int &pos) const override; QRegularExpression regularExpression() const; |