From 964d9e8f8ad289072d046239931c4377122bbf97 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Tue, 6 Dec 2016 23:22:46 +0300 Subject: 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 --- src/plugins/platforms/eglfs/api/qeglfswindow_p.h | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/plugins/platforms/eglfs/api/qeglfswindow_p.h') 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: -- cgit v1.2.3