summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/windows/botcheckerwindow.h4
-rw-r--r--src/gui/windows/buydialog.h4
-rw-r--r--src/gui/windows/buyselldialog.h2
-rw-r--r--src/gui/windows/changeemaildialog.h2
-rw-r--r--src/gui/windows/changepassworddialog.h2
-rw-r--r--src/gui/windows/charcreatedialog.h6
-rw-r--r--src/gui/windows/charselectdialog.h10
-rw-r--r--src/gui/windows/chatwindow.h24
-rw-r--r--src/gui/windows/confirmdialog.h2
-rw-r--r--src/gui/windows/connectiondialog.h2
-rw-r--r--src/gui/windows/debugwindow.h12
-rw-r--r--src/gui/windows/didyouknowwindow.h6
-rw-r--r--src/gui/windows/editdialog.h4
-rw-r--r--src/gui/windows/editserverdialog.h10
-rw-r--r--src/gui/windows/emotewindow.h6
-rw-r--r--src/gui/windows/equipmentwindow.h14
-rw-r--r--src/gui/windows/helpwindow.h4
-rw-r--r--src/gui/windows/inventorywindow.cpp4
-rw-r--r--src/gui/windows/inventorywindow.h24
-rw-r--r--src/gui/windows/itemamountwindow.cpp4
-rw-r--r--src/gui/windows/itemamountwindow.h10
-rw-r--r--src/gui/windows/killstats.h2
-rw-r--r--src/gui/windows/logindialog.cpp10
-rw-r--r--src/gui/windows/logindialog.h8
-rw-r--r--src/gui/windows/minimap.h8
-rw-r--r--src/gui/windows/ministatuswindow.h16
-rw-r--r--src/gui/windows/npcdialog.h16
-rw-r--r--src/gui/windows/npcpostdialog.h6
-rw-r--r--src/gui/windows/okdialog.h2
-rw-r--r--src/gui/windows/outfitwindow.h10
-rw-r--r--src/gui/windows/questswindow.h2
-rw-r--r--src/gui/windows/quitdialog.h6
-rw-r--r--src/gui/windows/registerdialog.h2
-rw-r--r--src/gui/windows/selldialog.h6
-rw-r--r--src/gui/windows/serverdialog.cpp4
-rw-r--r--src/gui/windows/serverdialog.h19
-rw-r--r--src/gui/windows/setup.h8
-rw-r--r--src/gui/windows/shopwindow.h8
-rw-r--r--src/gui/windows/shortcutwindow.h8
-rw-r--r--src/gui/windows/skilldialog.h6
-rw-r--r--src/gui/windows/socialwindow.cpp38
-rw-r--r--src/gui/windows/socialwindow.h6
-rw-r--r--src/gui/windows/statuswindow.cpp8
-rw-r--r--src/gui/windows/textcommandeditor.cpp12
-rw-r--r--src/gui/windows/textcommandeditor.h6
-rw-r--r--src/gui/windows/textdialog.h6
-rw-r--r--src/gui/windows/tradewindow.h6
-rw-r--r--src/gui/windows/unregisterdialog.h4
-rw-r--r--src/gui/windows/updaterwindow.h10
-rw-r--r--src/gui/windows/whoisonline.h13
-rw-r--r--src/gui/windows/worldselectdialog.cpp4
-rw-r--r--src/gui/windows/worldselectdialog.h6
52 files changed, 212 insertions, 210 deletions
diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h
index fbe53cf82..853cce587 100644
--- a/src/gui/windows/botcheckerwindow.h
+++ b/src/gui/windows/botcheckerwindow.h
@@ -61,7 +61,7 @@ class BotCheckerWindow final : public Window,
*/
~BotCheckerWindow();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void update();
@@ -71,7 +71,7 @@ class BotCheckerWindow final : public Window,
void reset();
- void optionChanged(const std::string &name) override;
+ void optionChanged(const std::string &name) override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 25d8bdb69..9fdf2e4d6 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -98,7 +98,7 @@ class BuyDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Returns the number of items in the shop inventory.
@@ -108,7 +108,7 @@ class BuyDialog final : public Window,
/**
* Updates the labels according to the selected item.
*/
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
/**
* Updates the state of buttons and labels.
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index e8fe80a06..dfcd761d4 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -58,7 +58,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::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 41c611fb8..ebb9ee8a7 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -57,7 +57,7 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::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 144f73cd7..cd1596ab3 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -57,7 +57,7 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
TextField *mOldPassField;
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index fe4732725..0204c9622 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -58,7 +58,7 @@ class CharCreateDialog final : public Window,
*/
~CharCreateDialog();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Unlocks the dialog, enabling the create character button again.
@@ -72,11 +72,11 @@ class CharCreateDialog final : public Window,
void setFixedGender(const bool fixed,
const Gender gender = GENDER_FEMALE);
- void logic() override;
+ void logic() override final;
void updatePlayer();
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
private:
int getDistributedPoints() const A_WARN_UNUSED;
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 485f7fbeb..34d7c155e 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -61,9 +61,9 @@ class CharSelectDialog final : public Window,
~CharSelectDialog();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
enum SelectAction
{
@@ -84,13 +84,13 @@ class CharSelectDialog final : public Window,
void askPasswordForDeletion(const int index);
- void close() override;
+ void close() override final;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void updateState();
- void postInit() override;
+ void postInit() override final;
private:
void attemptCharacterDelete(const int index);
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index b2001a6ef..f9170ac91 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -139,7 +139,7 @@ class ChatWindow final : public Window,
/**
* Performs action.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Request focus for typing chat message.
@@ -169,7 +169,7 @@ class ChatWindow final : public Window,
void localChatInput(const std::string &msg) const;
/** Called when key is pressed */
- void keyPressed(gcn::KeyEvent &event) override;
+ void keyPressed(gcn::KeyEvent &event) override final;
/** Set the chat input as the given text. */
void setInputText(const std::string &text);
@@ -186,15 +186,15 @@ class ChatWindow final : public Window,
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
void processEvent(const Channels channel,
- const DepricatedEvent &event) override;
+ const DepricatedEvent &event) override final;
/**
* Scrolls the chat window
@@ -271,25 +271,25 @@ class ChatWindow final : public Window,
void copyToClipboard(const int x, const int y) const;
- void optionChanged(const std::string &name) override;
+ void optionChanged(const std::string &name) override final;
- void mouseEntered(gcn::MouseEvent& mouseEvent) override;
+ void mouseEntered(gcn::MouseEvent& mouseEvent) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override;
+ void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override final;
- void draw(gcn::Graphics* graphics) override;
+ void draw(gcn::Graphics* graphics) override final;
void updateVisibility();
void unHideWindow();
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void addGlobalMessage(const std::string &line);
- void postInit() override;
+ void postInit() override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 54b9fbc0b..b06054e0a 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -58,7 +58,7 @@ class ConfirmDialog : public Window, public gcn::ActionListener
*/
void action(const gcn::ActionEvent &event) override;
- void postInit() override;
+ void postInit() override final;
private:
TextBox *mTextBox;
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index 7545a69b9..677134bc0 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -49,7 +49,7 @@ class ConnectionDialog final : public Window, private gcn::ActionListener
A_DELETE_COPY(ConnectionDialog)
- void postInit() override;
+ void postInit() override final;
/**
* Called when the user presses Cancel. Restores the global state to
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 5424385bb..43b4dbc74 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -58,7 +58,7 @@ class MapDebugTab final : public DebugTab
A_DELETE_COPY(MapDebugTab)
- void logic() override;
+ void logic() override final;
private:
Label *mMusicFileLabel;
@@ -90,7 +90,7 @@ class TargetDebugTab final : public DebugTab
A_DELETE_COPY(TargetDebugTab)
- void logic() override;
+ void logic() override final;
private:
Label *mTargetLabel;
@@ -115,7 +115,7 @@ class NetDebugTab final : public DebugTab
A_DELETE_COPY(NetDebugTab)
- void logic() override;
+ void logic() override final;
private:
Label *mPingLabel;
@@ -140,18 +140,18 @@ class DebugWindow final : public Window
~DebugWindow();
- void postInit() override;
+ void postInit() override final;
/**
* Logic (updates components' size and infos)
*/
void slowLogic();
- void draw(gcn::Graphics *g) override;
+ void draw(gcn::Graphics *g) override final;
void setPing(int pingTime);
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index b0376f068..0af9d7f24 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -48,18 +48,18 @@ class DidYouKnowWindow final : public Window,
A_DELETE_COPY(DidYouKnowWindow)
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event) override;
+ gcn::MouseEvent *event) override final;
void loadData(int num = 0);
diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h
index ce5160906..d53cd431d 100644
--- a/src/gui/windows/editdialog.h
+++ b/src/gui/windows/editdialog.h
@@ -52,12 +52,12 @@ class EditDialog final : public Window, public gcn::ActionListener
A_DELETE_COPY(EditDialog)
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::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 dd69b9771..43a7c20c0 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -47,7 +47,7 @@ class TypeListModel : public gcn::ListModel
/**
* Used to get number of line in the list
*/
- int getNumberOfElements() override A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
#ifdef EATHENA_SUPPORT
#ifdef MANASERV_SUPPORT
{ return 4; }
@@ -65,7 +65,7 @@ class TypeListModel : public gcn::ListModel
/**
* Used to get an element from the list
*/
- std::string getElementAt(int elementIndex) override A_WARN_UNUSED;
+ std::string getElementAt(int elementIndex) override final A_WARN_UNUSED;
};
/**
@@ -85,14 +85,14 @@ class EditServerDialog final : public Window,
~EditServerDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
private:
TextField *mServerAddressField;
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index 43f1a4679..b73184546 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() override;
+ void postInit() override final;
void show();
@@ -61,9 +61,9 @@ class EmoteWindow final : public Window
void addListeners(gcn::ActionListener *const listener);
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event &event) override;
+ void widgetMoved(const gcn::Event &event) override final;
private:
TabbedArea *mTabs;
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index cd87d8172..e3508e504 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -76,16 +76,16 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
*/
~EquipmentWindow();
- void postInit() override;
+ void postInit() override final;
/**
* Draws the equipment window.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void mousePressed(gcn::MouseEvent& mouseEvent) override;
+ void mousePressed(gcn::MouseEvent& mouseEvent) override final;
const Item* getEquipment(const int i) const A_WARN_UNUSED
{ return mEquipment ? mEquipment->getEquipment(i) : nullptr; }
@@ -96,11 +96,11 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
void resetBeing(const Being *const being);
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
void recalcSize();
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index c40390bc8..7261d8875 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -58,13 +58,13 @@ class HelpWindow final : public Window, public LinkHandler,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override;
+ gcn::MouseEvent *event A_UNUSED) override final;
/**
* Loads help in the dialog.
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index bc803d0d3..825c3d934 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -85,10 +85,10 @@ public:
~SortListModelInv()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{ return 6; }
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index a7ee5f31e..a5fabe8f2 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -69,14 +69,14 @@ class InventoryWindow final : public Window,
*/
~InventoryWindow();
- void postInit() override;
+ void postInit() override final;
void storeSortOrder();
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Returns the selected item.
@@ -91,27 +91,27 @@ class InventoryWindow final : public Window,
/**
* Handles closing of the window
*/
- void widgetHidden(const gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
/**
* Handles the mouse clicks.
*/
- void mouseClicked(gcn::MouseEvent &event) override;
+ void mouseClicked(gcn::MouseEvent &event) override final;
/**
* Handles the key presses.
*/
- void keyPressed(gcn::KeyEvent &event) override;
+ void keyPressed(gcn::KeyEvent &event) override final;
/**
* Handles the key releases.
*/
- void keyReleased(gcn::KeyEvent &event) override;
+ void keyReleased(gcn::KeyEvent &event) override final;
/**
* Updates labels to currently selected item.
*/
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
/**
* Sets whether the split button should be shown.
@@ -138,19 +138,19 @@ class InventoryWindow final : public Window,
void updateDropButton();
void processEvent(const Channels channel,
- const DepricatedEvent &event) override;
+ const DepricatedEvent &event) override final;
void updateButtons(const Item *item = nullptr);
bool isInputFocused() const A_WARN_UNUSED;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
static bool isAnyInputFocused();
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 6fd813183..9800379b1 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -84,12 +84,12 @@ public:
~ItemsModal()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return static_cast<int>(mStrings.size());
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i < 0 || i >= getNumberOfElements())
return "???";
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 189333d70..68953fbc9 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -60,12 +60,12 @@ class ItemAmountWindow final : public Window,
A_DELETE_COPY(ItemAmountWindow)
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from widget.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Sets default amount value.
@@ -73,16 +73,16 @@ class ItemAmountWindow final : public Window,
void resetAmount();
// MouseListener
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
/**
* Schedules the Item Amount window for deletion.
*/
void close();
- void keyReleased(gcn::KeyEvent &keyEvent) override;
+ void keyReleased(gcn::KeyEvent &keyEvent) 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 160eebc1e..18453e2ff 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 gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void gainXp(int Xp);
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index f6c1baf42..4162af961 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -63,7 +63,7 @@ namespace
A_DELETE_COPY(OpenUrlListener)
- void action(const gcn::ActionEvent &event) override
+ void action(const gcn::ActionEvent &event) override final
{
if (event.getId() == "yes")
openBrowser(url);
@@ -94,12 +94,12 @@ class UpdateTypeModel final : public gcn::ListModel
~UpdateTypeModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return 3;
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -121,14 +121,14 @@ class UpdateListModel final : public gcn::ListModel
~UpdateListModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
if (!mLoginData)
return 0;
return static_cast<int>(mLoginData->updateHosts.size());
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (!mLoginData || i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index 82357cfef..937e4a31d 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -60,19 +60,19 @@ class LoginDialog final : public Window, public gcn::ActionListener,
~LoginDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Called when a key is pressed in one of the text fields.
*/
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
- void close() override;
+ void close() override final;
static std::string savedPasswordKey;
static std::string savedPassword;
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 72517dae5..d5fdef841 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -60,13 +60,13 @@ class Minimap final : public Window, public ConfigListener
/**
* Draws the minimap.
*/
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void mouseMoved(gcn::MouseEvent &event) override;
+ void mouseMoved(gcn::MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
void screenToMap(int &x, int &y);
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 947e71cb8..82ba64034 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -62,19 +62,19 @@ class MiniStatusWindow final : public Popup,
void drawIcons(Graphics *const graphics);
void processEvent(const Channels channel,
- const DepricatedEvent &event) override;
+ const DepricatedEvent &event) override final;
void updateStatus();
- void logic() override;
+ void logic() override final;
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void mouseMoved(gcn::MouseEvent &mouseEvent) override;
+ void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override;
+ void mouseExited(gcn::MouseEvent &event) override final;
void showBar(const std::string &name, const bool visible);
@@ -82,12 +82,12 @@ class MiniStatusWindow final : public Popup,
void updateArrows();
- void slotsChanged(Inventory *const inventory) override;
+ void slotsChanged(Inventory *const inventory) override final;
std::vector <ProgressBar*> &getBars() A_WARN_UNUSED
{ return mBars; }
- gcn::Rectangle getChildrenArea() override A_WARN_UNUSED;
+ gcn::Rectangle getChildrenArea() override final A_WARN_UNUSED;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 17bc9db24..27efcee2f 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -72,12 +72,12 @@ class NpcDialog final : public Window,
~NpcDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Sets the text shows in the dialog.
@@ -118,17 +118,17 @@ class NpcDialog final : public Window,
/**
* Returns the number of items in the choices list.
*/
- int getNumberOfElements() override 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) override 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) override A_WARN_UNUSED;
+ const Image *getImageAt(int i) override final A_WARN_UNUSED;
/**
* Makes this dialog request a choice selection from the user.
@@ -168,9 +168,9 @@ class NpcDialog final : public Window,
void move(const int amount);
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
- void optionChanged(const std::string &name) override;
+ void optionChanged(const std::string &name) override final;
/**
* Returns true if any instances exist.
@@ -206,7 +206,7 @@ class NpcDialog final : public Window,
void setAvatarAction(const int actionId);
- void logic() override;
+ void logic() override final;
void clearRows();
diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h
index 110aac58a..b40eaf334 100644
--- a/src/gui/windows/npcpostdialog.h
+++ b/src/gui/windows/npcpostdialog.h
@@ -43,14 +43,14 @@ class NpcPostDialog final : public Window,
~NpcPostDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
/**
* Returns true if any instances exist.
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index 5917c8c3a..f12100b9b 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -62,7 +62,7 @@ class OkDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
TextBox *mTextBox;
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index cb1c399f5..96f3329a1 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -50,15 +50,15 @@ class OutfitWindow final : public Window,
*/
~OutfitWindow();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void draw(gcn::Graphics *graphics) override;
+ void draw(gcn::Graphics *graphics) override final;
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override;
+ void mouseReleased(gcn::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 b5deb283f..fe970715a 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 gcn::ActionEvent &event) override;
+ void action(const gcn::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 14c112eef..1870554f6 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -56,14 +56,14 @@ class QuitDialog final : public Window, public gcn::ActionListener,
*/
~QuitDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
private:
void placeOption(ContainerPlacer &placer,
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index bc089a559..3cded7d58 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -47,7 +47,7 @@ class WrongDataNoticeListener final : public gcn::ActionListener
void setTarget(TextField *const textField);
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
TextField *mTarget;
};
diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h
index 3f51aad76..f811cc311 100644
--- a/src/gui/windows/selldialog.h
+++ b/src/gui/windows/selldialog.h
@@ -80,14 +80,14 @@ class SellDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Updates labels according to selected item.
*
* @see SelectionListener::selectionChanged
*/
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
/**
* Gives Player's Money amount
@@ -97,7 +97,7 @@ class SellDialog final : public Window,
/**
* Sets the visibility of this window.
*/
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
void addItem(const int id, const unsigned char color,
const int amount, const int price);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index a8895cad9..dfe7d3052 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -157,7 +157,7 @@ public:
mHighlightColor = getThemeColor(Theme::HIGHLIGHT);
}
- void draw(gcn::Graphics *graphics) override
+ void draw(gcn::Graphics *graphics) override final
{
if (!mListModel)
return;
@@ -231,7 +231,7 @@ public:
}
}
- unsigned int getRowHeight() const override
+ unsigned int getRowHeight() const override final
{
return 2 * getFont()->getHeight() + 5;
}
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 31ad9609a..a07ab0339 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -60,12 +60,13 @@ class ServersListModel final : public gcn::ListModel
/**
* Used to get number of line in the list
*/
- int getNumberOfElements() override A_WARN_UNUSED;
+ int getNumberOfElements() override final A_WARN_UNUSED;
/**
* Used to get an element from the list
*/
- std::string getElementAt(int elementIndex) override A_WARN_UNUSED;
+ std::string getElementAt(int elementIndex)
+ override final A_WARN_UNUSED;
/**
* Used to get the corresponding Server struct
@@ -104,7 +105,7 @@ class ServerDialog final : public Window,
A_DELETE_COPY(ServerDialog)
- void postInit() override;
+ void postInit() override final;
/**
* Destructor
@@ -114,24 +115,24 @@ class ServerDialog final : public Window,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
/**
* Called when the selected value changed in the servers list box.
*/
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
- void mouseClicked(gcn::MouseEvent &mouseEvent) override;
+ void mouseClicked(gcn::MouseEvent &mouseEvent) override final;
- void logic() override;
+ void logic() override final;
void updateServer(const ServerInfo &server, const int index);
void connectToSelectedServer();
- void close() override;
+ void close() override final;
protected:
friend class ServersListModel;
diff --git a/src/gui/windows/setup.h b/src/gui/windows/setup.h
index 23eb1c6dc..9d3696f7f 100644
--- a/src/gui/windows/setup.h
+++ b/src/gui/windows/setup.h
@@ -49,9 +49,9 @@ class Setup final : public Window, public gcn::ActionListener
~Setup();
- void postInit() override;
+ void postInit() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void setInGame(const bool inGame);
@@ -66,9 +66,9 @@ class Setup final : public Window, public gcn::ActionListener
void activateTab(const std::string &name);
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
private:
std::list<SetupTab*> mTabs;
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 3cc60bba3..02395ba3a 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -67,17 +67,17 @@ class ShopWindow final : public Window,
*/
~ShopWindow();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Updates the labels according to the selected item.
*/
- void valueChanged(const gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
/**
* Updates the state of buttons and labels.
@@ -87,7 +87,7 @@ class ShopWindow final : public Window,
/**
* Sets the visibility of this window.
*/
- void setVisible(bool visible) override;
+ void setVisible(bool visible) override final;
/**
* Returns true if any instances exist.
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index c8fb91b4c..82968eaf2 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 gcn::Event &event) override;
+ void widgetHidden(const gcn::Event &event) override final;
- void widgetMoved(const gcn::Event& event) override;
+ void widgetMoved(const gcn::Event& event) override final;
- void mousePressed(gcn::MouseEvent &event) override;
+ void mousePressed(gcn::MouseEvent &event) override final;
- void mouseDragged(gcn::MouseEvent &event) override;
+ void mouseDragged(gcn::MouseEvent &event) override final;
#ifdef USE_PROFILER
void logicChildren();
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 6cbff4f01..ac81d9084 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -52,12 +52,12 @@ class SkillDialog final : public Window, public gcn::ActionListener
~SkillDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from widget.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Update the given skill's display
@@ -85,7 +85,7 @@ class SkillDialog final : public Window, public gcn::ActionListener
bool hasSkills() const A_WARN_UNUSED
{ return !mSkills.empty(); }
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void useItem(const int itemId) const;
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index aa9d4d328..bc5c0b888 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -145,7 +145,7 @@ protected:
}
}
- void setCurrent() override
+ void setCurrent() override final
{
updateCounter();
}
@@ -207,7 +207,7 @@ public:
mScroll = nullptr;
}
- void action(const gcn::ActionEvent &event) override
+ void action(const gcn::ActionEvent &event) override final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -245,7 +245,7 @@ public:
}
}
- void invite() override
+ void invite() override final
{
// TRANSLATORS: guild invite message
mInviteDialog = new TextDialog(_("Member Invite to Guild"),
@@ -257,7 +257,7 @@ public:
mInviteDialog->addActionListener(this);
}
- void leave() override
+ void leave() override final
{
// TRANSLATORS: guild leave message
mConfirmDialog = new ConfirmDialog(_("Leave Guild?"),
@@ -342,7 +342,7 @@ public:
mScroll = nullptr;
}
- void action(const gcn::ActionEvent &event A_UNUSED) override
+ void action(const gcn::ActionEvent &event A_UNUSED) override final
{
}
@@ -410,7 +410,7 @@ public:
mScroll = nullptr;
}
- void action(const gcn::ActionEvent &event) override
+ void action(const gcn::ActionEvent &event) override final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -447,7 +447,7 @@ public:
}
}
- void invite() override
+ void invite() override final
{
// TRANSLATORS: party invite message
mInviteDialog = new TextDialog(_("Member Invite to Party"),
@@ -459,7 +459,7 @@ public:
mInviteDialog->addActionListener(this);
}
- void leave() override
+ void leave() override final
{
// TRANSLATORS: party leave message
mConfirmDialog = new ConfirmDialog(_("Leave Party?"),
@@ -520,12 +520,12 @@ public:
return &mMembers;
}
- Avatar *getAvatarAt(int index) override
+ Avatar *getAvatarAt(int index) override final
{
return mMembers[index];
}
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return static_cast<int>(mMembers.size());
}
@@ -565,12 +565,12 @@ public:
mBeings = nullptr;
}
- void updateList() override
+ void updateList() override final
{
getPlayersAvatars();
}
- void updateAvatar(const std::string &name) override
+ void updateAvatar(const std::string &name) override final
{
if (!actorManager)
return;
@@ -598,7 +598,7 @@ public:
}
}
- void resetDamage(const std::string &name) override
+ void resetDamage(const std::string &name) override final
{
if (!actorManager)
return;
@@ -731,7 +731,7 @@ public:
mBeings = nullptr;
}
- void updateList() override
+ void updateList() override final
{
if (!socialWindow || !player_node)
return;
@@ -823,7 +823,7 @@ public:
}
- void selectIndex(const unsigned num) override
+ void selectIndex(const unsigned num) override final
{
if (!player_node)
return;
@@ -1060,7 +1060,7 @@ public:
mBeings = nullptr;
}
- void updateList() override
+ void updateList() override final
{
updateAtkListStart();
// TRANSLATORS: mobs group name in social window
@@ -1107,7 +1107,7 @@ public:
mBeings = nullptr;
}
- void updateList() override
+ void updateList() override final
{
updateAtkListStart();
// TRANSLATORS: items group name in social window
@@ -1153,7 +1153,7 @@ public:
mBeings = nullptr;
}
- void updateList() override
+ void updateList() override final
{
getPlayersAvatars();
}
@@ -1241,7 +1241,7 @@ public:
A_DELETE_COPY(CreatePopup)
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override
+ gcn::MouseEvent *event A_UNUSED) override final
{
if (link == "guild" && socialWindow)
{
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index e9ee0744e..bbd84bbdc 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -54,7 +54,7 @@ public:
~SocialWindow();
- void postInit() override;
+ void postInit() override final;
bool addTab(Guild *const guild);
@@ -64,7 +64,7 @@ public:
bool removeTab(Party *const party);
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
void showGuildInvite(const std::string &guildName, const int guildId,
const std::string &inviterName);
@@ -118,7 +118,7 @@ public:
void updatePickupFilter();
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
void setCounter(const SocialTab *const tab, const std::string &str);
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 0915429f9..e574c7230 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -108,7 +108,7 @@ class DerDisplay final : public AttrDisplay
A_DELETE_COPY(DerDisplay)
- Type getType() const override
+ Type getType() const override final
{ return DERIVED; }
};
@@ -121,14 +121,14 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
A_DELETE_COPY(ChangeDisplay)
- std::string update() override;
+ std::string update() override final;
- Type getType() const override
+ Type getType() const override final
{ return CHANGEABLE; }
void setPointsNeeded(const int needed);
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
int mNeeded;
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index da0eadfec..e7302e527 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -77,12 +77,12 @@ public:
~IconsModal()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return static_cast<int>(mStrings.size());
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i < 0 || i >= getNumberOfElements())
return "???";
@@ -125,12 +125,12 @@ public:
~TargetTypeModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return 3;
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -144,12 +144,12 @@ public:
~MagicSchoolModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return 6;
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index cd080aebb..fb16ff4bb 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -53,11 +53,11 @@ class TextCommandEditor final : public Window, public gcn::ActionListener
*/
~TextCommandEditor();
- void postInit() override;
+ void postInit() override final;
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void scheduleDelete() override;
+ void scheduleDelete() override final;
private:
void showControls(const bool show);
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index c783c6ed2..a5bba14a0 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -51,12 +51,12 @@ public:
~TextDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Get the text in the textfield
@@ -68,7 +68,7 @@ public:
static bool isActive() A_WARN_UNUSED
{ return instances; }
- void close() override;
+ void close() override final;
private:
static int instances;
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index fbd516d9d..d9970f083 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -109,18 +109,18 @@ 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 gcn::SelectionEvent &event) override;
+ void valueChanged(const gcn::SelectionEvent &event) override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
/**
* Closes the Trade Window, as well as telling the server that the
* window has been closed.
*/
- void close() override;
+ void close() override final;
/**
* Clear auto trade items.
diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h
index 5b5587794..5cd612214 100644
--- a/src/gui/windows/unregisterdialog.h
+++ b/src/gui/windows/unregisterdialog.h
@@ -51,12 +51,12 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener
~UnRegisterDialog();
- void postInit() override;
+ void postInit() override final;
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
private:
LoginData *mLoginData;
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index fca58b3f8..1f9328908 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -92,7 +92,7 @@ class UpdaterWindow final : public Window,
*/
~UpdaterWindow();
- void postInit() override;
+ void postInit() override final;
/**
* Set's progress bar status
@@ -117,14 +117,14 @@ class UpdaterWindow final : public Window,
void loadPatch();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
- void logic() override;
+ void logic() override final;
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override;
+ gcn::MouseEvent *event A_UNUSED) override final;
static void loadLocalUpdates(const std::string &dir);
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 6db5a0dcc..60aa67e93 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -118,7 +118,7 @@ public:
*/
~WhoIsOnline();
- void postInit() override;
+ void postInit() override final;
/**
* Loads and display online list from the memory buffer.
@@ -127,15 +127,16 @@ public:
void loadList(std::vector<OnlinePlayer*> &list);
- void handleLink(const std::string& link, gcn::MouseEvent *event) override;
+ void handleLink(const std::string& link,
+ gcn::MouseEvent *event) override final;
- void logic() override;
+ void logic() override final;
void slowLogic();
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void widgetResized(const gcn::Event &event) override;
+ void widgetResized(const gcn::Event &event) override final;
const std::set<OnlinePlayer*> &getOnlinePlayers() const A_WARN_UNUSED
{ return mOnlinePlayers; }
@@ -146,7 +147,7 @@ public:
void setAllowUpdate(const bool n)
{ mAllowUpdate = n; }
- void optionChanged(const std::string &name) override;
+ void optionChanged(const std::string &name) override final;
void updateList(StringVect &list);
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index b3686ee10..e5ddbee6d 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -57,12 +57,12 @@ class WorldListModel final : public gcn::ListModel
~WorldListModel()
{ }
- int getNumberOfElements() override
+ int getNumberOfElements() override final
{
return static_cast<int>(mWorlds.size());
}
- std::string getElementAt(int i) override
+ std::string getElementAt(int i) override final
{
const WorldInfo *const si = mWorlds[i];
if (si)
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index 6afaa25c8..21156d613 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -52,7 +52,7 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
A_DELETE_COPY(WorldSelectDialog)
- void postInit() override;
+ void postInit() override final;
/**
* Destructor.
@@ -62,9 +62,9 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
/**
* Called when receiving actions from the widgets.
*/
- void action(const gcn::ActionEvent &event) override;
+ void action(const gcn::ActionEvent &event) override final;
- void keyPressed(gcn::KeyEvent &keyEvent) override;
+ void keyPressed(gcn::KeyEvent &keyEvent) override final;
private:
WorldListModel *mWorldListModel;