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/widgets/effects | |
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/widgets/effects')
-rw-r--r-- | src/widgets/effects/qgraphicseffect.h | 12 | ||||
-rw-r--r-- | src/widgets/effects/qpixmapfilter_p.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 78d025ded5..ec5cf886a6 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -144,7 +144,7 @@ Q_SIGNALS: void strengthChanged(qreal strength); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsColorizeEffect) @@ -170,7 +170,7 @@ public: QGraphicsBlurEffect(QObject *parent = Q_NULLPTR); ~QGraphicsBlurEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; qreal blurRadius() const; BlurHints blurHints() const; @@ -183,7 +183,7 @@ Q_SIGNALS: void blurHintsChanged(BlurHints hints); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsBlurEffect) @@ -205,7 +205,7 @@ public: QGraphicsDropShadowEffect(QObject *parent = Q_NULLPTR); ~QGraphicsDropShadowEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; QPointF offset() const; inline qreal xOffset() const @@ -241,7 +241,7 @@ Q_SIGNALS: void colorChanged(const QColor &color); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsDropShadowEffect) @@ -270,7 +270,7 @@ Q_SIGNALS: void opacityMaskChanged(const QBrush &mask); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsOpacityEffect) diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 399a835142..0f582bde60 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -105,8 +105,8 @@ public: void setConvolutionKernel(const qreal *matrix, int rows, int columns); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapConvolutionFilter; @@ -133,8 +133,8 @@ public: qreal radius() const; QGraphicsBlurEffect::BlurHints blurHints() const; - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapBlurFilter; @@ -157,7 +157,7 @@ public: void setStrength(qreal strength); qreal strength() const; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; }; class QPixmapDropShadowFilterPrivate; @@ -171,8 +171,8 @@ public: QPixmapDropShadowFilter(QObject *parent = 0); ~QPixmapDropShadowFilter(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const override; qreal blurRadius() const; void setBlurRadius(qreal radius); |