summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/eglfs/api/qeglfswindow_p.h
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-06 23:22:46 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-07 19:12:08 +0000
commit964d9e8f8ad289072d046239931c4377122bbf97 (patch)
tree7d71c9822ac8ae7976338fd64ff0d0421469b437 /src/plugins/platforms/eglfs/api/qeglfswindow_p.h
parentb5c273cb1a92d6b0554aff4577d80b9b4a84e078 (diff)
eglfs: Replace Q_DECL_OVERRIDE by override
We can use 'override' directly since Qt 5.7. Also remove redundant 'virtual'. Change-Id: I4c1d5d8a69bf51a7f31077f7cdc74ba06da0bc11 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms/eglfs/api/qeglfswindow_p.h')
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfswindow_p.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h
index d280197aae..6bda262523 100644
--- a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h
+++ b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h
@@ -77,21 +77,21 @@ public:
void create();
void destroy();
- void setGeometry(const QRect &) Q_DECL_OVERRIDE;
- QRect geometry() const Q_DECL_OVERRIDE;
- void setVisible(bool visible) Q_DECL_OVERRIDE;
- void requestActivateWindow() Q_DECL_OVERRIDE;
- void raise() Q_DECL_OVERRIDE;
- void lower() Q_DECL_OVERRIDE;
-
- void propagateSizeHints() Q_DECL_OVERRIDE { }
- void setMask(const QRegion &) Q_DECL_OVERRIDE { }
- bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; }
- bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; }
- void setOpacity(qreal) Q_DECL_OVERRIDE;
- WId winId() const Q_DECL_OVERRIDE;
-
- QSurfaceFormat format() const Q_DECL_OVERRIDE;
+ void setGeometry(const QRect &) override;
+ QRect geometry() const override;
+ void setVisible(bool visible) override;
+ void requestActivateWindow() override;
+ void raise() override;
+ void lower() override;
+
+ void propagateSizeHints() override { }
+ void setMask(const QRegion &) override { }
+ bool setKeyboardGrabEnabled(bool) override { return false; }
+ bool setMouseGrabEnabled(bool) override { return false; }
+ void setOpacity(qreal) override;
+ WId winId() const override;
+
+ QSurfaceFormat format() const override;
EGLNativeWindowType eglWindow() const;
EGLSurface surface() const;
@@ -99,7 +99,7 @@ public:
bool hasNativeWindow() const { return m_flags.testFlag(HasNativeWindow); }
- virtual void invalidateSurface() Q_DECL_OVERRIDE;
+ void invalidateSurface() override;
virtual void resetSurface();
#ifndef QT_NO_OPENGL
@@ -108,9 +108,9 @@ public:
#endif
bool isRaster() const;
#ifndef QT_NO_OPENGL
- QWindow *sourceWindow() const Q_DECL_OVERRIDE;
- const QPlatformTextureList *textures() const Q_DECL_OVERRIDE;
- void endCompositing() Q_DECL_OVERRIDE;
+ QWindow *sourceWindow() const override;
+ const QPlatformTextureList *textures() const override;
+ void endCompositing() override;
#endif
protected: