diff options
Diffstat (limited to 'examples/touch')
-rw-r--r-- | examples/touch/fingerpaint/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/touch/fingerpaint/scribblearea.h | 6 | ||||
-rw-r--r-- | examples/touch/knobs/knob.h | 2 | ||||
-rw-r--r-- | examples/touch/pinchzoom/graphicsview.h | 2 | ||||
-rw-r--r-- | examples/touch/pinchzoom/mouse.h | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/examples/touch/fingerpaint/mainwindow.h b/examples/touch/fingerpaint/mainwindow.h index 3686947065..47c339050e 100644 --- a/examples/touch/fingerpaint/mainwindow.h +++ b/examples/touch/fingerpaint/mainwindow.h @@ -65,7 +65,7 @@ public: MainWindow(); protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void open(); diff --git a/examples/touch/fingerpaint/scribblearea.h b/examples/touch/fingerpaint/scribblearea.h index d81414e8b9..5138e3a1ab 100644 --- a/examples/touch/fingerpaint/scribblearea.h +++ b/examples/touch/fingerpaint/scribblearea.h @@ -74,9 +74,9 @@ public slots: void print(); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + bool event(QEvent *event) override; private: void resizeImage(QImage *image, const QSize &newSize); diff --git a/examples/touch/knobs/knob.h b/examples/touch/knobs/knob.h index b35b16aabe..c16b61d6f1 100644 --- a/examples/touch/knobs/knob.h +++ b/examples/touch/knobs/knob.h @@ -58,7 +58,7 @@ class Knob : public QGraphicsEllipseItem public: Knob(); - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; + bool sceneEvent(QEvent *event) override; }; #endif // KNOB_H diff --git a/examples/touch/pinchzoom/graphicsview.h b/examples/touch/pinchzoom/graphicsview.h index f9dbc43980..d4e2e32d36 100644 --- a/examples/touch/pinchzoom/graphicsview.h +++ b/examples/touch/pinchzoom/graphicsview.h @@ -58,7 +58,7 @@ class GraphicsView : public QGraphicsView public: GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0); - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; + bool viewportEvent(QEvent *event) override; private: qreal totalScaleFactor; diff --git a/examples/touch/pinchzoom/mouse.h b/examples/touch/pinchzoom/mouse.h index a01c4d629c..870bfcd6c0 100644 --- a/examples/touch/pinchzoom/mouse.h +++ b/examples/touch/pinchzoom/mouse.h @@ -61,13 +61,13 @@ class Mouse : public QGraphicsObject public: Mouse(); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) Q_DECL_OVERRIDE; + QWidget *widget) override; protected: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private: qreal angle; |