Remove override keyword, if it present with final.

86 files changed, 423 insertions, 423 deletions

diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 72ff49e80..360d7c481 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -41,15 +41,15 @@ class AvatarListBox final : public ListBox,
         /**
          * Draws the list box.
          */
-        void draw(Graphics *gcnGraphics) override final A_NONNULL(2);
+        void draw(Graphics *gcnGraphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *gcnGraphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *gcnGraphics) final A_NONNULL(2);
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
-        void mouseReleased(MouseEvent &event A_UNUSED) override final A_CONST;
+        void mouseReleased(MouseEvent &event A_UNUSED) final A_CONST;
 
-        void optionChanged(const std::string &value) override final;
+        void optionChanged(const std::string &value) final;
 
     private:
         int mImagePadding;
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index d0655631c..0fa901189 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -113,18 +113,18 @@ class BrowserBox final : public Widget,
         /**
          * Handles mouse actions.
          */
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
         /**
          * Draws the browser box.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         void updateHeight();
 
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 2e20be616..7bd5e90b9 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -153,16 +153,16 @@ class Button final : public Widget,
         /**
          * Draws the button.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Update the alpha value to the button components.
          */
         static void updateAlpha();
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
         void setDescription(const std::string &text)
         { mDescription = text; }
@@ -185,11 +185,11 @@ class Button final : public Widget,
         void setPressed(bool b)
         { mPressed = b; }
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
         void loadImage(const std::string &imageName);
 
@@ -197,9 +197,9 @@ class Button final : public Widget,
 
         void adjustSize();
 
-        void keyPressed(KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) final;
 
-        void keyReleased(KeyEvent &event) override final;
+        void keyReleased(KeyEvent &event) final;
 
         bool isPressed2() const A_WARN_UNUSED;
 
@@ -241,19 +241,19 @@ class Button final : public Widget,
         Graphics::Alignment getAlignment() const
         { return mAlignment; }
 
-        void focusLost(const Event& event) override final;
+        void focusLost(const Event& event) final;
 
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseEntered(MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) final;
 
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
-        void setParent(Widget *widget) override final;
+        void setParent(Widget *widget) final;
 
-        void setWindow(Widget *const widget) override final;
+        void setWindow(Widget *const widget) final;
 
         void setImageWidth(const int width)
         { mImageWidth = width; }
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index 9df2b0026..47992c9be 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -55,7 +55,7 @@ class CharacterDisplay final : public Container,
         Net::Character *getCharacter() const
         { return mCharacter; }
 
-        void requestFocus() override final A_CONST;
+        void requestFocus() final A_CONST;
 
         void setActive(const bool active) A_CONST;
 
@@ -74,13 +74,13 @@ class CharacterDisplay final : public Container,
         void setSelect(bool b)
         { mPlayerBox->setSelected(b); }
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void mouseExited(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) final;
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         void update();
 
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 29e125dc5..9dfee0ec1 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -36,11 +36,11 @@ class CharacterViewNormal final : public CharacterViewBase
 
         ~CharacterViewNormal();
 
-        void show(const int i) override final;
+        void show(const int i) final;
 
         void resize() override;
 
-        void action(const ActionEvent &event A_UNUSED) override final A_CONST;
+        void action(const ActionEvent &event A_UNUSED) final A_CONST;
 
     private:
         std::vector<CharacterDisplay*> *mCharacterEntries;
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index 1ba655df7..0c417d821 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -37,11 +37,11 @@ class CharacterViewSmall final : public CharacterViewBase
 
         ~CharacterViewSmall();
 
-        void show(const int i) override final;
+        void show(const int i) final;
 
