Run clang-tidy with modernize-use-override check

Summary: Currently code base of kwin can be viewed as two pieces. One is very ancient, and the other one is more modern, which uses new C++ features. The main problem with the ancient code is that it was written before C++11 era. So, no override or final keywords, lambdas, etc. Quite recently, KDE compiler settings were changed to show a warning if a virtual method has missing override keyword. As you might have already guessed, this fired back at us because of that ancient code. We had about 500 new compiler warnings. A "solution" was proposed to that problem - disable -Wno-suggest-override and the other similar warning for clang. It's hard to call a solution because those warnings are disabled not only for the old code, but also for new. This is not what we want! The main argument for not actually fixing the problem was that git history will be screwed as well because of human factor. While good git history is a very important thing, we should not go crazy about it and block every change that somehow alters git history. git blame allows to specify starting revision for a reason. The other argument (human factor) can be easily solved by using tools such as clang-tidy. clang-tidy is a clang-based linter for C++. It can be used for various things, e.g. fixing coding style(e.g. add missing braces to if statements, readability-braces-around-statements check), or in our case add missing override keywords. Test Plan: Compiles. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: davidedmundson, apol, romangg, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D22371
5 years ago · 8af2fa73dc
parent eafe7aee65
commit 8af2fa73dc
235 changed files with 884 additions and 892 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -53,14 +53,6 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER -DQT_NO
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # This is a workaround/compromise for a Kwin specific policy of not applying the relevant override fix.
 # See thread in D18167.
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
 else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")
 endif()
 find_package(Qt5Multimedia QUIET)
 set_package_properties(Qt5Multimedia PROPERTIES
         PURPOSE "Runtime-only dependency for effect video playback"
--- a/abstract_client.h
+++ b/abstract_client.h
@ -332,7 +332,7 @@ class KWIN_EXPORT AbstractClient : public Toplevel
    Q_PROPERTY(QString colorScheme READ colorScheme NOTIFY colorSchemeChanged)
 public:
-    virtual ~AbstractClient();
+    ~AbstractClient() override;
    QWeakPointer<TabBox::TabBoxClientImpl> tabBoxClient() const {
        return m_tabBoxClient.toWeakRef();
@ -479,7 +479,7 @@ public:
    int desktop() const override {
        return m_desktops.isEmpty() ? (int)NET::OnAllDesktops : m_desktops.last()->x11DesktopNumber();
    }
-    virtual QVector<VirtualDesktop *> desktops() const {
+    QVector<VirtualDesktop *> desktops() const override {
        return m_desktops;
    }
    QVector<uint> x11DesktopIds() const;
--- a/abstract_wayland_output.h
+++ b/abstract_wayland_output.h
@ -57,7 +57,7 @@ class KWIN_EXPORT AbstractWaylandOutput : public AbstractOutput
    Q_OBJECT
 public:
    explicit AbstractWaylandOutput(QObject *parent = nullptr);
-    virtual ~AbstractWaylandOutput();
+    ~AbstractWaylandOutput() override;
    QString name() const override;
    bool isEnabled() const {
--- a/activities.h
+++ b/activities.h
@ -40,7 +40,7 @@ class KWIN_EXPORT Activities : public QObject
    Q_OBJECT
 public:
-    ~Activities();
+    ~Activities() override;
    bool stop(const QString &id);
    bool start(const QString &id);
--- a/autotests/fakeeffectplugin.cpp
+++ b/autotests/fakeeffectplugin.cpp
@ -27,7 +27,7 @@ class FakeEffect : public Effect
    Q_OBJECT
 public:
    FakeEffect() {}
-    virtual ~FakeEffect() {}
+    ~FakeEffect() override {}
    static bool supported() {
        return effects->isOpenGLCompositing();
--- a/autotests/fakeeffectplugin_version.cpp
+++ b/autotests/fakeeffectplugin_version.cpp
@ -27,7 +27,7 @@ class FakeVersionEffect : public Effect
    Q_OBJECT
 public:
    FakeVersionEffect() {}
-    virtual ~FakeVersionEffect() {}
+    ~FakeVersionEffect() override {}
 };
 } // namespace
@ -39,7 +39,7 @@ class FakeEffectPluginFactory : public KWin::EffectPluginFactory
    Q_INTERFACES(KPluginFactory)
 public:
    FakeEffectPluginFactory() {}
-    ~FakeEffectPluginFactory() {}
+    ~FakeEffectPluginFactory() override {}
    KWin::Effect *createEffect() const override {
        return new KWin::FakeVersionEffect();
    }
--- a/autotests/integration/debug_console_test.cpp
+++ b/autotests/integration/debug_console_test.cpp
@ -413,7 +413,7 @@ class HelperWindow : public QRasterWindow
    Q_OBJECT
 public:
    HelperWindow() : QRasterWindow(nullptr) {}
-    ~HelperWindow() = default;
+    ~HelperWindow() override = default;
 Q_SIGNALS:
    void entered();
--- a/autotests/integration/helper/copy.cpp
+++ b/autotests/integration/helper/copy.cpp
@ -28,7 +28,7 @@ class Window : public QRasterWindow
    Q_OBJECT
 public:
    explicit Window();
-    virtual ~Window();
+    ~Window() override;
 protected:
    void paintEvent(QPaintEvent *event) override;
--- a/autotests/integration/helper/paste.cpp
+++ b/autotests/integration/helper/paste.cpp
@ -28,7 +28,7 @@ class Window : public QRasterWindow
    Q_OBJECT
 public:
    explicit Window();
-    virtual ~Window();
+    ~Window() override;
 protected:
    void paintEvent(QPaintEvent *event) override;
--- a/autotests/integration/internal_window.cpp
+++ b/autotests/integration/internal_window.cpp
@ -84,7 +84,7 @@ class HelperWindow : public QRasterWindow
    Q_OBJECT
 public:
    HelperWindow();
-    ~HelperWindow();
+    ~HelperWindow() override;
    QPoint latestGlobalMousePos() const {
        return m_latestGlobalMousePos;
--- a/autotests/integration/kwin_wayland_test.h
+++ b/autotests/integration/kwin_wayland_test.h
@ -67,7 +67,7 @@ class WaylandTestApplication : public ApplicationWaylandAbstract
    Q_OBJECT
 public:
    WaylandTestApplication(OperationMode mode, int &argc, char **argv);
-    virtual ~WaylandTestApplication();
+    ~WaylandTestApplication() override;
 protected:
    void performStartup() override;
--- a/autotests/integration/lockscreen.cpp
+++ b/autotests/integration/lockscreen.cpp
@ -93,7 +93,7 @@ class HelperEffect : public Effect
    Q_OBJECT
 public:
    HelperEffect() {}
-    ~HelperEffect() {}
+    ~HelperEffect() override {}
    void windowInputMouseEvent(QEvent*) override {
        emit inputEvent();
--- a/autotests/integration/modifier_only_shortcut_test.cpp
+++ b/autotests/integration/modifier_only_shortcut_test.cpp
@ -61,7 +61,7 @@ class Target : public QObject
 public:
    Target();
-    virtual ~Target();
+    ~Target() override;
 public Q_SLOTS:
    Q_SCRIPTABLE void shortcut();
--- a/autotests/integration/no_global_shortcuts_test.cpp
+++ b/autotests/integration/no_global_shortcuts_test.cpp
@ -70,7 +70,7 @@ class Target : public QObject
 public:
    Target();
-    virtual ~Target();
+    ~Target() override;
 public Q_SLOTS:
    Q_SCRIPTABLE void shortcut();
--- a/autotests/integration/plasmawindow_test.cpp
+++ b/autotests/integration/plasmawindow_test.cpp
@ -207,7 +207,7 @@ class HelperWindow : public QRasterWindow
    Q_OBJECT
 public:
    HelperWindow();
-    ~HelperWindow();
+    ~HelperWindow() override;
 protected:
    void paintEvent(QPaintEvent *event) override;
--- a/autotests/integration/pointer_input.cpp
+++ b/autotests/integration/pointer_input.cpp
@ -1079,7 +1079,7 @@ class HelperEffect : public Effect
    Q_OBJECT
 public:
    HelperEffect() {}
-    ~HelperEffect() {}
+    ~HelperEffect() override {}
 };
 void PointerInputTest::testEffectOverrideCursorImage()
--- a/autotests/mock_abstract_client.h
+++ b/autotests/mock_abstract_client.h
@ -31,7 +31,7 @@ class AbstractClient : public QObject
    Q_OBJECT
 public:
    explicit AbstractClient(QObject *parent);
-    virtual ~AbstractClient();
+    ~AbstractClient() override;
    int screen() const;
    bool isOnScreen(int screen) const;
--- a/autotests/mock_client.h
+++ b/autotests/mock_client.h
@ -33,7 +33,7 @@ class Client : public AbstractClient
    Q_OBJECT
 public:
    explicit Client(QObject *parent);
-    virtual ~Client();
+    ~Client() override;
    void showOnScreenEdge() override;
 };
--- a/autotests/mock_effectshandler.h
+++ b/autotests/mock_effectshandler.h
@ -29,7 +29,7 @@ class MockEffectsHandler : public KWin::EffectsHandler
 public:
    explicit MockEffectsHandler(KWin::CompositingType type);
    void activateWindow(KWin::EffectWindow *) override {}
-    KWin::Effect *activeFullScreenEffect() const {
+    KWin::Effect *activeFullScreenEffect() const override {
        return nullptr;
    }
    bool hasActiveFullScreenEffect() const override {
@ -271,7 +271,7 @@ public:
    }
    void hideOnScreenMessage(OnScreenMessageHideFlags flags = OnScreenMessageHideFlags()) override { Q_UNUSED(flags)}
-    void windowToDesktops(KWin::EffectWindow *w, const QVector<uint> &desktops) {
+    void windowToDesktops(KWin::EffectWindow *w, const QVector<uint> &desktops) override {
        Q_UNUSED(w)
        Q_UNUSED(desktops)
    }
--- a/autotests/mock_screens.h
+++ b/autotests/mock_screens.h
@ -30,7 +30,7 @@ class MockScreens : public Screens
    Q_OBJECT
 public:
    explicit MockScreens(QObject *parent = nullptr);
-    virtual ~MockScreens();
+    ~MockScreens() override;
    QRect geometry(int screen) const override;
    int number(const QPoint &pos) const override;
    QString name(int screen) const override;
--- a/autotests/mock_workspace.h
+++ b/autotests/mock_workspace.h
@ -38,7 +38,7 @@ class MockWorkspace : public QObject
    Q_OBJECT
 public:
    explicit MockWorkspace(QObject *parent = nullptr);
-    virtual ~MockWorkspace();
+    ~MockWorkspace() override;
    AbstractClient *activeClient() const;
    AbstractClient *moveResizeClient() const;
    void setShowingDesktop(bool showing);
--- a/autotests/tabbox/mock_tabboxclient.h
+++ b/autotests/tabbox/mock_tabboxclient.h
@ -31,38 +31,38 @@ class MockTabBoxClient : public TabBox::TabBoxClient
 {
 public:
    explicit MockTabBoxClient(QString caption, WId id);
-    virtual bool isMinimized() const {
+    bool isMinimized() const override {
        return false;
    }
-    virtual QString caption() const {
+    QString caption() const override {
        return m_caption;
    }
-    virtual void close();
+    void close() override;
-    virtual int height() const {
+    int height() const override {
        return 100;
    }
    virtual QPixmap icon(const QSize &size = QSize(32, 32)) const {
        return QPixmap(size);
    }
-    virtual bool isCloseable() const {
+    bool isCloseable() const override {
        return true;
    }
-    virtual bool isFirstInTabBox() const {
+    bool isFirstInTabBox() const override {
        return false;
    }
-    virtual int width() const {
+    int width() const override {
        return 100;
    }
-    virtual WId window() const {
+    WId window() const override {
        return m_wId;
    }
-    virtual int x() const {
+    int x() const override {
        return 0;
    }
-    virtual int y() const {
+    int y() const override {
        return 0;
    }
-    virtual QIcon icon() const {
+    QIcon icon() const override {
        return QIcon();
    }
--- a/autotests/tabbox/mock_tabboxhandler.h
+++ b/autotests/tabbox/mock_tabboxhandler.h
@ -28,70 +28,70 @@ class MockTabBoxHandler : public TabBox::TabBoxHandler
    Q_OBJECT
 public:
    MockTabBoxHandler(QObject *parent = nullptr);
-    virtual ~MockTabBoxHandler();
+    ~MockTabBoxHandler() override;
-    virtual void activateAndClose() {
+    void activateAndClose() override {
    }
-    virtual QWeakPointer< TabBox::TabBoxClient > activeClient() const;
+    QWeakPointer< TabBox::TabBoxClient > activeClient() const override;
    void setActiveClient(const QWeakPointer<TabBox::TabBoxClient> &client);
-    virtual int activeScreen() const {
+    int activeScreen() const override {
        return 0;
    }
-    virtual QWeakPointer< TabBox::TabBoxClient > clientToAddToList(TabBox::TabBoxClient *client, int desktop) const;
+    QWeakPointer< TabBox::TabBoxClient > clientToAddToList(TabBox::TabBoxClient *client, int desktop) const override;
-    virtual int currentDesktop() const {
+    int currentDesktop() const override {
        return 1;
    }
-    virtual QWeakPointer< TabBox::TabBoxClient > desktopClient() const {
+    QWeakPointer< TabBox::TabBoxClient > desktopClient() const override {
        return QWeakPointer<TabBox::TabBoxClient>();
    }
-    virtual QString desktopName(int desktop) const {
+    QString desktopName(int desktop) const override {
        Q_UNUSED(desktop)
        return "desktop 1";
    }
-    virtual QString desktopName(TabBox::TabBoxClient *client) const {
+    QString desktopName(TabBox::TabBoxClient *client) const override {
        Q_UNUSED(client)
        return "desktop";
    }
-    virtual void elevateClient(TabBox::TabBoxClient *c, QWindow *tabbox, bool elevate) const {
+    void elevateClient(TabBox::TabBoxClient *c, QWindow *tabbox, bool elevate) const override {
        Q_UNUSED(c)
        Q_UNUSED(tabbox)
        Q_UNUSED(elevate)
    }
-    virtual void shadeClient(TabBox::TabBoxClient *c, bool b) const {
+    void shadeClient(TabBox::TabBoxClient *c, bool b) const override {
        Q_UNUSED(c)
        Q_UNUSED(b)
    }
    virtual void hideOutline() {
    }
-    virtual QWeakPointer< TabBox::TabBoxClient > nextClientFocusChain(TabBox::TabBoxClient *client) const;
+    QWeakPointer< TabBox::TabBoxClient > nextClientFocusChain(TabBox::TabBoxClient *client) const override;
-    virtual QWeakPointer<TabBox::TabBoxClient> firstClientFocusChain() const;
+    QWeakPointer<TabBox::TabBoxClient> firstClientFocusChain() const override;
-    virtual bool isInFocusChain (TabBox::TabBoxClient* client) const;
+    bool isInFocusChain (TabBox::TabBoxClient* client) const override;
-    virtual int nextDesktopFocusChain(int desktop) const {
+    int nextDesktopFocusChain(int desktop) const override {
        Q_UNUSED(desktop)
        return 1;
    }
-    virtual int numberOfDesktops() const {
+    int numberOfDesktops() const override {
        return 1;
    }
    virtual QVector< xcb_window_t > outlineWindowIds() const {
        return QVector<xcb_window_t>();
    }
-    virtual bool isKWinCompositing() const {
+    bool isKWinCompositing() const override {
        return false;
    }
-    virtual void raiseClient(TabBox::TabBoxClient *c) const {
+    void raiseClient(TabBox::TabBoxClient *c) const override {
        Q_UNUSED(c)
    }
-    virtual void restack(TabBox::TabBoxClient *c, TabBox::TabBoxClient *under) {
+    void restack(TabBox::TabBoxClient *c, TabBox::TabBoxClient *under) override {
        Q_UNUSED(c)
        Q_UNUSED(under)
    }
    virtual void showOutline(const QRect &outline) {
        Q_UNUSED(outline)
    }
-    virtual TabBox::TabBoxClientList stackingOrder() const {
+    TabBox::TabBoxClientList stackingOrder() const override {
        return TabBox::TabBoxClientList();
    }
-    virtual void grabbedKeyEvent(QKeyEvent *event) const;
+    void grabbedKeyEvent(QKeyEvent *event) const override;
    void highlightWindows(TabBox::TabBoxClient *window = nullptr, QWindow *controller = nullptr) override {
        Q_UNUSED(window)
--- a/autotests/test_virtualkeyboard_dbus.cpp
+++ b/autotests/test_virtualkeyboard_dbus.cpp
@ -52,7 +52,7 @@ public:
            this,
            SLOT(slotEnabledChanged()));
    }
-    ~DbusPropertyHelper() = default;
+    ~DbusPropertyHelper() override = default;
 Q_SIGNALS:
    void enabledChanged();
--- a/autotests/test_x11_timestamp_update.cpp
+++ b/autotests/test_x11_timestamp_update.cpp
@ -35,7 +35,7 @@ class X11TestApplication : public Application
    Q_OBJECT
 public:
    X11TestApplication(int &argc, char **argv);
-    virtual ~X11TestApplication();
+    ~X11TestApplication() override;
 protected:
    void performStartup() override;
--- a/client.h
+++ b/client.h
@ -90,7 +90,7 @@ public:
    explicit Client();
    xcb_window_t wrapperId() const;
    xcb_window_t inputId() const { return m_decoInputExtent; }
-    virtual xcb_window_t frameId() const override;
+    xcb_window_t frameId() const override;
    bool isTransient() const override;
    bool groupTransient() const override;
@ -111,17 +111,17 @@ public:
    QSize minSize() const override;
    QSize maxSize() const override;
    QSize basicUnit() const;
-    virtual QSize clientSize() const;
+    QSize clientSize() const override;
    QPoint inputPos() const { return input_offset; } // Inside of geometry()
    bool windowEvent(xcb_generic_event_t *e);
-    NET::WindowType windowType(bool direct = false, int supported_types = 0) const;
+    NET::WindowType windowType(bool direct = false, int supported_types = 0) const override;
    bool manage(xcb_window_t w, bool isMapped);
    void releaseWindow(bool on_shutdown = false);
    void destroyClient();
-    virtual QStringList activities() const;
+    QStringList activities() const override;
    void setOnActivity(const QString &activity, bool enable);
    void setOnAllActivities(bool set) override;
    void setOnActivities(QStringList newActivitiesList) override;
@ -203,7 +203,7 @@ public:
    void hideClient(bool hide) override;
    bool hiddenPreview() const; ///< Window is mapped in order to get a window pixmap
-    virtual bool setupCompositing();
+    bool setupCompositing() override;
    void finishCompositing(ReleaseReason releaseReason = ReleaseReason::Release) override;
    void setBlockingCompositing(bool block);
    inline bool isBlockingCompositing() { return blocks_compositing; }
@ -263,9 +263,9 @@ public:
    bool hasOffscreenXineramaStrut() const;
    // Decorations <-> Effects
-    QRect decorationRect() const;
+    QRect decorationRect() const override;
-    QRect transparentRect() const;
+    QRect transparentRect() const override;
    bool isClientSideDecorated() const;
    bool wantsShadowToBeRendered() const override;
@ -281,7 +281,7 @@ public:
    //sets whether the client should be faked as being on all activities (and be shown during session save)
    void setSessionActivityOverride(bool needed);
-    virtual bool isClient() const;
+    bool isClient() const override;
    template <typename T>
    void print(T &stream) const;
@ -327,20 +327,20 @@ private Q_SLOTS:
 private:
    // Use Workspace::createClient()
-    virtual ~Client(); ///< Use destroyClient() or releaseWindow()
+    ~Client() override; ///< Use destroyClient() or releaseWindow()
    // Handlers for X11 events
    bool mapRequestEvent(xcb_map_request_event_t *e);
    void unmapNotifyEvent(xcb_unmap_notify_event_t *e);
    void destroyNotifyEvent(xcb_destroy_notify_event_t *e);
    void configureRequestEvent(xcb_configure_request_event_t *e);
-    virtual void propertyNotifyEvent(xcb_property_notify_event_t *e) override;
+    void propertyNotifyEvent(xcb_property_notify_event_t *e) override;
    void clientMessageEvent(xcb_client_message_event_t *e) override;
    void enterNotifyEvent(xcb_enter_notify_event_t *e);
    void leaveNotifyEvent(xcb_leave_notify_event_t *e);
    void focusInEvent(xcb_focus_in_event_t *e);
    void focusOutEvent(xcb_focus_out_event_t *e);
-    virtual void damageNotifyEvent();
+    void damageNotifyEvent() override;
    bool buttonPressEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root, xcb_timestamp_t time = XCB_CURRENT_TIME);
    bool buttonReleaseEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root);
@ -349,7 +349,7 @@ private:
    Client* findAutogroupCandidate() const;
 protected:
-    virtual void debug(QDebug& stream) const;
+    void debug(QDebug& stream) const override;
    void addDamage(const QRegion &damage) override;
    bool belongsToSameApplication(const AbstractClient *other, SameApplicationChecks checks) const override;
    void doSetActive() override;
--- a/client_machine.h
+++ b/client_machine.h
@ -35,7 +35,7 @@ class GetAddrInfo : public QObject
    Q_OBJECT
 public:
    explicit GetAddrInfo(const QByteArray &hostName, QObject *parent = NULL);
-    virtual ~GetAddrInfo();
+    ~GetAddrInfo() override;
    void resolve();
@ -65,7 +65,7 @@ class ClientMachine : public QObject
    Q_OBJECT
 public:
    explicit ClientMachine(QObject *parent = NULL);
-    virtual ~ClientMachine();
+    ~ClientMachine() override;
    void resolve(xcb_window_t window, xcb_window_t clientLeader);
    const QByteArray &hostName() const;
--- a/colorcorrection/colorcorrectdbusinterface.h
+++ b/colorcorrection/colorcorrectdbusinterface.h
@ -39,7 +39,7 @@ class ColorCorrectDBusInterface : public QObject
 public:
    explicit ColorCorrectDBusInterface(Manager *parent);
-    virtual ~ColorCorrectDBusInterface() = default;
+    ~ColorCorrectDBusInterface() override = default;
 public Q_SLOTS:
    /**
--- a/cursor.h
+++ b/cursor.h
@ -97,7 +97,7 @@ class KWIN_EXPORT Cursor : public QObject
 {
    Q_OBJECT
 public:
-    virtual ~Cursor();
+    ~Cursor() override;
    void startMousePolling();
    void stopMousePolling();
    /**
@ -258,11 +258,11 @@ class InputRedirectionCursor : public Cursor
    Q_OBJECT
 public:
    explicit InputRedirectionCursor(QObject *parent);
-    virtual ~InputRedirectionCursor();
+    ~InputRedirectionCursor() override;
 protected:
-    virtual void doSetPos();
+    void doSetPos() override;
-    virtual void doStartCursorTracking();
+    void doStartCursorTracking() override;
-    virtual void doStopCursorTracking();
+    void doStopCursorTracking() override;
 private Q_SLOTS:
    void slotPosChanged(const QPointF &pos);
    void slotPointerButtonChanged();
--- a/dbusinterface.h
+++ b/dbusinterface.h
@ -52,7 +52,7 @@ class DBusInterface: public QObject, protected QDBusContext
    Q_CLASSINFO("D-Bus Interface", "org.kde.KWin")
 public:
    explicit DBusInterface(QObject *parent);
-    virtual ~DBusInterface();
+    ~DBusInterface() override;
 public: // PROPERTIES
 public Q_SLOTS: // METHODS
@ -125,7 +125,7 @@ class CompositorDBusInterface : public QObject
    Q_PROPERTY(bool platformRequiresCompositing READ platformRequiresCompositing)
 public:
    explicit CompositorDBusInterface(Compositor *parent);
-    virtual ~CompositorDBusInterface() = default;
+    ~CompositorDBusInterface() override = default;
    bool isActive() const;
    bool isCompositingPossible() const;
@ -211,7 +211,7 @@ class VirtualDesktopManagerDBusInterface : public QObject
 public:
    VirtualDesktopManagerDBusInterface(VirtualDesktopManager *parent);
-    ~VirtualDesktopManagerDBusInterface() = default;
+    ~VirtualDesktopManagerDBusInterface() override = default;
    uint count() const;
--- a/debug_console.h
+++ b/debug_console.h
@ -49,7 +49,7 @@ class KWIN_EXPORT DebugConsoleModel : public QAbstractItemModel
    Q_OBJECT
 public:
    explicit DebugConsoleModel(QObject *parent = nullptr);
-    virtual ~DebugConsoleModel();
+    ~DebugConsoleModel() override;
    int columnCount(const QModelIndex &parent) const override;
@ -90,7 +90,7 @@ class DebugConsoleDelegate : public QStyledItemDelegate
    Q_OBJECT
 public:
    explicit DebugConsoleDelegate(QObject *parent = nullptr);
-    virtual ~DebugConsoleDelegate();
+    ~DebugConsoleDelegate() override;
    QString displayText(const QVariant &value, const QLocale &locale) const override;
 };
@ -100,7 +100,7 @@ class KWIN_EXPORT DebugConsole : public QWidget
    Q_OBJECT
 public:
    DebugConsole();
-    virtual ~DebugConsole();
+    ~DebugConsole() override;
 protected:
    void showEvent(QShowEvent *event) override;
@ -118,7 +118,7 @@ class SurfaceTreeModel : public QAbstractItemModel
    Q_OBJECT
 public:
    explicit SurfaceTreeModel(QObject *parent = nullptr);
-    virtual ~SurfaceTreeModel();
+    ~SurfaceTreeModel() override;
    int columnCount(const QModelIndex &parent) const override;
    QVariant data(const QModelIndex &index, int role) const override;
@ -131,7 +131,7 @@ class DebugConsoleFilter : public InputEventSpy
 {
 public:
    explicit DebugConsoleFilter(QTextEdit *textEdit);
-    virtual ~DebugConsoleFilter();
+    ~DebugConsoleFilter() override;
    void pointerEvent(MouseEvent *event) override;
    void wheelEvent(WheelEvent *event) override;
@ -166,7 +166,7 @@ class InputDeviceModel : public QAbstractItemModel
    Q_OBJECT
 public:
    explicit InputDeviceModel(QObject *parent = nullptr);
-    virtual ~InputDeviceModel();
+    ~InputDeviceModel() override;
    int columnCount(const QModelIndex &parent) const override;
    QVariant data(const QModelIndex &index, int role) const override;
--- a/decorations/decoratedclient.h
+++ b/decorations/decoratedclient.h
@ -42,7 +42,7 @@ class DecoratedClientImpl : public QObject, public KDecoration2::ApplicationMenu
    Q_OBJECT
 public:
    explicit DecoratedClientImpl(AbstractClient *client, KDecoration2::DecoratedClient *decoratedClient, KDecoration2::Decoration *decoration);
-    virtual ~DecoratedClientImpl();
+    ~DecoratedClientImpl() override;
    QString caption() const override;
    WId decorationId() const override;
    int desktop() const override;
@ -87,7 +87,7 @@ public:
    void requestToggleOnAllDesktops() override;
    void requestToggleShade() override;
-    void showApplicationMenu(int actionId);
+    void showApplicationMenu(int actionId) override;
    AbstractClient *client() {
        return m_client;
--- a/decorations/decorationbridge.h
+++ b/decorations/decorationbridge.h
@ -48,7 +48,7 @@ class KWIN_EXPORT DecorationBridge : public KDecoration2::DecorationBridge
 {
    Q_OBJECT
 public:
-    virtual ~DecorationBridge();
+    ~DecorationBridge() override;
    void init();
    KDecoration2::Decoration *createDecoration(AbstractClient *client);
--- a/decorations/decorationrenderer.h
+++ b/decorations/decorationrenderer.h
@ -39,7 +39,7 @@ class KWIN_EXPORT Renderer : public QObject
 {
    Q_OBJECT
 public:
-    virtual ~Renderer();
+    ~Renderer() override;
    void schedule(const QRect &rect);
--- a/decorations/settings.h
+++ b/decorations/settings.h
@ -36,7 +36,7 @@ class SettingsImpl : public QObject, public KDecoration2::DecorationSettingsPriv
    Q_OBJECT
 public:
    explicit SettingsImpl(KDecoration2::DecorationSettings *parent);
-    virtual ~SettingsImpl();
+    ~SettingsImpl() override;
    bool isAlphaChannelSupported() const override;
    bool isOnAllDesktopsAvailable() const override;
    bool isCloseOnDoubleClickOnMenu() const override;
--- a/deleted.h
+++ b/deleted.h
@ -44,23 +44,23 @@ public:
    void refWindow();
    void unrefWindow();
    void discard();
-    virtual int desktop() const;
+    int desktop() const override;
-    virtual QStringList activities() const;
+    QStringList activities() const override;
-    virtual QVector<VirtualDesktop *> desktops() const;
+    QVector<VirtualDesktop *> desktops() const override;
-    virtual QPoint clientPos() const;
+    QPoint clientPos() const override;
-    virtual QSize clientSize() const;
+    QSize clientSize() const override;
    QPoint clientContentPos() const override {
        return m_contentPos;
    }
-    virtual QRect transparentRect() const;
+    QRect transparentRect() const override;
-    virtual bool isDeleted() const;
+    bool isDeleted() const override;
-    virtual xcb_window_t frameId() const override;
+    xcb_window_t frameId() const override;
    bool noBorder() const {
        return no_border;
    }
    void layoutDecorationRects(QRect &left, QRect &top, QRect &right, QRect &bottom) const;
-    QRect decorationRect() const;
+    QRect decorationRect() const override;
-    virtual Layer layer() const {
+    Layer layer() const override {
        return m_layer;
    }
    bool isMinimized() const {
@ -72,7 +72,7 @@ public:
    QList<AbstractClient*> mainClients() const {
        return m_mainClients;
    }
-    NET::WindowType windowType(bool direct = false, int supported_types = 0) const;
+    NET::WindowType windowType(bool direct = false, int supported_types = 0) const override;
    bool wasClient() const {
        return m_wasClient;
    }
@ -185,7 +185,7 @@ public:
    }
 protected:
-    virtual void debug(QDebug& stream) const;
+    void debug(QDebug& stream) const override;
 private Q_SLOTS:
    void mainClientClosed(KWin::Toplevel *client);
@ -194,7 +194,7 @@ private Q_SLOTS:
 private:
    Deleted();   // use create()
    void copyToDeleted(Toplevel* c);
-    virtual ~Deleted(); // deleted only using unrefWindow()
+    ~Deleted() override; // deleted only using unrefWindow()
    void addTransient(Deleted *transient);
    void removeTransient(Deleted *transient);
--- a/effectloader.h
+++ b/effectloader.h
@ -70,7 +70,7 @@ class KWIN_EXPORT AbstractEffectLoader : public QObject
 {
    Q_OBJECT
 public:
-    virtual ~AbstractEffectLoader();
+    ~AbstractEffectLoader() override;
    /**
     * @brief The KSharedConfig this EffectLoader should operate on.
--- a/effects.h
+++ b/effects.h
@ -72,7 +72,7 @@ class KWIN_EXPORT EffectsHandlerImpl : public EffectsHandler
    Q_PROPERTY(QStringList listOfEffects READ listOfEffects)
 public:
    EffectsHandlerImpl(Compositor *compositor, Scene *scene);
-    virtual ~EffectsHandlerImpl();
+    ~EffectsHandlerImpl() override;
    void prePaintScreen(ScreenPrePaintData& data, int time) override;
    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
    /**
@ -262,7 +262,7 @@ public:
        return registered_atoms.contains(atom);
    }
-    void windowToDesktops(EffectWindow *w, const QVector<uint> &desktops);
+    void windowToDesktops(EffectWindow *w, const QVector<uint> &desktops) override;
    /**
     * Finds an effect with the given name.
@ -490,8 +490,8 @@ public:
    void elevate(bool elevate);
-    void setData(int role, const QVariant &data);
+    void setData(int role, const QVariant &data) override;
-    QVariant data(int role) const;
+    QVariant data(int role) const override;
    void registerThumbnail(AbstractThumbnailItem *item);
    QHash<WindowThumbnailItem*, QWeakPointer<EffectWindowImpl> > const &thumbnails() const {
@ -534,7 +534,7 @@ class KWIN_EXPORT EffectFrameImpl
 public:
    explicit EffectFrameImpl(EffectFrameStyle style, bool staticSize = true, QPoint position = QPoint(-1, -1),
                             Qt::Alignment alignment = Qt::AlignCenter);
-    virtual ~EffectFrameImpl();
+    ~EffectFrameImpl() override;
    void free() override;
    void render(QRegion region = infiniteRegion(), double opacity = 1.0, double frameOpacity = 1.0) override;
--- a/effects/blur/blur_config.h
+++ b/effects/blur/blur_config.h
@ -32,9 +32,9 @@ class BlurEffectConfig : public KCModule
 public:
    explicit BlurEffectConfig(QWidget *parent = 0, const QVariantList& args = QVariantList());
-    ~BlurEffectConfig();
+    ~BlurEffectConfig() override;
-    void save();
+    void save() override;
 private:
    ::Ui::BlurEffectConfig ui;
--- a/effects/colorpicker/colorpicker.h
+++ b/effects/colorpicker/colorpicker.h
@ -36,7 +36,7 @@ class ColorPickerEffect : public Effect, protected QDBusContext
    Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.ColorPicker")
 public:
    ColorPickerEffect();
-    virtual ~ColorPickerEffect();
+    ~ColorPickerEffect() override;
    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
    void postPaintScreen() override;
    bool isActive() const override;
--- a/effects/coverswitch/coverswitch.h
+++ b/effects/coverswitch/coverswitch.h
@ -55,7 +55,7 @@ public:
    void reconfigure(ReconfigureFlags) override;
    void prePaintScreen(ScreenPrePaintData &data, int time) override;
    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
-    void postPaintScreen();
+    void postPaintScreen() override;
    void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) override;
    void windowInputMouseEvent(QEvent *e) override;
    bool isActive() const override;
--- a/effects/coverswitch/coverswitch_config.h
+++ b/effects/coverswitch/coverswitch_config.h
@ -43,7 +43,7 @@ public:
    explicit CoverSwitchEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    CoverSwitchEffectConfigForm* m_ui;
--- a/effects/cube/cube.h
+++ b/effects/cube/cube.h
@ -56,24 +56,24 @@ class CubeEffect
    // TODO: electric borders: not a registered type
 public:
    CubeEffect();
-    ~CubeEffect();
+    ~CubeEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual bool borderActivated(ElectricBorder border);
+    bool borderActivated(ElectricBorder border) override;
-    virtual void grabbedKeyboardEvent(QKeyEvent* e);
+    void grabbedKeyboardEvent(QKeyEvent* e) override;
-    virtual void windowInputMouseEvent(QEvent* e);
+    void windowInputMouseEvent(QEvent* e) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
    }
    // proxy functions
-    virtual void* proxy();
+    void* proxy() override;
    void registerCubeInsideEffect(CubeInsideEffect* effect);
    void unregisterCubeInsideEffect(CubeInsideEffect* effect);
--- a/effects/cube/cube_config.h
+++ b/effects/cube/cube_config.h
@ -43,7 +43,7 @@ public:
    explicit CubeEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private Q_SLOTS:
    void capsSelectionChanged();
--- a/effects/cube/cube_inside.h
+++ b/effects/cube/cube_inside.h
@ -29,7 +29,7 @@ class CubeInsideEffect : public Effect
 {
 public:
    CubeInsideEffect() {}
-    virtual ~CubeInsideEffect() {}
+    ~CubeInsideEffect() override {}
    virtual void paint() = 0;
    virtual void setActive(bool active) = 0;
--- a/effects/cubeslide/cubeslide.h
+++ b/effects/cubeslide/cubeslide.h
@ -40,14 +40,14 @@ class CubeSlideEffect
    Q_PROPERTY(bool useWindowMoving READ isUseWindowMoving)
 public:
    CubeSlideEffect();
-    ~CubeSlideEffect();
+    ~CubeSlideEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
--- a/effects/cubeslide/cubeslide_config.h
+++ b/effects/cubeslide/cubeslide_config.h
@ -43,7 +43,7 @@ public:
    explicit CubeSlideEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    CubeSlideEffectConfigForm* m_ui;
--- a/effects/desktopgrid/desktopgrid.h
+++ b/effects/desktopgrid/desktopgrid.h
@ -67,17 +67,17 @@ class DesktopGridEffect
    // TODO: electric borders
 public:
    DesktopGridEffect();
-    ~DesktopGridEffect();
+    ~DesktopGridEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void windowInputMouseEvent(QEvent* e);
+    void windowInputMouseEvent(QEvent* e) override;
-    virtual void grabbedKeyboardEvent(QKeyEvent* e);
+    void grabbedKeyboardEvent(QKeyEvent* e) override;
-    virtual bool borderActivated(ElectricBorder border);
+    bool borderActivated(ElectricBorder border) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
--- a/effects/desktopgrid/desktopgrid_config.h
+++ b/effects/desktopgrid/desktopgrid_config.h
@ -42,12 +42,12 @@ class DesktopGridEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit DesktopGridEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~DesktopGridEffectConfig();
+    ~DesktopGridEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
-    virtual void load();
+    void load() override;
-    virtual void defaults();
+    void defaults() override;
 private Q_SLOTS:
    void layoutSelectionChanged();
--- a/effects/fallapart/fallapart.h
+++ b/effects/fallapart/fallapart.h
@ -33,12 +33,12 @@ class FallApartEffect
    Q_PROPERTY(int blockSize READ configuredBlockSize)
 public:
    FallApartEffect();
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 70;
--- a/effects/flipswitch/flipswitch.h
+++ b/effects/flipswitch/flipswitch.h
@ -43,17 +43,17 @@ class FlipSwitchEffect
    Q_PROPERTY(bool windowTitle READ isWindowTitle)
 public:
    FlipSwitchEffect();
-    ~FlipSwitchEffect();
+    ~FlipSwitchEffect() override;
-
+
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time);
+    void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void grabbedKeyboardEvent(QKeyEvent* e);
+    void grabbedKeyboardEvent(QKeyEvent* e) override;
-    virtual void windowInputMouseEvent(QEvent* e);
+    void windowInputMouseEvent(QEvent* e) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
--- a/effects/flipswitch/flipswitch_config.h
+++ b/effects/flipswitch/flipswitch_config.h
@ -42,10 +42,10 @@ class FlipSwitchEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit FlipSwitchEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~FlipSwitchEffectConfig();
+    ~FlipSwitchEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    FlipSwitchEffectConfigForm* m_ui;
--- a/effects/highlightwindow/highlightwindow.h
+++ b/effects/highlightwindow/highlightwindow.h
@ -32,11 +32,11 @@ class HighlightWindowEffect
    Q_OBJECT
 public:
    HighlightWindowEffect();
-    virtual ~HighlightWindowEffect();
+    ~HighlightWindowEffect() override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 70;
--- a/effects/invert/invert.h
+++ b/effects/invert/invert.h
@ -38,12 +38,12 @@ class InvertEffect
    Q_OBJECT
 public:
    InvertEffect();
-    ~InvertEffect();
+    ~InvertEffect() override;
-    virtual void drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void paintEffectFrame(KWin::EffectFrame* frame, QRegion region, double opacity, double frameOpacity);
+    void paintEffectFrame(KWin::EffectFrame* frame, QRegion region, double opacity, double frameOpacity) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
-    virtual bool provides(Feature);
+    bool provides(Feature) override;
    int requestedEffectChainPosition() const override;
--- a/effects/invert/invert_config.h
+++ b/effects/invert/invert_config.h
@ -33,12 +33,12 @@ class InvertEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit InvertEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~InvertEffectConfig();
+    ~InvertEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
-    virtual void load();
+    void load() override;
-    virtual void defaults();
+    void defaults() override;
 private:
    KShortcutsEditor* mShortcutEditor;
--- a/effects/kscreen/kscreen.h
+++ b/effects/kscreen/kscreen.h
@ -31,15 +31,15 @@ class KscreenEffect : public Effect
 public:
    KscreenEffect();
-    virtual ~KscreenEffect();
+    ~KscreenEffect() override;
-    virtual void prePaintScreen(ScreenPrePaintData &data, int time);
+    void prePaintScreen(ScreenPrePaintData &data, int time) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time);
+    void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time) override;
-    virtual void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data);
+    void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) override;
-    void reconfigure(ReconfigureFlags flags);
+    void reconfigure(ReconfigureFlags flags) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 99;
--- a/effects/lookingglass/lookingglass.h
+++ b/effects/lookingglass/lookingglass.h
@ -41,13 +41,13 @@ class LookingGlassEffect : public Effect
    Q_PROPERTY(int initialRadius READ initialRadius)
 public:
    LookingGlassEffect();
-    virtual ~LookingGlassEffect();
+    ~LookingGlassEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    static bool supported();
--- a/effects/lookingglass/lookingglass_config.h
+++ b/effects/lookingglass/lookingglass_config.h
@ -42,10 +42,10 @@ class LookingGlassEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit LookingGlassEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~LookingGlassEffectConfig();
+    ~LookingGlassEffectConfig() override;
-    virtual void save();
+    void save() override;
-    virtual void defaults();
+    void defaults() override;
 private:
    LookingGlassEffectConfigForm* m_ui;
--- a/effects/magiclamp/magiclamp.h
+++ b/effects/magiclamp/magiclamp.h
@ -34,12 +34,12 @@ class MagicLampEffect
 public:
    MagicLampEffect();
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
--- a/effects/magiclamp/magiclamp_config.h
+++ b/effects/magiclamp/magiclamp_config.h
@ -43,7 +43,7 @@ public:
    explicit MagicLampEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    MagicLampEffectConfigForm* m_ui;
--- a/effects/magnifier/magnifier.h
+++ b/effects/magnifier/magnifier.h
@ -39,12 +39,12 @@ class MagnifierEffect
    Q_PROPERTY(qreal targetZoom READ targetZoom)
 public:
    MagnifierEffect();
-    virtual ~MagnifierEffect();
+    ~MagnifierEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    static bool supported();
    // for properties
--- a/effects/magnifier/magnifier_config.h
+++ b/effects/magnifier/magnifier_config.h
@ -42,10 +42,10 @@ class MagnifierEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit MagnifierEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~MagnifierEffectConfig();
+    ~MagnifierEffectConfig() override;
-    virtual void save();
+    void save() override;
-    virtual void defaults();
+    void defaults() override;
 private:
    MagnifierEffectConfigForm* m_ui;
--- a/effects/mouseclick/mouseclick.h
+++ b/effects/mouseclick/mouseclick.h
@ -101,12 +101,12 @@ class MouseClickEffect
    Q_PROPERTY(bool enabled READ isEnabled)
 public:
    MouseClickEffect();
-    ~MouseClickEffect();
+    ~MouseClickEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    // for properties
    QColor color1() const {
--- a/effects/mouseclick/mouseclick_config.h
+++ b/effects/mouseclick/mouseclick_config.h
@ -42,9 +42,9 @@ class MouseClickEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit MouseClickEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~MouseClickEffectConfig();
+    ~MouseClickEffectConfig() override;
-    virtual void save();
+    void save() override;
 private:
    MouseClickEffectConfigForm* m_ui;
--- a/effects/mousemark/mousemark.h
+++ b/effects/mousemark/mousemark.h
@ -38,10 +38,10 @@ class MouseMarkEffect
    Q_PROPERTY(QColor color READ configuredColor)
 public:
    MouseMarkEffect();
-    ~MouseMarkEffect();
+    ~MouseMarkEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    // for properties
    int configuredWidth() const {
--- a/effects/mousemark/mousemark_config.h
+++ b/effects/mousemark/mousemark_config.h
@ -42,9 +42,9 @@ class MouseMarkEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit MouseMarkEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~MouseMarkEffectConfig();
+    ~MouseMarkEffectConfig() override;
-    virtual void save();
+    void save() override;
 private:
    MouseMarkEffectConfigForm* m_ui;
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@ -107,25 +107,25 @@ private:
 public:
    PresentWindowsEffect();
-    virtual ~PresentWindowsEffect();
+    ~PresentWindowsEffect() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void* proxy();
+    void* proxy() override;
    // Screen painting
-    virtual void prePaintScreen(ScreenPrePaintData &data, int time);
+    void prePaintScreen(ScreenPrePaintData &data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData &data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
    // Window painting
-    virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time);
+    void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time) override;
-    virtual void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data);
+    void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) override;
    // User interaction
-    virtual bool borderActivated(ElectricBorder border);
+    bool borderActivated(ElectricBorder border) override;
-    virtual void windowInputMouseEvent(QEvent *e);
+    void windowInputMouseEvent(QEvent *e) override;
-    virtual void grabbedKeyboardEvent(QKeyEvent *e);
+    void grabbedKeyboardEvent(QKeyEvent *e) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    bool touchDown(quint32 id, const QPointF &pos, quint32 time) override;
    bool touchMotion(quint32 id, const QPointF &pos, quint32 time) override;
--- a/effects/presentwindows/presentwindows_config.h
+++ b/effects/presentwindows/presentwindows_config.h
@ -41,11 +41,11 @@ class PresentWindowsEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit PresentWindowsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~PresentWindowsEffectConfig();
+    ~PresentWindowsEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
-    virtual void defaults();
+    void defaults() override;
 private:
    PresentWindowsEffectConfigForm* m_ui;
--- a/effects/resize/resize.h
+++ b/effects/resize/resize.h
@ -34,15 +34,15 @@ class ResizeEffect
    Q_PROPERTY(bool outline READ isOutline)
 public:
    ResizeEffect();
-    ~ResizeEffect();
+    ~ResizeEffect() override;
-    virtual inline bool provides(Effect::Feature ef) {
+    inline bool provides(Effect::Feature ef) override {
        return ef == Effect::Resize;
    }
-    inline bool isActive() const { return m_active || AnimationEffect::isActive(); }
+    inline bool isActive() const override { return m_active || AnimationEffect::isActive(); }
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
    int requestedEffectChainPosition() const override {
        return 60;
--- a/effects/resize/resize_config.h
+++ b/effects/resize/resize_config.h
@ -43,7 +43,7 @@ public:
    explicit ResizeEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    ResizeEffectConfigForm* m_ui;
--- a/effects/screenedge/screenedgeeffect.h
+++ b/effects/screenedge/screenedgeeffect.h
@ -35,10 +35,10 @@ class ScreenEdgeEffect : public Effect
    Q_OBJECT
 public:
    ScreenEdgeEffect();
-    virtual ~ScreenEdgeEffect();
+    ~ScreenEdgeEffect() override;
-    virtual void prePaintScreen(ScreenPrePaintData &data, int time);
+    void prePaintScreen(ScreenPrePaintData &data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData &data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 90;
--- a/effects/showfps/showfps.h
+++ b/effects/showfps/showfps.h
@ -44,11 +44,11 @@ class ShowFpsEffect
    Q_PROPERTY(QColor textColor READ configuredTextColor)
 public:
    ShowFpsEffect();
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
    enum { INSIDE_GRAPH, NOWHERE, TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }; // fps text position
    // for properties
--- a/effects/showfps/showfps_config.h
+++ b/effects/showfps/showfps_config.h
@ -33,10 +33,10 @@ class ShowFpsEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit ShowFpsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~ShowFpsEffectConfig();
+    ~ShowFpsEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    Ui::ShowFpsEffectConfigForm *m_ui;
--- a/effects/slide/slide_config.h
+++ b/effects/slide/slide_config.h
@ -34,9 +34,9 @@ class SlideEffectConfig : public KCModule
 public:
    explicit SlideEffectConfig(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
-    ~SlideEffectConfig();
+    ~SlideEffectConfig() override;
-    void save();
+    void save() override;
 private:
    ::Ui::SlideEffectConfig m_ui;
--- a/effects/slideback/slideback.h
+++ b/effects/slideback/slideback.h
@ -34,13 +34,13 @@ class SlideBackEffect
 public:
    SlideBackEffect();
-    virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time);
+    void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void postPaintWindow(EffectWindow* w);
+    void postPaintWindow(EffectWindow* w) override;
-    virtual void prePaintScreen(ScreenPrePaintData &data, int time);
+    void prePaintScreen(ScreenPrePaintData &data, int time) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 50;
--- a/effects/startupfeedback/startupfeedback.h
+++ b/effects/startupfeedback/startupfeedback.h
@ -36,13 +36,13 @@ class StartupFeedbackEffect
    Q_PROPERTY(int type READ type)
 public:
    StartupFeedbackEffect();
-    virtual ~StartupFeedbackEffect();
+    ~StartupFeedbackEffect() override;
-    virtual void reconfigure(ReconfigureFlags flags);
+    void reconfigure(ReconfigureFlags flags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 90;
--- a/effects/thumbnailaside/thumbnailaside.h
+++ b/effects/thumbnailaside/thumbnailaside.h
@ -45,9 +45,9 @@ class ThumbnailAsideEffect
    Q_PROPERTY(int screen READ configuredScreen)
 public:
    ThumbnailAsideEffect();
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data);
+    void paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) override;
    // for properties
    int configuredMaxWidth() const {
@ -67,7 +67,7 @@ private Q_SLOTS:
    void slotWindowClosed(KWin::EffectWindow *w);
    void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
    void slotWindowDamaged(KWin::EffectWindow* w, const QRect& damage);
-    virtual bool isActive() const;
+    bool isActive() const override;
    void repaintAll();
 private:
    void addThumbnail(EffectWindow* w);
--- a/effects/thumbnailaside/thumbnailaside_config.h
+++ b/effects/thumbnailaside/thumbnailaside_config.h
@ -42,9 +42,9 @@ class ThumbnailAsideEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit ThumbnailAsideEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~ThumbnailAsideEffectConfig();
+    ~ThumbnailAsideEffectConfig() override;
-    virtual void save();
+    void save() override;
 private:
    ThumbnailAsideEffectConfigForm* m_ui;
--- a/effects/touchpoints/touchpoints.h
+++ b/effects/touchpoints/touchpoints.h
@ -37,7 +37,7 @@ class TouchPointsEffect
    Q_PROPERTY(int ringCount READ ringCount)
 public:
    TouchPointsEffect();
-    ~TouchPointsEffect();
+    ~TouchPointsEffect() override;
    void prePaintScreen(ScreenPrePaintData& data, int time) override;
    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
    void postPaintScreen() override;
--- a/effects/trackmouse/trackmouse.h
+++ b/effects/trackmouse/trackmouse.h
@ -39,12 +39,12 @@ class TrackMouseEffect
    Q_PROPERTY(bool mousePolling READ isMousePolling)
 public:
    TrackMouseEffect();
-    virtual ~TrackMouseEffect();
+    ~TrackMouseEffect() override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    // for properties
    Qt::KeyboardModifiers modifiers() const {
--- a/effects/trackmouse/trackmouse_config.h
+++ b/effects/trackmouse/trackmouse_config.h
@ -43,12 +43,12 @@ class TrackMouseEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit TrackMouseEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~TrackMouseEffectConfig();
+    ~TrackMouseEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
-    virtual void load();
+    void load() override;
-    virtual void defaults();
+    void defaults() override;
 private Q_SLOTS:
    void shortcutChanged(const QKeySequence &seq);
 private:
--- a/effects/windowgeometry/windowgeometry.h
+++ b/effects/windowgeometry/windowgeometry.h
@ -33,14 +33,14 @@ class WindowGeometry : public Effect
    Q_PROPERTY(bool handlesResizes READ isHandlesResizes)
 public:
    WindowGeometry();
-    ~WindowGeometry();
+    ~WindowGeometry() override;
-    inline bool provides(Effect::Feature ef) {
+    inline bool provides(Effect::Feature ef) override {
        return ef == Effect::GeometryTip;
    }
-    void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    void paintScreen(int mask, QRegion region, ScreenPaintData &data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData &data) override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        return 90;
--- a/effects/windowgeometry/windowgeometry_config.h
+++ b/effects/windowgeometry/windowgeometry_config.h
@ -41,11 +41,11 @@ class WindowGeometryConfig : public KCModule
    Q_OBJECT
 public:
    explicit WindowGeometryConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~WindowGeometryConfig();
+    ~WindowGeometryConfig() override;
 public Q_SLOTS:
-    void save();
+    void save() override;
-    void defaults();
+    void defaults() override;
 private:
    WindowGeometryConfigForm* myUi;
--- a/effects/wobblywindows/wobblywindows.h
+++ b/effects/wobblywindows/wobblywindows.h
@ -44,14 +44,14 @@ class WobblyWindowsEffect : public Effect
 public:
    WobblyWindowsEffect();
-    virtual ~WobblyWindowsEffect();
+    ~WobblyWindowsEffect() override;
-
+
-    virtual void reconfigure(ReconfigureFlags);
+    void reconfigure(ReconfigureFlags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
+    void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) override;
-    virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
+    void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    int requestedEffectChainPosition() const override {
        // Please notice that the Wobbly Windows effect has to be placed
--- a/effects/wobblywindows/wobblywindows_config.h
+++ b/effects/wobblywindows/wobblywindows_config.h
@ -35,10 +35,10 @@ class WobblyWindowsEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit WobblyWindowsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    ~WobblyWindowsEffectConfig();
+    ~WobblyWindowsEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private Q_SLOTS:
    void wobblinessChanged();
--- a/effects/zoom/zoom.h
+++ b/effects/zoom/zoom.h
@ -46,12 +46,12 @@ class ZoomEffect
    Q_PROPERTY(qreal targetZoom READ targetZoom)
 public:
    ZoomEffect();
-    virtual ~ZoomEffect();
+    ~ZoomEffect() override;
-    virtual void reconfigure(ReconfigureFlags flags);
+    void reconfigure(ReconfigureFlags flags) override;
-    virtual void prePaintScreen(ScreenPrePaintData& data, int time);
+    void prePaintScreen(ScreenPrePaintData& data, int time) override;
-    virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data);
+    void paintScreen(int mask, QRegion region, ScreenPaintData& data) override;
-    virtual void postPaintScreen();
+    void postPaintScreen() override;
-    virtual bool isActive() const;
+    bool isActive() const override;
    // for properties
    qreal configuredZoomFactor() const {
        return zoomFactor;
--- a/effects/zoom/zoom_config.h
+++ b/effects/zoom/zoom_config.h
@ -42,10 +42,10 @@ class ZoomEffectConfig : public KCModule
    Q_OBJECT
 public:
    explicit ZoomEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList());
-    virtual ~ZoomEffectConfig();
+    ~ZoomEffectConfig() override;
 public Q_SLOTS:
-    virtual void save();
+    void save() override;
 private:
    ZoomEffectConfigForm* m_ui;
--- a/focuschain.h
+++ b/focuschain.h
@ -55,7 +55,7 @@ public:
        Update,
        MakeFirstMinimized = MakeFirst
    };
-    virtual ~FocusChain();
+    ~FocusChain() override;
    /**
     * @brief Updates the position of the @p client according to the requested @p change in the
     * focus chain.
--- a/geometrytip.h
+++ b/geometrytip.h
@ -32,7 +32,7 @@ class GeometryTip: public QLabel
    Q_OBJECT
 public:
    GeometryTip(const Xcb::GeometryHints* xSizeHints);
-    ~GeometryTip();
+    ~GeometryTip() override;
    void setGeometry(const QRect& geom);
 private:
--- a/globalshortcuts.h
+++ b/globalshortcuts.h
@ -49,7 +49,7 @@ class GlobalShortcutsManager : public QObject
    Q_OBJECT
 public:
    explicit GlobalShortcutsManager(QObject *parent = nullptr);
-    virtual ~GlobalShortcutsManager();
+    ~GlobalShortcutsManager() override;
    void init();
    /**
@ -149,7 +149,7 @@ public:
    InternalGlobalShortcut(Qt::KeyboardModifiers pointerButtonModifiers, Qt::MouseButtons pointerButtons, QAction *action);
    InternalGlobalShortcut(Qt::KeyboardModifiers axisModifiers, PointerAxisDirection axis, QAction *action);
    InternalGlobalShortcut(Qt::KeyboardModifiers swipeModifier, SwipeDirection direction, QAction *action);
-    virtual ~InternalGlobalShortcut();
+    ~InternalGlobalShortcut() override;
    void invoke() override;
--- a/idle_inhibition.h
+++ b/idle_inhibition.h
@ -44,7 +44,7 @@ class IdleInhibition : public QObject
    Q_OBJECT
 public:
    explicit IdleInhibition(IdleInterface *idle);
-    ~IdleInhibition();
+    ~IdleInhibition() override;
    void registerShellClient(ShellClient *client);
--- a/input.h
+++ b/input.h
@ -92,7 +92,7 @@ public:
        KeyboardKeyPressed,
        KeyboardKeyAutoRepeat
    };
-    virtual ~InputRedirection();
+    ~InputRedirection() override;
    void init();
    /**
@ -378,7 +378,7 @@ class KWIN_EXPORT InputDeviceHandler : public QObject
 {
    Q_OBJECT
 public:
-    virtual ~InputDeviceHandler();
+    ~InputDeviceHandler() override;
    virtual void init();
    void update();
--- a/kcmkwin/kwincompositing/compositing.h
+++ b/kcmkwin/kwincompositing/compositing.h
@ -140,7 +140,7 @@ public:
    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    virtual QHash< int, QByteArray > roleNames() const override;
+    QHash< int, QByteArray > roleNames() const override;
    Q_INVOKABLE int compositingTypeForIndex(int row) const;
    Q_INVOKABLE int indexForCompositingType(int type) const;
@ -161,7 +161,7 @@ class OpenGLPlatformInterfaceModel : public QAbstractListModel
    Q_OBJECT
 public:
    explicit OpenGLPlatformInterfaceModel(QObject *parent = nullptr);
-    virtual ~OpenGLPlatformInterfaceModel();
+    ~OpenGLPlatformInterfaceModel() override;
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
--- a/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h
@ -36,7 +36,7 @@ class ButtonsModel : public QAbstractListModel
 public:
    explicit ButtonsModel(const QVector< DecorationButtonType > &buttons, QObject *parent = 0);
    explicit ButtonsModel(QObject *parent = nullptr);
-    virtual ~ButtonsModel();
+    ~ButtonsModel() override;
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
    QHash< int, QByteArray > roleNames() const override;
--- a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
@ -45,7 +45,7 @@ class PreviewBridge : public DecorationBridge
    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
 public:
    explicit PreviewBridge(QObject *parent = nullptr);
-    virtual ~PreviewBridge();
+    ~PreviewBridge() override;
    std::unique_ptr<DecoratedClientPrivate> createClient(DecoratedClient *client, Decoration *decoration) override;
    void update(Decoration* decoration, const QRect& geometry) override;
    std::unique_ptr<DecorationSettingsPrivate> settings(DecorationSettings *parent) override;
@ -99,7 +99,7 @@ class BridgeItem : public QObject
 public:
    explicit BridgeItem(QObject *parent = nullptr);
-    virtual ~BridgeItem();
+    ~BridgeItem() override;
    void setPlugin(const QString &plugin) {
        m_bridge->setPlugin(plugin);
--- a/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h
@ -44,7 +44,7 @@ class PreviewButtonItem : public QQuickPaintedItem
 public:
    explicit PreviewButtonItem(QQuickItem *parent = nullptr);
-    virtual ~PreviewButtonItem();
+    ~PreviewButtonItem() override;
    void paint(QPainter *painter) override;
    PreviewBridge *bridge() const;
--- a/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
@ -64,7 +64,7 @@ class PreviewClient : public QObject, public ApplicationMenuEnabledDecoratedClie
    Q_PROPERTY(bool bordersBottomEdge READ bordersBottomEdge WRITE setBordersBottomEdge NOTIFY bordersBottomEdgeChanged)
 public:
    explicit PreviewClient(DecoratedClient *client, Decoration *decoration);
-    virtual ~PreviewClient();
+    ~PreviewClient() override;
    QString caption() const override;
    WId decorationId() const override;
@ -110,7 +110,7 @@ public:
    void requestShowApplicationMenu(const QRect &rect, int actionId) override;
    void requestToggleOnAllDesktops() override;
-    void showApplicationMenu(int actionId);
+    void showApplicationMenu(int actionId) override;
    void setCaption(const QString &caption);
    void setActive(bool active);
--- a/kcmkwin/kwindecoration/declarative-plugin/previewitem.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewitem.h
@ -47,8 +47,8 @@ class PreviewItem : public QQuickPaintedItem
    Q_PROPERTY(bool drawBackground READ isDrawingBackground WRITE setDrawingBackground NOTIFY drawingBackgroundChanged)
 public:
    PreviewItem(QQuickItem *parent = nullptr);
-    virtual ~PreviewItem();
+    ~PreviewItem() override;
-    void paint(QPainter *painter);
+    void paint(QPainter *painter) override;
    KDecoration2::Decoration *decoration() const;
    void setDecoration(KDecoration2::Decoration *deco);
--- a/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h
@ -38,7 +38,7 @@ class BorderSizesModel : public QAbstractListModel
    Q_OBJECT
 public:
    explicit BorderSizesModel(QObject *parent = 0);
-    virtual ~BorderSizesModel();
+    ~BorderSizesModel() override;
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
    QHash< int, QByteArray > roleNames() const override;
@ -70,7 +70,7 @@ class PreviewSettings : public QObject, public DecorationSettingsPrivate
    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
 public:
    explicit PreviewSettings(DecorationSettings *parent);
-    virtual ~PreviewSettings();
+    ~PreviewSettings() override;
    bool isAlphaChannelSupported() const override;
    bool isOnAllDesktopsAvailable() const override;
    bool isCloseOnDoubleClickOnMenu() const override {
@ -100,7 +100,7 @@ public:
    }
    void setBorderSizesIndex(int index);
-    QFont font() const {
+    QFont font() const override {
        return m_font;
    }
    void setFont(const QFont &font);
@ -132,7 +132,7 @@ class Settings : public QObject
    Q_PROPERTY(int borderSizesIndex READ borderSizesIndex WRITE setBorderSizesIndex NOTIFY borderSizesIndexChanged)
 public:
    explicit Settings(QObject *parent = nullptr);
-    virtual ~Settings();
+    ~Settings() override;
    PreviewBridge *bridge() const;
    void setBridge(PreviewBridge *bridge);
--- a/kcmkwin/kwindecoration/decorationmodel.h
+++ b/kcmkwin/kwindecoration/decorationmodel.h
@ -43,7 +43,7 @@ public:
 public:
    explicit DecorationsModel(QObject *parent = nullptr);
-    virtual ~DecorationsModel();
+    ~DecorationsModel() override;
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
--- a/Show More
+++ b/Show More