From c26f8dbd5c5ff15167e90db529845091705cbe46 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 1 Apr 2017 21:08:38 -0700 Subject: Fix warning about inconsistent use of override keyword qwaylandshmbackingstore_p.h:93:19: warning: 'paintDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing- override Change-Id: I27b55fdf514247549455fffd14b1791d4dd6b6b3 Reviewed-by: Johan Helsing --- src/client/qwaylandshmbackingstore_p.h | 2 +- src/compositor/wayland_wrapper/qwlclientbuffer_p.h | 2 +- .../compositor/drm-egl-server/drmeglserverbufferintegration.h | 2 +- .../compositor/wayland-egl/waylandeglclientbufferintegration.h | 2 +- .../compositor/xcomposite-egl/xcompositeeglintegration.h | 4 ++-- src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h index 71f98e30c..8564cc9d2 100644 --- a/src/client/qwaylandshmbackingstore_p.h +++ b/src/client/qwaylandshmbackingstore_p.h @@ -90,7 +90,7 @@ public: QWaylandShmBackingStore(QWindow *window); ~QWaylandShmBackingStore(); - QPaintDevice *paintDevice(); + QPaintDevice *paintDevice() override; void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; void resize(const QSize &size, const QRegion &staticContents) override; void resize(const QSize &size); diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h index efb2eb18b..dbc8a0b7c 100644 --- a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h +++ b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h @@ -130,7 +130,7 @@ public: QSize size() const override; QWaylandSurface::Origin origin() const override; - QImage image() const; + QImage image() const override; #if QT_CONFIG(opengl) QOpenGLTexture *toOpenGlTexture(int plane = 0) override; diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index d9072b069..6286f0f20 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -96,7 +96,7 @@ public: DrmEglServerBufferIntegration(); ~DrmEglServerBufferIntegration(); - void initializeHardware(QWaylandCompositor *); + void initializeHardware(QWaylandCompositor *) override; bool supportsFormat(QtWayland::ServerBuffer::Format format) const override; QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override; diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index e0235d84c..846cbc3a4 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -53,7 +53,7 @@ public: void initializeHardware(struct ::wl_display *display) override; - QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer); + QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; private: Q_DISABLE_COPY(WaylandEglClientBufferIntegration) diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index fb869b2e7..55e02abe7 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -67,8 +67,8 @@ class XCompositeEglClientBuffer : public QtWayland::ClientBuffer public: XCompositeEglClientBuffer(XCompositeEglClientBufferIntegration *integration, wl_resource *bufferResource); - QSize size() const; - QWaylandSurface::Origin origin() const; + QSize size() const override; + QWaylandSurface::Origin origin() const override; QOpenGLTexture *toOpenGlTexture(int plane) override; QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override { return QWaylandBufferRef::BufferFormatEgl_RGBA; diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index 5a0bfbdc0..cb3b1bec2 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -53,7 +53,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIviShellIntegration : public QWaylandShell public: QWaylandIviShellIntegration(); ~QWaylandIviShellIntegration(); - bool initialize(QWaylandDisplay *display); + bool initialize(QWaylandDisplay *display) override; virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; private: -- cgit v1.2.3