-        void resize() override final;
+        void resize() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
     private:
         CharacterDisplay *mSelectedEntry;
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 0c6bb8586..44a567d1a 100644
--- a/src/gui/widgets/chatinput.h
+++ b/src/gui/widgets/chatinput.h
@@ -54,7 +54,7 @@ class ChatInput final : public TextField
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void focusLost(const Event &event) override final
+        void focusLost(const Event &event) final
         {
             TextField::focusLost(event);
             if (mFocusGaining || !config.getBoolValue("protectChatFocus"))
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 921c89a93..3452893a1 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -109,9 +109,9 @@ class CheckBox final : public Widget,
         /**
          * Draws the caption, then calls drawBox to draw the check box.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Update the alpha value to the checkbox components.
@@ -126,14 +126,14 @@ class CheckBox final : public Widget,
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         void adjustSize();
 
@@ -174,15 +174,15 @@ class CheckBox final : public Widget,
          */
         void setCaption(const std::string& caption);
 
-        void mouseClicked(MouseEvent& event) override final;
+        void mouseClicked(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
-        void setParent(Widget *widget) override final;
+        void setParent(Widget *widget) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void setWindow(Widget *const widget) override final;
+        void setWindow(Widget *const widget) final;
 
     private:
         void toggleSelected();
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index f191966cc..356144a2b 100644
--- a/src/gui/widgets/colorpage.h
+++ b/src/gui/widgets/colorpage.h
@@ -36,13 +36,13 @@ class ColorPage final : public ListBox
 
         ~ColorPage();
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         void resetAction();
 
-        void adjustSize() override final;
+        void adjustSize() final;
 };
 
 #endif  // GUI_WIDGETS_COLORPAGE_H
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 263bbabce..56441ce1c 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -63,16 +63,16 @@ class Desktop final : public Container,
          */
         void reloadWallpaper();
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
-        void postInit() override final;
+        void postInit() final;
 
         void handleLink(const std::string &link,
-                        MouseEvent *event) override final;
+                        MouseEvent *event) final;
     private:
         void setBestFittingWallpaper();
 
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 265b69948..77d6c7c05 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -79,36 +79,36 @@ class DropDown final : public ActionListener,
          */
         void updateAlpha();
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
-        void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
+        void drawFrame(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDrawFrame(Graphics *const graphics) override final
+        void safeDrawFrame(Graphics *const graphics) final
                            A_NONNULL(2);
 
         // Inherited from KeyListener
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         // Inherited from MouseListener
 
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
-        void mouseWheelMovedUp(MouseEvent& event) override final;
+        void mouseWheelMovedUp(MouseEvent& event) final;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final;
+        void mouseWheelMovedDown(MouseEvent& event) final;
 
         void setSelectedString(const std::string &str);
 
         std::string getSelectedString() const A_WARN_UNUSED;
 
-        void valueChanged(const SelectionEvent& event) override final A_CONST;
+        void valueChanged(const SelectionEvent& event) final A_CONST;
 
         void updateSelection();
 
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 7caa19b44..9de4d4b2f 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -41,17 +41,17 @@ class EmotePage final : public Widget,
 
         ~EmotePage();
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         int getIndexFromGrid(const int x, const int y) const;
 
-        void widgetResized(const Event &event A_UNUSED) override final;
+        void widgetResized(const Event &event A_UNUSED) final;
 
-        void widgetMoved(const Event &event A_UNUSED) override final;
+        void widgetMoved(const Event &event A_UNUSED) final;
 
         void resetAction();
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 2ceb41430..b98ffbb12 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -50,37 +50,37 @@ class EmoteShortcutContainer final : public ShortcutContainer
          * Draws the items.
          */
         void draw(Graphics *restrict graphics)
-                  restrict2 override final A_NONNULL(2);
+                  restrict2 final A_NONNULL(2);
 
         void safeDraw(Graphics *restrict graphics)
-                      restrict2 override final A_NONNULL(2);
+                      restrict2 final A_NONNULL(2);
 
         /**
          * Handles mouse when dragged.
          */
         void mouseDragged(MouseEvent &restrict event)
-                          restrict2 override final A_CONST;
+                          restrict2 final A_CONST;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(MouseEvent &restrict event) restrict2 override final;
+        void mousePressed(MouseEvent &restrict event) restrict2 final;
 
         /**
          * Handles mouse release.
          */
         void mouseReleased(MouseEvent &restrict event)
-                           restrict2 override final;
+                           restrict2 final;
 
-        void mouseMoved(MouseEvent &restrict event) restrict2 override final;
+        void mouseMoved(MouseEvent &restrict event) restrict2 final;
 
-        void mouseExited(MouseEvent &restrict event) restrict2 override final;
+        void mouseExited(MouseEvent &restrict event) restrict2 final;
 
         void widgetHidden(const Event &restrict event)
-                          restrict2 override final;
+                          restrict2 final;
 
         void setWidget2(const Widget2 *restrict const widget)
-                        restrict2 override final;
+                        restrict2 final;
 
     private:
         std::vector<const EmoteSprite*> mEmoteImg;
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 6e40ecc2b..83f44f706 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -42,13 +42,13 @@ class ExtendedListBox final : public ListBox
         /**
          * Draws the list box.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         void adjustSize() override;
 
-        int getSelectionByMouse(const int y) const override final;
+        int getSelectionByMouse(const int y) const final;
 
     protected:
         int mImagePadding;
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 5e47af759..a04d686a6 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -56,7 +56,7 @@ class FlowContainer final : public Container,
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
         int getBoxWidth() const A_WARN_UNUSED
         { return mBoxWidth; }
@@ -64,7 +64,7 @@ class FlowContainer final : public Container,
         int getBoxHeight() const A_WARN_UNUSED
         { return mBoxHeight; }
 
-        void add(Widget *const widget) override final;
+        void add(Widget *const widget) final;
 
     private:
         int mBoxWidth;
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 35000ccff..5e4ba9dc1 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -91,7 +91,7 @@ class GuiTable final : public Widget,
         void setWrappingEnabled(bool wrappingEnabled)
         { mWrappingEnabled = wrappingEnabled; }
 
-        Rect getChildrenArea() override final A_WARN_UNUSED;
+        Rect getChildrenArea() final A_WARN_UNUSED;
 
         /**
          * Toggle whether to use linewise selection mode, in which the table
@@ -110,20 +110,20 @@ class GuiTable final : public Widget,
         { mLinewiseMode = linewise; }
 
         // Inherited from Widget
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
-        Widget *getWidgetAt(int x, int y) override final A_WARN_UNUSED;
+        Widget *getWidgetAt(int x, int y) final A_WARN_UNUSED;
 
-        void moveToTop(Widget *const widget) override final;
+        void moveToTop(Widget *const widget) final;
 
-        void moveToBottom(Widget *const widget) override final;
+        void moveToBottom(Widget *const widget) final;
 
-        void setFocusHandler(FocusHandler *const focusHandler) override final;
+        void setFocusHandler(FocusHandler *const focusHandler) final;
 
         // Inherited from KeyListener
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         /**
          * Sets the table to be opaque, that is sets the table
@@ -144,16 +144,16 @@ class GuiTable final : public Widget,
         { return mOpaque; }
 
         // Inherited from MouseListener
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseWheelMovedUp(MouseEvent& event) override final;
+        void mouseWheelMovedUp(MouseEvent& event) final;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final;
+        void mouseWheelMovedDown(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
         // Constraints inherited from TableModelListener
-        void modelUpdated(const bool completed) override final;
+        void modelUpdated(const bool completed) final;
 
         void requestFocus() override;
 
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 23ca5159c..bba821185 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -45,13 +45,13 @@ class HorizontContainer final : public Container,
 
         A_DELETE_COPY(HorizontContainer)
 
-        void add(Widget *const widget) override final;
+        void add(Widget *const widget) final;
 
         void add(Widget *const widget, const int spacing);
 
         void clear() override;
 
-        void widgetResized(const Event &event) override final A_CONST;
+        void widgetResized(const Event &event) final A_CONST;
 
     protected:
         int mSpacing;
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index e630339d8..87fa77713 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -71,9 +71,9 @@ class Icon final : public Widget
         /**
          * Draws the Icon.
          */
-        void draw(Graphics *const g) override final A_NONNULL(2);
+        void draw(Graphics *const g) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const g) override final A_NONNULL(2);
+        void safeDraw(Graphics *const g) final A_NONNULL(2);
 
     private:
         Image *mImage;
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index a55fe22fc..2aabafa85 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -73,7 +73,7 @@ class IntTextField final : public TextField
         /**
          * Responds to key presses.
          */
-        void keyPressed(KeyEvent &event) override final;
+        void keyPressed(KeyEvent &event) final;
 
     private:
         int mMin;            /**< Minimum value */
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 006644425..5c290fa6d 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -75,30 +75,30 @@ class ItemContainer final : public Widget,
         /**
          * Necessary for checking how full the inventory is.
          */
-        void logic() override final;
+        void logic() final;
 
         /**
          * Draws the items.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         // KeyListener
-        void keyPressed(KeyEvent &event) override final A_CONST;
-        void keyReleased(KeyEvent &event) override final A_CONST;
+        void keyPressed(KeyEvent &event) final A_CONST;
+        void keyReleased(KeyEvent &event) final A_CONST;
 
         // MouseListener
-        void mousePressed(MouseEvent &event) override final;
-        void mouseDragged(MouseEvent &event) override final;
-        void mouseReleased(MouseEvent &event) override final;
-        void mouseMoved(MouseEvent &event) override final;
-        void mouseExited(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
+        void mouseDragged(MouseEvent &event) final;
+        void mouseReleased(MouseEvent &event) final;
+        void mouseMoved(MouseEvent &event) final;
+        void mouseExited(MouseEvent &event) final;
 
         // WidgetListener
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
         /**
          * Returns the selected item.
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 6a0f87cb7..2ec4b7fb7 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -37,7 +37,7 @@ class ItemLinkHandler final : public LinkHandler
         ~ItemLinkHandler();
 
         void handleLink(const std::string &link,
-                        MouseEvent *event) override final;
+                        MouseEvent *event) final;
 
         void setAllowCommands(const bool b)
         { mAllowCommands = b; }
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 9e043663b..045da145f 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -49,32 +49,32 @@ class ItemShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void mouseExited(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) final;
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void setWidget2(const Widget2 *const widget) override final;
+        void setWidget2(const Widget2 *const widget) final;
 
     private:
         bool mItemClicked;
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 98c7cc6ac..e21a510a3 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -110,9 +110,9 @@ class Label final : public Widget,
         /**
          * Draws the label.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         void adjustSize();
 
@@ -162,11 +162,11 @@ class Label final : public Widget,
         Graphics::Alignment getAlignment() const
         { return mAlignment; }
 
-        void setParent(Widget *const widget) override final;
+        void setParent(Widget *const widget) final;
 
-        void setWindow(Widget *const widget) override final;
+        void setWindow(Widget *const widget) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
         static Skin *mSkin;
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 4f36b2565..cbfa2a41e 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -81,7 +81,7 @@ class LayoutHelper final : public WidgetListener
         /**
          * Called whenever the managed container changes size.
          */
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
     private:
         Layout mLayout;              /**< Layout handler */
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 97ee63ba7..9eeedbd59 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -119,13 +119,13 @@ class ListBox notfinal : public Widget,
 
         // Inherited from KeyListener
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         // Inherited from MouseListener
 
