Replace all occurrences of Q_DECL_OVERRIDE with override

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

6 files changed, 18 insertions, 18 deletions

diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
index dafb3c5e5..efb2eb18b 100644
--- a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
+++ b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
@@ -128,12 +128,12 @@ class Q_WAYLAND_COMPOSITOR_EXPORT SharedMemoryBuffer : public ClientBuffer
 public:
     SharedMemoryBuffer(struct ::wl_resource *bufferResource);
 
-    QSize size() const Q_DECL_OVERRIDE;
-    QWaylandSurface::Origin origin() const  Q_DECL_OVERRIDE;
+    QSize size() const override;
+    QWaylandSurface::Origin origin() const  override;
     QImage image() const;
 
 #if QT_CONFIG(opengl)
-    QOpenGLTexture *toOpenGlTexture(int plane = 0) Q_DECL_OVERRIDE;
+    QOpenGLTexture *toOpenGlTexture(int plane = 0) override;
 
 private:
     QOpenGLTexture *m_shmTexture;
diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index 17591ae27..57a9c0a80 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -79,8 +79,8 @@ public:
     void cancelDrag();
 
 protected:
-    void data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) Q_DECL_OVERRIDE;
-    void data_device_set_selection(Resource *resource, struct ::wl_resource *source, uint32_t serial) Q_DECL_OVERRIDE;
+    void data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) override;
+    void data_device_set_selection(Resource *resource, struct ::wl_resource *source, uint32_t serial) override;
 
 private:
     void setDragIcon(QWaylandSurface *icon);
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
index 8408db977..483731dfd 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
@@ -85,8 +85,8 @@ public:
     void offerRetainedSelection(wl_resource *clientDataDeviceResource);
 
 protected:
-    void data_device_manager_create_data_source(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
-    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) Q_DECL_OVERRIDE;
+    void data_device_manager_create_data_source(Resource *resource, uint32_t id) override;
+    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) override;
 
 private Q_SLOTS:
     void readFromClient(int fd);
diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h
index 09ca87650..dc1c84fe0 100644
--- a/src/compositor/wayland_wrapper/qwldataoffer_p.h
+++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h
@@ -65,10 +65,10 @@ public:
     ~DataOffer();
 
 protected:
-    void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) Q_DECL_OVERRIDE;
-    void data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) Q_DECL_OVERRIDE;
-    void data_offer_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void data_offer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) override;
+    void data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) override;
+    void data_offer_destroy(Resource *resource) override;
+    void data_offer_destroy_resource(Resource *resource) override;
 
 private:
     QPointer<DataSource> m_dataSource;
diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h
index 4389b40fb..b548a2411 100644
--- a/src/compositor/wayland_wrapper/qwldatasource_p.h
+++ b/src/compositor/wayland_wrapper/qwldatasource_p.h
@@ -78,9 +78,9 @@ public:
     static DataSource *fromResource(struct ::wl_resource *resource);
 
 protected:
-    void data_source_offer(Resource *resource, const QString &mime_type) Q_DECL_OVERRIDE;
-    void data_source_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void data_source_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void data_source_offer(Resource *resource, const QString &mime_type) override;
+    void data_source_destroy(Resource *resource) override;
+    void data_source_destroy_resource(Resource *resource) override;
 
 private:
     uint32_t m_time;
diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index c63cdbc45..c5047596e 100644
--- a/src/compositor/wayland_wrapper/qwlregion_p.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -76,11 +76,11 @@ private:
 
     QRegion m_region;
 
-    void region_destroy_resource(Resource *) Q_DECL_OVERRIDE;
+    void region_destroy_resource(Resource *) override;
 
-    void region_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void region_add(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) Q_DECL_OVERRIDE;
-    void region_subtract(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) Q_DECL_OVERRIDE;
+    void region_destroy(Resource *resource) override;
+    void region_add(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) override;
+    void region_subtract(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) override;
 };
 
 }