From 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 20:03:14 +0300 Subject: Remove override keyword, if it present with final. --- 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 +++--- 53 files changed, 211 insertions(+), 211 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h index b3cea2be8..72e00ad28 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) override final; + void action(const ActionEvent &event) final; - void widgetShown(const Event &event) override final; + void widgetShown(const Event &event) final; - void bankMoneyChanged(const int money) override final; + void bankMoneyChanged(const int money) final; private: Label *mBankMoneyLabel; diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 77d5c357f..a7fa081bf 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) override final; + void action(const ActionEvent &event) 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) override final; + void valueChanged(const SelectionEvent &event) 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) override final; + void setVisible(Visible visible) final; void sort(); - void close() override final; + void close() final; /** * Returns true if any instances exist. diff --git a/src/gui/windows/buyingstoreselldialog.h b/src/gui/windows/buyingstoreselldialog.h index cb2219fca..879272d36 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) override final; + void sellAction(const ActionEvent &event) final; BeingId mAccountId; int mStoreId; diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 92a556d7e..69e0b37fb 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) override final; + void setVisible(Visible visible) final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Returns true if any instances exist. diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index 511e3b00d..ccf510a0c 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) override final; + void action(const ActionEvent &event) 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 857067f13..46bb9a73f 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) override final; + void action(const ActionEvent &event) final; private: TextField *mOldPassField A_NONNULLPOINTER; diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 5f2885049..bc87ae45e 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) override final; + void action(const ActionEvent &event) 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() override final; + void logic() final; void updatePlayer(); - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; private: int getDistributedPoints() const A_WARN_UNUSED; diff --git a/src/gui/windows/chardeleteconfirm.h b/src/gui/windows/chardeleteconfirm.h index 5cee85b47..08b78cc33 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) override final + void action(const ActionEvent &event) final { if (event.getId() == "yes" && mMaster) mMaster->askPasswordForDeletion(mIndex); diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 1083e3ae5..e1d1190da 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) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; enum SelectAction { @@ -88,13 +88,13 @@ class CharSelectDialog final : public Window, void askPasswordForDeletion(const int index); - void close() override final; + void close() final; - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; void updateState(); - void postInit() override final; + void postInit() 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 49c068a0f..c2b664dda 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) override final; + void action(const ActionEvent &event) 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) override final; + void keyPressed(KeyEvent &event) 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) override final; + void setVisible(Visible visible) final; /** * Handles mouse when dragged. */ - void mouseDragged(MouseEvent &event) override final; + void mouseDragged(MouseEvent &event) final; /** * Handles mouse when pressed. */ - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; /** * 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) override final; + void optionChanged(const std::string &name) final; - void mouseEntered(MouseEvent& event) override final; + void mouseEntered(MouseEvent& event) final; - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mouseExited(MouseEvent& event A_UNUSED) override final; + void mouseExited(MouseEvent& event A_UNUSED) final; - void draw(Graphics *const graphics) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); void updateVisibility(); void unHideWindow(); - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; void addGlobalMessage(const std::string &line); - void postInit() override final; + void postInit() 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) override final; + const int newVal) final; void statChanged(const AttributesT id, const int oldVal1, - const int oldVal2) override final; + const int oldVal2) 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) override final; + void debugMessage(const std::string &msg) final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h index 8198b0c54..236824cba 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() override final; + void postInit() final; private: TextBox *mTextBox A_NONNULLPOINTER; diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index 5630ee121..4c807c515 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() override final; + void postInit() final; /** * Called when the user presses Cancel. Restores the global state to * the previous one. */ - void action(const ActionEvent &) override final; + void action(const ActionEvent &) final; - void draw(Graphics *const graphics) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); private: StateT mCancelState; diff --git a/src/gui/windows/cutinwindow.h b/src/gui/windows/cutinwindow.h index fd6e63390..5e4bdf220 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) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); void draw2(Graphics *const graphics) A_NONNULL(2); @@ -49,7 +49,7 @@ class CutInWindow final : public Window void hide(); - void logic() override final; + void logic() final; private: AnimatedSprite *mImage; diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h index 12bb97f13..aca10cdb7 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() override final; + void postInit() final; /** * Logic (updates components' size and infos) */ void slowLogic(); - void draw(Graphics *const g) override final A_NONNULL(2); + void draw(Graphics *const g) final A_NONNULL(2); - void safeDraw(Graphics *const g) override final A_NONNULL(2); + void safeDraw(Graphics *const g) final A_NONNULL(2); void setPing(int pingTime); - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index c63b2d421..14953d995 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Handles link action. */ void handleLink(const std::string &link, - MouseEvent *const event) override final; + MouseEvent *const event) final; void loadData(int num = 0); - void setVisible(Visible visible) override final; + void setVisible(Visible visible) final; private: void loadFile(const int num); diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h index 44e1423c4..3e7e52961 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) 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 5595c3120..9251dbe42 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; private: TextField *mServerAddressField A_NONNULLPOINTER; diff --git a/src/gui/windows/eggselectiondialog.h b/src/gui/windows/eggselectiondialog.h index c8060dc10..ce621a771 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() override final; - void sellAction(const ActionEvent &event) override final; + void initButtons() final; + void sellAction(const ActionEvent &event) final; }; #endif // EATHENA_SUPPORT diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h index 0bc2af060..c896f79d0 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 final; + void postInit() final; void show(); @@ -61,9 +61,9 @@ class EmoteWindow final : public Window void addListeners(ActionListener *const listener); - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; - void widgetMoved(const Event &event) override final; + void widgetMoved(const Event &event) final; private: TabbedArea *mTabs A_NONNULLPOINTER; diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 985208e03..f43f7278f 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() override final; + void postInit() final; /** * Draws the equipment window. */ - void draw(Graphics *const graphics) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void mousePressed(MouseEvent& event) override final; + void mousePressed(MouseEvent& event) 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) override final; + void mouseExited(MouseEvent &event) final; - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mouseReleased(MouseEvent &event) override final; + void mouseReleased(MouseEvent &event) final; void recalcSize(); diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index ec0b88d93..7a367e978 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) override final; + void action(const ActionEvent &event) final; /** * Handles link action. */ void handleLink(const std::string &link, - MouseEvent *const event A_UNUSED) override final; + MouseEvent *const event A_UNUSED) final; /** * Loads help in the dialog. diff --git a/src/gui/windows/insertcarddialog.h b/src/gui/windows/insertcarddialog.h index eff74cde0..7f5ffaaf3 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() override final; - void sellAction(const ActionEvent &event) override final; + void initButtons() final; + void sellAction(const ActionEvent &event) final; private: int mItemIndex; diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index e19b219f8..8ac52ee21 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() override final; + void postInit() final; void storeSortOrder() const; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Returns the selected item. @@ -97,35 +97,35 @@ class InventoryWindow final : public Window, /** * Handles closing of the window */ - void widgetHidden(const Event &event) override final; + void widgetHidden(const Event &event) final; /** * Handles the mouse clicks. */ - void mouseClicked(MouseEvent &event) override final; + void mouseClicked(MouseEvent &event) final; /** * Handles the key presses. */ - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; /** * Handles the key releases. */ - void keyReleased(KeyEvent &event) override final; + void keyReleased(KeyEvent &event) final; /** * Updates labels to currently selected item. */ - void valueChanged(const SelectionEvent &event) override final; + void valueChanged(const SelectionEvent &event) final; /** * Closes the Storage Window, as well as telling the server that the * window has been closed. */ - void close() override final; + void close() final; - void slotsChanged(const Inventory *const inventory) override final; + void slotsChanged(const Inventory *const inventory) 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) override final; + void widgetResized(const Event &event) final; - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mouseExited(MouseEvent &event) override final; + void mouseExited(MouseEvent &event) final; - void setVisible(Visible visible) override final; + void setVisible(Visible visible) final; void unsetInventory(); void attributeChanged(const AttributesT id, const int oldVal, - const int newVal) override final; + const int newVal) final; #ifdef EATHENA_SUPPORT void combineItems(const int index1, diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index c9cbd4227..3e1fa45d7 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() override final; + void postInit() final; /** * Called when receiving actions from widget. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Sets default amount value. @@ -63,16 +63,16 @@ class ItemAmountWindow final : public Window, void resetAmount(); // MouseListener - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mouseExited(MouseEvent &event) override final; + void mouseExited(MouseEvent &event) final; /** * Schedules the Item Amount window for deletion. */ - void close() override final; + void close() final; - void keyReleased(KeyEvent &event) override final; + void keyReleased(KeyEvent &event) 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 d3b7a88b8..c1a60c36a 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) override final; + void action(const ActionEvent &event) 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) override final; + const int newVal) final; private: int mKillTimer; /**< Timer for kill stats. */ diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index 2af656230..f15b0824a 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Called when a key is pressed in one of the text fields. */ - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; - void close() override final; + void close() final; static std::string savedPasswordKey; static std::string savedPassword; diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h index 097820366..4bd9c9b95 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) override final; + void action(const ActionEvent &event) 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() override final; + void close() final; private: Button *mSendButton; diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h index 563f9e99f..46f4bb170 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) override final; + void action(const ActionEvent &event) final; private: const MailMessage *mMessage; diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h index 1a78c1de9..3e879728e 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) override final; + void action(const ActionEvent &event) final; void addMail(MailMessage *const message); - void clear() override final; + void clear() final; void showMessage(MailMessage *const mail); @@ -63,7 +63,7 @@ class MailWindow final : public Window, void viewPrev(const int id); - void mouseClicked(MouseEvent &event) override final; + void mouseClicked(MouseEvent &event) final; void postConnection(); diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h index 7d6f8bfc4..841c12db2 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) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); void draw2(Graphics *const graphics) A_NONNULL(2); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mouseReleased(MouseEvent &event) override final; + void mouseReleased(MouseEvent &event) final; - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; - void mouseExited(MouseEvent &event) override final; + void mouseExited(MouseEvent &event) final; void screenToMap(int &x, int &y); - void optionChanged(const std::string &name) override final; + void optionChanged(const std::string &name) final; private: void deleteMapImage(); diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 82fa059c7..10ff9211d 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() override final; + void updateStatus() final; - void logic() override final; + void logic() final; - void draw(Graphics *const graphics) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); - void mouseMoved(MouseEvent &event) override final; + void mouseMoved(MouseEvent &event) final; - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; - void mouseExited(MouseEvent &event) override final; + void mouseExited(MouseEvent &event) final; void showBar(const std::string &name, const Visible visible); void updateBars(); - void slotsChanged(const Inventory *const inventory) override final; + void slotsChanged(const Inventory *const inventory) final; std::vector &getBars() A_WARN_UNUSED { return mBars; } - Rect getChildrenArea() override final A_WARN_UNUSED; + Rect getChildrenArea() final A_WARN_UNUSED; void attributeChanged(const AttributesT id, const int oldVal, - const int newVal) override final; + const int newVal) final; void statChanged(const AttributesT id, const int oldVal1, - const int oldVal2) override final; + const int oldVal2) final; - void arrowsChanged() override final; + void arrowsChanged() final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index fa3e52097..beaee8afa 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() override final; + void postInit() final; enum NpcInputState { @@ -99,7 +99,7 @@ class NpcDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) 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() override final A_WARN_UNUSED; + int getNumberOfElements() final A_WARN_UNUSED; /** * Returns the name of item number i of the choices list. */ - std::string getElementAt(int i) override final A_WARN_UNUSED; + std::string getElementAt(int i) final A_WARN_UNUSED; /** * Returns the image of item number i of the choices list. */ - const Image *getImageAt(int i) override final A_WARN_UNUSED; + const Image *getImageAt(int i) 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) override final; + void setVisible(Visible visible) final; - void optionChanged(const std::string &name) override final; + void optionChanged(const std::string &name) final; /** * Returns true if any instances exist. @@ -232,11 +232,11 @@ class NpcDialog final : public Window, void setAvatarAction(const int actionId); - void logic() override final; + void logic() final; void clearRows(); - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; int isCloseState() const { return mActionState == NPC_ACTION_CLOSE; } diff --git a/src/gui/windows/npcselldialog.h b/src/gui/windows/npcselldialog.h index dde77de93..5b65ea50d 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() override final; + void close() final; protected: - void sellAction(const ActionEvent &event) override final; + void sellAction(const ActionEvent &event) final; void sellOneItem(); diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 156ab71f7..8e6a71ef1 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) override final; + void action(const ActionEvent &event) final; private: TextBox *mTextBox; diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index b10388005..30f2d1053 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) override final; + void action(const ActionEvent &event) final; - void draw(Graphics *const graphics) override final A_NONNULL(2); + void draw(Graphics *const graphics) final A_NONNULL(2); - void safeDraw(Graphics *const graphics) override final A_NONNULL(2); + void safeDraw(Graphics *const graphics) final A_NONNULL(2); - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; - void mouseDragged(MouseEvent &event) override final; + void mouseDragged(MouseEvent &event) final; - void mouseReleased(MouseEvent &event) override final; + void mouseReleased(MouseEvent &event) final; void load(const bool oldConfig = false); diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 1012e813a..dce261b72 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) override final; + void action(const ActionEvent &event) final; void updateQuest(const int var, const int val); diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index f643d0368..d945e4773 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; private: void placeOption(ContainerPlacer &placer, diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index e273b7809..059bd2a4b 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() override final; + void postInit() final; /** * Destructor @@ -78,24 +78,24 @@ class ServerDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; /** * Called when the selected value changed in the servers list box. */ - void valueChanged(const SelectionEvent &event) override final; + void valueChanged(const SelectionEvent &event) final; - void mouseClicked(MouseEvent &event) override final; + void mouseClicked(MouseEvent &event) final; - void logic() override final; + void logic() final; void updateServer(const ServerInfo &server, const int index); void connectToSelectedServer(); - void close() override final; + void close() final; protected: friend class ServersListModel; diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index 4e6d6b15c..10e084b19 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() override final; + void postInit() final; - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) 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) override final; + void setVisible(Visible visible) final; - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; private: void unloadAdditionalTabs(); diff --git a/src/gui/windows/shopselldialog.h b/src/gui/windows/shopselldialog.h index 4d68e0aeb..59149e83f 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) override final; + void sellAction(const ActionEvent &event) final; std::string mNick; }; diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 8bd5e5d2a..3a9a5001b 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Updates the labels according to the selected item. */ - void valueChanged(const SelectionEvent &event) override final; + void valueChanged(const SelectionEvent &event) 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) override final; + void setVisible(Visible visible) 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) override final; + void vendingEnabled(const bool b) final; - void vendingSlotsChanged(const int slots) override final; + void vendingSlotsChanged(const int slots) final; - void buyingStoreEnabled(const bool b) override final; + void buyingStoreEnabled(const bool b) final; - void buyingStoreSlotsChanged(const int slots) override final; + void buyingStoreSlotsChanged(const int slots) final; void setShopName(const std::string &name); #endif diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index 2e0d8ee83..a04ca7e95 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) override final; + void widgetHidden(const Event &event) final; - void widgetMoved(const Event& event) override final; + void widgetMoved(const Event& event) final; - void mousePressed(MouseEvent &event) override final; + void mousePressed(MouseEvent &event) final; - void mouseDragged(MouseEvent &event) override final; + void mouseDragged(MouseEvent &event) final; void nextTab(); diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 910ba9b72..39d03a164 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() override final; + void postInit() final; /** * Called when receiving actions from widget. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) 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) override final; + void widgetResized(const Event &event) final; void useItem(const int itemId, const AutoTarget autoTarget, diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index b65ad02df..feca9ce02 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() override final; + void postInit() 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) override final; + void action(const ActionEvent &event) 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) override final; + void widgetResized(const Event &event) 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) override final; + void updatedPlayer(const std::string &name) final; - void updateAll() override final; + void updateAll() final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 00b468d07..2e7bb2e70 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) override final; + const int newVal) final; void statChanged(const AttributesT id, const int oldVal1, - const int oldVal2) override final; + const int oldVal2) final; void updateLevelLabel(); diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 07562320a..9367baff1 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() override final; + void postInit() final; - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void scheduleDelete() override final; + void scheduleDelete() final; private: #ifdef TMWA_SUPPORT diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h index edf97c547..77fb1151c 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) 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() override final; + void close() final; private: static int instances; diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h index 70da4ad5e..76124df9a 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) override final; + void action(const ActionEvent &event) final; /** * Updates labels according to selected item. * * @see SelectionListener::selectionChanged */ - void valueChanged(const SelectionEvent &event) override final; + void valueChanged(const SelectionEvent &event) final; /** * Sets the visibility of this window. */ - void setVisible(Visible visible) override final; + void setVisible(Visible visible) final; void postInit() override; diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index f8a280a20..d33f614c7 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) override final; + void valueChanged(const SelectionEvent &event) final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; /** * Closes the Trade Window, as well as telling the server that the * window has been closed. */ - void close() override final; + void close() final; /** * Clear auto trade items. */ - void clear() override final; + void clear() final; /** * Add item what will be added to trade. diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index aaba439ad..4e2ab4adc 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() override final; + void postInit() final; /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; private: LoginData *mLoginData A_NONNULLPOINTER; diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index 0d322dccf..2c72eae2d 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() override final; + void postInit() final; /** * Set's progress bar status @@ -108,14 +108,14 @@ class UpdaterWindow final : public Window, void loadPatch(); - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; - void logic() override final; + void logic() final; void handleLink(const std::string &link, - MouseEvent *const event A_UNUSED) override final; + MouseEvent *const event A_UNUSED) final; void loadFile(std::string file); diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 6aee4c139..0fbd2f232 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() override final; + void postInit() final; #ifdef TMWA_SUPPORT /** @@ -70,15 +70,15 @@ class WhoIsOnline final : public Window, void loadList(const std::vector &list); void handleLink(const std::string& link, - MouseEvent *event) override final; + MouseEvent *event) final; - void logic() override final; + void logic() final; void slowLogic(); - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) final; const std::set &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) override final; + void optionChanged(const std::string &name) final; void updateList(StringVect &list); diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index 99306df03..0de093dc8 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() override final; + void postInit() final; /** * Destructor. @@ -63,9 +63,9 @@ class WorldSelectDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) final; - void keyPressed(KeyEvent &event) override final; + void keyPressed(KeyEvent &event) final; private: WorldListModel *mWorldListModel A_NONNULLPOINTER; -- cgit v1.2.3-60-g2f50