-        void mouseWheelMovedUp(MouseEvent& event) override final A_CONST;
+        void mouseWheelMovedUp(MouseEvent& event) final A_CONST;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final A_CONST;
+        void mouseWheelMovedDown(MouseEvent& event) final A_CONST;
 
         void mousePressed(MouseEvent &event) override;
 
@@ -142,7 +142,7 @@ class ListBox notfinal : public Widget,
 
         virtual void adjustSize();
 
-        void logic() override final;
+        void logic() final;
 
         virtual int getSelectionByMouse(const int y) const;
 
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 305adf739..d36539451 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -44,9 +44,9 @@ class PasswordField final : public TextField
         /**
          * Draws the password field.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
     protected:
         char mPasswordChar;
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 1a122fbbd..243ecbd94 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -76,16 +76,16 @@ class PlayerBox final : public Widget,
         /**
          * Draws the scroll area.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
+        void drawFrame(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDrawFrame(Graphics *const graphics) override final
+        void safeDrawFrame(Graphics *const graphics) final
                            A_NONNULL(2);
 
         Being *getBeing() A_WARN_UNUSED
@@ -94,7 +94,7 @@ class PlayerBox final : public Widget,
         void setSelected(bool b)
         { mSelected = b; }
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
     private:
         Being *mBeing;
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index bf09e4a51..481710bad 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -168,7 +168,7 @@ class Popup notfinal : public Container,
 
         void widgetResized(const Event &event) override;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
         bool isPopupVisible() const
         { return mVisible == Visible_true; }
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index e6fa74d83..76adb48b2 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -47,11 +47,11 @@ class PopupList final : public Popup,
 
         A_DELETE_COPY(PopupList)
 
-        void postInit() override final;
+        void postInit() final;
 
         void show(int x, int y);
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
         void setSelected(const int selected);
 
@@ -64,13 +64,13 @@ class PopupList final : public Popup,
 
         void adjustSize();
 
-        void focusGained(const Event& event A_UNUSED) override final;
+        void focusGained(const Event& event A_UNUSED) final;
 
-        void focusLost(const Event& event A_UNUSED) override final;
+        void focusLost(const Event& event A_UNUSED) final;
 
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
     private:
         ListModel *mListModel;
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 289633f3d..3c1b47cf1 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -63,7 +63,7 @@ class ProgressBar final : public Widget,
         /**
          * Performs progress bar logic (fading colors)
          */
-        void logic() override final;
+        void logic() final;
 
         /**
          * Update the alpha value to the graphic components.
@@ -73,9 +73,9 @@ class ProgressBar final : public Widget,
         /**
          * Draws the progress bar.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Sets the current progress.
@@ -130,11 +130,11 @@ class ProgressBar final : public Widget,
         void setSmoothColorChange(bool smoothColorChange)
         { mSmoothColorChange = smoothColorChange; }
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
         void setPadding(unsigned int padding)
         { mPadding = padding; }
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 773750365..1ce518fff 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -41,11 +41,11 @@ class ProgressIndicator final : public Widget
 
         ~ProgressIndicator();
 
-        void logic() override final;
+        void logic() final;
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
     private:
         SimpleAnimation *mIndicator;
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 79f1aefae..1f1d47f9d 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -112,21 +112,21 @@ class RadioButton final : public Widget,
          * Implementation of the draw methods.
          * Thus, avoiding the rhomb around the radio button.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         void updateAlpha();
 
@@ -169,9 +169,9 @@ class RadioButton final : public Widget,
          */
         void setCaption(const std::string &caption);
 
-        void mouseClicked(MouseEvent& event) override final;
+        void mouseClicked(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
         /**
          * Sets the group the radio button should belong to. Note that
@@ -192,11 +192,11 @@ class RadioButton final : public Widget,
         const std::string &getGroup() const
         { return mGroup; }
 
-        void setParent(Widget *widget) override final;
+        void setParent(Widget *widget) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void setWindow(Widget *const widget) override final;
+        void setWindow(Widget *const widget) final;
 
     private:
         static int instances;
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index c849b73ed..34576ef96 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -35,7 +35,7 @@ class RadioGroup final : public WidgetGroup
 
         Widget *createWidget(const std::string &name,
                              const bool pressed = false)
-                             const override final A_WARN_UNUSED;
+                             const final A_WARN_UNUSED;
 };
 
 #endif  // GUI_WIDGETS_RADIOGROUP_H
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index cf02e0317..eca834f81 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -127,7 +127,7 @@ class ScrollArea final : public BasicContainer,
          * Logic function optionally adapts width or height of contents. This
          * depends on the scrollbar settings.
          */
-        void logic() override final;
+        void logic() final;
 
         /**
          * Update the alpha value to the graphic components.
@@ -137,16 +137,16 @@ class ScrollArea final : public BasicContainer,
         /**
          * Draws the scroll area.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Draws the background and border of the scroll area.
          */
-        void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
+        void drawFrame(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDrawFrame(Graphics *const graphics) override final
+        void safeDrawFrame(Graphics *const graphics) final
                            A_NONNULL(2);
 
         /**
@@ -163,27 +163,27 @@ class ScrollArea final : public BasicContainer,
         /**
          * Called when the mouse moves in the widget area.
          */
-        void mouseMoved(MouseEvent& event) override final;
+        void mouseMoved(MouseEvent& event) final;
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) final;
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
         Rect getVerticalBarDimension() const;
 
@@ -414,11 +414,11 @@ class ScrollArea final : public BasicContainer,
         { return mDownButtonScrollAmount; }
 
         void showWidgetPart(Widget *const widget,
-                            const Rect &area) override final;
+                            const Rect &area) final;
 
-        Rect getChildrenArea() override final;
+        Rect getChildrenArea() final;
 
-        Widget *getWidgetAt(int x, int y) override final;
+        Widget *getWidgetAt(int x, int y) final;
 
         void setWidth(int width);
 
@@ -426,9 +426,9 @@ class ScrollArea final : public BasicContainer,
 
         void setDimension(const Rect& dimension);
 
-        void mouseWheelMovedUp(MouseEvent& event) override final;
+        void mouseWheelMovedUp(MouseEvent& event) final;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final;
+        void mouseWheelMovedDown(MouseEvent& event) final;
 
     protected:
         enum BUTTON_DIR
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index 46512225f..0156557c9 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -80,14 +80,14 @@ class SellDialog notfinal : public Window,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         /**
          * Updates labels according to selected item.
          *
          * @see SelectionListener::selectionChanged
          */
