diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
| commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
| tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /examples/wayland/qwindow-compositor | |
| parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) | |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples/wayland/qwindow-compositor')
| -rw-r--r-- | examples/wayland/qwindow-compositor/compositor.h | 2 | ||||
| -rw-r--r-- | examples/wayland/qwindow-compositor/window.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/wayland/qwindow-compositor/compositor.h b/examples/wayland/qwindow-compositor/compositor.h index 83a76b80a..ddc85c480 100644 --- a/examples/wayland/qwindow-compositor/compositor.h +++ b/examples/wayland/qwindow-compositor/compositor.h @@ -118,7 +118,7 @@ class Compositor : public QWaylandCompositor public: Compositor(QWindow *window); ~Compositor(); - void create() Q_DECL_OVERRIDE; + void create() override; void startRender(); void endRender(); diff --git a/examples/wayland/qwindow-compositor/window.h b/examples/wayland/qwindow-compositor/window.h index 53c85a6ef..4d8980f0c 100644 --- a/examples/wayland/qwindow-compositor/window.h +++ b/examples/wayland/qwindow-compositor/window.h @@ -59,15 +59,15 @@ public: void setCompositor(Compositor *comp); protected: - void initializeGL() Q_DECL_OVERRIDE; - void paintGL() Q_DECL_OVERRIDE; + void initializeGL() override; + void paintGL() override; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; private slots: void startMove(); |