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 /src/hardwareintegration/compositor/xcomposite_share | |
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 'src/hardwareintegration/compositor/xcomposite_share')
-rw-r--r-- | src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h | 4 | ||||
-rw-r--r-- | src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h index 318b1787..6f17f7e3 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h @@ -68,8 +68,8 @@ public: static XCompositeBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<XCompositeBuffer*>(Resource::fromResource(resource)->buffer_object); } protected: - void buffer_destroy_resource(Resource *) Q_DECL_OVERRIDE; - void buffer_destroy(Resource *) Q_DECL_OVERRIDE; + void buffer_destroy_resource(Resource *) override; + void buffer_destroy(Resource *) override; private: Window mWindow; diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h index 482224b6..b2a61206 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h @@ -56,9 +56,9 @@ private: QString mDisplayString; - void xcomposite_bind_resource(Resource *resource) Q_DECL_OVERRIDE; + void xcomposite_bind_resource(Resource *resource) override; void xcomposite_create_buffer(Resource *resource, uint32_t id, uint32_t x_window, - int32_t width, int32_t height) Q_DECL_OVERRIDE; + int32_t width, int32_t height) override; }; |