summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandsurface_p.h
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-01-12 13:25:48 +0100
committerJohan Helsing <johan.helsing@qt.io>2017-01-23 16:20:03 +0000
commitf72d63866d3f5820865fcd309b649dc9932518ee (patch)
tree675610cbbc8a88f0197c351e754e7892e4eb7871 /src/compositor/compositor_api/qwaylandsurface_p.h
parent76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff)
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface_p.h')
-rw-r--r--src/compositor/compositor_api/qwaylandsurface_p.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 135d78732..aea6eda98 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -117,22 +117,22 @@ public:
QWaylandSurfacePrivate *parentSurface() const { return subsurface ? subsurface->parentSurface : nullptr; }
protected:
- void surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+ void surface_destroy_resource(Resource *resource) override;
- void surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+ void surface_destroy(Resource *resource) override;
void surface_attach(Resource *resource,
- struct wl_resource *buffer, int x, int y) Q_DECL_OVERRIDE;
+ struct wl_resource *buffer, int x, int y) override;
void surface_damage(Resource *resource,
- int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
+ int32_t x, int32_t y, int32_t width, int32_t height) override;
void surface_frame(Resource *resource,
- uint32_t callback) Q_DECL_OVERRIDE;
+ uint32_t callback) override;
void surface_set_opaque_region(Resource *resource,
- struct wl_resource *region) Q_DECL_OVERRIDE;
+ struct wl_resource *region) override;
void surface_set_input_region(Resource *resource,
- struct wl_resource *region) Q_DECL_OVERRIDE;
- void surface_commit(Resource *resource) Q_DECL_OVERRIDE;
- void surface_set_buffer_transform(Resource *resource, int32_t transform) Q_DECL_OVERRIDE;
- void surface_set_buffer_scale(Resource *resource, int32_t bufferScale) Q_DECL_OVERRIDE;
+ struct wl_resource *region) override;
+ void surface_commit(Resource *resource) override;
+ void surface_set_buffer_transform(Resource *resource, int32_t transform) override;
+ void surface_set_buffer_scale(Resource *resource, int32_t bufferScale) override;
QtWayland::ClientBuffer *getBuffer(struct ::wl_resource *buffer);