-        void valueChanged(const SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) final;
 
         /**
          * Gives Player's Money amount
@@ -97,7 +97,7 @@ class SellDialog notfinal : public Window,
         /**
          * Sets the visibility of this window.
          */
-        void setVisible(Visible visible) override final;
+        void setVisible(Visible visible) final;
 
         ShopItem *addItem(const int id,
                           const ItemTypeT type,
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index ff3262296..7a4cf0145 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -43,7 +43,7 @@ class ServersListBox final : public ListBox
             mHighlightColor = getThemeColor(ThemeColorId::HIGHLIGHT);
         }
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2)
+        void draw(Graphics *const graphics) final A_NONNULL(2)
         {
             if (!mListModel)
                 return;
@@ -140,12 +140,12 @@ class ServersListBox final : public ListBox
             }
         }
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2)
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2)
         {
             ServersListBox::draw(graphics);
         }
 
-        unsigned int getRowHeight() const override final
+        unsigned int getRowHeight() const final
         {
             return 2 * getFont()->getHeight() + 5;
         }
diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h
index c0d6005cd..a23699f51 100644
--- a/src/gui/widgets/setupbuttonitem.h
+++ b/src/gui/widgets/setupbuttonitem.h
@@ -43,23 +43,23 @@ class SetupButtonItem final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() final A_CONST;
 
-        void toWidget() override final A_CONST;
+        void toWidget() final A_CONST;
 
-        void action(const ActionEvent &event) override final A_CONST;
+        void action(const ActionEvent &event) final A_CONST;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) final A_CONST;
 
         void cancel(const std::string &eventName A_UNUSED)
-                    override final A_CONST;
+                    final A_CONST;
 
         void externalUpdated(const std::string &eventName A_UNUSED)
-                             override final A_CONST;
+                             final A_CONST;
 
-        void rereadValue() override final A_CONST;
+        void rereadValue() final A_CONST;
 
-        void save() override final A_CONST;
+        void save() final A_CONST;
 
     protected:
         HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index c7bea7af7..ac25a298f 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -174,9 +174,9 @@ class SetupItemCheckBox final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
     protected:
         CheckBox *mCheckBox;
@@ -208,22 +208,22 @@ class SetupItemTextField final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void apply(const std::string &eventName) override final;
+        void apply(const std::string &eventName) final;
 
-        void cancel(const std::string &eventName A_UNUSED) override final;
+        void cancel(const std::string &eventName A_UNUSED) final;
 
         void externalUpdated(const std::string &eventName A_UNUSED)
-                             override final;
+                             final;
 
-        void rereadValue() override final;
+        void rereadValue() final;
 
-        void save() override final;
+        void save() final;
 
         void setUseBase64(const UseBase64 b)
         { mUseBase64 = b; }
@@ -263,13 +263,13 @@ class SetupItemIntTextField final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void apply(const std::string &eventName) override final;
+        void apply(const std::string &eventName) final;
 
     protected:
         HorizontContainer *mHorizont;
@@ -295,13 +295,13 @@ class SetupItemLabel final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() final A_CONST;
 
-        void toWidget() override final A_CONST;
+        void toWidget() final A_CONST;
 
-        void action(const ActionEvent &event) override final A_CONST;
+        void action(const ActionEvent &event) final A_CONST;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) final A_CONST;
 
     protected:
         Label *mLabel;
@@ -336,9 +336,9 @@ class SetupItemDropDown final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
     protected:
         HorizontContainer *mHorizont;
@@ -382,13 +382,13 @@ class SetupItemSlider final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void apply(const std::string &eventName) override final;
+        void apply(const std::string &eventName) final;
 
         void updateLabel();
 
@@ -439,13 +439,13 @@ class SetupItemSlider2 final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void apply(const std::string &eventName) override final;
+        void apply(const std::string &eventName) final;
 
         void setInvertValue(const int v);
 
@@ -483,7 +483,7 @@ class SetupItemSliderList notfinal : public SetupItem
 
         void action(const ActionEvent &event) override;
 
-        void apply(const std::string &eventName) override final;
+        void apply(const std::string &eventName) final;
 
         virtual void addMoreControls() = 0;
 
@@ -532,9 +532,9 @@ class SetupItemSound final : public SetupItemSliderList
 
         A_DELETE_COPY(SetupItemSound)
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void addMoreControls() override final;
+        void addMoreControls() final;
 
     protected:
         Button *mButton;
@@ -556,11 +556,11 @@ class SetupItemSliderInt final : public SetupItemSliderList
 
         A_DELETE_COPY(SetupItemSliderInt)
 
-        void addMoreControls() override final;
+        void addMoreControls() final;
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
     protected:
         int mMin;
diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h
index cb72c063c..3c1ef98b1 100644
--- a/src/gui/widgets/setupquickitem.h
+++ b/src/gui/widgets/setupquickitem.h
@@ -49,25 +49,25 @@ class SetupQuickItem final : public SetupItem,
 
         void createControls();
 
-        void fromWidget() override final A_CONST;
+        void fromWidget() final A_CONST;
 
-        void toWidget() override final;
+        void toWidget() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void apply(const std::string &eventName) override final A_CONST;
+        void apply(const std::string &eventName) final A_CONST;
 
-        void cancel(const std::string &eventName A_UNUSED) override final
+        void cancel(const std::string &eventName A_UNUSED) final
                     A_CONST;
 
         void externalUpdated(const std::string &eventName A_UNUSED)
-                             override final A_CONST;
+                             final A_CONST;
 
-        void rereadValue() override final A_CONST;
+        void rereadValue() final A_CONST;
 
-        void save() override final A_CONST;
+        void save() final A_CONST;
 
-        void gameModifiersChanged() override final;
+        void gameModifiersChanged() final;
 
     protected:
         HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 8e577caa9..711f7e107 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -52,9 +52,9 @@ class SetupActionDropDown final : public SetupItem
 
         void createControls();
 
-        void fromWidget() override final;
+        void fromWidget() final;
 
-        void toWidget() override final;
+        void toWidget() final;
 
     protected:
         HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index cc4504c82..ce29c0247 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -55,9 +55,9 @@ class ShopListBox final : public ListBox
         /**
          * Draws the list box.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * gives information about the current player's money
@@ -67,7 +67,7 @@ class ShopListBox final : public ListBox
         /**
          * Adjust List draw size
          */
