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 | |
parent | 1fab644753443a525475740fc23172dedaa70d0e (diff) | |
download | qtwayland-ced351295b67f0c8ef72802a11d2a0f2381b46e8.tar.gz |
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')
78 files changed, 103 insertions, 103 deletions
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 1711852c..e6602191 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationPlugin : public QOb Q_OBJECT public: explicit QWaylandClientBufferIntegrationPlugin(QObject *parent = nullptr); - ~QWaylandClientBufferIntegrationPlugin(); + ~QWaylandClientBufferIntegrationPlugin() override; virtual QWaylandClientBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index bf6c04f8..b5e7ede4 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationPlugin : public QOb Q_OBJECT public: explicit QWaylandServerBufferIntegrationPlugin(QObject *parent = nullptr); - ~QWaylandServerBufferIntegrationPlugin(); + ~QWaylandServerBufferIntegrationPlugin() override; virtual QWaylandServerBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h index 104d594c..bae6e216 100644 --- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h +++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationPlugin : public QObj Q_OBJECT public: explicit QWaylandInputDeviceIntegrationPlugin(QObject *parent = nullptr); - ~QWaylandInputDeviceIntegrationPlugin(); + ~QWaylandInputDeviceIntegrationPlugin() override; virtual QWaylandInputDeviceIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/client/qwaylandabstractdecoration.cpp b/src/client/qwaylandabstractdecoration.cpp index c20b70e9..c82ff539 100644 --- a/src/client/qwaylandabstractdecoration.cpp +++ b/src/client/qwaylandabstractdecoration.cpp @@ -58,7 +58,7 @@ class QWaylandAbstractDecorationPrivate : public QObjectPrivate public: QWaylandAbstractDecorationPrivate(); - ~QWaylandAbstractDecorationPrivate(); + ~QWaylandAbstractDecorationPrivate() override; QWindow *m_window = nullptr; QWaylandWindow *m_wayland_window = nullptr; diff --git a/src/client/qwaylandabstractdecoration_p.h b/src/client/qwaylandabstractdecoration_p.h index 42c65be6..84a6d4dd 100644 --- a/src/client/qwaylandabstractdecoration_p.h +++ b/src/client/qwaylandabstractdecoration_p.h @@ -85,7 +85,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandAbstractDecoration : public QObject Q_DECLARE_PRIVATE(QWaylandAbstractDecoration) public: QWaylandAbstractDecoration(); - virtual ~QWaylandAbstractDecoration(); + ~QWaylandAbstractDecoration() override; void setWaylandWindow(QWaylandWindow *window); QWaylandWindow *waylandWindow() const; diff --git a/src/client/qwaylandclipboard_p.h b/src/client/qwaylandclipboard_p.h index 42202285..ce14e124 100644 --- a/src/client/qwaylandclipboard_p.h +++ b/src/client/qwaylandclipboard_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard public: QWaylandClipboard(QWaylandDisplay *display); - ~QWaylandClipboard(); + ~QWaylandClipboard() override; QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h index b7b1c2a7..b3df9316 100644 --- a/src/client/qwaylandcursor_p.h +++ b/src/client/qwaylandcursor_p.h @@ -73,7 +73,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandCursor : public QPlatformCursor { public: QWaylandCursor(QWaylandScreen *screen); - ~QWaylandCursor(); + ~QWaylandCursor() override; void changeCursor(QCursor *cursor, QWindow *window) override; void pointerEvent(const QMouseEvent &event) override; diff --git a/src/client/qwaylanddatadevice_p.h b/src/client/qwaylanddatadevice_p.h index 29461930..0a7f4253 100644 --- a/src/client/qwaylanddatadevice_p.h +++ b/src/client/qwaylanddatadevice_p.h @@ -80,7 +80,7 @@ class QWaylandDataDevice : public QObject, public QtWayland::wl_data_device Q_OBJECT public: QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWaylandInputDevice *inputDevice); - ~QWaylandDataDevice(); + ~QWaylandDataDevice() override; QWaylandDataOffer *selectionOffer() const; void invalidateSelectionOffer(); diff --git a/src/client/qwaylanddatadevicemanager_p.h b/src/client/qwaylanddatadevicemanager_p.h index 10df1bca..bd05c0fb 100644 --- a/src/client/qwaylanddatadevicemanager_p.h +++ b/src/client/qwaylanddatadevicemanager_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDataDeviceManager : public QtWayland::wl_d { public: QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id); - ~QWaylandDataDeviceManager(); + ~QWaylandDataDeviceManager() override; QWaylandDataDevice *getDataDevice(QWaylandInputDevice *inputDevice); diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h index 932506bf..3e88b8f4 100644 --- a/src/client/qwaylanddataoffer_p.h +++ b/src/client/qwaylanddataoffer_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDataOffer : public QtWayland::wl_data_offe { public: explicit QWaylandDataOffer(QWaylandDisplay *display, struct ::wl_data_offer *offer); - ~QWaylandDataOffer(); + ~QWaylandDataOffer() override; QString firstFormat() const; @@ -86,7 +86,7 @@ private: class QWaylandMimeData : public QInternalMimeData { public: explicit QWaylandMimeData(QWaylandDataOffer *dataOffer, QWaylandDisplay *display); - ~QWaylandMimeData(); + ~QWaylandMimeData() override; void appendFormat(const QString &mimeType); diff --git a/src/client/qwaylanddatasource_p.h b/src/client/qwaylanddatasource_p.h index a79cdcbf..25afff79 100644 --- a/src/client/qwaylanddatasource_p.h +++ b/src/client/qwaylanddatasource_p.h @@ -72,7 +72,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDataSource : public QObject, public QtWayl Q_OBJECT public: QWaylandDataSource(QWaylandDataDeviceManager *dataDeviceManager, QMimeData *mimeData); - ~QWaylandDataSource(); + ~QWaylandDataSource() override; QMimeData *mimeData() const; diff --git a/src/client/qwaylanddecorationplugin_p.h b/src/client/qwaylanddecorationplugin_p.h index 4255de46..41daaea0 100644 --- a/src/client/qwaylanddecorationplugin_p.h +++ b/src/client/qwaylanddecorationplugin_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationPlugin : public QObject Q_OBJECT public: explicit QWaylandDecorationPlugin(QObject *parent = nullptr); - ~QWaylandDecorationPlugin(); + ~QWaylandDecorationPlugin() override; virtual QWaylandAbstractDecoration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index dbcc2112..bc4af7a5 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -109,7 +109,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland public: QWaylandDisplay(QWaylandIntegration *waylandIntegration); - ~QWaylandDisplay(void); + ~QWaylandDisplay(void) override; QList<QWaylandScreen *> screens() const { return mScreens; } diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h index 0f14eb00..04b39826 100644 --- a/src/client/qwaylanddnd_p.h +++ b/src/client/qwaylanddnd_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag { public: QWaylandDrag(QWaylandDisplay *display); - ~QWaylandDrag(); + ~QWaylandDrag() override; void updateTarget(const QString &mimeType); void setResponse(const QPlatformDragQtResponse &response); diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h index dffd0428..cd604f34 100644 --- a/src/client/qwaylandextendedsurface_p.h +++ b/src/client/qwaylandextendedsurface_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandExtendedSurface : public QtWayland::qt_ext { public: QWaylandExtendedSurface(QWaylandWindow *window); - ~QWaylandExtendedSurface(); + ~QWaylandExtendedSurface() override; void setContentOrientationMask(Qt::ScreenOrientations mask); diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h index cbb2e18d..93300e1f 100644 --- a/src/client/qwaylandinputcontext_p.h +++ b/src/client/qwaylandinputcontext_p.h @@ -74,7 +74,7 @@ class QWaylandTextInput : public QtWayland::zwp_text_input_v2 { public: QWaylandTextInput(QWaylandDisplay *display, struct ::zwp_text_input_v2 *text_input); - ~QWaylandTextInput(); + ~QWaylandTextInput() override; void reset(); void commit(); @@ -132,7 +132,7 @@ class QWaylandInputContext : public QPlatformInputContext Q_OBJECT public: explicit QWaylandInputContext(QWaylandDisplay *display); - ~QWaylandInputContext(); + ~QWaylandInputContext() override; bool isValid() const override; diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 2c7d2cff..48c1cf57 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -102,7 +102,7 @@ public: class Touch; QWaylandInputDevice(QWaylandDisplay *display, int version, uint32_t id); - ~QWaylandInputDevice(); + ~QWaylandInputDevice() override; uint32_t capabilities() const { return mCaps; } @@ -187,7 +187,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Keyboard : public QObject, pu public: Keyboard(QWaylandInputDevice *p); - virtual ~Keyboard(); + ~Keyboard() override; void stopRepeat(); @@ -247,7 +247,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Pointer : public QtWayland::w public: Pointer(QWaylandInputDevice *p); - virtual ~Pointer(); + ~Pointer() override; void pointer_enter(uint32_t serial, struct wl_surface *surface, wl_fixed_t sx, wl_fixed_t sy) override; @@ -281,7 +281,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice::Touch : public QtWayland::wl_ { public: Touch(QWaylandInputDevice *p); - virtual ~Touch(); + ~Touch() override; void touch_down(uint32_t serial, uint32_t time, diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 7ce79e6d..8c34e719 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -71,7 +71,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIntegration : public QPlatformIntegration { public: QWaylandIntegration(); - ~QWaylandIntegration(); + ~QWaylandIntegration() override; bool hasFailed() { return mFailed; } diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h index 37c35cff..9df55d60 100644 --- a/src/client/qwaylandscreen_p.h +++ b/src/client/qwaylandscreen_p.h @@ -67,7 +67,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland { public: QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id); - ~QWaylandScreen(); + ~QWaylandScreen() override; void init(); QWaylandDisplay *display() const; diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h index 3a725d82..72bef918 100644 --- a/src/client/qwaylandshellsurface_p.h +++ b/src/client/qwaylandshellsurface_p.h @@ -74,7 +74,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface : public QObject Q_OBJECT public: explicit QWaylandShellSurface(QWaylandWindow *window); - virtual ~QWaylandShellSurface() {} + ~QWaylandShellSurface() override {} virtual void resize(QWaylandInputDevice * /*inputDevice*/, enum wl_shell_surface_resize /*edges*/) {} diff --git a/src/client/qwaylandshm_p.h b/src/client/qwaylandshm_p.h index 519482d0..639effa1 100644 --- a/src/client/qwaylandshm_p.h +++ b/src/client/qwaylandshm_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShm : public QtWayland::wl_shm public: QWaylandShm(QWaylandDisplay *display, int version, uint32_t id); - ~QWaylandShm(); + ~QWaylandShm() override; bool formatSupported(wl_shm_format format) const; bool formatSupported(QImage::Format format) const; @@ -78,7 +78,7 @@ public: static QImage::Format formatFrom(wl_shm_format format); protected: - virtual void shm_format(uint32_t format); + void shm_format(uint32_t format) override; private: QVector<uint32_t> m_formats; diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h index 628d1858..cb66288f 100644 --- a/src/client/qwaylandshmbackingstore_p.h +++ b/src/client/qwaylandshmbackingstore_p.h @@ -71,7 +71,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBuffer : public QWaylandBuffer { public: QWaylandShmBuffer(QWaylandDisplay *display, const QSize &size, QImage::Format format, int scale = 1); - ~QWaylandShmBuffer(); + ~QWaylandShmBuffer() override; QSize size() const override { return mImage.size(); } int scale() const override { return int(mImage.devicePixelRatio()); } QImage *image() { return &mImage; } @@ -88,7 +88,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBackingStore : public QPlatformBackingS { public: QWaylandShmBackingStore(QWindow *window); - ~QWaylandShmBackingStore(); + ~QWaylandShmBackingStore() override; QPaintDevice *paintDevice() override; void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; diff --git a/src/client/qwaylandshmwindow_p.h b/src/client/qwaylandshmwindow_p.h index af86ce3a..ae172785 100644 --- a/src/client/qwaylandshmwindow_p.h +++ b/src/client/qwaylandshmwindow_p.h @@ -62,7 +62,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow { public: QWaylandShmWindow(QWindow *window); - ~QWaylandShmWindow(); + ~QWaylandShmWindow() override; WindowType windowType() const override; QSurfaceFormat format() const override { return QSurfaceFormat(); } diff --git a/src/client/qwaylandsubsurface_p.h b/src/client/qwaylandsubsurface_p.h index a9fd76a8..e9a7cb20 100644 --- a/src/client/qwaylandsubsurface_p.h +++ b/src/client/qwaylandsubsurface_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandSubSurface : public QtWayland::wl_subsurfa { public: QWaylandSubSurface(QWaylandWindow *window, QWaylandWindow *parent, ::wl_subsurface *subsurface); - ~QWaylandSubSurface(); + ~QWaylandSubSurface() override; QWaylandWindow *window() const { return m_window; } QWaylandWindow *parent() const { return m_parent; } diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index a74f1882..0680b14e 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -104,7 +104,7 @@ public: }; QWaylandWindow(QWindow *window); - ~QWaylandWindow(); + ~QWaylandWindow() override; virtual WindowType windowType() const = 0; virtual void ensureSize(); diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index e399d4f0..1319abd9 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -75,7 +75,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, Q_DECLARE_PRIVATE(QWaylandWindowManagerIntegration) public: explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay); - virtual ~QWaylandWindowManagerIntegration(); + ~QWaylandWindowManagerIntegration() override; bool openUrl(const QUrl &url) override; bool openDocument(const QUrl &url) override; diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h index b0e67795..f9ac1bb4 100644 --- a/src/client/qwaylandwlshellsurface_p.h +++ b/src/client/qwaylandwlshellsurface_p.h @@ -75,7 +75,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellSurface : public QWaylandShellSurfa Q_OBJECT public: QWaylandWlShellSurface(struct ::wl_shell_surface *shell_surface, QWaylandWindow *window); - virtual ~QWaylandWlShellSurface(); + ~QWaylandWlShellSurface() override; using QtWayland::wl_shell_surface::resize; void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override; diff --git a/src/client/qwaylandxdgpopup_p.h b/src/client/qwaylandxdgpopup_p.h index 74c0dca2..b027c05d 100644 --- a/src/client/qwaylandxdgpopup_p.h +++ b/src/client/qwaylandxdgpopup_p.h @@ -72,7 +72,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgPopup : public QWaylandShellSurface Q_OBJECT public: QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *window); - virtual ~QWaylandXdgPopup(); + ~QWaylandXdgPopup() override; void setType(Qt::WindowType type, QWaylandWindow *transientParent) override; diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h index e01104ca..afbd9c59 100644 --- a/src/client/qwaylandxdgshell_p.h +++ b/src/client/qwaylandxdgshell_p.h @@ -76,7 +76,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_shell public: QWaylandXdgShell(struct ::xdg_shell *shell); QWaylandXdgShell(struct ::wl_registry *registry, uint32_t id); - virtual ~QWaylandXdgShell(); + ~QWaylandXdgShell() override; QWaylandXdgSurface *createXdgSurface(QWaylandWindow *window); QWaylandXdgPopup *createXdgPopup(QWaylandWindow *window); diff --git a/src/client/qwaylandxdgshellv6_p.h b/src/client/qwaylandxdgshellv6_p.h index e59a67d6..baaf3807 100644 --- a/src/client/qwaylandxdgshellv6_p.h +++ b/src/client/qwaylandxdgshellv6_p.h @@ -75,7 +75,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurfaceV6 : public QWaylandShellSurface { public: QWaylandXdgSurfaceV6(QWaylandXdgShellV6 *shell, ::zxdg_surface_v6 *surface, QWaylandWindow *window); - ~QWaylandXdgSurfaceV6(); + ~QWaylandXdgSurfaceV6() override; void resize(QWaylandInputDevice *inputDevice, enum zxdg_toplevel_v6_resize_edge edges); void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override; @@ -94,7 +94,7 @@ private: { public: Toplevel(QWaylandXdgSurfaceV6 *xdgSurface); - ~Toplevel(); + ~Toplevel() override; void applyConfigure(); @@ -112,7 +112,7 @@ private: class Popup : public QtWayland::zxdg_popup_v6 { public: Popup(QWaylandXdgSurfaceV6 *xdgSurface, QWaylandXdgSurfaceV6 *parent, QtWayland::zxdg_positioner_v6 *positioner); - ~Popup(); + ~Popup() override; void applyConfigure(); void zxdg_popup_v6_popup_done() override; @@ -138,7 +138,7 @@ public: QWaylandXdgSurfaceV6 *getXdgSurface(QWaylandWindow *window); - virtual ~QWaylandXdgShellV6(); + ~QWaylandXdgShellV6() override; private: void zxdg_shell_v6_ping(uint32_t serial) override; diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index 42846c66..9fcecca7 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -77,7 +77,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface Q_OBJECT public: QWaylandXdgSurface(QWaylandXdgShell *shell, QWaylandWindow *window); - virtual ~QWaylandXdgSurface(); + ~QWaylandXdgSurface() override; using QtWayland::xdg_surface::resize; void resize(QWaylandInputDevice *inputDevice, enum resize_edge edges); diff --git a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h index 8ec9a542..d6067569 100644 --- a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h +++ b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h @@ -70,7 +70,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationPlugin : public QObject Q_OBJECT public: explicit QWaylandShellIntegrationPlugin(QObject *parent = nullptr); - ~QWaylandShellIntegrationPlugin(); + ~QWaylandShellIntegrationPlugin() override; virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index bde24be1..7f0b225b 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -60,7 +60,7 @@ public: wl_client_get_credentials(client, &pid, &uid, &gid); } - ~QWaylandClientPrivate() + ~QWaylandClientPrivate() override { } diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h index 5c3b9e72..bff1bcd2 100644 --- a/src/compositor/compositor_api/qwaylandclient.h +++ b/src/compositor/compositor_api/qwaylandclient.h @@ -63,7 +63,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandClient : public QObject Q_PROPERTY(qint64 groupId READ groupId CONSTANT) Q_PROPERTY(qint64 processId READ processId CONSTANT) public: - ~QWaylandClient(); + ~QWaylandClient() override; static QWaylandClient *fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient); diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 44c09a5f..23844d72 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -85,7 +85,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject public: QWaylandCompositor(QObject *parent = nullptr); - virtual ~QWaylandCompositor(); + ~QWaylandCompositor() override; virtual void create(); bool isCreated() const; diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h index 340860a9..0d259ee8 100644 --- a/src/compositor/compositor_api/qwaylandcompositor_p.h +++ b/src/compositor/compositor_api/qwaylandcompositor_p.h @@ -79,7 +79,7 @@ public: static QWaylandCompositorPrivate *get(QWaylandCompositor *compositor) { return compositor->d_func(); } QWaylandCompositorPrivate(QWaylandCompositor *compositor); - ~QWaylandCompositorPrivate(); + ~QWaylandCompositorPrivate() override; void preInit(); void init(); diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h index bcc4abb1..6db312cf 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard_p.h +++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h @@ -78,7 +78,7 @@ public: static QWaylandKeyboardPrivate *get(QWaylandKeyboard *keyboard); QWaylandKeyboardPrivate(QWaylandSeat *seat); - ~QWaylandKeyboardPrivate(); + ~QWaylandKeyboardPrivate() override; QWaylandCompositor *compositor() const { return seat->compositor(); } diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index 1e5bde53..f0bea809 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -104,7 +104,7 @@ public: QWaylandOutput(); QWaylandOutput(QWaylandCompositor *compositor, QWindow *window); - ~QWaylandOutput(); + ~QWaylandOutput() override; static QWaylandOutput *fromResource(wl_resource *resource); struct ::wl_resource *resourceForClient(QWaylandClient *client) const; diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h index 28a19ff8..38bb1ec6 100644 --- a/src/compositor/compositor_api/qwaylandoutput_p.h +++ b/src/compositor/compositor_api/qwaylandoutput_p.h @@ -96,7 +96,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public: QWaylandOutputPrivate(); - ~QWaylandOutputPrivate(); + ~QWaylandOutputPrivate() override; static QWaylandOutputPrivate *get(QWaylandOutput *output) { return output->d_func(); } void addView(QWaylandView *view, QWaylandSurface *surface); diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 23b52e0b..21b3a531 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -268,7 +268,7 @@ public: { } - ~QWaylandSurfaceTextureProvider() + ~QWaylandSurfaceTextureProvider() override { if (m_sgTex) m_sgTex->deleteLater(); diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 11457fa6..047fdeb6 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -75,7 +75,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem Q_PROPERTY(bool allowDiscardFrontBuffer READ allowDiscardFrontBuffer WRITE setAllowDiscardFrontBuffer NOTIFY allowDiscardFrontBufferChanged) public: QWaylandQuickItem(QQuickItem *parent = nullptr); - ~QWaylandQuickItem(); + ~QWaylandQuickItem() override; QWaylandCompositor *compositor() const; QWaylandView *view() const; diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h index de405a94..f926d55e 100644 --- a/src/compositor/compositor_api/qwaylandquickitem_p.h +++ b/src/compositor/compositor_api/qwaylandquickitem_p.h @@ -86,7 +86,7 @@ class QWaylandBufferMaterial : public QSGMaterial { public: QWaylandBufferMaterial(QWaylandBufferRef::BufferFormatEgl format); - ~QWaylandBufferMaterial(); + ~QWaylandBufferMaterial() override; void setTextureForPlane(int plane, QOpenGLTexture *texture); diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp index a1269b11..279795e4 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.cpp +++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp @@ -59,7 +59,7 @@ public: { } - ~QWaylandQuickSurfacePrivate() + ~QWaylandQuickSurfacePrivate() override { } diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h index 273fb25f..a234b776 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.h +++ b/src/compositor/compositor_api/qwaylandquicksurface.h @@ -58,7 +58,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface public: QWaylandQuickSurface(); QWaylandQuickSurface(QWaylandCompositor *compositor, QWaylandClient *client, quint32 id, int version); - ~QWaylandQuickSurface(); + ~QWaylandQuickSurface() override; bool useTextureAlpha() const; void setUseTextureAlpha(bool useTextureAlpha); diff --git a/src/compositor/compositor_api/qwaylandseat.h b/src/compositor/compositor_api/qwaylandseat.h index d22e05a5..f438b663 100644 --- a/src/compositor/compositor_api/qwaylandseat.h +++ b/src/compositor/compositor_api/qwaylandseat.h @@ -84,7 +84,7 @@ public: Q_ENUM(CapabilityFlags) QWaylandSeat(QWaylandCompositor *compositor, CapabilityFlags capabilityFlags = DefaultCapabilities); - virtual ~QWaylandSeat(); + ~QWaylandSeat() override; virtual void initialize(); bool isInitialized() const; diff --git a/src/compositor/compositor_api/qwaylandseat_p.h b/src/compositor/compositor_api/qwaylandseat_p.h index 1e182f41..7eb6aa69 100644 --- a/src/compositor/compositor_api/qwaylandseat_p.h +++ b/src/compositor/compositor_api/qwaylandseat_p.h @@ -90,7 +90,7 @@ public: Q_DECLARE_PUBLIC(QWaylandSeat) QWaylandSeatPrivate(QWaylandSeat *seat); - ~QWaylandSeatPrivate(); + ~QWaylandSeatPrivate() override; void setCapabilities(QWaylandSeat::CapabilityFlags caps); diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index 010f279a..c208c16d 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -97,7 +97,7 @@ public: QWaylandSurface(); QWaylandSurface(QWaylandCompositor *compositor, QWaylandClient *client, uint id, int version); - virtual ~QWaylandSurface(); + ~QWaylandSurface() override; Q_INVOKABLE void initialize(QWaylandCompositor *compositor, QWaylandClient *client, uint id, int version); bool isInitialized() const; diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 9d4a3b03..0cb12d15 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -92,7 +92,7 @@ public: static QWaylandSurfacePrivate *get(QWaylandSurface *surface); QWaylandSurfacePrivate(); - ~QWaylandSurfacePrivate(); + ~QWaylandSurfacePrivate() override; void ref(); void deref(); @@ -185,11 +185,11 @@ public: //member variables QWaylandSurfacePrivate *surfaceFromResource(); protected: - void subsurface_set_position(wl_subsurface::Resource *resource, int32_t x, int32_t y); - void subsurface_place_above(wl_subsurface::Resource *resource, struct wl_resource *sibling); - void subsurface_place_below(wl_subsurface::Resource *resource, struct wl_resource *sibling); - void subsurface_set_sync(wl_subsurface::Resource *resource); - void subsurface_set_desync(wl_subsurface::Resource *resource); + void subsurface_set_position(wl_subsurface::Resource *resource, int32_t x, int32_t y) override; + void subsurface_place_above(wl_subsurface::Resource *resource, struct wl_resource *sibling) override; + void subsurface_place_below(wl_subsurface::Resource *resource, struct wl_resource *sibling) override; + void subsurface_set_sync(wl_subsurface::Resource *resource) override; + void subsurface_set_desync(wl_subsurface::Resource *resource) override; private: friend class QWaylandSurfacePrivate; diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h index 66308bc4..c98b8105 100644 --- a/src/compositor/compositor_api/qwaylandview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -63,7 +63,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandView : public QObject Q_PROPERTY(bool allowDiscardFrontBuffer READ allowDiscardFrontBuffer WRITE setAllowDiscardFrontBuffer NOTIFY allowDiscardFrontBufferChanged) public: QWaylandView(QObject *renderObject = nullptr, QObject *parent = nullptr); - virtual ~QWaylandView(); + ~QWaylandView() override; QObject *renderObject() const; diff --git a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h index a28bd6de..8257479f 100644 --- a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h +++ b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h @@ -64,7 +64,7 @@ class IviSurfaceIntegration : public QWaylandQuickShellIntegration Q_OBJECT public: IviSurfaceIntegration(QWaylandQuickShellSurfaceItem *item); - ~IviSurfaceIntegration(); + ~IviSurfaceIntegration() override; private Q_SLOTS: void handleIviSurfaceDestroyed(); diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h index 152d5c53..e2c82365 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h @@ -56,7 +56,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItem : public QWaylan Q_PROPERTY(QQuickItem *moveItem READ moveItem WRITE setMoveItem NOTIFY moveItemChanged) public: QWaylandQuickShellSurfaceItem(QQuickItem *parent = nullptr); - ~QWaylandQuickShellSurfaceItem(); + ~QWaylandQuickShellSurfaceItem() override; QWaylandShellSurface *shellSurface() const; void setShellSurface(QWaylandShellSurface *shellSurface); diff --git a/src/compositor/extensions/qwaylandtextinput.h b/src/compositor/extensions/qwaylandtextinput.h index 21c1bd91..9f252837 100644 --- a/src/compositor/extensions/qwaylandtextinput.h +++ b/src/compositor/extensions/qwaylandtextinput.h @@ -58,7 +58,7 @@ class QWaylandTextInput : public QWaylandCompositorExtensionTemplate<QWaylandTex Q_DECLARE_PRIVATE(QWaylandTextInput) public: explicit QWaylandTextInput(QWaylandObject *container, QWaylandCompositor *compositor); - ~QWaylandTextInput(); + ~QWaylandTextInput() override; void sendInputMethodEvent(QInputMethodEvent *event); void sendKeyEvent(QKeyEvent *event); diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h index d1efeed0..4923b4fb 100644 --- a/src/compositor/extensions/qwaylandwlshell.h +++ b/src/compositor/extensions/qwaylandwlshell.h @@ -116,7 +116,7 @@ public: QWaylandWlShellSurface(); QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &resource); - virtual ~QWaylandWlShellSurface(); + ~QWaylandWlShellSurface() override; Q_INVOKABLE void initialize(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &resource); diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h index 4e91eabc..e8d568fc 100644 --- a/src/compositor/extensions/qwaylandwlshell_p.h +++ b/src/compositor/extensions/qwaylandwlshell_p.h @@ -91,7 +91,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurfacePrivate Q_DECLARE_PUBLIC(QWaylandWlShellSurface) public: QWaylandWlShellSurfacePrivate(); - ~QWaylandWlShellSurfacePrivate(); + ~QWaylandWlShellSurfacePrivate() override; static QWaylandWlShellSurfacePrivate *get(QWaylandWlShellSurface *surface) { return surface->d_func(); } diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h index 19ee07b8..68c936b1 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration_p.h +++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h @@ -64,7 +64,7 @@ class WlShellIntegration : public QWaylandQuickShellIntegration Q_OBJECT public: WlShellIntegration(QWaylandQuickShellSurfaceItem *item); - ~WlShellIntegration(); + ~WlShellIntegration() override; bool mouseMoveEvent(QMouseEvent *event) override; bool mouseReleaseEvent(QMouseEvent *event) override; diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h index 271a5b25..b2c16c6d 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h @@ -63,7 +63,7 @@ class XdgShellV5Integration : public QWaylandQuickShellIntegration Q_OBJECT public: XdgShellV5Integration(QWaylandQuickShellSurfaceItem *item); - ~XdgShellV5Integration(); + ~XdgShellV5Integration() override; bool mouseMoveEvent(QMouseEvent *event) override; bool mouseReleaseEvent(QMouseEvent *event) override; @@ -115,7 +115,7 @@ class XdgPopupV5Integration : public QWaylandQuickShellIntegration Q_OBJECT public: XdgPopupV5Integration(QWaylandQuickShellSurfaceItem *item); - ~XdgPopupV5Integration(); + ~XdgPopupV5Integration() override; private Q_SLOTS: void handlePopupDestroyed(); diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 1a22e080..30161692 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -78,7 +78,7 @@ public: Q_DECLARE_FLAGS(BehaviorFlags, BehaviorFlag) TouchExtensionGlobal(QWaylandCompositor *compositor); - ~TouchExtensionGlobal(); + ~TouchExtensionGlobal() override; bool postTouchEvent(QTouchEvent *event, QWaylandSurface *surface); diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index 48fce0c9..4f0014b8 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -57,7 +57,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject { Q_OBJECT public: - virtual ~QWaylandObject(); + ~QWaylandObject() override; QWaylandCompositorExtension *extension(const QByteArray &name); QWaylandCompositorExtension *extension(const wl_interface *interface); @@ -78,7 +78,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtension : public QWaylandO public: QWaylandCompositorExtension(); QWaylandCompositorExtension(QWaylandObject *container); - virtual ~QWaylandCompositorExtension(); + ~QWaylandCompositorExtension() override; QWaylandObject *extensionContainer() const; void setExtensionContainer(QWaylandObject *container); diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h index edf4fea0..e50d2519 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject Q_OBJECT public: explicit ClientBufferIntegrationPlugin(QObject *parent = nullptr); - ~ClientBufferIntegrationPlugin(); + ~ClientBufferIntegrationPlugin() override; virtual ClientBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h index 410dfd2f..f3e486a4 100644 --- a/src/compositor/hardware_integration/qwlhwintegration_p.h +++ b/src/compositor/hardware_integration/qwlhwintegration_p.h @@ -72,7 +72,7 @@ public: void setServerBufferIntegration(const QString &name); protected: - void hardware_integration_bind_resource(Resource *resource); + void hardware_integration_bind_resource(Resource *resource) override; private: QString m_client_buffer_integration; diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h index 0cb5ed32..2f45fee1 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h @@ -69,7 +69,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT ServerBufferIntegrationPlugin : public QObject Q_OBJECT public: explicit ServerBufferIntegrationPlugin(QObject *parent = nullptr); - ~ServerBufferIntegrationPlugin(); + ~ServerBufferIntegrationPlugin() override; virtual ServerBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h index 9d5efb5f..d46f26ae 100644 --- a/src/compositor/wayland_wrapper/qwldataoffer_p.h +++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h @@ -68,7 +68,7 @@ class DataOffer : public QtWaylandServer::wl_data_offer { public: DataOffer(DataSource *data_source, QtWaylandServer::wl_data_device::Resource *target); - ~DataOffer(); + ~DataOffer() override; protected: void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) override; diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h index d5437a30..5b463ce6 100644 --- a/src/compositor/wayland_wrapper/qwldatasource_p.h +++ b/src/compositor/wayland_wrapper/qwldatasource_p.h @@ -70,7 +70,7 @@ class DataSource : public QObject, public QtWaylandServer::wl_data_source { public: DataSource(struct wl_client *client, uint32_t id, uint32_t time); - ~DataSource(); + ~DataSource() override; uint32_t time() const; QList<QString> mimeTypes() const; diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h index d333f6ba..00e1d239 100644 --- a/src/compositor/wayland_wrapper/qwlregion_p.h +++ b/src/compositor/wayland_wrapper/qwlregion_p.h @@ -66,7 +66,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT Region : public QtWaylandServer::wl_region { public: Region(struct wl_client *client, uint32_t id); - ~Region(); + ~Region() override; static Region *fromResource(struct ::wl_resource *resource); diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index f9eb2d1d..2c65969f 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 5c63092f..fef7cfe4 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 93edfcc5..0c532623 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 2adaf0ac..ee55d689 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 746678f7..26f2bad6 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 f6f16299..472f569b 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 850ad040..77e4353c 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 04b99ea3..30d92eb9 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 948632ef..380d8bba 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; diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 44413414..e877f692 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -106,7 +106,7 @@ class QWaylandCompositorPlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - virtual void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWayland.Compositor")); defineModule(uri); diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h index 62558391..f2c8a154 100644 --- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -57,7 +57,7 @@ public: m_client_buffer_integration->initialize(display()); } - QWaylandEglClientBufferIntegration *clientBufferIntegration() const + QWaylandEglClientBufferIntegration *clientBufferIntegration() const override { return m_client_buffer_integration; } private: diff --git a/src/plugins/shellintegration/ivi-shell/main.cpp b/src/plugins/shellintegration/ivi-shell/main.cpp index f6d5775f..14a33066 100644 --- a/src/plugins/shellintegration/ivi-shell/main.cpp +++ b/src/plugins/shellintegration/ivi-shell/main.cpp @@ -50,7 +50,7 @@ class QWaylandIviShellIntegrationPlugin : public QWaylandShellIntegrationPlugin Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "ivi-shell.json") public: - virtual QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) override; + QWaylandShellIntegration *create(const QString &key, const QStringList ¶mList) override; }; QWaylandShellIntegration *QWaylandIviShellIntegrationPlugin::create(const QString &key, const QStringList ¶mList) diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index 0b575c6c..11a2ae99 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -58,9 +58,9 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIviShellIntegration : public QWaylandShell { public: QWaylandIviShellIntegration(); - ~QWaylandIviShellIntegration(); + ~QWaylandIviShellIntegration() override; bool initialize(QWaylandDisplay *display) override; - virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; + QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override; private: static void registryIvi(void *data, struct wl_registry *registry, diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index 6cab1c98..ff943060 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -60,13 +60,13 @@ public: QWaylandIviSurface(struct ::ivi_surface *shell_surface, QWaylandWindow *window); QWaylandIviSurface(struct ::ivi_surface *shell_surface, QWaylandWindow *window, struct ::ivi_controller_surface *iviControllerSurface); - virtual ~QWaylandIviSurface(); + ~QWaylandIviSurface() override; void setType(Qt::WindowType type, QWaylandWindow *transientParent) override; private: void createExtendedSurface(QWaylandWindow *window); - virtual void ivi_surface_configure(int32_t width, int32_t height) override; + void ivi_surface_configure(int32_t width, int32_t height) override; void ivi_controller_surface_visibility(int32_t visibility) override; QWaylandWindow *m_window = nullptr; |