summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/avatarlistbox.h10
-rw-r--r--src/gui/widgets/browserbox.h6
-rw-r--r--src/gui/widgets/button.h12
-rw-r--r--src/gui/widgets/characterdisplay.h10
-rw-r--r--src/gui/widgets/characterviewnormal.h4
-rw-r--r--src/gui/widgets/characterviewsmall.h6
-rw-r--r--src/gui/widgets/checkbox.h8
-rw-r--r--src/gui/widgets/colormodel.h4
-rw-r--r--src/gui/widgets/colorpage.h4
-rw-r--r--src/gui/widgets/desktop.h4
-rw-r--r--src/gui/widgets/dropdown.h18
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h16
-rw-r--r--src/gui/widgets/emotepage.h8
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h16
-rw-r--r--src/gui/widgets/extendedlistbox.h4
-rw-r--r--src/gui/widgets/extendednamesmodel.h6
-rw-r--r--src/gui/widgets/flowcontainer.h4
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/guitable.h24
-rw-r--r--src/gui/widgets/horizontcontainer.h4
-rw-r--r--src/gui/widgets/icon.h2
-rw-r--r--src/gui/widgets/inttextfield.h2
-rw-r--r--src/gui/widgets/itemcontainer.h20
-rw-r--r--src/gui/widgets/itemlinkhandler.cpp2
-rw-r--r--src/gui/widgets/itemlinkhandler.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h14
-rw-r--r--src/gui/widgets/label.h2
-rw-r--r--src/gui/widgets/layouthelper.h2
-rw-r--r--src/gui/widgets/listbox.h8
-rw-r--r--src/gui/widgets/namesmodel.h4
-rw-r--r--src/gui/widgets/passwordfield.h2
-rw-r--r--src/gui/widgets/playerbox.h6
-rw-r--r--src/gui/widgets/popup.h2
-rw-r--r--src/gui/widgets/popuplist.h12
-rw-r--r--src/gui/widgets/progressbar.h8
-rw-r--r--src/gui/widgets/progressindicator.h4
-rw-r--r--src/gui/widgets/radiobutton.h10
-rw-r--r--src/gui/widgets/radiogroup.h2
-rw-r--r--src/gui/widgets/scrollarea.h30
-rw-r--r--src/gui/widgets/setupitem.h58
-rw-r--r--src/gui/widgets/setuptouchitem.h4
-rw-r--r--src/gui/widgets/shopitems.h4
-rw-r--r--src/gui/widgets/shoplistbox.h12
-rw-r--r--src/gui/widgets/shortcutcontainer.h4
-rw-r--r--src/gui/widgets/skillmodel.h4
-rw-r--r--src/gui/widgets/slider.h8
-rw-r--r--src/gui/widgets/sliderlist.h8
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h16
-rw-r--r--src/gui/widgets/tabbedarea.h12
-rw-r--r--src/gui/widgets/tablemodel.h13
-rw-r--r--src/gui/widgets/tabs/battletab.h4
-rw-r--r--src/gui/widgets/tabs/chattab.h2
-rw-r--r--src/gui/widgets/tabs/gmtab.h10
-rw-r--r--src/gui/widgets/tabs/guildchattab.h12
-rw-r--r--src/gui/widgets/tabs/langtab.h4
-rw-r--r--src/gui/widgets/tabs/setup_audio.h2
-rw-r--r--src/gui/widgets/tabs/setup_chat.h4
-rw-r--r--src/gui/widgets/tabs/setup_colors.h8
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_input.h6
-rw-r--r--src/gui/widgets/tabs/setup_joystick.h6
-rw-r--r--src/gui/widgets/tabs/setup_other.h4
-rw-r--r--src/gui/widgets/tabs/setup_relations.cpp18
-rw-r--r--src/gui/widgets/tabs/setup_relations.h8
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp10
-rw-r--r--src/gui/widgets/tabs/setup_theme.h6
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp6
-rw-r--r--src/gui/widgets/tabs/setup_video.h6
-rw-r--r--src/gui/widgets/tabs/setup_visual.h2
-rw-r--r--src/gui/widgets/tabs/setuptabscroll.h7
-rw-r--r--src/gui/widgets/tabs/tab.h10
-rw-r--r--src/gui/widgets/tabs/tradetab.h6
-rw-r--r--src/gui/widgets/tabs/whispertab.h14
-rw-r--r--src/gui/widgets/tabstrip.h4
-rw-r--r--src/gui/widgets/textbox.h4
-rw-r--r--src/gui/widgets/textfield.h8
-rw-r--r--src/gui/widgets/textpreview.h2
-rw-r--r--src/gui/widgets/vertcontainer.h2
-rw-r--r--src/gui/widgets/widgetgroup.h2
79 files changed, 315 insertions, 313 deletions
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 8760fab73..c208824e7 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -37,7 +37,7 @@ class AvatarListModel : public gcn::ListModel
public:
virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
- std::string getElementAt(int i) override A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{ return getAvatarAt(i)->getName(); }
};
@@ -53,13 +53,13 @@ public:
/**
* Draws the list box.
*/
- void draw(gcn::Graphics *gcnGraphics) override;
+ void draw(gcn::Graphics *gcnGraphics) override final;
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event A_UNUSED) override;
+ void mouseReleased(gcn::MouseEvent &event A_UNUSED) override final;
- void optionChanged(const std::string &value) override;
+ void optionChanged(const std::string &value) override final;
private:
int mImagePadding;
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 3c470121a..e06ca3f48 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -158,14 +158,14 @@ class BrowserBox final : public gcn::Widget,
/**
* Handles mouse actions.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
/**
* Draws the browser box.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
void updateHeight();
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index e07a3bc1d..15567ea52 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -97,14 +97,14 @@ class Button final : public gcn::Button,
/**
* Draws the button.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Update the alpha value to the button components.
*/
void updateAlpha();
- void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+ void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
void setDescription(std::string text)
{ mDescription = text; }
@@ -127,9 +127,9 @@ class Button final : public gcn::Button,
void setPressed(bool b)
{ mPressed = b; }
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
void loadImage(const std::string &imageName);
@@ -139,9 +139,9 @@ class Button final : public gcn::Button,
void setCaption(const std::string& caption);
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
- void keyReleased(gcn::KeyEvent &keyEvent) override;
+ void keyReleased(gcn::KeyEvent &keyEvent) override final;
bool isPressed2() const A_WARN_UNUSED;
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index d2fedb8b7..0ee533004 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -54,7 +54,7 @@ class CharacterDisplay final : public Container,
Net::Character *getCharacter() const
{ return mCharacter; }
- void requestFocus() override;
+ void requestFocus() override final;
void setActive(const bool active);
@@ -73,13 +73,13 @@ class CharacterDisplay final : public Container,
void setSelect(bool b)
{ mPlayerBox->setSelected(b); }
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mousePressed(gcn::MouseEvent &event);
+ void mousePressed(gcn::MouseEvent &event) override final;
private:
void update();
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index b8b8e1f7c..1c72f62d3 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;
+ void show(const int i) override final;
void resize() override;
- void action(const gcn::ActionEvent &event A_UNUSED) override;
+ void action(const gcn::ActionEvent &event A_UNUSED) override final;
private:
std::vector<CharacterDisplay*> *mCharacterEntries;
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index 835ef7fb0..8b89318f7 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -35,11 +35,11 @@ class CharacterViewSmall final : public CharacterViewBase
~CharacterViewSmall();
- void show(const int i) override;
+ void show(const int i) override final;
- void resize() override;
+ void resize() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
CharacterDisplay *mSelectedEntry;
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 22316730a..e23ffda46 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -58,7 +58,7 @@ class CheckBox final : public gcn::CheckBox,
/**
* Draws the caption, then calls drawBox to draw the check box.
*/
- void draw(gcn::Graphics *const graphics) override;
+ void draw(gcn::Graphics *const graphics) override final;
/**
* Update the alpha value to the checkbox components.
@@ -73,14 +73,14 @@ class CheckBox final : public gcn::CheckBox,
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(gcn::MouseEvent& event) override;
+ void mouseEntered(gcn::MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(gcn::MouseEvent& event) override;
+ void mouseExited(gcn::MouseEvent& event) override final;
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
void adjustSize();
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
index aaa988846..2c3fd4232 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/widgets/colormodel.h
@@ -51,9 +51,9 @@ class ColorModel : public gcn::ListModel
virtual ~ColorModel();
- virtual int getNumberOfElements() override A_WARN_UNUSED;
+ virtual int getNumberOfElements() override final A_WARN_UNUSED;
- virtual std::string getElementAt(int i) override A_WARN_UNUSED;
+ virtual std::string getElementAt(int i) override final A_WARN_UNUSED;
virtual const ColorPair *getColorAt(const int i) const A_WARN_UNUSED;
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index 1d9faa56d..348746fc6 100644
--- a/src/gui/widgets/colorpage.h
+++ b/src/gui/widgets/colorpage.h
@@ -36,11 +36,11 @@ class ColorPage final : public ListBox
~ColorPage();
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
void resetAction();
- void adjustSize() override;
+ void adjustSize() override final;
private:
int mItemPadding;
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 3d7c6bdf5..112d1e794 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -58,9 +58,9 @@ class Desktop final : public Container, private gcn::WidgetListener
*/
void reloadWallpaper();
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
void postInit();
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index b666c90d2..c345fc6cc 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -82,31 +82,31 @@ class DropDown final : public gcn::ActionListener,
*/
void updateAlpha();
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void drawFrame(gcn::Graphics *graphics) override;
+ void drawFrame(gcn::Graphics *graphics) override final;
// Inherited from KeyListener
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
// Inherited from MouseListener
- void mousePressed(gcn::MouseEvent& mouseEvent) override;
+ void mousePressed(gcn::MouseEvent& mouseEvent) override final;
- void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+ void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
- void mouseDragged(gcn::MouseEvent& mouseEvent) override;
+ void mouseDragged(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
void setSelectedString(const std::string &str);
std::string getSelectedString() const A_WARN_UNUSED;
- void valueChanged(const gcn::SelectionEvent& event) override;
+ void valueChanged(const gcn::SelectionEvent& event) override final;
void updateSelection();
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index e57caf6aa..958721ebb 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -50,30 +50,30 @@ class DropShortcutContainer final : public ShortcutContainer
/**
* Draws the items.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void setWidget2(const Widget2 *const widget) override;
+ void setWidget2(const Widget2 *const widget) override final;
private:
bool mItemClicked;
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index f553fa750..7001027fd 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -41,15 +41,15 @@ class EmotePage final : public gcn::Widget,
~EmotePage();
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void mousePressed(gcn::MouseEvent &mouseEvent) override;
+ void mousePressed(gcn::MouseEvent &mouseEvent) override final;
int getIndexFromGrid(const int x, const int y) const;
- void widgetResized(const gcn::Event &event A_UNUSED);
+ void widgetResized(const gcn::Event &event A_UNUSED) override final;
- void widgetMoved(const gcn::Event &event A_UNUSED);
+ void widgetMoved(const gcn::Event &event A_UNUSED) override final;
void resetAction();
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 71ce562db..fd6550cc1 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -53,30 +53,30 @@ class EmoteShortcutContainer final : public ShortcutContainer
/**
* Draws the items.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void setWidget2(const Widget2 *const widget) override;
+ void setWidget2(const Widget2 *const widget) override final;
private:
std::vector<const EmoteSprite*> mEmoteImg;
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 854c02f8b..778db3b20 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -59,11 +59,11 @@ class ExtendedListBox final : public ListBox
/**
* Draws the list box.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
void adjustSize() override;
- int getSelectionByMouse(const int y) const override;
+ int getSelectionByMouse(const int y) const override final;
protected:
int mImagePadding;
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index 77dca565d..2fff7e608 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -34,11 +34,11 @@ class ExtendedNamesModel : public ExtendedListModel
virtual ~ExtendedNamesModel();
- virtual int getNumberOfElements() override A_WARN_UNUSED;
+ virtual int getNumberOfElements() override final A_WARN_UNUSED;
- virtual std::string getElementAt(int i) override A_WARN_UNUSED;
+ virtual std::string getElementAt(int i) override final A_WARN_UNUSED;
- virtual const Image *getImageAt(int i) override A_WARN_UNUSED;
+ virtual const Image *getImageAt(int i) override final A_WARN_UNUSED;
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 81644f0ac..3a92d06e5 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -55,7 +55,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 gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
int getBoxWidth() const A_WARN_UNUSED
{ return mBoxWidth; }
@@ -63,7 +63,7 @@ class FlowContainer final : public Container,
int getBoxHeight() const A_WARN_UNUSED
{ return mBoxHeight; }
- void add(gcn::Widget *widget) override;
+ void add(gcn::Widget *widget) override final;
private:
int mBoxWidth;
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 2de077f62..64a9d6ab6 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -47,7 +47,7 @@ public:
~GuiTableActionListener();
- void action(const gcn::ActionEvent& actionEvent) override;
+ void action(const gcn::ActionEvent& actionEvent) override final;
protected:
GuiTable *mTable;
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index ffadbb0cd..072563715 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -94,7 +94,7 @@ public:
void setWrappingEnabled(bool wrappingEnabled)
{ mWrappingEnabled = wrappingEnabled; }
- gcn::Rectangle getChildrenArea() override A_WARN_UNUSED;
+ gcn::Rectangle getChildrenArea() override final A_WARN_UNUSED;
/**
* Toggle whether to use linewise selection mode, in which the table selects
@@ -113,18 +113,18 @@ public:
}
// Inherited from Widget
- void draw(gcn::Graphics* graphics) override;
+ void draw(gcn::Graphics* graphics) override final;
- gcn::Widget *getWidgetAt(int x, int y) override A_WARN_UNUSED;
+ gcn::Widget *getWidgetAt(int x, int y) override final A_WARN_UNUSED;
- void moveToTop(gcn::Widget *child) override;
+ void moveToTop(gcn::Widget *child) override final;
- void moveToBottom(gcn::Widget *child) override;
+ void moveToBottom(gcn::Widget *child) override final;
- void _setFocusHandler(gcn::FocusHandler* focusHandler) override;
+ void _setFocusHandler(gcn::FocusHandler* focusHandler) override final;
// Inherited from KeyListener
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
/**
* Sets the table to be opaque, that is sets the table
@@ -145,16 +145,16 @@ public:
{ return mOpaque; }
// Inherited from MouseListener
- void mousePressed(gcn::MouseEvent& mouseEvent) override;
+ void mousePressed(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
- void mouseDragged(gcn::MouseEvent& mouseEvent) override;
+ void mouseDragged(gcn::MouseEvent& mouseEvent) override final;
// Constraints inherited from TableModelListener
- void modelUpdated(const bool completed) override;
+ void modelUpdated(const bool completed) override final;
void requestFocus();
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 1deb8f3ea..6c3305d91 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -41,13 +41,13 @@ class HorizontContainer final : public Container, public gcn::WidgetListener
A_DELETE_COPY(HorizontContainer)
- void add(gcn::Widget *widget) override;
+ void add(gcn::Widget *widget) override final;
void add(gcn::Widget *const widget, const int spacing);
void clear() override;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
protected:
int mSpacing;
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index a81fc8bc1..03f3cce8e 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -68,7 +68,7 @@ class Icon final : public gcn::Widget,
/**
* Draws the Icon.
*/
- void draw(gcn::Graphics *g) override;
+ void draw(gcn::Graphics *g) override final;
private:
Image *mImage;
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 1d1980069..5c17f40b9 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -68,7 +68,7 @@ class IntTextField final : public TextField
/**
* Responds to key presses.
*/
- void keyPressed(gcn::KeyEvent &event) override;
+ void keyPressed(gcn::KeyEvent &event) override final;
private:
int mMin; /**< Minimum value */
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 14acc6bfb..a39a4c685 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -80,26 +80,26 @@ class ItemContainer final : public gcn::Widget,
/**
* Necessary for checking how full the inventory is.
*/
- void logic() override;
+ void logic() override final;
/**
* Draws the items.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
// KeyListener
- void keyPressed(gcn::KeyEvent &event) override;
- void keyReleased(gcn::KeyEvent &event) override;
+ void keyPressed(gcn::KeyEvent &event) override final;
+ void keyReleased(gcn::KeyEvent &event) override final;
// MouseListener
- void mousePressed(gcn::MouseEvent &event) override;
- void mouseDragged(gcn::MouseEvent &event) override;
- void mouseReleased(gcn::MouseEvent &event) override;
- void mouseMoved(gcn::MouseEvent &event) override;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
+ void mouseDragged(gcn::MouseEvent &event) override final;
+ void mouseReleased(gcn::MouseEvent &event) override final;
+ void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseExited(gcn::MouseEvent &event) override final;
// WidgetListener
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
/**
* Returns the selected item.
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index bca0585a1..0ce9408bf 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -53,7 +53,7 @@ namespace
A_DELETE_COPY(OpenUrlListener)
- void action(const gcn::ActionEvent &event) override
+ void action(const gcn::ActionEvent &event) override final
{
if (event.getId() == "yes")
openBrowser(url);
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index abeee0156..6c1682ef4 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -39,7 +39,7 @@ class ItemLinkHandler final : public LinkHandler
~ItemLinkHandler();
void handleLink(const std::string &link,
- gcn::MouseEvent *event) override;
+ gcn::MouseEvent *event) override final;
private:
ItemPopup *mItemPopup;
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 4a57e4292..abeda6ecf 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -51,28 +51,28 @@ class ItemShortcutContainer final : public ShortcutContainer
/**
* Draws the items.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
void setWidget2(const Widget2 *const widget);
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 049e7bae9..9654161d5 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -59,7 +59,7 @@ class Label final : public gcn::Label, public Widget2
/**
* Draws the label.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
void adjustSize();
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 9831abc28..57eb33576 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -78,7 +78,7 @@ class LayoutHelper final : public gcn::WidgetListener
/**
* Called whenever the managed container changes size.
*/
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
private:
Layout mLayout; /**< Layout handler */
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 3f4637e73..15a521b77 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -67,13 +67,13 @@ class ListBox : public gcn::ListBox,
// Inherited from KeyListener
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
// Inherited from MouseListener
- void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
void mousePressed(gcn::MouseEvent &event) override;
@@ -90,7 +90,7 @@ class ListBox : public gcn::ListBox,
virtual void adjustSize();
- void logic() override;
+ void logic() override final;
virtual int getSelectionByMouse(const int y) const;
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index 9bf024a9e..8c2a7f1ca 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -36,9 +36,9 @@ class NamesModel : public gcn::ListModel
virtual ~NamesModel();
- virtual int getNumberOfElements() override A_WARN_UNUSED;
+ virtual int getNumberOfElements() override final A_WARN_UNUSED;
- virtual std::string getElementAt(int i) override A_WARN_UNUSED;
+ virtual std::string getElementAt(int i) override final A_WARN_UNUSED;
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index fdd88c6a6..7e23a4d70 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -44,7 +44,7 @@ class PasswordField final : public TextField
/**
* Draws the password field.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
protected:
int mPasswordChar;
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 5b53d4b96..d88a83b37 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -71,12 +71,12 @@ class PlayerBox final : public Widget2,
/**
* Draws the scroll area.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Draws the background and border of the scroll area.
*/
- void drawFrame(gcn::Graphics *graphics) override;
+ void drawFrame(gcn::Graphics *graphics) override final;
Being *getBeing() A_WARN_UNUSED
{ return mBeing; }
@@ -84,7 +84,7 @@ class PlayerBox final : public Widget2,
void setSelected(bool b)
{ mSelected = b; }
- void mouseReleased(gcn::MouseEvent& event) override;
+ void mouseReleased(gcn::MouseEvent& event) override final;
private:
Being *mBeing;
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 3f503432b..04a4562ed 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -165,7 +165,7 @@ class Popup : public Container, public gcn::MouseListener,
void widgetResized(const gcn::Event &event) override;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
bool isPopupVisible() const
{ return mVisible; }
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 9d48ba0e7..39caf7748 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -44,11 +44,11 @@ class PopupList final : public Popup,
A_DELETE_COPY(PopupList)
- void postInit() override;
+ void postInit() override final;
void show(int x, int y);
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void setSelected(int selected);
@@ -61,13 +61,13 @@ class PopupList final : public Popup,
void adjustSize();
- void focusGained(const gcn::Event& event A_UNUSED) override;
+ void focusGained(const gcn::Event& event A_UNUSED) override final;
- void focusLost(const gcn::Event& event A_UNUSED) override;
+ void focusLost(const gcn::Event& event A_UNUSED) override final;
- void mousePressed(gcn::MouseEvent& mouseEvent) override;
+ void mousePressed(gcn::MouseEvent& mouseEvent) override final;
- void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+ void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
private:
gcn::ListModel *mListModel;
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 8c37500b7..fa05e7bd3 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -60,7 +60,7 @@ class ProgressBar final : public gcn::Widget,
/**
* Performs progress bar logic (fading colors)
*/
- void logic() override;
+ void logic() override final;
/**
* Update the alpha value to the graphic components.
@@ -70,7 +70,7 @@ class ProgressBar final : public gcn::Widget,
/**
* Draws the progress bar.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Sets the current progress.
@@ -129,9 +129,9 @@ class ProgressBar final : public gcn::Widget,
*/
void render(Graphics *graphics);
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
void setPadding(unsigned int padding)
{ mPadding = padding; }
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 66f6c8a0e..353de1ff4 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -44,9 +44,9 @@ class ProgressIndicator final : public gcn::Widget,
~ProgressIndicator();
- void logic() override;
+ void logic() override final;
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
private:
SimpleAnimation *mIndicator;
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 72ffc3c14..0bfd97c76 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -54,25 +54,25 @@ class RadioButton final : public gcn::RadioButton,
/**
* Draws the radiobutton, not the caption.
*/
- void drawBox(gcn::Graphics* graphics) override;
+ void drawBox(gcn::Graphics* graphics) override final;
/**
* Implementation of the draw methods.
* Thus, avoiding the rhomb around the radio button.
*/
- void draw(gcn::Graphics* graphics) override;
+ void draw(gcn::Graphics* graphics) override final;
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(gcn::MouseEvent& event) override;
+ void mouseEntered(gcn::MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(gcn::MouseEvent& event) override;
+ void mouseExited(gcn::MouseEvent& event) override final;
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
void updateAlpha();
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index a6c54c15a..0d65365c8 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -35,7 +35,7 @@ class RadioGroup final : public WidgetGroup
A_DELETE_COPY(RadioGroup)
gcn::Widget *createWidget(const std::string &name)
- const override A_WARN_UNUSED;
+ const override final A_WARN_UNUSED;
};
#endif // GUI_WIDGETS_RADIOGROUP_H
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 649ed50ac..165b1f131 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -74,7 +74,7 @@ class ScrollArea final : public gcn::ScrollArea,
* Logic function optionally adapts width or height of contents. This
* depends on the scrollbar settings.
*/
- void logic() override;
+ void logic() override final;
/**
* Update the alpha value to the graphic components.
@@ -84,12 +84,12 @@ class ScrollArea final : public gcn::ScrollArea,
/**
* Draws the scroll area.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Draws the background and border of the scroll area.
*/
- void drawFrame(gcn::Graphics *graphics) override;
+ void drawFrame(gcn::Graphics *graphics) override final;
/**
* Sets whether the widget should draw its background or not.
@@ -105,27 +105,27 @@ class ScrollArea final : public gcn::ScrollArea,
/**
* Called when the mouse moves in the widget area.
*/
- void mouseMoved(gcn::MouseEvent& event) override;
+ void mouseMoved(gcn::MouseEvent& event) override final;
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(gcn::MouseEvent& event) override;
+ void mouseEntered(gcn::MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(gcn::MouseEvent& event) override;
+ void mouseExited(gcn::MouseEvent& event) override final;
- void mousePressed(gcn::MouseEvent& event) override;
+ void mousePressed(gcn::MouseEvent& event) override final;
- void mouseReleased(gcn::MouseEvent& event) override;
+ void mouseReleased(gcn::MouseEvent& event) override final;
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
gcn::Rectangle getVerticalBarDimension() const;
@@ -160,10 +160,10 @@ class ScrollArea final : public gcn::ScrollArea,
void drawButton(gcn::Graphics *const graphics, const BUTTON_DIR dir);
void calcButton(gcn::Graphics *const graphics, const BUTTON_DIR dir);
- void drawVBar(gcn::Graphics *const graphics) override;
- void drawHBar(gcn::Graphics *const graphics) override;
- void drawVMarker(gcn::Graphics *const graphics) override;
- void drawHMarker(gcn::Graphics *const graphics) override;
+ void drawVBar(gcn::Graphics *const graphics) override final;
+ void drawHBar(gcn::Graphics *const graphics) override final;
+ void drawVMarker(gcn::Graphics *const graphics) override final;
+ void drawHMarker(gcn::Graphics *const graphics) override final;
void calcVBar(gcn::Graphics *const graphics);
void calcHBar(gcn::Graphics *const graphics);
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index f566d6db0..0f6b5d392 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -155,9 +155,9 @@ class SetupItemCheckBox final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
protected:
CheckBox *mCheckBox;
@@ -187,13 +187,13 @@ class SetupItemTextField final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
protected:
HorizontContainer *mHorizont;
@@ -229,13 +229,13 @@ class SetupItemIntTextField final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
protected:
HorizontContainer *mHorizont;
@@ -261,13 +261,13 @@ class SetupItemLabel final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
protected:
Label *mLabel;
@@ -300,9 +300,9 @@ class SetupItemDropDown final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
protected:
HorizontContainer *mHorizont;
@@ -340,13 +340,13 @@ class SetupItemSlider final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
void updateLabel();
@@ -396,13 +396,13 @@ class SetupItemSlider2 final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
void setInvertValue(const int v);
@@ -433,13 +433,13 @@ class SetupItemSliderList : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
virtual void action(const gcn::ActionEvent &event) override;
- void apply(const std::string &eventName) override;
+ void apply(const std::string &eventName) override final;
virtual void addMoreControls() = 0;
@@ -486,9 +486,9 @@ class SetupItemSound final : public SetupItemSliderList
A_DELETE_COPY(SetupItemSound)
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void addMoreControls() override;
+ void addMoreControls() override final;
protected:
Button *mButton;
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 30a54ede7..285e0e02f 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -69,9 +69,9 @@ class SetupActionDropDown final : public SetupItem
void createControls();
- void fromWidget() override;
+ void fromWidget() override final;
- void toWidget() override;
+ void toWidget() override final;
protected:
HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index c3ce2ff4b..219ada7cd 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -81,7 +81,7 @@ class ShopItems final : public gcn::ListModel
/**
* Returns the number of items in the shop.
*/
- int getNumberOfElements() override A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return static_cast<int>(mShopItems.size()); }
bool empty() const A_WARN_UNUSED
@@ -92,7 +92,7 @@ class ShopItems final : public gcn::ListModel
*
* @param i the index to retrieve
*/
- std::string getElementAt(int i) override A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
/**
* Returns the item number i in the shop.
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index d471f5886..7f91c3e3a 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -56,12 +56,12 @@ class ShopListBox final : public ListBox
/**
* Draws the list box.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Returns the height of a row.
*/
- unsigned int getRowHeight() const override A_WARN_UNUSED
+ unsigned int getRowHeight() const override final A_WARN_UNUSED
{ return mRowHeight; }
/**
@@ -72,7 +72,7 @@ class ShopListBox final : public ListBox
/**
* Adjust List draw size
*/
- void adjustSize() override;
+ void adjustSize() override final;
/**
* Set on/off the disabling of too expensive items.
@@ -80,11 +80,11 @@ class ShopListBox final : public ListBox
*/
void setPriceCheck(const bool check);
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+ void mouseReleased(gcn::MouseEvent& mouseEvent) override final;
- void mouseExited(gcn::MouseEvent& mouseEvent) override;
+ void mouseExited(gcn::MouseEvent& mouseEvent) override final;
void setProtectItems(bool p)
{ mProtectItems = p; }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 7d37ed18c..11aa0fe86 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -59,9 +59,9 @@ class ShortcutContainer : public gcn::Widget,
* Invoked when a widget changes its size. This is used to determine
* the new height of the container.
*/
- virtual void widgetResized(const gcn::Event &event) override;
+ virtual void widgetResized(const gcn::Event &event) override final;
- virtual void widgetMoved(const gcn::Event& event) override;
+ virtual void widgetMoved(const gcn::Event& event) override final;
/**
* Handles mouse when dragged.
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index 89f36b72f..733407eaa 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -37,9 +37,9 @@ class SkillModel final : public gcn::ListModel
SkillInfo *getSkillAt(const int i) const;
- std::string getElementAt(int i) override;
+ std::string getElementAt(int i) override final;
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{ return static_cast<int>(mVisibleSkills.size()); }
void addSkill(SkillInfo *const info)
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 2dbafa280..e54c9e374 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -63,7 +63,7 @@ class Slider final : public gcn::Slider,
/**
* Draws the slider.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Draws the marker.
@@ -73,14 +73,14 @@ class Slider final : public gcn::Slider,
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(gcn::MouseEvent& event) override;
+ void mouseEntered(gcn::MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(gcn::MouseEvent& event) override;
+ void mouseExited(gcn::MouseEvent& event) override final;
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
enum SLIDER_ENUM
{
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index ed743761a..28c469e34 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -49,15 +49,15 @@ class SliderList final : public Container,
void updateAlpha();
- void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) override final;
- void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override;
+ void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) override final;
void resize();
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void setSelectedString(const std::string &str);
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index f0ebc4ba5..30617e736 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -50,30 +50,30 @@ class SpellShortcutContainer final : public ShortcutContainer
/**
* Draws the items.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void setWidget2(const Widget2 *const widget) override;
+ void setWidget2(const Widget2 *const widget) override final;
int getItemByIndex(const int index);
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 115d41095..449d8c51a 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -60,7 +60,7 @@ class TabbedArea final : public Widget2,
/**
* Draw the tabbed area.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Return how many tabs have been created.
@@ -114,7 +114,7 @@ class TabbedArea final : public Widget2,
/**
* Overload the logic function since it's broken in guichan 0.8.
*/
- void logic() override;
+ void logic() override final;
int getContainerHeight() const A_WARN_UNUSED
{ return mWidgetContainer->getHeight(); }
@@ -138,7 +138,7 @@ class TabbedArea final : public Widget2,
void setSelectedTabByName(const std::string &name);
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
/*
void moveLeft(Tab *tab);
@@ -147,11 +147,11 @@ class TabbedArea final : public Widget2,
*/
void adjustTabPositions();
- void action(const gcn::ActionEvent& actionEvent) override;
+ void action(const gcn::ActionEvent& actionEvent) override final;
// Inherited from MouseListener
- void mousePressed(gcn::MouseEvent &mouseEvent) override;
+ void mousePressed(gcn::MouseEvent &mouseEvent) override final;
void enableScrollButtons(const bool enable);
@@ -167,7 +167,7 @@ class TabbedArea final : public Widget2,
bool getFollowDownScroll() const A_WARN_UNUSED
{ return mFollowDownScroll; }
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
void setBlockSwitching(const bool b)
{ mBlockSwitching = b; }
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 231a5f5e1..b6122fcb8 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -147,14 +147,15 @@ public:
*/
void resize();
- int getRows() const override A_WARN_UNUSED;
- int getColumns() const override A_WARN_UNUSED;
- int getRowHeight() const override A_WARN_UNUSED;
+ int getRows() const override final A_WARN_UNUSED;
+ int getColumns() const override final A_WARN_UNUSED;
+ int getRowHeight() const override final A_WARN_UNUSED;
int getWidth() const A_WARN_UNUSED;
int getHeight() const A_WARN_UNUSED;
- int getColumnWidth(const int index) const override A_WARN_UNUSED;
- gcn::Widget *getElementAt(const int row, const int column)
- const override A_WARN_UNUSED;
+ int getColumnWidth(const int index) const override final A_WARN_UNUSED;
+ gcn::Widget *getElementAt(const int row,
+ const int column) const
+ override final A_WARN_UNUSED;
protected:
int mRows, mColumns;
diff --git a/src/gui/widgets/tabs/battletab.h b/src/gui/widgets/tabs/battletab.h
index 1624094aa..54f7f2b30 100644
--- a/src/gui/widgets/tabs/battletab.h
+++ b/src/gui/widgets/tabs/battletab.h
@@ -37,10 +37,10 @@ class BattleTab final : public ChatTab
~BattleTab();
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_BATTLE; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
};
extern BattleTab *battleChatTab;
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index 91dee8148..b9f0dff10 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -183,7 +183,7 @@ class ChatTab : public Tab
friend class ChatWindow;
friend class WhisperWindow;
- virtual void setCurrent() override
+ virtual void setCurrent() override final
{ setFlash(0); }
virtual void handleInput(const std::string &msg);
diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h
index 85f6cad89..b3fd601d6 100644
--- a/src/gui/widgets/tabs/gmtab.h
+++ b/src/gui/widgets/tabs/gmtab.h
@@ -35,17 +35,17 @@ class GmTab final : public ChatTab
~GmTab();
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_GM; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
protected:
- void getAutoCompleteList(StringVect &names) const override;
+ void getAutoCompleteList(StringVect &names) const override final;
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
- void handleCommand(const std::string &msg) override;
+ void handleCommand(const std::string &msg) override final;
};
extern GmTab *gmChatTab;
diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h
index 9739f5958..469a10936 100644
--- a/src/gui/widgets/tabs/guildchattab.h
+++ b/src/gui/widgets/tabs/guildchattab.h
@@ -38,23 +38,23 @@ class GuildChatTab final : public ChatTab, public ConfigListener
~GuildChatTab();
bool handleCommand(const std::string &type,
- const std::string &args) override;
+ const std::string &args) override final;
void showHelp() override;
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
int getType() const override A_WARN_UNUSED
{ return ChatTab::TAB_GUILD; }
- void playNewMessageSound() const override;
+ void playNewMessageSound() const override final;
- void optionChanged(const std::string &value) override;
+ void optionChanged(const std::string &value) override final;
protected:
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
- void getAutoCompleteList(StringVect &names) const override;
+ void getAutoCompleteList(StringVect &names) const override final;
};
#endif // GUI_WIDGETS_TABS_GUILDCHATTAB_H
diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h
index 8f2d0dfed..bef59792f 100644
--- a/src/gui/widgets/tabs/langtab.h
+++ b/src/gui/widgets/tabs/langtab.h
@@ -32,10 +32,10 @@ class LangTab final : public ChatTab
~LangTab();
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_LANG; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
};
extern LangTab *langChatTab;
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index 1054f250b..ef8ab04f7 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -34,7 +34,7 @@ class Setup_Audio final : public SetupTabScroll
~Setup_Audio();
- void apply() override;
+ void apply() override final;
private:
gcn::ListModel *mSoundModel;
diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index aa151e6f0..2a465673f 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;
+ void apply() override final;
- void externalUpdated() override;
+ void externalUpdated() override 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 347c43cab..ba8dfa03e 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -46,13 +46,13 @@ class Setup_Colors final : public SetupTab,
~Setup_Colors();
- void apply() override;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
private:
static const char *const rawmsg;
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 3d4203244..9df05582f 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -64,13 +64,13 @@ class KeyListModel final : public gcn::ListModel
/**
* Returns the number of elements in container.
*/
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{ return mSize; }
/**
* Returns element from container.
*/
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{ return setupActionData[selectedData][i].text; }
/**
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 72ea08f31..9ed9d3d47 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;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override 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 4254dac81..a9109e0f6 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;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void setTempEnabled(const bool sel);
diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index e914dca37..a3801b21d 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;
+ void apply() override final;
- void externalUpdated() override;
+ void externalUpdated() override final;
protected:
NamesModel *mProxyTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index c837f1cf7..c06ec6c49 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -84,12 +84,12 @@ public:
~PlayerRelationListModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return PlayerRelation::RELATIONS_NR;
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "";
@@ -121,7 +121,7 @@ public:
mPlayers = nullptr;
}
- int getRows() const override
+ int getRows() const override final
{
if (mPlayers)
return static_cast<int>(mPlayers->size());
@@ -129,17 +129,17 @@ public:
return 0;
}
- int getColumns() const override
+ int getColumns() const override final
{
return COLUMNS_NR;
}
- int getRowHeight() const override
+ int getRowHeight() const override final
{
return ROW_HEIGHT;
}
- int getColumnWidth(const int index) const override
+ int getColumnWidth(const int index) const override final
{
if (index == NAME_COLUMN)
return NAME_COLUMN_WIDTH;
@@ -186,7 +186,7 @@ public:
}
- gcn::Widget *getElementAt(int row, int column) const override
+ gcn::Widget *getElementAt(int row, int column) const override final
{
return mWidgets[WIDGET_AT(row, column)];
}
@@ -222,13 +222,13 @@ public:
~IgnoreChoicesListModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
->size());
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index b5c99934a..092c9bb5d 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -50,19 +50,19 @@ public:
~Setup_Relations();
- void apply() override;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
void reset();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void updatedPlayer(const std::string &name);
void updateAll();
- void externalUpdated() override;
+ void externalUpdated() override final;
private:
StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 109666bb1..65bb059bc 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -118,10 +118,10 @@ public:
~FontSizeChoiceListModel()
{ }
- int getNumberOfElements() override A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return maxFontSizes; }
- std::string getElementAt(int i) override A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -202,10 +202,10 @@ public:
}
}
- int getNumberOfElements() override A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return langs_count; }
- std::string getElementAt(int i) override A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -213,7 +213,7 @@ public:
return gettext(LANG_NAME[i].name.c_str());
}
- const Image *getImageAt(int i) override A_WARN_UNUSED
+ const Image *getImageAt(int i) override final A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return nullptr;
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index e6cf63d17..41c49e18c 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;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void updateInfo();
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 7ce063746..2eb0e4ef0 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -67,7 +67,7 @@ class ModeListModel final : public gcn::ListModel
/**
* Returns the number of elements in container.
*/
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{ return static_cast<int>(mVideoModes.size()); }
/**
@@ -161,10 +161,10 @@ public:
~OpenGLListModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{ return renderModesListSize; }
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index f98b1478b..9421017ca 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -46,11 +46,11 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
~Setup_Video();
- void apply() override;
+ void apply() override final;
- void cancel() override;
+ void cancel() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
bool mFullScreenEnabled;
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 92c8147ef..371657956 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -35,7 +35,7 @@ class Setup_Visual final : public SetupTabScroll
~Setup_Visual();
- void apply() override;
+ void apply() override final;
private:
NamesModel *mSpeachList;
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 16ded3ab3..3d77b716d 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -50,17 +50,18 @@ class SetupTabScroll : public SetupTab
virtual void apply() override;
- virtual void cancel() override;
+ virtual void cancel() override final;
virtual void externalUpdated() override;
- virtual void action(const gcn::ActionEvent &event A_UNUSED) override
+ virtual void action(const gcn::ActionEvent &event A_UNUSED)
+ override final
{ }
int getPreferredFirstItemSize() A_WARN_UNUSED
{ return mPreferredFirstItemSize; }
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void reread(const std::string &name);
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 1c5f349e4..0dd5478ce 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -68,7 +68,7 @@ class Tab : public gcn::BasicContainer,
/**
* Draw the tabbed area.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* Set the normal color for the tab's text.
@@ -129,9 +129,9 @@ class Tab : public gcn::BasicContainer,
int getFlash() const A_WARN_UNUSED
{ return mFlash; }
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
void setLabelFont(gcn::Font *const font);
@@ -148,9 +148,9 @@ class Tab : public gcn::BasicContainer,
const std::string &getCaption() const A_WARN_UNUSED;
- void mouseEntered(gcn::MouseEvent &mouseEvent) override;
+ void mouseEntered(gcn::MouseEvent &mouseEvent) override final;
- void mouseExited(gcn::MouseEvent &mouseEvent) override;
+ void mouseExited(gcn::MouseEvent &mouseEvent) override final;
void setImage(Image *const image);
diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h
index d868c5a26..c0670adc4 100644
--- a/src/gui/widgets/tabs/tradetab.h
+++ b/src/gui/widgets/tabs/tradetab.h
@@ -37,13 +37,13 @@ class TradeTab final : public ChatTab
~TradeTab();
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_TRADE; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
protected:
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
};
extern TradeTab *tradeChatTab;
diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h
index d6d8b2a47..db7233525 100644
--- a/src/gui/widgets/tabs/whispertab.h
+++ b/src/gui/widgets/tabs/whispertab.h
@@ -36,15 +36,15 @@ class WhisperTab final : public ChatTab
const std::string &getNick() const A_WARN_UNUSED
{ return mNick; }
- void showHelp() override;
+ void showHelp() override final;
bool handleCommand(const std::string &type,
- const std::string &args) override;
+ const std::string &args) override final;
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_WHISPER; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
void setWhisperTabColors();
@@ -53,7 +53,7 @@ class WhisperTab final : public ChatTab
protected:
friend class ChatWindow;
- void getAutoCompleteList(StringVect &names) const override;
+ void getAutoCompleteList(StringVect &names) const override final;
/**
* Constructor.
*
@@ -63,9 +63,9 @@ class WhisperTab final : public ChatTab
~WhisperTab();
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
- void handleCommand(const std::string &msg) override;
+ void handleCommand(const std::string &msg) override final;
private:
std::string mNick;
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 0873290b5..77cc83055 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -38,9 +38,9 @@ class TabStrip final : public WidgetGroup
A_DELETE_COPY(TabStrip)
gcn::Widget *createWidget(const std::string &name)
- const override A_WARN_UNUSED;
+ const override final A_WARN_UNUSED;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
};
#endif // GUI_WIDGETS_TABSTRIP_H
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index aa23364a7..fc6f4098a 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -60,9 +60,9 @@ class TextBox final : public gcn::TextBox,
int getMinWidth() const A_WARN_UNUSED
{ return mMinWidth; }
- void keyPressed(gcn::KeyEvent& keyEvent) override;
+ void keyPressed(gcn::KeyEvent& keyEvent) override final;
- void draw(gcn::Graphics* graphics) override;
+ void draw(gcn::Graphics* graphics) override final;
void setForegroundColor(const gcn::Color &color);
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index cbbe51562..70a722e53 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -69,7 +69,7 @@ class TextField : public gcn::TextField,
/**
* Draws the background and border.
*/
- void drawFrame(gcn::Graphics *graphics) override;
+ void drawFrame(gcn::Graphics *graphics) override final;
/**
* Determine whether the field should be numeric or not
@@ -116,18 +116,18 @@ class TextField : public gcn::TextField,
void setCaretPosition(unsigned int position);
- void mousePressed(gcn::MouseEvent &mouseEvent) override;
+ void mousePressed(gcn::MouseEvent &mouseEvent) override final;
void handlePaste();
void handleCopy() const;
- void focusGained(const gcn::Event &event) override;
+ void focusGained(const gcn::Event &event) override final;
void focusLost(const gcn::Event &event) override;
protected:
- void drawCaret(gcn::Graphics* graphics, int x) override;
+ void drawCaret(gcn::Graphics* graphics, int x) override final;
void fixScroll();
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 744347df5..8fe6f0e43 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -102,7 +102,7 @@ class TextPreview final : public gcn::Widget,
*
* @param graphics graphics to draw into
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
/**
* 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 f48bb0e66..6ba62c254 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -51,7 +51,7 @@ class VertContainer final : public Container, public gcn::WidgetListener
void clear();
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
private:
std::vector<gcn::Widget*> mResizableWidgets;
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 308c8fb8a..b8906327e 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -47,7 +47,7 @@ class WidgetGroup : public Container,
virtual void clear();
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
virtual Widget *createWidget(const std::string &name)
const A_WARN_UNUSED = 0;