-        void adjustSize() override final;
+        void adjustSize() final;
 
         /**
          * Set on/off the disabling of too expensive items.
@@ -75,11 +75,11 @@ class ShopListBox final : public ListBox
          */
         void setPriceCheck(const bool check);
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void mouseReleased(MouseEvent& event) override final;
+        void mouseReleased(MouseEvent& event) final;
 
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
         void setProtectItems(bool p)
         { mProtectItems = p; }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index d56f74f6f..23d2709c7 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -52,9 +52,9 @@ class ShortcutContainer notfinal : public Widget,
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event& event) override final;
+        void widgetMoved(const Event& event) final;
 
         /**
          * Handles mouse when dragged.
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index 8415e0cab..717578299 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -87,7 +87,7 @@ class SkillListBox final : public ListBox
             return static_cast<SkillModel*>(mListModel)->getSkillAt(selected);
         }
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2)
+        void draw(Graphics *const graphics) final A_NONNULL(2)
         {
             if (!mListModel)
                 return;
@@ -171,12 +171,12 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2)
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2)
         {
             SkillListBox::draw(graphics);
         }
 
-        unsigned int getRowHeight() const override final
+        unsigned int getRowHeight() const final
         { return mRowHeight; }
 
         const SkillInfo *getSkillByEvent(const MouseEvent &event) const
@@ -190,7 +190,7 @@ class SkillListBox final : public ListBox
             return skill;
         }
 
-        void mouseMoved(MouseEvent &event) override final
+        void mouseMoved(MouseEvent &event) final
         {
             ListBox::mouseMoved(event);
             if (!viewport || !dragDrop.isEmpty())
@@ -205,7 +205,7 @@ class SkillListBox final : public ListBox
                 viewport->mMouseY);
         }
 
-        void mouseDragged(MouseEvent &event) override final
+        void mouseDragged(MouseEvent &event) final
         {
             if (event.getButton() == MouseButton::LEFT)
             {
@@ -229,7 +229,7 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mousePressed(MouseEvent &event) override final
+        void mousePressed(MouseEvent &event) final
         {
             ListBox::mousePressed(event);
             if (event.getButton() == MouseButton::LEFT)
@@ -254,12 +254,12 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void mouseReleased(MouseEvent &event) override final
+        void mouseReleased(MouseEvent &event) final
         {
             ListBox::mouseReleased(event);
         }
 
-        void mouseExited(MouseEvent &event A_UNUSED) override final
+        void mouseExited(MouseEvent &event A_UNUSED) final
         {
             skillPopup->hide();
         }
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index b6d065634..8e4466c0a 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -125,29 +125,29 @@ class Slider final : public Widget,
         /**
          * Draws the slider.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Called when the mouse enteres the widget area.
          */
-        void mouseEntered(MouseEvent& event) override final;
+        void mouseEntered(MouseEvent& event) final;
 
         /**
          * Called when the mouse leaves the widget area.
          */
-        void mouseExited(MouseEvent& event) override final;
+        void mouseExited(MouseEvent& event) final;
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
-        void mouseDragged(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) final;
 
-        void mouseWheelMovedUp(MouseEvent &event) override final;
+        void mouseWheelMovedUp(MouseEvent &event) final;
 
-        void mouseWheelMovedDown(MouseEvent &event) override final;
+        void mouseWheelMovedDown(MouseEvent &event) final;
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         /**
          * Sets the scale of the slider.
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 622fa95dc..590b59177 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -49,17 +49,17 @@ class SliderList final : public Container,
 
         void updateAlpha();
 
-        void mouseWheelMovedUp(MouseEvent& event) override final;
+        void mouseWheelMovedUp(MouseEvent& event) final;
 
-        void mouseWheelMovedDown(MouseEvent& event) override final;
+        void mouseWheelMovedDown(MouseEvent& event) final;
 
         void resize();
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         void setSelectedString(const std::string &str);
 
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 3a044a79f..2f4514965 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -49,32 +49,32 @@ class SpellShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void mouseExited(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) final;
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void setWidget2(const Widget2 *const widget) override final;
+        void setWidget2(const Widget2 *const widget) final;
 
         int getItemByIndex(const int index) const A_WARN_UNUSED;
 
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index e4be9d05c..598e29086 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -91,7 +91,7 @@ class DerDisplay final : public AttrDisplay
 
         A_DELETE_COPY(DerDisplay)
 
-        Type getType() const override final
+        Type getType() const final
         { return DERIVED; }
 };
 
@@ -106,14 +106,14 @@ class ChangeDisplay final : public AttrDisplay,
 
         A_DELETE_COPY(ChangeDisplay)
 
-        std::string update() override final;
+        std::string update() final;
 
-        Type getType() const override final
+        Type getType() const final
         { return CHANGEABLE; }
 
         void setPointsNeeded(const int needed);
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
     private:
         int mNeeded;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 083f178f7..5c3b1d0e3 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -97,14 +97,14 @@ class TabbedArea final : public ActionListener,
 
         ~TabbedArea();
 
-        void postInit() override final;
+        void postInit() final;
 
         /**
          * Draw the tabbed area.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Return how many tabs have been created.
@@ -160,7 +160,7 @@ class TabbedArea final : public ActionListener,
         /**
          * Overload the logic function since it's broken in guichan 0.8.
          */
-        void logic() override final;
+        void logic() final;
 
         int getContainerHeight() const A_WARN_UNUSED
         { return mWidgetContainer->getHeight(); }
@@ -184,7 +184,7 @@ class TabbedArea final : public ActionListener,
 
         void setSelectedTabByName(const std::string &name);
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
 /*
         void moveLeft(Tab *tab);
@@ -193,11 +193,11 @@ class TabbedArea final : public ActionListener,
 */
         void adjustTabPositions();
 
-        void action(const ActionEvent& actionEvent) override final;
+        void action(const ActionEvent& actionEvent) final;
 
         // Inherited from MouseListener
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         void enableScrollButtons(const bool enable);
 
@@ -213,7 +213,7 @@ class TabbedArea final : public ActionListener,
         bool getFollowDownScroll() const A_WARN_UNUSED
         { return mFollowDownScroll; }
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
         void setBlockSwitching(const bool b)
         { mBlockSwitching = b; }
@@ -226,7 +226,7 @@ class TabbedArea final : public ActionListener,
 
         void setDimension(const Rect &dimension);
 
-        void death(const Event &event) override final;
+        void death(const Event &event) final;
 
         void setResizeHeight(bool b)
         { mResizeHeight = b; }
diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h
index 9b723a7dc..c7015cd41 100644
--- a/src/gui/widgets/tabs/chat/channeltab.h
+++ b/src/gui/widgets/tabs/chat/channeltab.h
@@ -39,13 +39,13 @@ class ChannelTab final : public ChatTab
         ~ChannelTab();
 
     protected:
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
         bool handleCommand(const std::string &restrict type,
-                           const std::string &restrict args) override final;
+                           const std::string &restrict args) final;
 
         void getAutoCompleteCommands(StringVect& commands)
-                                     const override final;
+                                     const final;
 };
 
 #endif  // GUI_WIDGETS_TABS_CHAT_CHANNELTAB_H
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index dc2062946..16c834503 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -184,7 +184,7 @@ class ChatTab notfinal : public Tab
         friend class ChatWindow;
         friend class WhisperWindow;
 
-        void setCurrent() override final
+        void setCurrent() final
         { setFlash(0); }
 
         virtual void handleInput(const std::string &msg);
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h
index 96eed73a6..8724aee75 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.h
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.h
@@ -41,18 +41,18 @@ class EmulateGuildTab final : public ChatTab,
         ~EmulateGuildTab();
 
         bool handleCommand(const std::string &restrict type,
-                           const std::string &restrict args) override final;
+                           const std::string &restrict args) final;
 
