diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-11-30 13:15:38 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-01 12:07:28 +0000 |
commit | 15b0b3db29636a94f98f5c7cd6d7a33c15bd6421 (patch) | |
tree | 3ace505dbb93b66fd9b03ead9add3625d3adafdc /src/plugins/platforms/xcb/qxcbbackingstore.h | |
parent | 7183fc8f0d2d1e16c52fe78d029ee9fa13868b79 (diff) |
xcb: Replace Q_DECL_OVERRIDE by override
We can use 'override' directly since Qt 5.7.
Also remove redundant 'virtual' keywords.
Change-Id: Ia40be0e1e60e51f9d043ab575fd6b9305ea620b0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbbackingstore.h')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbbackingstore.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h index 6af679d28a..2985432b7f 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.h +++ b/src/plugins/platforms/xcb/qxcbbackingstore.h @@ -57,22 +57,22 @@ public: QXcbBackingStore(QWindow *widget); ~QXcbBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; #ifndef QT_NO_OPENGL void composeAndFlush(QWindow *window, const QRegion ®ion, const QPoint &offset, QPlatformTextureList *textures, QOpenGLContext *context, - bool translucentBackground) Q_DECL_OVERRIDE; + bool translucentBackground) override; #endif - QImage toImage() const Q_DECL_OVERRIDE; + QImage toImage() const override; - QPlatformGraphicsBuffer *graphicsBuffer() const Q_DECL_OVERRIDE; + QPlatformGraphicsBuffer *graphicsBuffer() const override; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; - bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE; + void resize(const QSize &size, const QRegion &staticContents) override; + bool scroll(const QRegion &area, int dx, int dy) override; - void beginPaint(const QRegion &) Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint(const QRegion &) override; + void endPaint() override; private: QXcbShmImage *m_image; |