diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-20 14:00:19 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-28 14:25:27 +0000 |
commit | ced351295b67f0c8ef72802a11d2a0f2381b46e8 (patch) | |
tree | bdd563c8d0f731f3cb949494ee07e87a998aa7e5 /src/hardwareintegration | |
parent | 1fab644753443a525475740fc23172dedaa70d0e (diff) |
Use override when applicable
Applied automatic fixes using clang-tidy's modernize-use-override.
This adds the "override" keyword where it's possible and also removes the
"virtual" keyword when redundant.
Change-Id: I899950e5cf8782785d30a245a9c69c1720905d50
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/hardwareintegration')
9 files changed, 15 insertions, 15 deletions
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index f9eb2d1d8..2c65969f8 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -70,7 +70,7 @@ class DrmServerBuffer : public QWaylandServerBuffer { public: DrmServerBuffer(DrmEglServerBufferIntegration *integration, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format); - ~DrmServerBuffer(); + ~DrmServerBuffer() override; QOpenGLTexture* toOpenGlTexture() override; private: DrmEglServerBufferIntegration *m_integration = nullptr; @@ -85,7 +85,7 @@ class DrmEglServerBufferIntegration public: void initialize(QWaylandDisplay *display) override; - virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; + QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; inline EGLImageKHR eglCreateImageKHR(EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); inline EGLBoolean eglDestroyImageKHR (EGLImageKHR image); diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h index 5c63092fe..fef7cfe47 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h @@ -58,7 +58,7 @@ class ShmServerBuffer : public QWaylandServerBuffer { public: ShmServerBuffer(ShmServerBufferIntegration *integration, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format); - ~ShmServerBuffer(); + ~ShmServerBuffer() override; QOpenGLTexture* toOpenGlTexture() override; private: ShmServerBufferIntegration *m_integration = nullptr; @@ -75,7 +75,7 @@ class ShmServerBufferIntegration public: void initialize(QWaylandDisplay *display) override; - virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; + QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override; protected: void shm_emulation_server_buffer_server_buffer_created(qt_server_buffer *id, const QString &key, int32_t width, int32_t height, int32_t bytes_per_line, int32_t format) override; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h index 93edfcc58..0c5326230 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h @@ -56,7 +56,7 @@ class QWaylandEglClientBufferIntegration : public QWaylandClientBufferIntegratio { public: QWaylandEglClientBufferIntegration(); - ~QWaylandEglClientBufferIntegration(); + ~QWaylandEglClientBufferIntegration() override; void initialize(QWaylandDisplay *display) override; bool isValid() const override; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 2adaf0acf..ee55d6892 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -73,7 +73,7 @@ class QWaylandXCompositeEGLClientBufferIntegration : public QWaylandClientBuffer { public: QWaylandXCompositeEGLClientBufferIntegration(); - ~QWaylandXCompositeEGLClientBufferIntegration(); + ~QWaylandXCompositeEGLClientBufferIntegration() override; void initialize(QWaylandDisplay *dispaly) override; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index 746678f7a..26f2bad6f 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -68,7 +68,7 @@ class QWaylandXCompositeGLXIntegration : public QWaylandClientBufferIntegration { public: QWaylandXCompositeGLXIntegration(); - ~QWaylandXCompositeGLXIntegration(); + ~QWaylandXCompositeGLXIntegration() override; void initialize(QWaylandDisplay *display) override; diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index f6f162999..472f569ba 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -99,7 +99,7 @@ class DrmEglServerBufferIntegration : { public: DrmEglServerBufferIntegration(); - ~DrmEglServerBufferIntegration(); + ~DrmEglServerBufferIntegration() override; void initializeHardware(QWaylandCompositor *) override; diff --git a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h index 850ad040a..77e4353ca 100644 --- a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h @@ -61,7 +61,7 @@ class ShmServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServer:: { public: ShmServerBuffer(ShmServerBufferIntegration *integration, const QImage &qimage, QtWayland::ServerBuffer::Format format); - ~ShmServerBuffer(); + ~ShmServerBuffer() override; struct ::wl_resource *resourceForClient(struct ::wl_client *) override; QOpenGLTexture *toOpenGlTexture() override; @@ -83,7 +83,7 @@ class ShmServerBufferIntegration : { public: ShmServerBufferIntegration(); - ~ShmServerBufferIntegration(); + ~ShmServerBufferIntegration() override; void initializeHardware(QWaylandCompositor *) override; diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index 04b99ea34..30d92eb95 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -53,7 +53,7 @@ class WaylandEglClientBufferIntegration : public QtWayland::ClientBufferIntegrat Q_DECLARE_PRIVATE(WaylandEglClientBufferIntegration) public: WaylandEglClientBufferIntegration(); - ~WaylandEglClientBufferIntegration(); + ~WaylandEglClientBufferIntegration() override; void initializeHardware(struct ::wl_display *display) override; @@ -69,7 +69,7 @@ struct BufferState; class WaylandEglClientBuffer : public QtWayland::ClientBuffer { public: - ~WaylandEglClientBuffer(); + ~WaylandEglClientBuffer() override; QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override; QSize size() const override; diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 948632ef1..380d8bbab 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -56,7 +56,7 @@ class XCompositeGLXClientBufferIntegration : public QtWayland::ClientBufferInteg { public: XCompositeGLXClientBufferIntegration(); - ~XCompositeGLXClientBufferIntegration(); + ~XCompositeGLXClientBufferIntegration() override; void initializeHardware(struct ::wl_display *display) override; QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; @@ -78,8 +78,8 @@ class XCompositeGLXClientBuffer : public QtWayland::ClientBuffer public: XCompositeGLXClientBuffer(XCompositeGLXClientBufferIntegration *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; |