-        void playNewMessageSound() const override final;
+        void playNewMessageSound() const final;
 
-        void optionChanged(const std::string &value) override final;
+        void optionChanged(const std::string &value) final;
 
     protected:
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
-        void getAutoCompleteList(StringVect &names) const override final;
+        void getAutoCompleteList(StringVect &names) const final;
 
-        void getAutoCompleteCommands(StringVect &names) const override final;
+        void getAutoCompleteCommands(StringVect &names) const final;
 };
 
 #endif  // TMWA_SUPPORT
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index 797084a76..084034c0a 100644
--- a/src/gui/widgets/tabs/chat/gmtab.h
+++ b/src/gui/widgets/tabs/chat/gmtab.h
@@ -37,11 +37,11 @@ class GmTab final : public ChatTab
 
     protected:
         void getAutoCompleteList(StringVect &names) const
-                                 override final A_CONST;
+                                 final A_CONST;
 
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
-        void handleCommandStr(const std::string &msg) override final A_CONST;
+        void handleCommandStr(const std::string &msg) final A_CONST;
 };
 
 extern GmTab *gmChatTab;
diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h
index 005485c98..51995dc6b 100644
--- a/src/gui/widgets/tabs/chat/guildtab.h
+++ b/src/gui/widgets/tabs/chat/guildtab.h
@@ -39,18 +39,18 @@ class GuildTab notfinal : public ChatTab,
         virtual ~GuildTab();
 
         bool handleCommand(const std::string &restrict type,
-                           const std::string &restrict args) override final;
+                           const std::string &restrict args) final;
 
-        void playNewMessageSound() const override final;
+        void playNewMessageSound() const final;
 
-        void optionChanged(const std::string &value) override final;
+        void optionChanged(const std::string &value) final;
 
     protected:
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
-        void getAutoCompleteList(StringVect &names) const override final;
+        void getAutoCompleteList(StringVect &names) const final;
 
-        void getAutoCompleteCommands(StringVect &names) const override final;
+        void getAutoCompleteCommands(StringVect &names) const final;
 };
 
 #endif  // GUI_WIDGETS_TABS_CHAT_GUILDTAB_H
diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index 91d4391fd..3c5262184 100644
--- a/src/gui/widgets/tabs/chat/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -39,18 +39,18 @@ class PartyTab notfinal : public ChatTab,
         virtual ~PartyTab();
 
         bool handleCommand(const std::string &restrict type,
-                           const std::string &restrict args) override final;
+                           const std::string &restrict args) final;
 
-        void playNewMessageSound() const override final;
+        void playNewMessageSound() const final;
 
-        void optionChanged(const std::string &value) override final;
+        void optionChanged(const std::string &value) final;
 
     protected:
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
-        void getAutoCompleteList(StringVect&) const override final;
+        void getAutoCompleteList(StringVect&) const final;
 
-        void getAutoCompleteCommands(StringVect &names) const override final;
+        void getAutoCompleteCommands(StringVect &names) const final;
 };
 
 extern PartyTab *partyTab;
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 47057da4c..848cd5e1c 100644
--- a/src/gui/widgets/tabs/chat/tradetab.h
+++ b/src/gui/widgets/tabs/chat/tradetab.h
@@ -38,7 +38,7 @@ class TradeTab final : public ChatTab
         ~TradeTab();
 
     protected:
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 };
 
 extern TradeTab *tradeChatTab;
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index f298bf164..0513d40f3 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -37,7 +37,7 @@ class WhisperTab final : public ChatTab
         { return mNick; }
 
         bool handleCommand(const std::string &restrict type,
-                           const std::string &restrict args) override final;
+                           const std::string &restrict args) final;
 
         void setWhisperTabColors();
 
@@ -46,10 +46,10 @@ class WhisperTab final : public ChatTab
     protected:
         friend class ChatWindow;
 
-        void getAutoCompleteList(StringVect &names) const override final;
+        void getAutoCompleteList(StringVect &names) const final;
 
         void getAutoCompleteCommands(StringVect& commands)
-                                     const override final;
+                                     const final;
 
         /**
          * Constructor.
@@ -62,9 +62,9 @@ class WhisperTab final : public ChatTab
 
         ~WhisperTab();
 
-        void handleInput(const std::string &msg) override final;
+        void handleInput(const std::string &msg) final;
 
-        void handleCommandStr(const std::string &msg) override final;
+        void handleCommandStr(const std::string &msg) final;
 
     private:
         std::string mNick;
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index 1dd92b39d..2f9cd0e65 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.h
+++ b/src/gui/widgets/tabs/debugwindowtabs.h
@@ -56,7 +56,7 @@ class MapDebugTab final : public DebugTab
 
         A_DELETE_COPY(MapDebugTab)
 
-        void logic() override final;
+        void logic() final;
 
     private:
         Label *mMusicFileLabel A_NONNULLPOINTER;
@@ -88,7 +88,7 @@ class TargetDebugTab final : public DebugTab
 
         A_DELETE_COPY(TargetDebugTab)
 
-        void logic() override final;
+        void logic() final;
 
     private:
         Label *mTargetLabel A_NONNULLPOINTER;
@@ -116,7 +116,7 @@ class NetDebugTab final : public DebugTab
 
         A_DELETE_COPY(NetDebugTab)
 
-        void logic() override final;
+        void logic() final;
 
     private:
         Label *mPingLabel A_NONNULLPOINTER;
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index a93a20b38..311816df4 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -36,7 +36,7 @@ class Setup_Audio final : public SetupTabScroll
 
         ~Setup_Audio();
 
-        void apply() override final;
+        void apply() final;
 
     private:
         ListModel *mSoundModel;
diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index 4feeb703a..e83887913 100644
--- a/src/gui/widgets/tabs/setup_chat.h
+++ b/src/gui/widgets/tabs/setup_chat.h
@@ -32,9 +32,9 @@ class Setup_Chat final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Chat)
 
-        void apply() override final;
+        void apply() final;
 
-        void externalUpdated() override final;
+        void externalUpdated() final;
 };
 
 #endif  // GUI_WIDGETS_TABS_SETUP_CHAT_H
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index da4fb6c90..ab433d288 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -44,13 +44,13 @@ class Setup_Colors final : public SetupTab,
 
         ~Setup_Colors();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final;
+        void cancel() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void valueChanged(const SelectionEvent &event) override final;
+        void valueChanged(const SelectionEvent &event) final;
 
     private:
         static const char *const rawmsg;
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index fbbbcadd5..df6b2a957 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -51,11 +51,11 @@ class Setup_Input final : public SetupTab
          */
         ~Setup_Input();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final;
