Replace all occurrences of Q_DECL_OVERRIDE with override

Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

10 files changed, 25 insertions, 25 deletions

diff --git a/examples/wayland/custom-extension/client-common/customextension.h b/examples/wayland/custom-extension/client-common/customextension.h
index 3b64fc646..9f7fac782 100644
--- a/examples/wayland/custom-extension/client-common/customextension.h
+++ b/examples/wayland/custom-extension/client-common/customextension.h
@@ -69,11 +69,11 @@ private slots:
     void handleExtensionActive();
 
 private:
-    void example_extension_close(wl_surface *surface) Q_DECL_OVERRIDE;
-    void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) Q_DECL_OVERRIDE;
-    void example_extension_set_window_decoration(uint32_t state) Q_DECL_OVERRIDE;
+    void example_extension_close(wl_surface *surface) override;
+    void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) override;
+    void example_extension_set_window_decoration(uint32_t state) override;
 
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
     QWindow *windowForSurface(struct ::wl_surface *);
     void sendWindowRegistration(QWindow *);
diff --git a/examples/wayland/custom-extension/client-common/main.cpp b/examples/wayland/custom-extension/client-common/main.cpp
index 8c27fa77d..ad7c027ff 100644
--- a/examples/wayland/custom-extension/client-common/main.cpp
+++ b/examples/wayland/custom-extension/client-common/main.cpp
@@ -54,7 +54,7 @@ class CustomIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "client.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
     QPlatformIntegration *CustomIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/examples/wayland/custom-extension/compositor/customextension.h b/examples/wayland/custom-extension/compositor/customextension.h
index b1b00408b..7f09ad0eb 100644
--- a/examples/wayland/custom-extension/compositor/customextension.h
+++ b/examples/wayland/custom-extension/compositor/customextension.h
@@ -54,7 +54,7 @@ class CustomExtension  : public QWaylandCompositorExtensionTemplate<CustomExtens
     Q_OBJECT
 public:
     CustomExtension(QWaylandCompositor *compositor = 0);
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 signals:
     void surfaceAdded(QWaylandSurface *surface);
@@ -67,9 +67,9 @@ public slots:
     void close(QWaylandSurface *surface);
 
 protected:
-    void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE;
-    void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE;
-    void example_extension_register_surface(Resource *resource, wl_resource *surface) Q_DECL_OVERRIDE;
+    void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) override;
+    void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) override;
+    void example_extension_register_surface(Resource *resource, wl_resource *surface) override;
 };
 
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(CustomExtension)
diff --git a/examples/wayland/custom-extension/cpp-client/main.cpp b/examples/wayland/custom-extension/cpp-client/main.cpp
index af8de53b5..3dbada171 100644
--- a/examples/wayland/custom-extension/cpp-client/main.cpp
+++ b/examples/wayland/custom-extension/cpp-client/main.cpp
@@ -100,7 +100,7 @@ public slots:
     }
 
 protected:
-    void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
+    void paintEvent(QPaintEvent *) override
     {
         QPainter p(this);
         p.setFont(m_font);
@@ -113,7 +113,7 @@ protected:
         p.drawText(rect3, Qt::TextWordWrap, "Create new window.");
     }
 
-    void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE
+    void mousePressEvent(QMouseEvent *ev) override
     {
         if (rect1.contains(ev->pos()))
             doSpin();
diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h
index e44a8eb52..3ac0311e3 100644
--- a/examples/wayland/minimal-cpp/compositor.h
+++ b/examples/wayland/minimal-cpp/compositor.h
@@ -68,7 +68,7 @@ class Compositor : public QWaylandCompositor
 public:
     Compositor(Window *window);
     ~Compositor();
-    void create() Q_DECL_OVERRIDE;
+    void create() override;
 
     QList<View*> views() const { return m_views; }
 
diff --git a/examples/wayland/minimal-cpp/window.h b/examples/wayland/minimal-cpp/window.h
index 4df1bc833..16b14c8e9 100644
--- a/examples/wayland/minimal-cpp/window.h
+++ b/examples/wayland/minimal-cpp/window.h
@@ -55,8 +55,8 @@ public:
     void setCompositor(Compositor *comp);
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintGL() override;
 
 private:
     QOpenGLTextureBlitter m_textureBlitter;
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();
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp
index 1a2c447a7..bab4a942a 100644
--- a/examples/wayland/server-buffer/client/main.cpp
+++ b/examples/wayland/server-buffer/client/main.cpp
@@ -144,7 +144,7 @@ public slots:
     }
 
 protected:
-    void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE
+    void registry_global(uint32_t name, const QString &interface, uint32_t version) override
     {
         Q_UNUSED(version);
         if (interface == QStringLiteral("qt_share_buffer")) {
@@ -152,7 +152,7 @@ protected:
         }
     }
 
-    void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) Q_DECL_OVERRIDE
+    void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) override
     {
         QtWaylandClient::QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
         if (m_server_buffer_list.isEmpty()) {
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 8c43ce5c5..9ac91244e 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -215,7 +215,7 @@ protected:
         connect(surface, &QWaylandSurface::hasContentChanged, this, &QmlCompositor::surfaceMapped);
     }
 
-    void share_buffer_bind_resource(Resource *resource) Q_DECL_OVERRIDE
+    void share_buffer_bind_resource(Resource *resource) override
     {
         if (m_server_buffer_32_bit) {
             struct ::wl_client *client = resource->handle->client;