diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /examples/wayland/server-buffer | |
parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) | |
download | qtwayland-f72d63866d3f5820865fcd309b649dc9932518ee.tar.gz |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples/wayland/server-buffer')
-rw-r--r-- | examples/wayland/server-buffer/client/main.cpp | 4 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp index 1a2c447a..bab4a942 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 8c43ce5c..9ac91244 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; |