summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-01-12 13:25:48 +0100
committerJohan Helsing <johan.helsing@qt.io>2017-01-23 16:20:03 +0000
commitf72d63866d3f5820865fcd309b649dc9932518ee (patch)
tree675610cbbc8a88f0197c351e754e7892e4eb7871 /src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
parent76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (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 'src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h')
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index bf656689a..e471a8f7c 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -58,10 +58,10 @@ class QWaylandEglWindow : public QWaylandWindow
public:
QWaylandEglWindow(QWindow *window);
~QWaylandEglWindow();
- WindowType windowType() const Q_DECL_OVERRIDE;
+ WindowType windowType() const override;
void updateSurface(bool create);
- virtual void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+ virtual void setGeometry(const QRect &rect) override;
QRect contentsRect() const;
EGLSurface eglSurface() const;
@@ -69,12 +69,12 @@ public:
GLuint contentTexture() const;
bool needToUpdateContentFBO() const { return decoration() && (m_resize || !m_contentFBO); }
- QSurfaceFormat format() const Q_DECL_OVERRIDE;
+ QSurfaceFormat format() const override;
void bindContentFBO();
- void invalidateSurface() Q_DECL_OVERRIDE;
- void setVisible(bool visible) Q_DECL_OVERRIDE;
+ void invalidateSurface() override;
+ void setVisible(bool visible) override;
private Q_SLOTS:
void doInvalidateSurface();