+        void cancel() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         /**
          * Get an update on the assigned key.
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index 11af99b23..d9c16d683 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -40,11 +40,11 @@ class Setup_Joystick final : public SetupTab
 
         ~Setup_Joystick();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final;
+        void cancel() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         void setTempEnabled(const bool sel);
 
diff --git a/src/gui/widgets/tabs/setup_mods.h b/src/gui/widgets/tabs/setup_mods.h
index e9f47fbd0..3f488eaa9 100644
--- a/src/gui/widgets/tabs/setup_mods.h
+++ b/src/gui/widgets/tabs/setup_mods.h
@@ -34,11 +34,11 @@ class Setup_Mods final : public SetupTabScroll
 
         ~Setup_Mods();
 
-        void apply() override final;
+        void apply() final;
 
-        void externalUpdated() override final;
+        void externalUpdated() final;
 
-        void externalUnloaded() override final;
+        void externalUnloaded() final;
 
         void loadMods();
 
diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index d73cf0d4b..85b018e95 100644
--- a/src/gui/widgets/tabs/setup_other.h
+++ b/src/gui/widgets/tabs/setup_other.h
@@ -36,9 +36,9 @@ class Setup_Other final : public SetupTabScroll
 
         ~Setup_Other();
 
-        void apply() override final;
+        void apply() final;
 
-        void externalUpdated() override final;
+        void externalUpdated() final;
 
     protected:
         NamesModel *mProxyTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index b86856782..1173731a7 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -46,19 +46,19 @@ class Setup_Relations final : public SetupTab,
 
         ~Setup_Relations();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final A_CONST;
+        void cancel() final A_CONST;
 
         void reset();
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
-        void updatedPlayer(const std::string &name) override final;
+        void updatedPlayer(const std::string &name) final;
 
-        void updateAll() override final;
+        void updateAll() final;
 
-        void externalUpdated() override final;
+        void externalUpdated() final;
 
     private:
         StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 526ebdd8f..1c9d885fe 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -42,11 +42,11 @@ class Setup_Theme final : public SetupTab
 
         ~Setup_Theme();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final;
+        void cancel() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         void updateInfo();
 
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index e1a94557e..2dd53f3bc 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -47,11 +47,11 @@ class Setup_Video final : public SetupTab,
 
         ~Setup_Video();
 
-        void apply() override final;
+        void apply() final;
 
-        void cancel() override final;
+        void cancel() final;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
     private:
         bool mFullScreenEnabled;
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 6a645e50a..3c71cb083 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -37,7 +37,7 @@ class Setup_Visual final : public SetupTabScroll
 
         ~Setup_Visual();
 
-        void apply() override final;
+        void apply() final;
 
     private:
         NamesModel *mSpeachList;
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 30e771c05..5afe4ac46 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -47,23 +47,23 @@ class SetupTabScroll notfinal : public SetupTab
 
         void apply() override;
 
-        void cancel() override final;
+        void cancel() final;
 
         void externalUpdated() override;
 
         void externalUnloaded() override;
 
-        void action(const ActionEvent &event A_UNUSED) override final
+        void action(const ActionEvent &event A_UNUSED) final
         { }
 
         int getPreferredFirstItemSize() const A_WARN_UNUSED
         { return mPreferredFirstItemSize; }
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
         void reread(const std::string &name);
 
-        void clear() override final;
+        void clear() final;
 
         const std::set<SetupItem*> &getAllItems() const
         { return mAllItems; }
diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index 31cafd1ff..4787a990a 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -58,7 +58,7 @@ class SocialAttackTab final : public SocialTab
             delete2(mBeings)
         }
 
-        void updateList() override final
+        void updateList() final
         {
             updateAtkListStart();
             // TRANSLATORS: mobs group name in social window
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index b53138e10..a2a97ce98 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -63,7 +63,7 @@ class SocialFriendsTab final : public SocialTab
             delete2(mBeings)
         }
 
-        void updateList() override final
+        void updateList() final
         {
             getPlayersAvatars();
         }
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 942ce9d59..081d3a5f1 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -69,7 +69,7 @@ class SocialGuildTab final : public SocialTab,
             delete2(mScroll)
         }
 
-        void action(const ActionEvent &event) override final
+        void action(const ActionEvent &event) final
         {
             const std::string &eventId = event.getId();
             if (eventId == "do invite")
@@ -111,7 +111,7 @@ class SocialGuildTab final : public SocialTab,
             }
         }
 
-        void invite() override final
+        void invite() final
         {
             CREATEWIDGETV(mInviteDialog, TextDialog,
                 // TRANSLATORS: guild invite message
@@ -123,7 +123,7 @@ class SocialGuildTab final : public SocialTab,
             mInviteDialog->addActionListener(this);
         }
 
-        void leave() override final
+        void leave() final
         {
             CREATEWIDGETV(mConfirmDialog, ConfirmDialog,
                 // TRANSLATORS: guild leave message
@@ -134,7 +134,7 @@ class SocialGuildTab final : public SocialTab,
             mConfirmDialog->addActionListener(this);
         }
 
-        void buildCounter(const int online0, const int total0) override final
+        void buildCounter(const int online0, const int total0) final
         {
             if (online0 || total0)
             {
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index c216c6d36..61fc7ea33 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -69,12 +69,12 @@ class SocialGuildTab2 final : public SocialTab,
             delete2(mScroll)
         }
 
-        void action(const ActionEvent &event A_UNUSED) override final
+        void action(const ActionEvent &event A_UNUSED) final
         {
         }
 
         void buildCounter(const int online0 A_UNUSED,
-                          const int total0 A_UNUSED) override final
+                          const int total0 A_UNUSED) final
         {
             if (!localPlayer)
                 return;
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index e673c689b..d15167945 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -69,7 +69,7 @@ class SocialNavigationTab final : public SocialTab
             delete2(mBeings)
         }
 
-        void updateList() override final
+        void updateList() final
         {
             if (!socialWindow || !localPlayer)
                 return;
@@ -164,7 +164,7 @@ class SocialNavigationTab final : public SocialTab
             updateCounter();
         }
 
-        void selectIndex(const unsigned num) override final
+        void selectIndex(const unsigned num) final
         {
             if (!localPlayer)
                 return;
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 153c1b3ec..f7da18c88 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -71,7 +71,7 @@ class SocialPartyTab final : public SocialTab,
             delete2(mScroll)
         }
 
-        void action(const ActionEvent &event) override final
+        void action(const ActionEvent &event) final
         {
             const std::string &eventId = event.getId();
             if (eventId == "do invite")
@@ -112,7 +112,7 @@ class SocialPartyTab final : public SocialTab,
             }
         }
 
-        void invite() override final
+        void invite() final
         {
             CREATEWIDGETV(mInviteDialog, TextDialog,
                 // TRANSLATORS: party invite message
@@ -124,7 +124,7 @@ class SocialPartyTab final : public SocialTab,
             mInviteDialog->addActionListener(this);
         }
 
-        void leave() override final
+        void leave() final
         {
             CREATEWIDGETV(mConfirmDialog, ConfirmDialog,
                 // TRANSLATORS: party leave message
@@ -136,7 +136,7 @@ class SocialPartyTab final : public SocialTab,
         }
 
         void buildCounter(const int online0 A_UNUSED,
-                          const int total0 A_UNUSED) override final
+                          const int total0 A_UNUSED) final
         {
             if (!localPlayer)
                 return;
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index 7c0c6fd35..daffe3fe7 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -58,7 +58,7 @@ class SocialPickupTab final : public SocialTab
             delete2(mBeings)
         }
 
-        void updateList() override final
+        void updateList() final
         {
             updateAtkListStart();
             // TRANSLATORS: items group name in social window
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 50d86e33c..22ffbe67d 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -63,12 +63,12 @@ class SocialPlayersTab final : public SocialTab
             delete2(mBeings)
         }
 
-        void updateList() override final
+        void updateList() final
         {
             getPlayersAvatars();
         }
 
-        void updateAvatar(const std::string &name) override final
+        void updateAvatar(const std::string &name) final
         {
             if (!actorManager)
                 return;
@@ -100,7 +100,7 @@ class SocialPlayersTab final : public SocialTab
             BLOCK_END("SocialPlayersTab::updateAvatar")
         }
 
-        void resetDamage(const std::string &name) override final
+        void resetDamage(const std::string &name) final
         {
             if (!actorManager)
                 return;
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index dfd6ad828..7c41dda4b 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -113,7 +113,7 @@ class SocialTab notfinal : public Tab
             mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
         }
 
-        void setCurrent() override final
+        void setCurrent() final
         {
             updateCounter();
         }
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index d32cc176c..42c7e0f06 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -109,9 +109,9 @@ class Tab notfinal : public BasicContainer,
         /**
          * Draw the tabbed area.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Set the normal color for the tab's text.
@@ -177,9 +177,9 @@ class Tab notfinal : public BasicContainer,
         int getFlash() const A_WARN_UNUSED
         { return mFlash; }
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
-        void widgetMoved(const Event &event) override final;
+        void widgetMoved(const Event &event) final;
 
         void setLabelFont(Font *const font);
 
@@ -196,9 +196,9 @@ class Tab notfinal : public BasicContainer,
 
         const std::string &getCaption() const A_WARN_UNUSED;
 
-        void mouseEntered(MouseEvent &event) override final;
+        void mouseEntered(MouseEvent &event) final;
 
-        void mouseExited(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) final;
 
         void setImage(Image *const image);
 
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 6c45414e7..39bb76529 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -39,9 +39,9 @@ class TabStrip final : public WidgetGroup
 
         Widget *createWidget(const std::string &name,
                              const bool pressed = false)
-                             const override final A_WARN_UNUSED;
+                             const final A_WARN_UNUSED;
 
-        void action(const ActionEvent &event) override final;
+        void action(const ActionEvent &event) final;
 
         void nextTab();
 
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 10a76c85d..cbbae5f72 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -105,11 +105,11 @@ class TextBox final : public Widget,
         int getMinWidth() const A_WARN_UNUSED
         { return mMinWidth; }
 
-        void keyPressed(KeyEvent& event) override final;
+        void keyPressed(KeyEvent& event) final;
 
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         void setForegroundColor(const Color &color);
 
@@ -271,12 +271,12 @@ class TextBox final : public Widget,
         void setOpaque(const bool opaque)
         { mOpaque = opaque; }
 
-        void fontChanged() override final
+        void fontChanged() final
         { adjustSize(); }
 
-        void mousePressed(MouseEvent& event) override final;
+        void mousePressed(MouseEvent& event) final;
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
     private:
         /**
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 89606d27c..19bfca820 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -119,9 +119,9 @@ class TextField notfinal : public Widget,
         /**
          * Draws the background and border.
          */
