From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 17 Apr 2016 23:06:06 +0300
Subject: Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
---
src/gui/dialogsmanager.h | 4 +-
src/gui/models/avatarlistmodel.h | 2 +-
src/gui/models/beingslistmodel.h | 4 +-
src/gui/models/colorlistmodel.h | 4 +-
src/gui/models/colormodel.h | 4 +-
src/gui/models/extendednamesmodel.h | 6 +--
src/gui/models/fontsizechoicelistmodel.h | 4 +-
src/gui/models/iconsmodel.h | 4 +-
src/gui/models/ignorechoiceslistmodel.h | 4 +-
src/gui/models/itemsmodel.h | 4 +-
src/gui/models/keylistmodel.h | 4 +-
src/gui/models/langlistmodel.h | 6 +--
src/gui/models/magicschoolmodel.h | 4 +-
src/gui/models/modelistmodel.h | 4 +-
src/gui/models/namesmodel.h | 4 +-
src/gui/models/opengllistmodel.h | 4 +-
src/gui/models/playerrelationlistmodel.h | 4 +-
src/gui/models/playertablemodel.h | 10 ++---
src/gui/models/serverslistmodel.h | 4 +-
src/gui/models/shopitems.h | 4 +-
src/gui/models/skillmodel.h | 4 +-
src/gui/models/sortlistmodelbuy.h | 4 +-
src/gui/models/sortlistmodelinv.h | 4 +-
src/gui/models/tablemodel.h | 10 ++---
src/gui/models/targettypemodel.h | 4 +-
src/gui/models/typelistmodel.h | 4 +-
src/gui/models/updatelistmodel.h | 4 +-
src/gui/models/updatetypemodel.h | 4 +-
src/gui/models/worldlistmodel.h | 4 +-
src/gui/popups/beingpopup.h | 2 +-
src/gui/popups/createpartypopup.h | 4 +-
src/gui/popups/itempopup.h | 4 +-
src/gui/popups/popupmenu.h | 6 +--
src/gui/popups/skillpopup.h | 4 +-
src/gui/popups/speechbubble.h | 2 +-
src/gui/popups/spellpopup.h | 4 +-
src/gui/popups/statuspopup.h | 2 +-
src/gui/popups/textboxpopup.h | 4 +-
src/gui/popups/textpopup.h | 4 +-
src/gui/theme.h | 2 +-
src/gui/userpalette.h | 4 +-
src/gui/viewport.h | 16 +++----
src/gui/widgets/avatarlistbox.h | 10 ++---
src/gui/widgets/browserbox.h | 10 ++---
src/gui/widgets/button.h | 30 ++++++-------
src/gui/widgets/characterdisplay.h | 10 ++---
src/gui/widgets/characterviewnormal.h | 4 +-
src/gui/widgets/characterviewsmall.h | 6 +--
src/gui/widgets/chatinput.h | 2 +-
src/gui/widgets/checkbox.h | 20 ++++-----
src/gui/widgets/colorpage.h | 6 +--
src/gui/widgets/desktop.h | 10 ++---
src/gui/widgets/dropdown.h | 22 +++++-----
src/gui/widgets/emotepage.h | 10 ++---
src/gui/widgets/emoteshortcutcontainer.h | 18 ++++----
src/gui/widgets/extendedlistbox.h | 6 +--
src/gui/widgets/flowcontainer.h | 4 +-
src/gui/widgets/guitable.h | 26 +++++------
src/gui/widgets/horizontcontainer.h | 4 +-
src/gui/widgets/icon.h | 4 +-
src/gui/widgets/inttextfield.h | 2 +-
src/gui/widgets/itemcontainer.h | 24 +++++-----
src/gui/widgets/itemlinkhandler.h | 2 +-
src/gui/widgets/itemshortcutcontainer.h | 18 ++++----
src/gui/widgets/label.h | 10 ++---
src/gui/widgets/layouthelper.h | 2 +-
src/gui/widgets/listbox.h | 8 ++--
src/gui/widgets/passwordfield.h | 4 +-
src/gui/widgets/playerbox.h | 10 ++---
src/gui/widgets/popup.h | 2 +-
src/gui/widgets/popuplist.h | 12 ++---
src/gui/widgets/progressbar.h | 12 ++---
src/gui/widgets/progressindicator.h | 6 +--
src/gui/widgets/radiobutton.h | 20 ++++-----
src/gui/widgets/radiogroup.h | 2 +-
src/gui/widgets/scrollarea.h | 36 +++++++--------
src/gui/widgets/selldialog.h | 6 +--
src/gui/widgets/serverslistbox.h | 6 +--
src/gui/widgets/setupbuttonitem.h | 16 +++----
src/gui/widgets/setupitem.h | 68 ++++++++++++++---------------
src/gui/widgets/setupquickitem.h | 18 ++++----
src/gui/widgets/setuptouchitem.h | 4 +-
src/gui/widgets/shoplistbox.h | 12 ++---
src/gui/widgets/shortcutcontainer.h | 4 +-
src/gui/widgets/skilllistbox.h | 16 +++----
src/gui/widgets/slider.h | 18 ++++----
src/gui/widgets/sliderlist.h | 10 ++---
src/gui/widgets/spellshortcutcontainer.h | 18 ++++----
src/gui/widgets/statuswindowattrs.h | 8 ++--
src/gui/widgets/tabbedarea.h | 18 ++++----
src/gui/widgets/tabs/chat/channeltab.h | 6 +--
src/gui/widgets/tabs/chat/chattab.h | 2 +-
src/gui/widgets/tabs/chat/emulateguildtab.h | 12 ++---
src/gui/widgets/tabs/chat/gmtab.h | 6 +--
src/gui/widgets/tabs/chat/guildtab.h | 12 ++---
src/gui/widgets/tabs/chat/partytab.h | 12 ++---
src/gui/widgets/tabs/chat/tradetab.h | 2 +-
src/gui/widgets/tabs/chat/whispertab.h | 10 ++---
src/gui/widgets/tabs/debugwindowtabs.h | 6 +--
src/gui/widgets/tabs/setup_audio.h | 2 +-
src/gui/widgets/tabs/setup_chat.h | 4 +-
src/gui/widgets/tabs/setup_colors.h | 8 ++--
src/gui/widgets/tabs/setup_input.h | 6 +--
src/gui/widgets/tabs/setup_joystick.h | 6 +--
src/gui/widgets/tabs/setup_mods.h | 6 +--
src/gui/widgets/tabs/setup_other.h | 4 +-
src/gui/widgets/tabs/setup_relations.h | 12 ++---
src/gui/widgets/tabs/setup_theme.h | 6 +--
src/gui/widgets/tabs/setup_video.h | 6 +--
src/gui/widgets/tabs/setup_visual.h | 2 +-
src/gui/widgets/tabs/setuptabscroll.h | 8 ++--
src/gui/widgets/tabs/socialattacktab.h | 2 +-
src/gui/widgets/tabs/socialfriendstab.h | 2 +-
src/gui/widgets/tabs/socialguildtab.h | 8 ++--
src/gui/widgets/tabs/socialguildtab2.h | 4 +-
src/gui/widgets/tabs/socialnavigationtab.h | 4 +-
src/gui/widgets/tabs/socialpartytab.h | 8 ++--
src/gui/widgets/tabs/socialpickuptab.h | 2 +-
src/gui/widgets/tabs/socialplayerstab.h | 6 +--
src/gui/widgets/tabs/socialtab.h | 2 +-
src/gui/widgets/tabs/tab.h | 12 ++---
src/gui/widgets/tabstrip.h | 4 +-
src/gui/widgets/textbox.h | 12 ++---
src/gui/widgets/textfield.h | 18 ++++----
src/gui/widgets/textpreview.h | 4 +-
src/gui/widgets/vertcontainer.h | 4 +-
src/gui/widgets/virtshortcutcontainer.h | 18 ++++----
src/gui/widgets/widgetgroup.h | 4 +-
src/gui/windowmenu.h | 14 +++---
src/gui/windows/bankwindow.h | 6 +--
src/gui/windows/buydialog.h | 8 ++--
src/gui/windows/buyingstoreselldialog.h | 2 +-
src/gui/windows/buyselldialog.h | 4 +-
src/gui/windows/changeemaildialog.h | 2 +-
src/gui/windows/changepassworddialog.h | 2 +-
src/gui/windows/charcreatedialog.h | 6 +--
src/gui/windows/chardeleteconfirm.h | 2 +-
src/gui/windows/charselectdialog.h | 10 ++---
src/gui/windows/chatwindow.h | 32 +++++++-------
src/gui/windows/confirmdialog.h | 2 +-
src/gui/windows/connectiondialog.h | 8 ++--
src/gui/windows/cutinwindow.h | 6 +--
src/gui/windows/debugwindow.h | 8 ++--
src/gui/windows/didyouknowwindow.h | 8 ++--
src/gui/windows/editdialog.h | 4 +-
src/gui/windows/editserverdialog.h | 6 +--
src/gui/windows/eggselectiondialog.h | 4 +-
src/gui/windows/emotewindow.h | 6 +--
src/gui/windows/equipmentwindow.h | 16 +++----
src/gui/windows/helpwindow.h | 4 +-
src/gui/windows/insertcarddialog.h | 4 +-
src/gui/windows/inventorywindow.h | 28 ++++++------
src/gui/windows/itemamountwindow.h | 12 ++---
src/gui/windows/killstats.h | 4 +-
src/gui/windows/logindialog.h | 8 ++--
src/gui/windows/maileditwindow.h | 4 +-
src/gui/windows/mailviewwindow.h | 2 +-
src/gui/windows/mailwindow.h | 6 +--
src/gui/windows/minimap.h | 14 +++---
src/gui/windows/ministatuswindow.h | 24 +++++-----
src/gui/windows/npcdialog.h | 18 ++++----
src/gui/windows/npcselldialog.h | 4 +-
src/gui/windows/okdialog.h | 2 +-
src/gui/windows/outfitwindow.h | 12 ++---
src/gui/windows/questswindow.h | 2 +-
src/gui/windows/quitdialog.h | 6 +--
src/gui/windows/serverdialog.h | 14 +++---
src/gui/windows/setupwindow.h | 8 ++--
src/gui/windows/shopselldialog.h | 2 +-
src/gui/windows/shopwindow.h | 16 +++----
src/gui/windows/shortcutwindow.h | 8 ++--
src/gui/windows/skilldialog.h | 6 +--
src/gui/windows/socialwindow.h | 10 ++---
src/gui/windows/statuswindow.h | 4 +-
src/gui/windows/textcommandeditor.h | 6 +--
src/gui/windows/textdialog.h | 6 +--
src/gui/windows/textselectdialog.h | 6 +--
src/gui/windows/tradewindow.h | 8 ++--
src/gui/windows/unregisterdialog.h | 4 +-
src/gui/windows/updaterwindow.h | 10 ++---
src/gui/windows/whoisonline.h | 12 ++---
src/gui/windows/worldselectdialog.h | 6 +--
182 files changed, 735 insertions(+), 735 deletions(-)
(limited to 'src/gui')
diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h
index dc08907da..5486eb3c1 100644
--- a/src/gui/dialogsmanager.h
+++ b/src/gui/dialogsmanager.h
@@ -51,11 +51,11 @@ class DialogsManager final : public AttributeListener,
const std::string &message,
const Modal modal) RETURNS_NONNULL;
- void playerDeath() final;
+ void playerDeath() override final;
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
};
extern DialogsManager *dialogsManager;
diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h
index cea5aa1ee..2083d6314 100644
--- a/src/gui/models/avatarlistmodel.h
+++ b/src/gui/models/avatarlistmodel.h
@@ -31,7 +31,7 @@ class AvatarListModel notfinal : public ListModel
public:
virtual Avatar *getAvatarAt(const int i) A_WARN_UNUSED = 0;
- std::string getElementAt(int i) final A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{ return getAvatarAt(i)->getName(); }
};
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index 4476dca05..ccf0338c7 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -48,12 +48,12 @@ class BeingsListModel final : public AvatarListModel
return &mMembers;
}
- Avatar *getAvatarAt(int index) final
+ Avatar *getAvatarAt(int index) override final
{
return mMembers[index];
}
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(mMembers.size());
}
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
index 1f4bf2e83..49dbffce5 100644
--- a/src/gui/models/colorlistmodel.h
+++ b/src/gui/models/colorlistmodel.h
@@ -65,12 +65,12 @@ class ColorListModel final : public ListModel
~ColorListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return 14;
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 96c4b1021..1e08dd9cd 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -41,9 +41,9 @@ class ColorModel final : public ListModel
virtual ~ColorModel();
- int getNumberOfElements() final A_WARN_UNUSED;
+ int getNumberOfElements() override final A_WARN_UNUSED;
- std::string getElementAt(int i) final A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
const ColorPair *getColorAt(const int i)
const RETURNS_NONNULL A_WARN_UNUSED;
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index f4f2670e1..e14032cc4 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -34,11 +34,11 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
virtual ~ExtendedNamesModel();
- int getNumberOfElements() final A_WARN_UNUSED;
+ int getNumberOfElements() override final A_WARN_UNUSED;
- std::string getElementAt(int i) final A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
- const Image *getImageAt(int i) final A_WARN_UNUSED;
+ const Image *getImageAt(int i) override final A_WARN_UNUSED;
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
diff --git a/src/gui/models/fontsizechoicelistmodel.h b/src/gui/models/fontsizechoicelistmodel.h
index 16b2a65ab..9496348c3 100644
--- a/src/gui/models/fontsizechoicelistmodel.h
+++ b/src/gui/models/fontsizechoicelistmodel.h
@@ -71,10 +71,10 @@ class FontSizeChoiceListModel final : public ListModel
~FontSizeChoiceListModel()
{ }
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return maxFontSizes; }
- std::string getElementAt(int i) final A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
index 1c8c25ae4..a04703149 100644
--- a/src/gui/models/iconsmodel.h
+++ b/src/gui/models/iconsmodel.h
@@ -68,12 +68,12 @@ class IconsModel final : public ListModel
~IconsModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(mStrings.size());
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i < 0 || i >= getNumberOfElements())
return "???";
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index b25c6874a..8a8a7f053 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -37,13 +37,13 @@ class IgnoreChoicesListModel final : public ListModel
~IgnoreChoicesListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(player_relations.
getPlayerIgnoreStrategies()->size());
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index 8fea34167..032a090eb 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -67,12 +67,12 @@ class ItemsModal final : public ListModel
~ItemsModal()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(mStrings.size());
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i < 0 || i >= getNumberOfElements())
return "???";
diff --git a/src/gui/models/keylistmodel.h b/src/gui/models/keylistmodel.h
index d9f04a634..101307f30 100644
--- a/src/gui/models/keylistmodel.h
+++ b/src/gui/models/keylistmodel.h
@@ -52,13 +52,13 @@ class KeyListModel final : public ListModel
/**
* Returns the number of elements in container.
*/
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return mSize; }
/**
* Returns element from container.
*/
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{ return setupActionData[mSelectedData][i].text; }
/**
diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h
index b3eacb550..1adfb3e91 100644
--- a/src/gui/models/langlistmodel.h
+++ b/src/gui/models/langlistmodel.h
@@ -109,10 +109,10 @@ class LangListModel final : public ExtendedListModel
}
}
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return langs_count; }
- std::string getElementAt(int i) final A_WARN_UNUSED
+ std::string getElementAt(int i) override final A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -120,7 +120,7 @@ class LangListModel final : public ExtendedListModel
return gettext(LANG_NAME[i].name.c_str());
}
- const Image *getImageAt(int i) final 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/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
index 91d87c337..4c4028312 100644
--- a/src/gui/models/magicschoolmodel.h
+++ b/src/gui/models/magicschoolmodel.h
@@ -51,12 +51,12 @@ class MagicSchoolModel final : public ListModel
~MagicSchoolModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return 6;
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h
index 2efa322d4..9e5339a3d 100644
--- a/src/gui/models/modelistmodel.h
+++ b/src/gui/models/modelistmodel.h
@@ -42,13 +42,13 @@ class ModeListModel final : public ListModel
/**
* Returns the number of elements in container.
*/
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return CAST_S32(mVideoModes.size()); }
/**
* Returns element from container.
*/
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{ return mVideoModes[CAST_SIZE(i)]; }
/**
diff --git a/src/gui/models/namesmodel.h b/src/gui/models/namesmodel.h
index ddf523ddd..63af17db6 100644
--- a/src/gui/models/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -36,9 +36,9 @@ class NamesModel notfinal : public ListModel
virtual ~NamesModel();
- int getNumberOfElements() final A_WARN_UNUSED;
+ int getNumberOfElements() override final A_WARN_UNUSED;
- std::string getElementAt(int i) final A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
diff --git a/src/gui/models/opengllistmodel.h b/src/gui/models/opengllistmodel.h
index cc040cb80..275da2f31 100644
--- a/src/gui/models/opengllistmodel.h
+++ b/src/gui/models/opengllistmodel.h
@@ -33,10 +33,10 @@ class OpenGLListModel final : public ListModel
~OpenGLListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return renderModesListSize; }
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
index 3fedec8bc..b23cea0f8 100644
--- a/src/gui/models/playerrelationlistmodel.h
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -53,12 +53,12 @@ class PlayerRelationListModel final : public ListModel
~PlayerRelationListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return PlayerRelation::RELATIONS_NR;
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "";
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index 297b34ba6..4aa4430a3 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -41,19 +41,19 @@ class PlayerTableModel final : public Widget2,
~PlayerTableModel();
- int getRows() const final;
+ int getRows() const override final;
- int getColumns() const final A_CONST;
+ int getColumns() const override final A_CONST;
- int getRowHeight() const final A_CONST;
+ int getRowHeight() const override final A_CONST;
- int getColumnWidth(const int index) const final A_CONST;
+ int getColumnWidth(const int index) const override final A_CONST;
void playerRelationsUpdated();
void updateModelInRow(const int row) const;
- Widget *getElementAt(int row, int column) const final;
+ Widget *getElementAt(int row, int column) const override final;
void freeWidgets();
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 8b259f04c..15d3d7e9a 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -53,7 +53,7 @@ class ServersListModel final : public ListModel
/**
* Used to get number of line in the list
*/
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{
MutexLocker lock = mParent->lock();
return CAST_S32(mServers->size());
@@ -63,7 +63,7 @@ class ServersListModel final : public ListModel
* Used to get an element from the list
*/
std::string getElementAt(int elementIndex)
- final A_WARN_UNUSED
+ override final A_WARN_UNUSED
{
MutexLocker lock = mParent->lock();
const ServerInfo &server = mServers->at(elementIndex);
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index ddba1d1b0..0aedce83f 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -93,7 +93,7 @@ class ShopItems final : public ListModel
/**
* Returns the number of items in the shop.
*/
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return CAST_S32(mShopItems.size()); }
bool empty() const A_WARN_UNUSED
@@ -104,7 +104,7 @@ class ShopItems final : public ListModel
*
* @param i the index to retrieve
*/
- std::string getElementAt(int i) final 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/models/skillmodel.h b/src/gui/models/skillmodel.h
index a7b796dd4..d7695253d 100644
--- a/src/gui/models/skillmodel.h
+++ b/src/gui/models/skillmodel.h
@@ -35,9 +35,9 @@ class SkillModel final : public ListModel
SkillInfo *getSkillAt(const int i) const;
- std::string getElementAt(int i) final;
+ std::string getElementAt(int i) override final;
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return CAST_S32(mVisibleSkills.size()); }
void addSkill(SkillInfo *const info)
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
index 586246645..ec42f9fdd 100644
--- a/src/gui/models/sortlistmodelbuy.h
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -51,10 +51,10 @@ class SortListModelBuy final : public ListModel
~SortListModelBuy()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return 7; }
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
index 103ffb26c..09dbbc53e 100644
--- a/src/gui/models/sortlistmodelinv.h
+++ b/src/gui/models/sortlistmodelinv.h
@@ -48,10 +48,10 @@ class SortListModelInv final : public ListModel
~SortListModelInv()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{ return 6; }
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index 14a186004..052718d40 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -129,14 +129,14 @@ class StaticTableModel final : public TableModel
*/
void resize();
- int getRows() const final A_WARN_UNUSED;
- int getColumns() const final A_WARN_UNUSED;
- int getRowHeight() const final 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 final A_WARN_UNUSED;
+ int getColumnWidth(const int index) const override final A_WARN_UNUSED;
Widget *getElementAt(const int row,
- const int column) const final
+ const int column) const override final
A_WARN_UNUSED;
protected:
diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h
index 416ba5a41..ad61e3c0b 100644
--- a/src/gui/models/targettypemodel.h
+++ b/src/gui/models/targettypemodel.h
@@ -42,12 +42,12 @@ class TargetTypeModel final : public ListModel
~TargetTypeModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return 3;
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h
index b58d91bb5..04d9d93de 100644
--- a/src/gui/models/typelistmodel.h
+++ b/src/gui/models/typelistmodel.h
@@ -36,7 +36,7 @@ class TypeListModel final : public ListModel
/**
* Used to get number of line in the list
*/
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
#if defined(EATHENA_SUPPORT) && defined(TMWA_SUPPORT)
{ return 3; }
#elif defined(EATHENA_SUPPORT)
@@ -49,7 +49,7 @@ class TypeListModel final : public ListModel
* Used to get an element from the list
*/
std::string getElementAt(int elementIndex)
- final A_WARN_UNUSED
+ override final A_WARN_UNUSED
{
#ifdef TMWA_SUPPORT
if (elementIndex == 0)
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index 37d5a8d12..e2424cb7b 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -53,12 +53,12 @@ class UpdateListModel final : public ListModel
~UpdateListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(mNames.size());
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
index 12a0a1e27..abdcc1625 100644
--- a/src/gui/models/updatetypemodel.h
+++ b/src/gui/models/updatetypemodel.h
@@ -47,12 +47,12 @@ class UpdateTypeModel final : public ListModel
~UpdateTypeModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return 3;
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h
index 4489cf95e..035824cb4 100644
--- a/src/gui/models/worldlistmodel.h
+++ b/src/gui/models/worldlistmodel.h
@@ -45,12 +45,12 @@ class WorldListModel final : public ListModel
~WorldListModel()
{ }
- int getNumberOfElements() final
+ int getNumberOfElements() override final
{
return CAST_S32(mWorlds.size());
}
- std::string getElementAt(int i) final
+ std::string getElementAt(int i) override final
{
const WorldInfo *const si = mWorlds[i];
if (si)
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h
index e48daedf6..8a11e1e10 100644
--- a/src/gui/popups/beingpopup.h
+++ b/src/gui/popups/beingpopup.h
@@ -50,7 +50,7 @@ class BeingPopup final : public Popup
*/
void show(const int x, const int y, Being *const b);
- void postInit() final;
+ void postInit() override final;
#ifdef USE_PROFILER
void logic();
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
index d5d483e54..dba59f142 100644
--- a/src/gui/popups/createpartypopup.h
+++ b/src/gui/popups/createpartypopup.h
@@ -53,7 +53,7 @@ class CreatePartyPopup final : public Popup,
mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel")));
}
- void postInit() final
+ void postInit() override final
{
Popup::postInit();
add(mBrowserBox);
@@ -64,7 +64,7 @@ class CreatePartyPopup final : public Popup,
A_DELETE_COPY(CreatePartyPopup)
void handleLink(const std::string &link,
- MouseEvent *event A_UNUSED) final
+ MouseEvent *event A_UNUSED) override final
{
if (link == "guild" && socialWindow)
{
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 2fe51f248..f862d2754 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -54,7 +54,7 @@ class ItemPopup final : public Popup
*/
~ItemPopup();
- void postInit() final;
+ void postInit() override final;
/**
* Sets the info to be displayed given a particular item.
@@ -68,7 +68,7 @@ class ItemPopup final : public Popup
void setItem(const Item *const item,
const bool showImage);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
void resetPopup();
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index b938c161e..b69a0f588 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -72,7 +72,7 @@ class PopupMenu final : public Popup, public LinkHandler
A_DELETE_COPY(PopupMenu)
- void postInit() final;
+ void postInit() override final;
/**
* Shows the being related popup menu at the specified mouse coords.
@@ -171,9 +171,9 @@ class PopupMenu final : public Popup, public LinkHandler
* Handles link action.
*/
void handleLink(const std::string &link,
- MouseEvent *event A_UNUSED) final;
+ MouseEvent *event A_UNUSED) override final;
- void clear() final;
+ void clear() override final;
void moveUp();
diff --git a/src/gui/popups/skillpopup.h b/src/gui/popups/skillpopup.h
index 4442b7916..ab170002f 100644
--- a/src/gui/popups/skillpopup.h
+++ b/src/gui/popups/skillpopup.h
@@ -49,7 +49,7 @@ class SkillPopup final : public Popup
*/
~SkillPopup();
- void postInit() final;
+ void postInit() override final;
/**
* Sets the info to be displayed given a particular item.
@@ -57,7 +57,7 @@ class SkillPopup final : public Popup
void show(const SkillInfo *const skill,
const int level);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
private:
Label *mSkillName A_NONNULLPOINTER;
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 95cfd9bda..75cd95219 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -39,7 +39,7 @@ class SpeechBubble final : public Popup
A_DELETE_COPY(SpeechBubble)
- void postInit() final;
+ void postInit() override final;
/**
* Sets the name displayed for the speech bubble, and in what color.
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index aa61b3d11..f71ced7c1 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -47,7 +47,7 @@ class SpellPopup final : public Popup
*/
~SpellPopup();
- void postInit() final;
+ void postInit() override final;
/**
* Sets the info to be displayed given a particular item.
@@ -59,7 +59,7 @@ class SpellPopup final : public Popup
*/
void view(const int x, const int y);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
private:
Label *mItemName A_NONNULLPOINTER;
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index fc4b92c0a..3807eb53e 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -45,7 +45,7 @@ class StatusPopup final : public Popup
A_DELETE_COPY(StatusPopup)
- void postInit() final;
+ void postInit() override final;
/**
* Destructor. Cleans up the item popup on deletion.
diff --git a/src/gui/popups/textboxpopup.h b/src/gui/popups/textboxpopup.h
index 4746d966a..daf287343 100644
--- a/src/gui/popups/textboxpopup.h
+++ b/src/gui/popups/textboxpopup.h
@@ -46,14 +46,14 @@ class TextBoxPopup final : public Popup
*/
~TextBoxPopup();
- void postInit() final;
+ void postInit() override final;
/**
* Sets the text to be displayed.
*/
void show(const int x, const int y, const std::string &str);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
private:
TextBox *mTextBox A_NONNULLPOINTER;
diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h
index 7294cb2a5..c5d5deba7 100644
--- a/src/gui/popups/textpopup.h
+++ b/src/gui/popups/textpopup.h
@@ -48,7 +48,7 @@ class TextPopup final : public Popup
*/
~TextPopup();
- void postInit() final;
+ void postInit() override final;
/**
* Sets the text to be displayed.
@@ -72,7 +72,7 @@ class TextPopup final : public Popup
void show(const int x, const int y, const std::string &str1,
const std::string &str2, const std::string &str3);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
private:
Label *mText[TEXTPOPUPCOUNT];
diff --git a/src/gui/theme.h b/src/gui/theme.h
index cec19521b..43d0c3308 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -158,7 +158,7 @@ class Theme final : public Palette,
*/
void setMinimumOpacity(const float minimumOpacity);
- void optionChanged(const std::string &) final;
+ void optionChanged(const std::string &) override final;
void loadRect(ImageRect &image,
const std::string &name,
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 7c1146f06..9f0566198 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -119,7 +119,7 @@ class UserPalette final : public Palette, public ListModel
*
* @return the number of colors known
*/
- inline int getNumberOfElements() final A_WARN_UNUSED
+ inline int getNumberOfElements() override final A_WARN_UNUSED
{ return CAST_S32(mColors.size()); }
/**
@@ -129,7 +129,7 @@ class UserPalette final : public Palette, public ListModel
*
* @return the name of the color
*/
- std::string getElementAt(int i) final A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
/**
* Commit the colors
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 9a1bbeccd..d189b2415 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -76,14 +76,14 @@ class Viewport final : public WindowContainer,
/**
* Draws the viewport.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Implements player to keep following mouse.
*/
- void logic() final;
+ void logic() override final;
/**
* Toggles whether the path debug graphics are shown. normal,
@@ -97,27 +97,27 @@ class Viewport final : public WindowContainer,
/**
* Handles mouse press on map.
*/
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
/**
* Handles mouse move on map
*/
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse button release on map.
*/
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
/**
* Handles mouse move on map.
*/
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
/**
* A relevant config option changed.
*/
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
/**
* Returns camera x offset in pixels.
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 360d7c481..72ff49e80 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) final A_NONNULL(2);
+ void draw(Graphics *gcnGraphics) override final A_NONNULL(2);
- void safeDraw(Graphics *gcnGraphics) final A_NONNULL(2);
+ void safeDraw(Graphics *gcnGraphics) override final A_NONNULL(2);
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseReleased(MouseEvent &event A_UNUSED) final A_CONST;
+ void mouseReleased(MouseEvent &event A_UNUSED) override final A_CONST;
- void optionChanged(const std::string &value) final;
+ 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 0fa901189..d0655631c 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) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
/**
* Draws the browser box.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void updateHeight();
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 7bd5e90b9..2e20be616 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Update the alpha value to the button components.
*/
static void updateAlpha();
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override 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) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
void loadImage(const std::string &imageName);
@@ -197,9 +197,9 @@ class Button final : public Widget,
void adjustSize();
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
- void keyReleased(KeyEvent &event) final;
+ void keyReleased(KeyEvent &event) override 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) final;
+ void focusLost(const Event& event) override final;
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override final;
- void setParent(Widget *widget) final;
+ void setParent(Widget *widget) override final;
- void setWindow(Widget *const widget) final;
+ void setWindow(Widget *const widget) override final;
void setImageWidth(const int width)
{ mImageWidth = width; }
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index 47992c9be..9df2b0026 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() final A_CONST;
+ void requestFocus() override 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) final;
+ void widgetHidden(const Event &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
void update();
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 9dfee0ec1..29e125dc5 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) final;
+ void show(const int i) override final;
void resize() override;
- void action(const ActionEvent &event A_UNUSED) final A_CONST;
+ void action(const ActionEvent &event A_UNUSED) override final A_CONST;
private:
std::vector<CharacterDisplay*> *mCharacterEntries;
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index 0c417d821..1ba655df7 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) final;
+ void show(const int i) override final;
- void resize() final;
+ void resize() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
CharacterDisplay *mSelectedEntry;
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 44a567d1a..0c6bb8586 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) final
+ void focusLost(const Event &event) override final
{
TextField::focusLost(event);
if (mFocusGaining || !config.getBoolValue("protectChatFocus"))
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 3452893a1..921c89a93 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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) final;
+ void mouseEntered(MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void keyPressed(KeyEvent& event) final;
+ void keyPressed(KeyEvent& event) override final;
void adjustSize();
@@ -174,15 +174,15 @@ class CheckBox final : public Widget,
*/
void setCaption(const std::string& caption);
- void mouseClicked(MouseEvent& event) final;
+ void mouseClicked(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override final;
- void setParent(Widget *widget) final;
+ void setParent(Widget *widget) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void setWindow(Widget *const widget) final;
+ void setWindow(Widget *const widget) override final;
private:
void toggleSelected();
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index 356144a2b..f191966cc 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void resetAction();
- void adjustSize() final;
+ void adjustSize() override final;
};
#endif // GUI_WIDGETS_COLORPAGE_H
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 56441ce1c..263bbabce 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) final;
+ void widgetResized(const Event &event) override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void postInit() final;
+ void postInit() override final;
void handleLink(const std::string &link,
- MouseEvent *event) final;
+ MouseEvent *event) override final;
private:
void setBestFittingWallpaper();
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 77d6c7c05..265b69948 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void drawFrame(Graphics *const graphics) final A_NONNULL(2);
+ void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
- void safeDrawFrame(Graphics *const graphics) final
+ void safeDrawFrame(Graphics *const graphics) override final
A_NONNULL(2);
// Inherited from KeyListener
- void keyPressed(KeyEvent& event) final;
+ void keyPressed(KeyEvent& event) override final;
// Inherited from MouseListener
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override final;
- void mouseWheelMovedUp(MouseEvent& event) final;
+ void mouseWheelMovedUp(MouseEvent& event) override final;
- void mouseWheelMovedDown(MouseEvent& event) final;
+ void mouseWheelMovedDown(MouseEvent& event) override final;
void setSelectedString(const std::string &str);
std::string getSelectedString() const A_WARN_UNUSED;
- void valueChanged(const SelectionEvent& event) final A_CONST;
+ void valueChanged(const SelectionEvent& event) override final A_CONST;
void updateSelection();
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 9de4d4b2f..7caa19b44 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
int getIndexFromGrid(const int x, const int y) const;
- void widgetResized(const Event &event A_UNUSED) final;
+ void widgetResized(const Event &event A_UNUSED) override final;
- void widgetMoved(const Event &event A_UNUSED) final;
+ void widgetMoved(const Event &event A_UNUSED) override final;
void resetAction();
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index b98ffbb12..2ceb41430 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 final A_NONNULL(2);
+ restrict2 override final A_NONNULL(2);
void safeDraw(Graphics *restrict graphics)
- restrict2 final A_NONNULL(2);
+ restrict2 override final A_NONNULL(2);
/**
* Handles mouse when dragged.
*/
void mouseDragged(MouseEvent &restrict event)
- restrict2 final A_CONST;
+ restrict2 override final A_CONST;
/**
* Handles mouse when pressed.
*/
- void mousePressed(MouseEvent &restrict event) restrict2 final;
+ void mousePressed(MouseEvent &restrict event) restrict2 override final;
/**
* Handles mouse release.
*/
void mouseReleased(MouseEvent &restrict event)
- restrict2 final;
+ restrict2 override final;
- void mouseMoved(MouseEvent &restrict event) restrict2 final;
+ void mouseMoved(MouseEvent &restrict event) restrict2 override final;
- void mouseExited(MouseEvent &restrict event) restrict2 final;
+ void mouseExited(MouseEvent &restrict event) restrict2 override final;
void widgetHidden(const Event &restrict event)
- restrict2 final;
+ restrict2 override final;
void setWidget2(const Widget2 *restrict const widget)
- restrict2 final;
+ restrict2 override final;
private:
std::vector<const EmoteSprite*> mEmoteImg;
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 83f44f706..6e40ecc2b 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void adjustSize() override;
- int getSelectionByMouse(const int y) const final;
+ int getSelectionByMouse(const int y) const override final;
protected:
int mImagePadding;
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index a04d686a6..5e47af759 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) final;
+ void widgetResized(const Event &event) override 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) final;
+ void add(Widget *const widget) override final;
private:
int mBoxWidth;
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 5e4ba9dc1..35000ccff 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() final A_WARN_UNUSED;
+ Rect getChildrenArea() override 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- Widget *getWidgetAt(int x, int y) final A_WARN_UNUSED;
+ Widget *getWidgetAt(int x, int y) override final A_WARN_UNUSED;
- void moveToTop(Widget *const widget) final;
+ void moveToTop(Widget *const widget) override final;
- void moveToBottom(Widget *const widget) final;
+ void moveToBottom(Widget *const widget) override final;
- void setFocusHandler(FocusHandler *const focusHandler) final;
+ void setFocusHandler(FocusHandler *const focusHandler) override final;
// Inherited from KeyListener
- void keyPressed(KeyEvent& event) final;
+ void keyPressed(KeyEvent& event) override 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) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseWheelMovedUp(MouseEvent& event) final;
+ void mouseWheelMovedUp(MouseEvent& event) override final;
- void mouseWheelMovedDown(MouseEvent& event) final;
+ void mouseWheelMovedDown(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override final;
// Constraints inherited from TableModelListener
- void modelUpdated(const bool completed) final;
+ void modelUpdated(const bool completed) override final;
void requestFocus() override;
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index bba821185..23ca5159c 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) final;
+ void add(Widget *const widget) override final;
void add(Widget *const widget, const int spacing);
void clear() override;
- void widgetResized(const Event &event) final A_CONST;
+ void widgetResized(const Event &event) override final A_CONST;
protected:
int mSpacing;
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 87fa77713..e630339d8 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) final A_NONNULL(2);
+ void draw(Graphics *const g) override final A_NONNULL(2);
- void safeDraw(Graphics *const g) final A_NONNULL(2);
+ void safeDraw(Graphics *const g) override final A_NONNULL(2);
private:
Image *mImage;
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 2aabafa85..a55fe22fc 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) final;
+ void keyPressed(KeyEvent &event) override final;
private:
int mMin; /**< Minimum value */
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 5c290fa6d..006644425 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() final;
+ void logic() override final;
/**
* Draws the items.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
// KeyListener
- void keyPressed(KeyEvent &event) final A_CONST;
- void keyReleased(KeyEvent &event) final A_CONST;
+ void keyPressed(KeyEvent &event) override final A_CONST;
+ void keyReleased(KeyEvent &event) override final A_CONST;
// MouseListener
- 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;
+ 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;
// WidgetListener
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override final;
/**
* Returns the selected item.
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 2ec4b7fb7..6a0f87cb7 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) final;
+ MouseEvent *event) override final;
void setAllowCommands(const bool b)
{ mAllowCommands = b; }
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 045da145f..9e043663b 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Handles mouse when dragged.
*/
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void setWidget2(const Widget2 *const widget) final;
+ void setWidget2(const Widget2 *const widget) override final;
private:
bool mItemClicked;
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index e21a510a3..98c7cc6ac 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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) final;
+ void setParent(Widget *const widget) override final;
- void setWindow(Widget *const widget) final;
+ void setWindow(Widget *const widget) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
static Skin *mSkin;
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index cbfa2a41e..4f36b2565 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) final;
+ void widgetResized(const Event &event) override final;
private:
Layout mLayout; /**< Layout handler */
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 9eeedbd59..97ee63ba7 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) final;
+ void keyPressed(KeyEvent& event) override final;
// Inherited from MouseListener
- void mouseWheelMovedUp(MouseEvent& event) final A_CONST;
+ void mouseWheelMovedUp(MouseEvent& event) override final A_CONST;
- void mouseWheelMovedDown(MouseEvent& event) final A_CONST;
+ void mouseWheelMovedDown(MouseEvent& event) override final A_CONST;
void mousePressed(MouseEvent &event) override;
@@ -142,7 +142,7 @@ class ListBox notfinal : public Widget,
virtual void adjustSize();
- void logic() final;
+ void logic() override final;
virtual int getSelectionByMouse(const int y) const;
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index d36539451..305adf739 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
protected:
char mPasswordChar;
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 243ecbd94..1a122fbbd 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Draws the background and border of the scroll area.
*/
- void drawFrame(Graphics *const graphics) final A_NONNULL(2);
+ void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
- void safeDrawFrame(Graphics *const graphics) final
+ void safeDrawFrame(Graphics *const graphics) override 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) final;
+ void mouseReleased(MouseEvent& event) override final;
private:
Being *mBeing;
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 481710bad..bf09e4a51 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) final;
+ void widgetMoved(const Event &event) override final;
bool isPopupVisible() const
{ return mVisible == Visible_true; }
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 76adb48b2..e6fa74d83 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() final;
+ void postInit() override final;
void show(int x, int y);
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void setSelected(const int selected);
@@ -64,13 +64,13 @@ class PopupList final : public Popup,
void adjustSize();
- void focusGained(const Event& event A_UNUSED) final;
+ void focusGained(const Event& event A_UNUSED) override final;
- void focusLost(const Event& event A_UNUSED) final;
+ void focusLost(const Event& event A_UNUSED) override final;
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override final;
private:
ListModel *mListModel;
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 3c1b47cf1..289633f3d 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() final;
+ void logic() override 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const 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 1ce518fff..773750365 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() final;
+ void logic() override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
private:
SimpleAnimation *mIndicator;
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 1f1d47f9d..79f1aefae 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void keyPressed(KeyEvent& event) final;
+ void keyPressed(KeyEvent& event) override final;
void updateAlpha();
@@ -169,9 +169,9 @@ class RadioButton final : public Widget,
*/
void setCaption(const std::string &caption);
- void mouseClicked(MouseEvent& event) final;
+ void mouseClicked(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override 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) final;
+ void setParent(Widget *widget) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void setWindow(Widget *const widget) final;
+ void setWindow(Widget *const widget) override final;
private:
static int instances;
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index 34576ef96..c849b73ed 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 final 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 eca834f81..cf02e0317 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() final;
+ void logic() override 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Draws the background and border of the scroll area.
*/
- void drawFrame(Graphics *const graphics) final A_NONNULL(2);
+ void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
- void safeDrawFrame(Graphics *const graphics) final
+ void safeDrawFrame(Graphics *const graphics) override 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) final;
+ void mouseMoved(MouseEvent& event) override final;
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override final;
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override final;
Rect getVerticalBarDimension() const;
@@ -414,11 +414,11 @@ class ScrollArea final : public BasicContainer,
{ return mDownButtonScrollAmount; }
void showWidgetPart(Widget *const widget,
- const Rect &area) final;
+ const Rect &area) override final;
- Rect getChildrenArea() final;
+ Rect getChildrenArea() override final;
- Widget *getWidgetAt(int x, int y) final;
+ Widget *getWidgetAt(int x, int y) override final;
void setWidth(int width);
@@ -426,9 +426,9 @@ class ScrollArea final : public BasicContainer,
void setDimension(const Rect& dimension);
- void mouseWheelMovedUp(MouseEvent& event) final;
+ void mouseWheelMovedUp(MouseEvent& event) override final;
- void mouseWheelMovedDown(MouseEvent& event) final;
+ void mouseWheelMovedDown(MouseEvent& event) override final;
protected:
enum BUTTON_DIR
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index 0156557c9..46512225f 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) final;
+ void action(const ActionEvent &event) override final;
/**
* Updates labels according to selected item.
*
* @see SelectionListener::selectionChanged
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override 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) final;
+ void setVisible(Visible visible) override final;
ShopItem *addItem(const int id,
const ItemTypeT type,
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 7a4cf0145..ff3262296 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) final A_NONNULL(2)
+ void draw(Graphics *const graphics) override final A_NONNULL(2)
{
if (!mListModel)
return;
@@ -140,12 +140,12 @@ class ServersListBox final : public ListBox
}
}
- void safeDraw(Graphics *const graphics) final A_NONNULL(2)
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2)
{
ServersListBox::draw(graphics);
}
- unsigned int getRowHeight() const final
+ unsigned int getRowHeight() const override final
{
return 2 * getFont()->getHeight() + 5;
}
diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h
index a23699f51..c0d6005cd 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() final A_CONST;
+ void fromWidget() override final A_CONST;
- void toWidget() final A_CONST;
+ void toWidget() override final A_CONST;
- void action(const ActionEvent &event) final A_CONST;
+ void action(const ActionEvent &event) override final A_CONST;
- void apply(const std::string &eventName) final A_CONST;
+ void apply(const std::string &eventName) override final A_CONST;
void cancel(const std::string &eventName A_UNUSED)
- final A_CONST;
+ override final A_CONST;
void externalUpdated(const std::string &eventName A_UNUSED)
- final A_CONST;
+ override final A_CONST;
- void rereadValue() final A_CONST;
+ void rereadValue() override final A_CONST;
- void save() final A_CONST;
+ void save() override final A_CONST;
protected:
HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index ac25a298f..c7bea7af7 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() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
CheckBox *mCheckBox;
@@ -208,22 +208,22 @@ class SetupItemTextField final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
- void cancel(const std::string &eventName A_UNUSED) final;
+ void cancel(const std::string &eventName A_UNUSED) override final;
void externalUpdated(const std::string &eventName A_UNUSED)
- final;
+ override final;
- void rereadValue() final;
+ void rereadValue() override final;
- void save() final;
+ void save() override final;
void setUseBase64(const UseBase64 b)
{ mUseBase64 = b; }
@@ -263,13 +263,13 @@ class SetupItemIntTextField final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
protected:
HorizontContainer *mHorizont;
@@ -295,13 +295,13 @@ class SetupItemLabel final : public SetupItem
void createControls();
- void fromWidget() final A_CONST;
+ void fromWidget() override final A_CONST;
- void toWidget() final A_CONST;
+ void toWidget() override final A_CONST;
- void action(const ActionEvent &event) final A_CONST;
+ void action(const ActionEvent &event) override final A_CONST;
- void apply(const std::string &eventName) final A_CONST;
+ void apply(const std::string &eventName) override final A_CONST;
protected:
Label *mLabel;
@@ -336,9 +336,9 @@ class SetupItemDropDown final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
HorizontContainer *mHorizont;
@@ -382,13 +382,13 @@ class SetupItemSlider final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override final;
void updateLabel();
@@ -439,13 +439,13 @@ class SetupItemSlider2 final : public SetupItem
void createControls();
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final;
+ void apply(const std::string &eventName) override 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) final;
+ void apply(const std::string &eventName) override final;
virtual void addMoreControls() = 0;
@@ -532,9 +532,9 @@ class SetupItemSound final : public SetupItemSliderList
A_DELETE_COPY(SetupItemSound)
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void addMoreControls() final;
+ void addMoreControls() override final;
protected:
Button *mButton;
@@ -556,11 +556,11 @@ class SetupItemSliderInt final : public SetupItemSliderList
A_DELETE_COPY(SetupItemSliderInt)
- void addMoreControls() final;
+ void addMoreControls() override final;
- void fromWidget() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
int mMin;
diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h
index 3c1ef98b1..cb72c063c 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() final A_CONST;
+ void fromWidget() override final A_CONST;
- void toWidget() final;
+ void toWidget() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void apply(const std::string &eventName) final A_CONST;
+ void apply(const std::string &eventName) override final A_CONST;
- void cancel(const std::string &eventName A_UNUSED) final
+ void cancel(const std::string &eventName A_UNUSED) override final
A_CONST;
void externalUpdated(const std::string &eventName A_UNUSED)
- final A_CONST;
+ override final A_CONST;
- void rereadValue() final A_CONST;
+ void rereadValue() override final A_CONST;
- void save() final A_CONST;
+ void save() override final A_CONST;
- void gameModifiersChanged() final;
+ void gameModifiersChanged() override final;
protected:
HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 711f7e107..8e577caa9 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() final;
+ void fromWidget() override final;
- void toWidget() final;
+ void toWidget() override final;
protected:
HorizontContainer *mHorizont;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index ce29c0247..cc4504c82 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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() final;
+ void adjustSize() override 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) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override final;
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
void setProtectItems(bool p)
{ mProtectItems = p; }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 23d2709c7..d56f74f6f 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) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event& event) final;
+ void widgetMoved(const Event& event) override final;
/**
* Handles mouse when dragged.
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index 717578299..8415e0cab 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) final A_NONNULL(2)
+ void draw(Graphics *const graphics) override final A_NONNULL(2)
{
if (!mListModel)
return;
@@ -171,12 +171,12 @@ class SkillListBox final : public ListBox
}
}
- void safeDraw(Graphics *const graphics) final A_NONNULL(2)
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2)
{
SkillListBox::draw(graphics);
}
- unsigned int getRowHeight() const final
+ unsigned int getRowHeight() const override 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) final
+ void mouseMoved(MouseEvent &event) override final
{
ListBox::mouseMoved(event);
if (!viewport || !dragDrop.isEmpty())
@@ -205,7 +205,7 @@ class SkillListBox final : public ListBox
viewport->mMouseY);
}
- void mouseDragged(MouseEvent &event) final
+ void mouseDragged(MouseEvent &event) override final
{
if (event.getButton() == MouseButton::LEFT)
{
@@ -229,7 +229,7 @@ class SkillListBox final : public ListBox
}
}
- void mousePressed(MouseEvent &event) final
+ void mousePressed(MouseEvent &event) override final
{
ListBox::mousePressed(event);
if (event.getButton() == MouseButton::LEFT)
@@ -254,12 +254,12 @@ class SkillListBox final : public ListBox
}
}
- void mouseReleased(MouseEvent &event) final
+ void mouseReleased(MouseEvent &event) override final
{
ListBox::mouseReleased(event);
}
- void mouseExited(MouseEvent &event A_UNUSED) final
+ void mouseExited(MouseEvent &event A_UNUSED) override final
{
skillPopup->hide();
}
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 8e4466c0a..b6d065634 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
- void mouseWheelMovedUp(MouseEvent &event) final;
+ void mouseWheelMovedUp(MouseEvent &event) override final;
- void mouseWheelMovedDown(MouseEvent &event) final;
+ void mouseWheelMovedDown(MouseEvent &event) override final;
- void keyPressed(KeyEvent& event) final;
+ void keyPressed(KeyEvent& event) override final;
/**
* Sets the scale of the slider.
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 590b59177..622fa95dc 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) final;
+ void mouseWheelMovedUp(MouseEvent& event) override final;
- void mouseWheelMovedDown(MouseEvent& event) final;
+ void mouseWheelMovedDown(MouseEvent& event) override final;
void resize();
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void action(const ActionEvent &event) final;
+ void action(const 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 2f4514965..3a044a79f 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Handles mouse when dragged.
*/
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void setWidget2(const Widget2 *const widget) final;
+ void setWidget2(const Widget2 *const widget) override 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 598e29086..e4be9d05c 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 final
+ Type getType() const override final
{ return DERIVED; }
};
@@ -106,14 +106,14 @@ class ChangeDisplay final : public AttrDisplay,
A_DELETE_COPY(ChangeDisplay)
- std::string update() final;
+ std::string update() override final;
- Type getType() const final
+ Type getType() const override final
{ return CHANGEABLE; }
void setPointsNeeded(const int needed);
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
int mNeeded;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 5c3b1d0e3..083f178f7 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() final;
+ void postInit() override final;
/**
* Draw the tabbed area.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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() final;
+ void logic() override 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) final;
+ void widgetResized(const Event &event) override final;
/*
void moveLeft(Tab *tab);
@@ -193,11 +193,11 @@ class TabbedArea final : public ActionListener,
*/
void adjustTabPositions();
- void action(const ActionEvent& actionEvent) final;
+ void action(const ActionEvent& actionEvent) override final;
// Inherited from MouseListener
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override 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) final;
+ void keyPressed(KeyEvent& event) override 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) final;
+ void death(const Event &event) override 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 c7015cd41..9b723a7dc 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) final;
+ void handleInput(const std::string &msg) override final;
bool handleCommand(const std::string &restrict type,
- const std::string &restrict args) final;
+ const std::string &restrict args) override final;
void getAutoCompleteCommands(StringVect& commands)
- const final;
+ const override 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 16c834503..dc2062946 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() final
+ void setCurrent() override 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 8724aee75..96eed73a6 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) final;
+ const std::string &restrict args) override final;
- void playNewMessageSound() const final;
+ void playNewMessageSound() const override final;
- void optionChanged(const std::string &value) final;
+ void optionChanged(const std::string &value) override final;
protected:
- void handleInput(const std::string &msg) final;
+ void handleInput(const std::string &msg) override final;
- void getAutoCompleteList(StringVect &names) const final;
+ void getAutoCompleteList(StringVect &names) const override final;
- void getAutoCompleteCommands(StringVect &names) const final;
+ void getAutoCompleteCommands(StringVect &names) const override final;
};
#endif // TMWA_SUPPORT
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index 084034c0a..797084a76 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
- final A_CONST;
+ override final A_CONST;
- void handleInput(const std::string &msg) final;
+ void handleInput(const std::string &msg) override final;
- void handleCommandStr(const std::string &msg) final A_CONST;
+ void handleCommandStr(const std::string &msg) override 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 51995dc6b..005485c98 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) final;
+ const std::string &restrict args) override final;
- void playNewMessageSound() const final;
+ void playNewMessageSound() const override final;
- void optionChanged(const std::string &value) final;
+ void optionChanged(const std::string &value) override final;
protected:
- void handleInput(const std::string &msg) final;
+ void handleInput(const std::string &msg) override final;
- void getAutoCompleteList(StringVect &names) const final;
+ void getAutoCompleteList(StringVect &names) const override final;
- void getAutoCompleteCommands(StringVect &names) const final;
+ void getAutoCompleteCommands(StringVect &names) const override 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 3c5262184..91d4391fd 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) final;
+ const std::string &restrict args) override final;
- void playNewMessageSound() const final;
+ void playNewMessageSound() const override final;
- void optionChanged(const std::string &value) final;
+ void optionChanged(const std::string &value) override final;
protected:
- void handleInput(const std::string &msg) final;
+ void handleInput(const std::string &msg) override final;
- void getAutoCompleteList(StringVect&) const final;
+ void getAutoCompleteList(StringVect&) const override final;
- void getAutoCompleteCommands(StringVect &names) const final;
+ void getAutoCompleteCommands(StringVect &names) const override final;
};
extern PartyTab *partyTab;
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 848cd5e1c..47057da4c 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) final;
+ void handleInput(const std::string &msg) override final;
};
extern TradeTab *tradeChatTab;
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 0513d40f3..f298bf164 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) final;
+ const std::string &restrict args) override final;
void setWhisperTabColors();
@@ -46,10 +46,10 @@ class WhisperTab final : public ChatTab
protected:
friend class ChatWindow;
- void getAutoCompleteList(StringVect &names) const final;
+ void getAutoCompleteList(StringVect &names) const override final;
void getAutoCompleteCommands(StringVect& commands)
- const final;
+ const override final;
/**
* Constructor.
@@ -62,9 +62,9 @@ class WhisperTab final : public ChatTab
~WhisperTab();
- void handleInput(const std::string &msg) final;
+ void handleInput(const std::string &msg) override final;
- void handleCommandStr(const std::string &msg) final;
+ void handleCommandStr(const std::string &msg) override final;
private:
std::string mNick;
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index 2f9cd0e65..1dd92b39d 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() final;
+ void logic() override final;
private:
Label *mMusicFileLabel A_NONNULLPOINTER;
@@ -88,7 +88,7 @@ class TargetDebugTab final : public DebugTab
A_DELETE_COPY(TargetDebugTab)
- void logic() final;
+ void logic() override final;
private:
Label *mTargetLabel A_NONNULLPOINTER;
@@ -116,7 +116,7 @@ class NetDebugTab final : public DebugTab
A_DELETE_COPY(NetDebugTab)
- void logic() final;
+ void logic() override 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 311816df4..a93a20b38 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() final;
+ void apply() override final;
private:
ListModel *mSoundModel;
diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index e83887913..4feeb703a 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() final;
+ void apply() override final;
- void externalUpdated() final;
+ 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 ab433d288..da4fb6c90 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() final;
+ void apply() override final;
- void cancel() final;
+ void cancel() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override 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 df6b2a957..fbbbcadd5 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() final;
+ void apply() override final;
- void cancel() final;
+ void cancel() override final;
- void action(const ActionEvent &event) final;
+ void action(const 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 d9c16d683..11af99b23 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() final;
+ void apply() override final;
- void cancel() final;
+ void cancel() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override 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 3f488eaa9..e9f47fbd0 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() final;
+ void apply() override final;
- void externalUpdated() final;
+ void externalUpdated() override final;
- void externalUnloaded() final;
+ void externalUnloaded() override final;
void loadMods();
diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index 85b018e95..d73cf0d4b 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() final;
+ void apply() override final;
- void externalUpdated() final;
+ void externalUpdated() override final;
protected:
NamesModel *mProxyTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 1173731a7..b86856782 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() final;
+ void apply() override final;
- void cancel() final A_CONST;
+ void cancel() override final A_CONST;
void reset();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void updatedPlayer(const std::string &name) final;
+ void updatedPlayer(const std::string &name) override final;
- void updateAll() final;
+ void updateAll() override final;
- void externalUpdated() final;
+ void externalUpdated() override final;
private:
StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 1c9d885fe..526ebdd8f 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() final;
+ void apply() override final;
- void cancel() final;
+ void cancel() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void updateInfo();
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index 2dd53f3bc..e1a94557e 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() final;
+ void apply() override final;
- void cancel() final;
+ void cancel() override final;
- void action(const ActionEvent &event) final;
+ void action(const 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 3c71cb083..6a645e50a 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() final;
+ void apply() override final;
private:
NamesModel *mSpeachList;
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 5afe4ac46..30e771c05 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() final;
+ void cancel() override final;
void externalUpdated() override;
void externalUnloaded() override;
- void action(const ActionEvent &event A_UNUSED) final
+ void action(const ActionEvent &event A_UNUSED) override final
{ }
int getPreferredFirstItemSize() const A_WARN_UNUSED
{ return mPreferredFirstItemSize; }
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void reread(const std::string &name);
- void clear() final;
+ void clear() override 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 4787a990a..31cafd1ff 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() final
+ void updateList() override 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 a2a97ce98..b53138e10 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() final
+ void updateList() override final
{
getPlayersAvatars();
}
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 081d3a5f1..942ce9d59 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) final
+ void action(const ActionEvent &event) override final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -111,7 +111,7 @@ class SocialGuildTab final : public SocialTab,
}
}
- void invite() final
+ void invite() override final
{
CREATEWIDGETV(mInviteDialog, TextDialog,
// TRANSLATORS: guild invite message
@@ -123,7 +123,7 @@ class SocialGuildTab final : public SocialTab,
mInviteDialog->addActionListener(this);
}
- void leave() final
+ void leave() override 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) final
+ void buildCounter(const int online0, const int total0) override final
{
if (online0 || total0)
{
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index 61fc7ea33..c216c6d36 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) final
+ void action(const ActionEvent &event A_UNUSED) override final
{
}
void buildCounter(const int online0 A_UNUSED,
- const int total0 A_UNUSED) final
+ const int total0 A_UNUSED) override final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index d15167945..e673c689b 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() final
+ void updateList() override final
{
if (!socialWindow || !localPlayer)
return;
@@ -164,7 +164,7 @@ class SocialNavigationTab final : public SocialTab
updateCounter();
}
- void selectIndex(const unsigned num) final
+ void selectIndex(const unsigned num) override final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index f7da18c88..153c1b3ec 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) final
+ void action(const ActionEvent &event) override final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -112,7 +112,7 @@ class SocialPartyTab final : public SocialTab,
}
}
- void invite() final
+ void invite() override final
{
CREATEWIDGETV(mInviteDialog, TextDialog,
// TRANSLATORS: party invite message
@@ -124,7 +124,7 @@ class SocialPartyTab final : public SocialTab,
mInviteDialog->addActionListener(this);
}
- void leave() final
+ void leave() override 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) final
+ const int total0 A_UNUSED) override final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index daffe3fe7..7c0c6fd35 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() final
+ void updateList() override 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 22ffbe67d..50d86e33c 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() final
+ void updateList() override final
{
getPlayersAvatars();
}
- void updateAvatar(const std::string &name) final
+ void updateAvatar(const std::string &name) override final
{
if (!actorManager)
return;
@@ -100,7 +100,7 @@ class SocialPlayersTab final : public SocialTab
BLOCK_END("SocialPlayersTab::updateAvatar")
}
- void resetDamage(const std::string &name) final
+ void resetDamage(const std::string &name) override final
{
if (!actorManager)
return;
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 7c41dda4b..dfd6ad828 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() final
+ void setCurrent() override final
{
updateCounter();
}
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 42c7e0f06..d32cc176c 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override 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) final;
+ void mouseEntered(MouseEvent &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
void setImage(Image *const image);
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 39bb76529..6c45414e7 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 final A_WARN_UNUSED;
+ const override final A_WARN_UNUSED;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void nextTab();
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index cbbae5f72..10a76c85d 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) final;
+ void keyPressed(KeyEvent& event) override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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() final
+ void fontChanged() override final
{ adjustSize(); }
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseDragged(MouseEvent& event) final;
+ void mouseDragged(MouseEvent& event) override final;
private:
/**
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 19bfca820..89606d27c 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) final A_NONNULL(2);
+ void drawFrame(Graphics *const graphics) override final A_NONNULL(2);
- void safeDrawFrame(Graphics *const graphics) final
+ void safeDrawFrame(Graphics *const graphics) override final
A_NONNULL(2);
/**
@@ -170,16 +170,16 @@ class TextField notfinal : public Widget,
void setCaretPosition(unsigned int position);
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
void handlePaste();
void handleCopy() const;
#ifdef ANDROID
- void focusGained(const Event &event) final;
+ void focusGained(const Event &event) override final;
#else
- void focusGained(const Event &event) final A_CONST;
+ void focusGained(const Event &event) override 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) final;
+ void mouseDragged(MouseEvent& event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void setParent(Widget *widget) final;
+ void setParent(Widget *widget) override final;
- void setWindow(Widget *const widget) final;
+ void setWindow(Widget *const widget) override 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 c37b87841..e32b911e7 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override 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 97ea01f1e..22055919d 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() final;
+ void clear() override final;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
private:
std::vector<Widget*> mResizableWidgets;
diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h
index c8482d39c..a8ee392f9 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) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
/**
* Handles mouse when dragged.
*/
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
/**
* Handles mouse release.
*/
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void setWidget2(const Widget2 *const widget) final;
+ void setWidget2(const Widget2 *const widget) override final;
private:
bool mItemClicked;
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 9cb382a97..7f305ba29 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() final;
+ void clear() override final;
- void widgetResized(const Event &event) final A_CONST;
+ void widgetResized(const Event &event) override final A_CONST;
virtual Widget *createWidget(const std::string &name,
const bool pressed = false)
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 70d731b83..cf9d701f7 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -57,13 +57,13 @@ class WindowMenu final : public Container,
~WindowMenu();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(MouseEvent& event A_UNUSED) final;
+ void mouseExited(MouseEvent& event A_UNUSED) override final;
std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED
{ return mButtonNames; }
@@ -80,17 +80,17 @@ class WindowMenu final : public Container,
void saveButtons() const;
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
#ifdef USE_PROFILER
void logicChildren();
#endif
protected:
- void drawChildren(Graphics *const graphics) final
+ void drawChildren(Graphics *const graphics) override final
A_NONNULL(2);
- void safeDrawChildren(Graphics *const graphics) final
+ void safeDrawChildren(Graphics *const graphics) override final
A_NONNULL(2);
private:
diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h
index 72e00ad28..b3cea2be8 100644
--- a/src/gui/windows/bankwindow.h
+++ b/src/gui/windows/bankwindow.h
@@ -48,11 +48,11 @@ class BankWindow final : public Window,
~BankWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void widgetShown(const Event &event) final;
+ void widgetShown(const Event &event) override final;
- void bankMoneyChanged(const int money) final;
+ void bankMoneyChanged(const int money) override final;
private:
Label *mBankMoneyLabel;
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index a7fa081bf..77d5c357f 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -115,7 +115,7 @@ class BuyDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Returns the number of items in the shop inventory.
@@ -125,7 +125,7 @@ class BuyDialog final : public Window,
/**
* Updates the labels according to the selected item.
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
/**
* Updates the state of buttons and labels.
@@ -135,11 +135,11 @@ class BuyDialog final : public Window,
/**
* Sets the visibility of this window.
*/
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
void sort();
- void close() final;
+ void close() override final;
/**
* Returns true if any instances exist.
diff --git a/src/gui/windows/buyingstoreselldialog.h b/src/gui/windows/buyingstoreselldialog.h
index 879272d36..cb2219fca 100644
--- a/src/gui/windows/buyingstoreselldialog.h
+++ b/src/gui/windows/buyingstoreselldialog.h
@@ -50,7 +50,7 @@ class BuyingStoreSellDialog final : public SellDialog
A_DELETE_COPY(BuyingStoreSellDialog)
protected:
- void sellAction(const ActionEvent &event) final;
+ void sellAction(const ActionEvent &event) override final;
BeingId mAccountId;
int mStoreId;
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index 69e0b37fb..92a556d7e 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -56,12 +56,12 @@ class BuySellDialog final : public Window,
void init();
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Returns true if any instances exist.
diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h
index ccf510a0c..511e3b00d 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -58,7 +58,7 @@ class ChangeEmailDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* This is used to pass the pointer to where the new email should be
diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h
index 46bb9a73f..857067f13 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -58,7 +58,7 @@ class ChangePasswordDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
TextField *mOldPassField A_NONNULLPOINTER;
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index bc87ae45e..5f2885049 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -61,7 +61,7 @@ class CharCreateDialog final : public Window,
*/
~CharCreateDialog();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Unlocks the dialog, enabling the create character button again.
@@ -74,11 +74,11 @@ class CharCreateDialog final : public Window,
void setDefaultGender(const GenderT gender = Gender::FEMALE);
- void logic() final;
+ void logic() override final;
void updatePlayer();
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
private:
int getDistributedPoints() const A_WARN_UNUSED;
diff --git a/src/gui/windows/chardeleteconfirm.h b/src/gui/windows/chardeleteconfirm.h
index 08b78cc33..5cee85b47 100644
--- a/src/gui/windows/chardeleteconfirm.h
+++ b/src/gui/windows/chardeleteconfirm.h
@@ -49,7 +49,7 @@ class CharDeleteConfirm final : public ConfirmDialog
A_DELETE_COPY(CharDeleteConfirm)
- void action(const ActionEvent &event) final
+ void action(const ActionEvent &event) override final
{
if (event.getId() == "yes" && mMaster)
mMaster->askPasswordForDeletion(mIndex);
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index e1d1190da..1083e3ae5 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -65,9 +65,9 @@ class CharSelectDialog final : public Window,
~CharSelectDialog();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
enum SelectAction
{
@@ -88,13 +88,13 @@ class CharSelectDialog final : public Window,
void askPasswordForDeletion(const int index);
- void close() final;
+ void close() override final;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void updateState();
- void postInit() final;
+ void postInit() override final;
void setName(const BeingId id, const std::string &newName);
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index c2b664dda..49c068a0f 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -112,7 +112,7 @@ class ChatWindow final : public Window,
/**
* Performs action.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Request focus for typing chat message.
@@ -142,7 +142,7 @@ class ChatWindow final : public Window,
void localChatInput(const std::string &msg) const;
/** Called when key is pressed */
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
/** Set the chat input as the given text. */
void setInputText(const std::string &text);
@@ -154,17 +154,17 @@ class ChatWindow final : public Window,
void addItemText(const std::string &item);
/** Override to reset mTmpVisible */
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
/**
* Handles mouse when dragged.
*/
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
/**
* Scrolls the chat window
@@ -271,27 +271,27 @@ class ChatWindow final : public Window,
void copyToClipboard(const int x, const int y) const;
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(MouseEvent& event A_UNUSED) final;
+ void mouseExited(MouseEvent& event A_UNUSED) override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void updateVisibility();
void unHideWindow();
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void addGlobalMessage(const std::string &line);
- void postInit() final;
+ void postInit() override final;
bool isTabPresent(const ChatTab *const tab) const A_WARN_UNUSED;
@@ -299,11 +299,11 @@ class ChatWindow final : public Window,
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
void statChanged(const AttributesT id,
const int oldVal1,
- const int oldVal2) final;
+ const int oldVal2) override final;
static void localPetSay(const std::string &nick,
const std::string &text);
@@ -324,7 +324,7 @@ class ChatWindow final : public Window,
void showGMTab();
- void debugMessage(const std::string &msg) final;
+ void debugMessage(const std::string &msg) override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 236824cba..8198b0c54 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -61,7 +61,7 @@ class ConfirmDialog notfinal : public Window,
*/
void action(const ActionEvent &event) override;
- void postInit() final;
+ void postInit() override final;
private:
TextBox *mTextBox A_NONNULLPOINTER;
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index 4c807c515..5630ee121 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -50,17 +50,17 @@ class ConnectionDialog final : public Window,
A_DELETE_COPY(ConnectionDialog)
- void postInit() final;
+ void postInit() override final;
/**
* Called when the user presses Cancel. Restores the global state to
* the previous one.
*/
- void action(const ActionEvent &) final;
+ void action(const ActionEvent &) override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
private:
StateT mCancelState;
diff --git a/src/gui/windows/cutinwindow.h b/src/gui/windows/cutinwindow.h
index 5e4bdf220..fd6e63390 100644
--- a/src/gui/windows/cutinwindow.h
+++ b/src/gui/windows/cutinwindow.h
@@ -38,9 +38,9 @@ class CutInWindow final : public Window
~CutInWindow();
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void draw2(Graphics *const graphics) A_NONNULL(2);
@@ -49,7 +49,7 @@ class CutInWindow final : public Window
void hide();
- void logic() final;
+ void logic() override final;
private:
AnimatedSprite *mImage;
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index aca10cdb7..12bb97f13 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -47,20 +47,20 @@ class DebugWindow final : public Window
~DebugWindow();
- void postInit() final;
+ void postInit() override final;
/**
* Logic (updates components' size and infos)
*/
void slowLogic();
- void draw(Graphics *const g) final A_NONNULL(2);
+ void draw(Graphics *const g) override final A_NONNULL(2);
- void safeDraw(Graphics *const g) final A_NONNULL(2);
+ void safeDraw(Graphics *const g) override final A_NONNULL(2);
void setPing(int pingTime);
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 14953d995..c63b2d421 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -48,22 +48,22 @@ class DidYouKnowWindow final : public Window,
A_DELETE_COPY(DidYouKnowWindow)
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Handles link action.
*/
void handleLink(const std::string &link,
- MouseEvent *const event) final;
+ MouseEvent *const event) override final;
void loadData(int num = 0);
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
private:
void loadFile(const int num);
diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h
index 3e7e52961..44e1423c4 100644
--- a/src/gui/windows/editdialog.h
+++ b/src/gui/windows/editdialog.h
@@ -54,12 +54,12 @@ class EditDialog final : public Window,
A_DELETE_COPY(EditDialog)
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
std::string getMsg() const A_WARN_UNUSED
{ return mTextField->getText(); }
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 9251dbe42..5595c3120 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -54,14 +54,14 @@ class EditServerDialog final : public Window,
~EditServerDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
private:
TextField *mServerAddressField A_NONNULLPOINTER;
diff --git a/src/gui/windows/eggselectiondialog.h b/src/gui/windows/eggselectiondialog.h
index ce621a771..c8060dc10 100644
--- a/src/gui/windows/eggselectiondialog.h
+++ b/src/gui/windows/eggselectiondialog.h
@@ -40,8 +40,8 @@ class EggSelectionDialog final : public SellDialog
A_DELETE_COPY(EggSelectionDialog)
protected:
- void initButtons() final;
- void sellAction(const ActionEvent &event) final;
+ void initButtons() override final;
+ void sellAction(const ActionEvent &event) override final;
};
#endif // EATHENA_SUPPORT
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index c896f79d0..0bc2af060 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -41,7 +41,7 @@ class EmoteWindow final : public Window
~EmoteWindow();
- void postInit() final;
+ void postInit() override final;
void show();
@@ -61,9 +61,9 @@ class EmoteWindow final : public Window
void addListeners(ActionListener *const listener);
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
- void widgetMoved(const Event &event) final;
+ void widgetMoved(const Event &event) override final;
private:
TabbedArea *mTabs A_NONNULLPOINTER;
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index f43f7278f..985208e03 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -65,18 +65,18 @@ class EquipmentWindow final : public Window,
*/
~EquipmentWindow();
- void postInit() final;
+ void postInit() override final;
/**
* Draws the equipment window.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
const Item* getEquipment(const int i) const A_WARN_UNUSED
{ return mEquipment ? mEquipment->getEquipment(i) : nullptr; }
@@ -87,11 +87,11 @@ class EquipmentWindow final : public Window,
void resetBeing(const Being *const being);
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
void recalcSize();
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index 7a367e978..ec0b88d93 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -56,13 +56,13 @@ class HelpWindow final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Handles link action.
*/
void handleLink(const std::string &link,
- MouseEvent *const event A_UNUSED) final;
+ MouseEvent *const event A_UNUSED) override final;
/**
* Loads help in the dialog.
diff --git a/src/gui/windows/insertcarddialog.h b/src/gui/windows/insertcarddialog.h
index 7f5ffaaf3..eff74cde0 100644
--- a/src/gui/windows/insertcarddialog.h
+++ b/src/gui/windows/insertcarddialog.h
@@ -41,8 +41,8 @@ class InsertCardDialog final : public SellDialog
A_DELETE_COPY(InsertCardDialog)
protected:
- void initButtons() final;
- void sellAction(const ActionEvent &event) final;
+ void initButtons() override final;
+ void sellAction(const ActionEvent &event) override final;
private:
int mItemIndex;
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 8ac52ee21..e19b219f8 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -75,14 +75,14 @@ class InventoryWindow final : public Window,
*/
~InventoryWindow();
- void postInit() final;
+ void postInit() override final;
void storeSortOrder() const;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Returns the selected item.
@@ -97,35 +97,35 @@ class InventoryWindow final : public Window,
/**
* Handles closing of the window
*/
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
/**
* Handles the mouse clicks.
*/
- void mouseClicked(MouseEvent &event) final;
+ void mouseClicked(MouseEvent &event) override final;
/**
* Handles the key presses.
*/
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
/**
* Handles the key releases.
*/
- void keyReleased(KeyEvent &event) final;
+ void keyReleased(KeyEvent &event) override final;
/**
* Updates labels to currently selected item.
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
/**
* Closes the Storage Window, as well as telling the server that the
* window has been closed.
*/
- void close() final;
+ void close() override final;
- void slotsChanged(const Inventory *const inventory) final;
+ void slotsChanged(const Inventory *const inventory) override final;
bool isMainInventory() const A_WARN_UNUSED
{ return mInventory ? mInventory->isMainInventory() : false; }
@@ -142,19 +142,19 @@ class InventoryWindow final : public Window,
bool isInputFocused() const A_WARN_UNUSED;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
void unsetInventory();
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
#ifdef EATHENA_SUPPORT
void combineItems(const int index1,
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 3e1fa45d7..c9cbd4227 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -50,12 +50,12 @@ class ItemAmountWindow final : public Window,
public:
A_DELETE_COPY(ItemAmountWindow)
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from widget.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Sets default amount value.
@@ -63,16 +63,16 @@ class ItemAmountWindow final : public Window,
void resetAmount();
// MouseListener
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
/**
* Schedules the Item Amount window for deletion.
*/
- void close() final;
+ void close() override final;
- void keyReleased(KeyEvent &event) final;
+ void keyReleased(KeyEvent &event) override final;
/**
* Creates the dialog, or bypass it if there aren't enough items.
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index c1a60c36a..d3b7a88b8 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -52,7 +52,7 @@ class KillStats final : public Window,
/**
* Stuff.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void gainXp(int Xp);
@@ -70,7 +70,7 @@ class KillStats final : public Window,
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
private:
int mKillTimer; /**< Timer for kill stats. */
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index f15b0824a..2af656230 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -61,19 +61,19 @@ class LoginDialog final : public Window,
~LoginDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Called when a key is pressed in one of the text fields.
*/
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
- void close() final;
+ void close() override final;
static std::string savedPasswordKey;
static std::string savedPassword;
diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h
index 4bd9c9b95..097820366 100644
--- a/src/gui/windows/maileditwindow.h
+++ b/src/gui/windows/maileditwindow.h
@@ -46,7 +46,7 @@ class MailEditWindow final : public Window,
~MailEditWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void addItem(const Item *const item, const int amount);
@@ -56,7 +56,7 @@ class MailEditWindow final : public Window,
void setMessage(const std::string &str);
- void close() final;
+ void close() override final;
private:
Button *mSendButton;
diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h
index 46f4bb170..563f9e99f 100644
--- a/src/gui/windows/mailviewwindow.h
+++ b/src/gui/windows/mailviewwindow.h
@@ -43,7 +43,7 @@ class MailViewWindow final : public Window,
~MailViewWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
const MailMessage *mMessage;
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index 3e879728e..1a78c1de9 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -49,11 +49,11 @@ class MailWindow final : public Window,
~MailWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void addMail(MailMessage *const message);
- void clear() final;
+ void clear() override final;
void showMessage(MailMessage *const mail);
@@ -63,7 +63,7 @@ class MailWindow final : public Window,
void viewPrev(const int id);
- void mouseClicked(MouseEvent &event) final;
+ void mouseClicked(MouseEvent &event) override final;
void postConnection();
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 841c12db2..7d6f8bfc4 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -59,23 +59,23 @@ class Minimap final : public Window, public ConfigListener
/**
* Draws the minimap.
*/
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
void draw2(Graphics *const graphics) A_NONNULL(2);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
void screenToMap(int &x, int &y);
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
private:
void deleteMapImage();
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 10ff9211d..82fa059c7 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -65,40 +65,40 @@ class MiniStatusWindow final : public Window,
void drawIcons(Graphics *const graphics) A_NONNULL(2);
- void updateStatus() final;
+ void updateStatus() override final;
- void logic() final;
+ void logic() override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void mouseMoved(MouseEvent &event) final;
+ void mouseMoved(MouseEvent &event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseExited(MouseEvent &event) final;
+ void mouseExited(MouseEvent &event) override final;
void showBar(const std::string &name, const Visible visible);
void updateBars();
- void slotsChanged(const Inventory *const inventory) final;
+ void slotsChanged(const Inventory *const inventory) override final;
std::vector <ProgressBar*> &getBars() A_WARN_UNUSED
{ return mBars; }
- Rect getChildrenArea() final A_WARN_UNUSED;
+ Rect getChildrenArea() override final A_WARN_UNUSED;
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
void statChanged(const AttributesT id,
const int oldVal1,
- const int oldVal2) final;
+ const int oldVal2) override final;
- void arrowsChanged() final;
+ void arrowsChanged() override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index beaee8afa..fa3e52097 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -75,7 +75,7 @@ class NpcDialog final : public Window,
~NpcDialog();
- void postInit() final;
+ void postInit() override final;
enum NpcInputState
{
@@ -99,7 +99,7 @@ class NpcDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Sets the text shows in the dialog.
@@ -140,17 +140,17 @@ class NpcDialog final : public Window,
/**
* Returns the number of items in the choices list.
*/
- int getNumberOfElements() final A_WARN_UNUSED;
+ int getNumberOfElements() override final A_WARN_UNUSED;
/**
* Returns the name of item number i of the choices list.
*/
- std::string getElementAt(int i) final A_WARN_UNUSED;
+ std::string getElementAt(int i) override final A_WARN_UNUSED;
/**
* Returns the image of item number i of the choices list.
*/
- const Image *getImageAt(int i) final A_WARN_UNUSED;
+ const Image *getImageAt(int i) override final A_WARN_UNUSED;
/**
* Makes this dialog request a choice selection from the user.
@@ -194,9 +194,9 @@ class NpcDialog final : public Window,
void move(const int amount);
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
/**
* Returns true if any instances exist.
@@ -232,11 +232,11 @@ class NpcDialog final : public Window,
void setAvatarAction(const int actionId);
- void logic() final;
+ void logic() override final;
void clearRows();
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
int isCloseState() const
{ return mActionState == NPC_ACTION_CLOSE; }
diff --git a/src/gui/windows/npcselldialog.h b/src/gui/windows/npcselldialog.h
index 5b65ea50d..dde77de93 100644
--- a/src/gui/windows/npcselldialog.h
+++ b/src/gui/windows/npcselldialog.h
@@ -44,10 +44,10 @@ class NpcSellDialog final : public SellDialog
A_DELETE_COPY(NpcSellDialog)
- void close() final;
+ void close() override final;
protected:
- void sellAction(const ActionEvent &event) final;
+ void sellAction(const ActionEvent &event) override final;
void sellOneItem();
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index 8e6a71ef1..156ab71f7 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -63,7 +63,7 @@ class OkDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
TextBox *mTextBox;
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index 30f2d1053..b10388005 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -52,17 +52,17 @@ class OutfitWindow final : public Window,
*/
~OutfitWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void draw(Graphics *const graphics) final A_NONNULL(2);
+ void draw(Graphics *const graphics) override final A_NONNULL(2);
- void safeDraw(Graphics *const graphics) final A_NONNULL(2);
+ void safeDraw(Graphics *const graphics) override final A_NONNULL(2);
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
- void mouseReleased(MouseEvent &event) final;
+ void mouseReleased(MouseEvent &event) override final;
void load(const bool oldConfig = false);
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index dce261b72..1012e813a 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -57,7 +57,7 @@ class QuestsWindow final : public Window,
~QuestsWindow();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void updateQuest(const int var, const int val);
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index d945e4773..f643d0368 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -55,14 +55,14 @@ class QuitDialog final : public Window,
*/
~QuitDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
private:
void placeOption(ContainerPlacer &placer,
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 059bd2a4b..e273b7809 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -68,7 +68,7 @@ class ServerDialog final : public Window,
A_DELETE_COPY(ServerDialog)
- void postInit() final;
+ void postInit() override final;
/**
* Destructor
@@ -78,24 +78,24 @@ class ServerDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
/**
* Called when the selected value changed in the servers list box.
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
- void mouseClicked(MouseEvent &event) final;
+ void mouseClicked(MouseEvent &event) override final;
- void logic() final;
+ void logic() override final;
void updateServer(const ServerInfo &server, const int index);
void connectToSelectedServer();
- void close() final;
+ void close() override final;
protected:
friend class ServersListModel;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 10e084b19..4e6d6b15c 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -48,9 +48,9 @@ class SetupWindow final : public Window,
~SetupWindow();
- void postInit() final;
+ void postInit() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void setInGame(const bool inGame);
@@ -71,9 +71,9 @@ class SetupWindow final : public Window,
void activateTab(const std::string &name);
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
private:
void unloadAdditionalTabs();
diff --git a/src/gui/windows/shopselldialog.h b/src/gui/windows/shopselldialog.h
index 59149e83f..4d68e0aeb 100644
--- a/src/gui/windows/shopselldialog.h
+++ b/src/gui/windows/shopselldialog.h
@@ -45,7 +45,7 @@ class ShopSellDialog final : public SellDialog
A_DELETE_COPY(ShopSellDialog)
protected:
- void sellAction(const ActionEvent &event) final;
+ void sellAction(const ActionEvent &event) override final;
std::string mNick;
};
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 3a9a5001b..8bd5e5d2a 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -77,17 +77,17 @@ class ShopWindow final : public Window,
*/
~ShopWindow();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Updates the labels according to the selected item.
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
/**
* Updates the state of buttons and labels.
@@ -97,7 +97,7 @@ class ShopWindow final : public Window,
/**
* Sets the visibility of this window.
*/
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
/**
* Returns true if any instances exist.
@@ -149,13 +149,13 @@ class ShopWindow final : public Window,
bool isShopEmpty() const A_WARN_UNUSED;
#ifdef EATHENA_SUPPORT
- void vendingEnabled(const bool b) final;
+ void vendingEnabled(const bool b) override final;
- void vendingSlotsChanged(const int slots) final;
+ void vendingSlotsChanged(const int slots) override final;
- void buyingStoreEnabled(const bool b) final;
+ void buyingStoreEnabled(const bool b) override final;
- void buyingStoreSlotsChanged(const int slots) final;
+ void buyingStoreSlotsChanged(const int slots) override final;
void setShopName(const std::string &name);
#endif
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index a04ca7e95..2e0d8ee83 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -60,13 +60,13 @@ class ShortcutWindow final : public Window
int getTabIndex() const A_WARN_UNUSED;
- void widgetHidden(const Event &event) final;
+ void widgetHidden(const Event &event) override final;
- void widgetMoved(const Event& event) final;
+ void widgetMoved(const Event& event) override final;
- void mousePressed(MouseEvent &event) final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
void nextTab();
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 39d03a164..910ba9b72 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -58,12 +58,12 @@ class SkillDialog final : public Window,
~SkillDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from widget.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Update the given skill's display
@@ -111,7 +111,7 @@ class SkillDialog final : public Window,
bool hasSkills() const A_WARN_UNUSED
{ return !mSkills.empty(); }
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void useItem(const int itemId,
const AutoTarget autoTarget,
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index feca9ce02..b65ad02df 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -54,7 +54,7 @@ class SocialWindow final : public Window,
~SocialWindow();
- void postInit() final;
+ void postInit() override final;
bool addTab(Guild *const guild);
@@ -64,7 +64,7 @@ class SocialWindow final : public Window,
bool removeTab(Party *const party);
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
void showGuildInvite(const std::string &restrict guildName,
const int guildId,
@@ -120,15 +120,15 @@ class SocialWindow final : public Window,
void updatePickupFilter();
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
void setCounter(const SocialTab *const tab, const std::string &str);
void updateGuildCounter(const int online = 0, const int total = 0);
- void updatedPlayer(const std::string &name) final;
+ void updatedPlayer(const std::string &name) override final;
- void updateAll() final;
+ void updateAll() override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index 2e7bb2e70..00b468d07 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -91,11 +91,11 @@ class StatusWindow final : public Window,
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) final;
+ const int newVal) override final;
void statChanged(const AttributesT id,
const int oldVal1,
- const int oldVal2) final;
+ const int oldVal2) override final;
void updateLevelLabel();
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index 9367baff1..07562320a 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -56,11 +56,11 @@ class TextCommandEditor final : public Window,
*/
~TextCommandEditor();
- void postInit() final;
+ void postInit() override final;
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void scheduleDelete() final;
+ void scheduleDelete() override final;
private:
#ifdef TMWA_SUPPORT
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index 77fb1151c..edf97c547 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -54,12 +54,12 @@ class TextDialog final : public Window,
~TextDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Get the text in the textfield
@@ -71,7 +71,7 @@ class TextDialog final : public Window,
static bool isActive() A_WARN_UNUSED
{ return instances; }
- void close() final;
+ void close() override final;
private:
static int instances;
diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h
index 76124df9a..70da4ad5e 100644
--- a/src/gui/windows/textselectdialog.h
+++ b/src/gui/windows/textselectdialog.h
@@ -57,19 +57,19 @@ class TextSelectDialog notfinal : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Updates labels according to selected item.
*
* @see SelectionListener::selectionChanged
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
/**
* Sets the visibility of this window.
*/
- void setVisible(Visible visible) final;
+ void setVisible(Visible visible) override final;
void postInit() override;
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index d33f614c7..f8a280a20 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -132,23 +132,23 @@ class TradeWindow final : public Window,
* Updates the labels and makes sure only one item is selected in
* either my inventory or partner inventory.
*/
- void valueChanged(const SelectionEvent &event) final;
+ void valueChanged(const SelectionEvent &event) override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
/**
* Closes the Trade Window, as well as telling the server that the
* window has been closed.
*/
- void close() final;
+ void close() override final;
/**
* Clear auto trade items.
*/
- void clear() final;
+ void clear() override final;
/**
* Add item what will be added to trade.
diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h
index 4e2ab4adc..aaba439ad 100644
--- a/src/gui/windows/unregisterdialog.h
+++ b/src/gui/windows/unregisterdialog.h
@@ -52,12 +52,12 @@ class UnRegisterDialog final : public Window,
~UnRegisterDialog();
- void postInit() final;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
private:
LoginData *mLoginData A_NONNULLPOINTER;
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 2c72eae2d..0d322dccf 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -83,7 +83,7 @@ class UpdaterWindow final : public Window,
*/
~UpdaterWindow();
- void postInit() final;
+ void postInit() override final;
/**
* Set's progress bar status
@@ -108,14 +108,14 @@ class UpdaterWindow final : public Window,
void loadPatch();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
- void logic() final;
+ void logic() override final;
void handleLink(const std::string &link,
- MouseEvent *const event A_UNUSED) final;
+ MouseEvent *const event A_UNUSED) override final;
void loadFile(std::string file);
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 0fbd2f232..6aee4c139 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -58,7 +58,7 @@ class WhoIsOnline final : public Window,
*/
~WhoIsOnline();
- void postInit() final;
+ void postInit() override final;
#ifdef TMWA_SUPPORT
/**
@@ -70,15 +70,15 @@ class WhoIsOnline final : public Window,
void loadList(const std::vector<OnlinePlayer*> &list);
void handleLink(const std::string& link,
- MouseEvent *event) final;
+ MouseEvent *event) override final;
- void logic() final;
+ void logic() override final;
void slowLogic();
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void widgetResized(const Event &event) final;
+ void widgetResized(const Event &event) override final;
const std::set<OnlinePlayer*> &getOnlinePlayers() const A_WARN_UNUSED
{ return mOnlinePlayers; }
@@ -89,7 +89,7 @@ class WhoIsOnline final : public Window,
void setAllowUpdate(const bool n)
{ mAllowUpdate = n; }
- void optionChanged(const std::string &name) final;
+ void optionChanged(const std::string &name) override final;
void updateList(StringVect &list);
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index 0de093dc8..99306df03 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -53,7 +53,7 @@ class WorldSelectDialog final : public Window,
A_DELETE_COPY(WorldSelectDialog)
- void postInit() final;
+ void postInit() override final;
/**
* Destructor.
@@ -63,9 +63,9 @@ class WorldSelectDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const ActionEvent &event) final;
+ void action(const ActionEvent &event) override final;
- void keyPressed(KeyEvent &event) final;
+ void keyPressed(KeyEvent &event) override final;
private:
WorldListModel *mWorldListModel A_NONNULLPOINTER;
--
cgit v1.2.3-70-g09d2