summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.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/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.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/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h')
-rw-r--r--src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 7b63f976e..2776ad353 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -55,8 +55,8 @@ public:
XCompositeGLXClientBufferIntegration();
~XCompositeGLXClientBufferIntegration();
- void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE;
- QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE;
+ void initializeHardware(struct ::wl_display *display) override;
+ QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override;
inline Display *xDisplay() const { return mDisplay; }
inline int xScreen() const { return mScreen; }
@@ -77,8 +77,8 @@ public:
QSize size() const;
QWaylandSurface::Origin origin() const;
- QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE;
- QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE {
+ QOpenGLTexture *toOpenGlTexture(int plane) override;
+ QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override {
return QWaylandBufferRef::BufferFormatEgl_RGBA;
}