diff options
Diffstat (limited to 'examples/widgets/painting')
-rw-r--r-- | examples/widgets/painting/affine/xform.h | 12 | ||||
-rw-r--r-- | examples/widgets/painting/basicdrawing/renderarea.h | 6 | ||||
-rw-r--r-- | examples/widgets/painting/composition/composition.h | 12 | ||||
-rw-r--r-- | examples/widgets/painting/concentriccircles/circlewidget.h | 6 | ||||
-rw-r--r-- | examples/widgets/painting/deform/pathdeform.h | 12 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/gradients.h | 10 | ||||
-rw-r--r-- | examples/widgets/painting/painterpaths/renderarea.h | 6 | ||||
-rw-r--r-- | examples/widgets/painting/pathstroke/pathstroke.h | 16 | ||||
-rw-r--r-- | examples/widgets/painting/shared/arthurstyle.h | 20 | ||||
-rw-r--r-- | examples/widgets/painting/shared/arthurwidgets.h | 8 | ||||
-rw-r--r-- | examples/widgets/painting/shared/hoverpoints.h | 2 | ||||
-rw-r--r-- | examples/widgets/painting/transformations/renderarea.h | 6 |
12 files changed, 58 insertions, 58 deletions
diff --git a/examples/widgets/painting/affine/xform.h b/examples/widgets/painting/affine/xform.h index 11c8fbde90..f2eed99b4f 100644 --- a/examples/widgets/painting/affine/xform.h +++ b/examples/widgets/painting/affine/xform.h @@ -80,14 +80,14 @@ public: enum XFormType { VectorType, PixmapType, TextType }; XFormView(QWidget *parent); - void paint(QPainter *) Q_DECL_OVERRIDE; + void paint(QPainter *) override; void drawVectorType(QPainter *painter); void drawPixmapType(QPainter *painter); void drawTextType(QPainter *painter); - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(500, 500); } + QSize sizeHint() const override { return QSize(500, 500); } - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; HoverPoints *hoverPoints() { return pts; } bool animation() const { return timer.isActive(); } @@ -124,9 +124,9 @@ signals: void shearChanged(int shear); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; #ifndef QT_NO_WHEELEVENT - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif private: diff --git a/examples/widgets/painting/basicdrawing/renderarea.h b/examples/widgets/painting/basicdrawing/renderarea.h index db44d8aa14..fb4aab470b 100644 --- a/examples/widgets/painting/basicdrawing/renderarea.h +++ b/examples/widgets/painting/basicdrawing/renderarea.h @@ -67,8 +67,8 @@ public: RenderArea(QWidget *parent = 0); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; public slots: void setShape(Shape shape); @@ -78,7 +78,7 @@ public slots: void setTransformed(bool transformed); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; private: Shape shape; diff --git a/examples/widgets/painting/composition/composition.h b/examples/widgets/painting/composition/composition.h index 015dd13098..49853f503b 100644 --- a/examples/widgets/painting/composition/composition.h +++ b/examples/widgets/painting/composition/composition.h @@ -118,21 +118,21 @@ class CompositionRenderer : public ArthurFrame public: CompositionRenderer(QWidget *parent); - void paint(QPainter *) Q_DECL_OVERRIDE; + void paint(QPainter *) override; void setCirclePos(const QPointF &pos); - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(500, 400); } + QSize sizeHint() const override { return QSize(500, 400); } bool animationEnabled() const { return m_animation_enabled; } int circleColor() const { return m_circle_hue; } int circleAlpha() const { return m_circle_alpha; } protected: - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void timerEvent(QTimerEvent *) override; public slots: void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear; update(); } diff --git a/examples/widgets/painting/concentriccircles/circlewidget.h b/examples/widgets/painting/concentriccircles/circlewidget.h index 99e39ca2bb..79fd5c71da 100644 --- a/examples/widgets/painting/concentriccircles/circlewidget.h +++ b/examples/widgets/painting/concentriccircles/circlewidget.h @@ -64,14 +64,14 @@ public: void setFloatBased(bool floatBased); void setAntialiased(bool antialiased); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; public slots: void nextAnimationFrame(); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; private: bool floatBased; diff --git a/examples/widgets/painting/deform/pathdeform.h b/examples/widgets/painting/deform/pathdeform.h index 46c1d2c5ac..68908045b9 100644 --- a/examples/widgets/painting/deform/pathdeform.h +++ b/examples/widgets/painting/deform/pathdeform.h @@ -69,14 +69,14 @@ class PathDeformRenderer : public ArthurFrame public: explicit PathDeformRenderer(QWidget *widget, bool smallScreen = false); - void paint(QPainter *painter) Q_DECL_OVERRIDE; + void paint(QPainter *painter) override; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void timerEvent(QTimerEvent *e) override; - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(600, 500); } + QSize sizeHint() const override { return QSize(600, 500); } bool animated() const { return m_animated; } int radius() const { return int(m_radius); } diff --git a/examples/widgets/painting/gradients/gradients.h b/examples/widgets/painting/gradients/gradients.h index b15a586d72..b4db298bb4 100644 --- a/examples/widgets/painting/gradients/gradients.h +++ b/examples/widgets/painting/gradients/gradients.h @@ -76,9 +76,9 @@ public: void setGradientStops(const QGradientStops &stops); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(150, 40); } + QSize sizeHint() const override { return QSize(150, 40); } QPolygonF points() const; HoverPoints *hoverPoints() const { return m_hoverPoints; } @@ -125,12 +125,12 @@ class GradientRenderer : public ArthurFrame public: GradientRenderer(QWidget *parent); - void paint(QPainter *p) Q_DECL_OVERRIDE; + void paint(QPainter *p) override; - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(400, 400); } + QSize sizeHint() const override { return QSize(400, 400); } HoverPoints *hoverPoints() const { return m_hoverPoints; } - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) override; public slots: void setGradientStops(const QGradientStops &stops); diff --git a/examples/widgets/painting/painterpaths/renderarea.h b/examples/widgets/painting/painterpaths/renderarea.h index 0c07108589..5f0874b772 100644 --- a/examples/widgets/painting/painterpaths/renderarea.h +++ b/examples/widgets/painting/painterpaths/renderarea.h @@ -62,8 +62,8 @@ class RenderArea : public QWidget public: explicit RenderArea(const QPainterPath &path, QWidget *parent = 0); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; public slots: void setFillRule(Qt::FillRule rule); @@ -73,7 +73,7 @@ public slots: void setRotationAngle(int degrees); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; //! [0] //! [1] diff --git a/examples/widgets/painting/pathstroke/pathstroke.h b/examples/widgets/painting/pathstroke/pathstroke.h index f5f2a9ae00..71352c8cc2 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.h +++ b/examples/widgets/painting/pathstroke/pathstroke.h @@ -65,14 +65,14 @@ public: explicit PathStrokeRenderer(QWidget *parent, bool smallScreen = false); - void paint(QPainter *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; - - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(500, 500); } + void paint(QPainter *) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void timerEvent(QTimerEvent *e) override; + bool event(QEvent *e) override; + + QSize sizeHint() const override { return QSize(500, 500); } bool animation() const { return m_timer.isActive(); } diff --git a/examples/widgets/painting/shared/arthurstyle.h b/examples/widgets/painting/shared/arthurstyle.h index ca5993b5a2..8ea8354bab 100644 --- a/examples/widgets/painting/shared/arthurstyle.h +++ b/examples/widgets/painting/shared/arthurstyle.h @@ -63,23 +63,23 @@ public: void drawHoverRect(QPainter *painter, const QRect &rect) const; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = 0) const override; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget) const override; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget) const override; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; + const QSize &size, const QWidget *widget) const override; - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE; + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; + SubControl sc, const QWidget *widget) const override; - int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const override; - void polish(QPalette &palette) Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; + void polish(QPalette &palette) override; + void polish(QWidget *widget) override; + void unpolish(QWidget *widget) override; }; #endif diff --git a/examples/widgets/painting/shared/arthurwidgets.h b/examples/widgets/painting/shared/arthurwidgets.h index 0133073c04..d6e1e44b3a 100644 --- a/examples/widgets/painting/shared/arthurwidgets.h +++ b/examples/widgets/painting/shared/arthurwidgets.h @@ -68,9 +68,9 @@ public: setAttribute(Qt::WA_AcceptTouchEvents); } void disableAutoBufferSwap() { setAutoBufferSwap(false); } - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE { parentWidget()->update(); } + void paintEvent(QPaintEvent *) override { parentWidget()->update(); } protected: - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { switch (event->type()) { case QEvent::TouchBegin: @@ -126,8 +126,8 @@ signals: void descriptionEnabledChanged(bool); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override; #if defined(QT_OPENGL_SUPPORT) GLWidget *glw; diff --git a/examples/widgets/painting/shared/hoverpoints.h b/examples/widgets/painting/shared/hoverpoints.h index 6f8c122042..6bf1cafe4e 100644 --- a/examples/widgets/painting/shared/hoverpoints.h +++ b/examples/widgets/painting/shared/hoverpoints.h @@ -85,7 +85,7 @@ public: HoverPoints(QWidget *widget, PointShape shape); - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; void paintPoints(); diff --git a/examples/widgets/painting/transformations/renderarea.h b/examples/widgets/painting/transformations/renderarea.h index 2cc9ac274a..140be27b2b 100644 --- a/examples/widgets/painting/transformations/renderarea.h +++ b/examples/widgets/painting/transformations/renderarea.h @@ -75,11 +75,11 @@ public: void setOperations(const QList<Operation> &operations); void setShape(const QPainterPath &shape); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; //! [1] //! [2] |