-        void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
+        void drawFrame(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDrawFrame(Graphics *const graphics) override final
+        void safeDrawFrame(Graphics *const graphics) final
                            A_NONNULL(2);
 
         /**
@@ -170,16 +170,16 @@ class TextField notfinal : public Widget,
 
         void setCaretPosition(unsigned int position);
 
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         void handlePaste();
 
         void handleCopy() const;
 
 #ifdef ANDROID
-        void focusGained(const Event &event) override final;
+        void focusGained(const Event &event) final;
 #else
-        void focusGained(const Event &event) override final A_CONST;
+        void focusGained(const Event &event) final A_CONST;
 #endif
 
         void focusLost(const Event &event) override A_CONST;
@@ -231,13 +231,13 @@ class TextField notfinal : public Widget,
         unsigned int getCaretPosition() const
         { return mCaretPosition; }
 
-        void mouseDragged(MouseEvent& event) override final;
+        void mouseDragged(MouseEvent& event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void setParent(Widget *widget) override final;
+        void setParent(Widget *widget) final;
 
-        void setWindow(Widget *const widget) override final;
+        void setWindow(Widget *const widget) final;
 
     protected:
         void drawCaret(Graphics* graphics, int x) A_NONNULL(2);
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index e32b911e7..c37b87841 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -100,9 +100,9 @@ class TextPreview final : public Widget
          *
          * @param graphics graphics to draw into
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Set opacity for this widget (whether or not to show the background
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 22055919d..97ea01f1e 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -49,9 +49,9 @@ class VertContainer final : public Container,
 
         void add1(Widget *const widget, const int spacing = -1);
 
-        void clear() override final;
+        void clear() final;
 
-        void widgetResized(const Event &event) override final;
+        void widgetResized(const Event &event) final;
 
     private:
         std::vector<Widget*> mResizableWidgets;
diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h
index a8ee392f9..c8482d39c 100644
--- a/src/gui/widgets/virtshortcutcontainer.h
+++ b/src/gui/widgets/virtshortcutcontainer.h
@@ -51,32 +51,32 @@ class VirtShortcutContainer final : public ShortcutContainer
         /**
          * Draws the items.
          */
-        void draw(Graphics *const graphics) override final A_NONNULL(2);
+        void draw(Graphics *const graphics) final A_NONNULL(2);
 
-        void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
+        void safeDraw(Graphics *const graphics) final A_NONNULL(2);
 
         /**
          * Handles mouse when dragged.
          */
-        void mouseDragged(MouseEvent &event) override final;
+        void mouseDragged(MouseEvent &event) final;
 
         /**
          * Handles mouse when pressed.
          */
-        void mousePressed(MouseEvent &event) override final;
+        void mousePressed(MouseEvent &event) final;
 
         /**
          * Handles mouse release.
          */
-        void mouseReleased(MouseEvent &event) override final;
+        void mouseReleased(MouseEvent &event) final;
 
-        void widgetHidden(const Event &event) override final;
+        void widgetHidden(const Event &event) final;
 
-        void mouseExited(MouseEvent &event) override final;
+        void mouseExited(MouseEvent &event) final;
 
-        void mouseMoved(MouseEvent &event) override final;
+        void mouseMoved(MouseEvent &event) final;
 
-        void setWidget2(const Widget2 *const widget) override final;
+        void setWidget2(const Widget2 *const widget) final;
 
     private:
         bool mItemClicked;
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 7f305ba29..9cb382a97 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -44,9 +44,9 @@ class WidgetGroup notfinal : public Container,
         virtual void addWidget(Widget *const widget,
                                const int spacing);
 
-        void clear() override final;
+        void clear() final;
 
-        void widgetResized(const Event &event) override final A_CONST;
+        void widgetResized(const Event &event) final A_CONST;
 
         virtual Widget *createWidget(const std::string &name,
                                      const bool pressed = false)