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>

5 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
index de13a058cf..c96dd585d3 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
@@ -76,12 +76,12 @@ public:
     ~QEglFSKmsGbmCursor();
 
     // input methods
-    void pointerEvent(const QMouseEvent & event) Q_DECL_OVERRIDE;
+    void pointerEvent(const QMouseEvent & event) override;
 #ifndef QT_NO_CURSOR
-    void changeCursor(QCursor * windowCursor, QWindow * window) Q_DECL_OVERRIDE;
+    void changeCursor(QCursor * windowCursor, QWindow * window) override;
 #endif
-    QPoint pos() const Q_DECL_OVERRIDE;
-    void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
+    QPoint pos() const override;
+    void setPos(const QPoint &pos) override;
 
     void updateMouseStatus();
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
index 25284c6468..08ca28d48e 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
@@ -56,10 +56,10 @@ class QEglFSKmsGbmDevice: public QEglFSKmsDevice
 public:
     QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path);
 
-    bool open() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool open() override;
+    void close() override;
 
-    void *nativeDisplay() const Q_DECL_OVERRIDE;
+    void *nativeDisplay() const override;
     gbm_device *gbmDevice() const;
 
     QPlatformCursor *globalCursor() const;
@@ -67,7 +67,7 @@ public:
 
     void handleDrmEvent();
 
-    QPlatformScreen *createScreen(const QKmsOutput &output) Q_DECL_OVERRIDE;
+    QPlatformScreen *createScreen(const QKmsOutput &output) override;
 
 private:
     Q_DISABLE_COPY(QEglFSKmsGbmDevice)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
index fa2e494a89..38f132d72e 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
@@ -57,15 +57,15 @@ public:
 
     EGLNativeWindowType createNativeWindow(QPlatformWindow *platformWindow,
                                            const QSize &size,
-                                           const QSurfaceFormat &format) Q_DECL_OVERRIDE;
-    EGLNativeWindowType createNativeOffscreenWindow(const QSurfaceFormat &format) Q_DECL_OVERRIDE;
-    void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE;
+                                           const QSurfaceFormat &format) override;
+    EGLNativeWindowType createNativeOffscreenWindow(const QSurfaceFormat &format) override;
+    void destroyNativeWindow(EGLNativeWindowType window) override;
 
-    QPlatformCursor *createCursor(QPlatformScreen *screen) const Q_DECL_OVERRIDE;
-    void presentBuffer(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    QPlatformCursor *createCursor(QPlatformScreen *screen) const override;
+    void presentBuffer(QPlatformSurface *surface) override;
 
 protected:
-    QKmsDevice *createDevice() Q_DECL_OVERRIDE;
+    QKmsDevice *createDevice() override;
 
 private:
 };
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmmain.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmmain.cpp
index f34e4859c6..945c8b4255 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmmain.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmmain.cpp
@@ -49,7 +49,7 @@ class QEglFSKmsGbmIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
     Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_kms.json")
 
 public:
-    QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSKmsGbmIntegration; }
+    QEglFSDeviceIntegration *create() override { return new QEglFSKmsGbmIntegration; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
index ffc96955d4..341cc95bbe 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
@@ -57,15 +57,15 @@ public:
     QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output);
     ~QEglFSKmsGbmScreen();
 
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
+    QPlatformCursor *cursor() const override;
 
     gbm_surface *surface() const { return m_gbm_surface; }
     gbm_surface *createSurface();
     void destroySurface();
 
-    void waitForFlip() Q_DECL_OVERRIDE;
-    void flip() Q_DECL_OVERRIDE;
-    void flipFinished() Q_DECL_OVERRIDE;
+    void waitForFlip() override;
+    void flip() override;
+    void flipFinished() override;
 
 private:
     gbm_surface *m_gbm_surface;