From 0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 18 Feb 2015 13:20:34 +0300 Subject: Add missing override keywords. --- src/gui/models/colorlistmodel.h | 4 ++-- src/gui/models/modelistmodel.h | 2 +- src/gui/models/sortlistmodelbuy.h | 4 ++-- src/gui/models/userstablemodel.h | 11 ++++++----- src/gui/popups/createpartypopup.h | 2 +- src/gui/popups/popupmenu.h | 2 +- src/gui/widgets/basiccontainer.h | 2 +- src/gui/widgets/basiccontainer2.h | 6 +++--- src/gui/widgets/chatinput.h | 2 +- src/gui/widgets/guitable.h | 2 +- src/gui/widgets/itemshortcutcontainer.h | 2 +- src/gui/widgets/selldialog.h | 2 +- src/gui/widgets/skilllistbox.h | 14 +++++++------- src/gui/widgets/tabbedarea.h | 2 +- src/gui/widgets/tabs/chat/partytab.h | 2 +- src/gui/widgets/tabs/setup_relations.h | 4 ++-- src/gui/widgets/tabs/setuptabscroll.h | 2 +- src/gui/widgets/tabs/socialguildtab.h | 2 +- src/gui/widgets/tabs/socialguildtab2.h | 2 +- src/gui/widgets/tabs/socialpartytab.h | 2 +- src/gui/widgets/textfield.h | 2 +- src/gui/widgets/vertcontainer.h | 2 +- src/gui/widgets/widgetgroup.h | 2 +- src/gui/widgets/window.h | 2 +- src/gui/windows/bankwindow.h | 2 +- src/gui/windows/buydialog.h | 2 +- src/gui/windows/buyselldialog.h | 2 +- src/gui/windows/chardeleteconfirm.h | 2 +- src/gui/windows/chatwindow.h | 2 +- src/gui/windows/didyouknowwindow.h | 2 +- src/gui/windows/inventorywindow.h | 4 ++-- src/gui/windows/itemamountwindow.h | 2 +- src/gui/windows/minimap.h | 2 +- src/gui/windows/ministatuswindow.h | 4 ++-- src/gui/windows/npcdialog.h | 2 +- src/gui/windows/socialwindow.h | 4 ++-- src/gui/windows/tradewindow.h | 2 +- 37 files changed, 56 insertions(+), 55 deletions(-) (limited to 'src/gui') diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h index 05f935c69..b50d5879d 100644 --- a/src/gui/models/colorlistmodel.h +++ b/src/gui/models/colorlistmodel.h @@ -65,12 +65,12 @@ class ColorListModel final : public ListModel ~ColorListModel() { } - int getNumberOfElements() + int getNumberOfElements() override final { return 14; } - std::string getElementAt(int i) + std::string getElementAt(int i) override final { if (i >= getNumberOfElements() || i < 0) return "???"; diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h index 05b82b36d..233221f75 100644 --- a/src/gui/models/modelistmodel.h +++ b/src/gui/models/modelistmodel.h @@ -48,7 +48,7 @@ class ModeListModel final : public ListModel /** * Returns element from container. */ - std::string getElementAt(int i) + std::string getElementAt(int i) override final { return mVideoModes[i]; } /** diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h index 4e42e548e..f76263cef 100644 --- a/src/gui/models/sortlistmodelbuy.h +++ b/src/gui/models/sortlistmodelbuy.h @@ -51,10 +51,10 @@ class SortListModelBuy final : public ListModel ~SortListModelBuy() { } - int getNumberOfElements() + int getNumberOfElements() override final { return 7; } - std::string getElementAt(int i) + std::string getElementAt(int i) override final { if (i >= getNumberOfElements() || i < 0) return "???"; diff --git a/src/gui/models/userstablemodel.h b/src/gui/models/userstablemodel.h index 801ef3595..2f6201024 100644 --- a/src/gui/models/userstablemodel.h +++ b/src/gui/models/userstablemodel.h @@ -70,22 +70,22 @@ class UsersTableModel final : public TableModel, freeWidgets(); } - int getRows() const + int getRows() const override final { return static_cast(mPlayers.size()); } - int getColumns() const + int getColumns() const override final { return COLUMNS_NR; } - int getRowHeight() const + int getRowHeight() const override final { return ROW_HEIGHT; } - int getColumnWidth(const int index) const + int getColumnWidth(const int index) const override final { if (index == NAME_COLUMN) return NAME_COLUMN_WIDTH; @@ -234,7 +234,8 @@ class UsersTableModel final : public TableModel, { } - Widget *getElementAt(const int row, const int column) const + Widget *getElementAt(const int row, + const int column) const override final { return mWidgets[WIDGET_AT(row, column)]; } diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h index 82a220cec..ad44928e7 100644 --- a/src/gui/popups/createpartypopup.h +++ b/src/gui/popups/createpartypopup.h @@ -54,7 +54,7 @@ class CreatePartyPopup final : public Popup, mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); } - void postInit() + void postInit() override final { add(mBrowserBox); setContentSize(mBrowserBox->getWidth() + 8, diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index 0274d69a4..c6ca65f61 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -150,7 +150,7 @@ class PopupMenu final : public Popup, public LinkHandler void handleLink(const std::string &link, MouseEvent *event A_UNUSED) override final; - void clear(); + void clear() override final; void moveUp(); diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h index fc64e0cfb..fcbf7f6dd 100644 --- a/src/gui/widgets/basiccontainer.h +++ b/src/gui/widgets/basiccontainer.h @@ -108,7 +108,7 @@ class BasicContainer notfinal : public Widget, * itself to be visible. * @param rectangle The rectangle to be visible. */ - virtual void showWidgetPart(Widget *const widget, Rect area); + void showWidgetPart(Widget *const widget, Rect area) override; // Inherited from Widget diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h index 9141550f5..60f4e69bb 100644 --- a/src/gui/widgets/basiccontainer2.h +++ b/src/gui/widgets/basiccontainer2.h @@ -140,18 +140,18 @@ class BasicContainer2: public BasicContainer * container. * @see add, clear */ - virtual void remove(Widget* widget); + void remove(Widget* widget) override; /** * Clears the container of all widgets. * * @see add, remove */ - virtual void clear(); + void clear() override; // Inherited from Widget - virtual void draw(Graphics* graphics); + void draw(Graphics* graphics) override; protected: /** diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h index 909b3449c..b1a22d3fb 100644 --- a/src/gui/widgets/chatinput.h +++ b/src/gui/widgets/chatinput.h @@ -54,7 +54,7 @@ class ChatInput final : public TextField * Called if the chat input loses focus. It will set itself to * invisible as result. */ - void focusLost(const Event &event) + void focusLost(const Event &event) override final { TextField::focusLost(event); if (mFocusGaining || !config.getBoolValue("protectChatFocus")) diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 8100aa3fc..3b9e19a65 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -155,7 +155,7 @@ class GuiTable final : public Widget, // Constraints inherited from TableModelListener void modelUpdated(const bool completed) override final; - void requestFocus(); + void requestFocus() override; void setSelectable(bool b) { mSelectable = b; } diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index c6038d7fe..d62b18914 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -72,7 +72,7 @@ class ItemShortcutContainer final : public ShortcutContainer void mouseMoved(MouseEvent &event) override final; - void setWidget2(const Widget2 *const widget); + void setWidget2(const Widget2 *const widget) override final; private: bool mItemClicked; diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h index 88db5f76d..1d0bed7e1 100644 --- a/src/gui/widgets/selldialog.h +++ b/src/gui/widgets/selldialog.h @@ -107,7 +107,7 @@ class SellDialog notfinal : public Window, */ static void closeAll(); - void postInit(); + void postInit() override; protected: typedef std::list DialogList; diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index 982a779e4..387bde055 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -91,7 +91,7 @@ class SkillListBox final : public ListBox return static_cast(mListModel)->getSkillAt(selected); } - void draw(Graphics *graphics) override + void draw(Graphics *graphics) override final { if (!mListModel) return; @@ -164,7 +164,7 @@ class SkillListBox final : public ListBox } } - unsigned int getRowHeight() const override + unsigned int getRowHeight() const override final { return mRowHeight; } const SkillInfo *getSkillByEvent(const MouseEvent &event) const @@ -178,7 +178,7 @@ class SkillListBox final : public ListBox return skill; } - void mouseMoved(MouseEvent &event) override + void mouseMoved(MouseEvent &event) override final { ListBox::mouseMoved(event); if (!viewport || !dragDrop.isEmpty()) @@ -189,7 +189,7 @@ class SkillListBox final : public ListBox mPopup->position(viewport->mMouseX, viewport->mMouseY); } - void mouseDragged(MouseEvent &event) + void mouseDragged(MouseEvent &event) override final { if (event.getButton() == MouseButton::LEFT) { @@ -213,7 +213,7 @@ class SkillListBox final : public ListBox } } - void mousePressed(MouseEvent &event) + void mousePressed(MouseEvent &event) override final { ListBox::mousePressed(event); if (event.getButton() == MouseButton::LEFT) @@ -226,12 +226,12 @@ class SkillListBox final : public ListBox } } - void mouseReleased(MouseEvent &event) + void mouseReleased(MouseEvent &event) override final { ListBox::mouseReleased(event); } - void mouseExited(MouseEvent &event A_UNUSED) override + void mouseExited(MouseEvent &event A_UNUSED) override final { mPopup->hide(); } diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 618bda209..7c192dac9 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -224,7 +224,7 @@ class TabbedArea final : public ActionListener, void setDimension(const Rect &dimension); - void death(const Event &event); + void death(const Event &event) override final; void setResizeHeight(bool b) { mResizeHeight = b; } diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h index bb7504bc2..7de669e7f 100644 --- a/src/gui/widgets/tabs/chat/partytab.h +++ b/src/gui/widgets/tabs/chat/partytab.h @@ -43,7 +43,7 @@ class PartyTab notfinal : public ChatTab, void playNewMessageSound() const override final; - void optionChanged(const std::string &value); + void optionChanged(const std::string &value) override final; protected: void handleInput(const std::string &msg) override final; diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index 14ae74575..5a023be9f 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -56,9 +56,9 @@ class Setup_Relations final : public SetupTab, void action(const ActionEvent &event) override final; - void updatedPlayer(const std::string &name); + void updatedPlayer(const std::string &name) override final; - void updateAll(); + void updateAll() override final; void externalUpdated() override final; diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index 5f7a51005..8c2c2f590 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -67,7 +67,7 @@ class SetupTabScroll notfinal : public SetupTab void reread(const std::string &name); - void clear(); + void clear() override final; const std::set &getAllItems() const { return mAllItems; } diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index 1c63a8dde..4c966b2ca 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -134,7 +134,7 @@ class SocialGuildTab final : public SocialTab, mConfirmDialog->addActionListener(this); } - void buildCounter(const int online0, const int total0) + void buildCounter(const int online0, const int total0) override final { if (online0 || total0) { diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index 39c114b1e..e17b97466 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -72,7 +72,7 @@ class SocialGuildTab2 final : public SocialTab, } void buildCounter(const int online0 A_UNUSED, - const int total0 A_UNUSED) + const int total0 A_UNUSED) override final { if (!localPlayer) return; diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index f04755c9a..83d29ec1b 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -135,7 +135,7 @@ class SocialPartyTab final : public SocialTab, } void buildCounter(const int online0 A_UNUSED, - const int total0 A_UNUSED) + const int total0 A_UNUSED) override final { if (!localPlayer) return; diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index caff8fd53..e7d6977c7 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -224,7 +224,7 @@ class TextField notfinal : public Widget, void fixScroll(); - void fontChanged(); + void fontChanged() override; bool handleNormalKeys(const int action, bool &consumed); diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 8d34a3317..6a0192a32 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -51,7 +51,7 @@ class VertContainer final : public Container, void add1(Widget *const widget, const int spacing = -1); - void clear(); + void clear() override final; void widgetResized(const Event &event) override final; diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index 1341688c5..dc85461f4 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -44,7 +44,7 @@ class WidgetGroup notfinal : public Container, virtual void add(Widget *const widget, const int spacing); - virtual void clear(); + void clear() override final; void widgetResized(const Event &event) override final; diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index b70a8b016..17db9778f 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -557,7 +557,7 @@ class Window notfinal : public BasicContainer2, bool isMovable() const { return mMovable; } - virtual Rect getChildrenArea(); + Rect getChildrenArea() override; /** * Resizes the window to fit the content. diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h index 92985e75c..f19f6c17f 100644 --- a/src/gui/windows/bankwindow.h +++ b/src/gui/windows/bankwindow.h @@ -52,7 +52,7 @@ class BankWindow final : public Window, void widgetShown(const Event &event) override final; - void bankMoneyChanged(const int money); + void bankMoneyChanged(const int money) override final; private: Label *mBankMoneyLabel; diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 78df8ebf8..56735baca 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -129,7 +129,7 @@ class BuyDialog final : public Window, /** * Sets the visibility of this window. */ - void setVisible(bool visible); + void setVisible(bool visible) override final; void sort(); diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 57a46f8a9..14121715f 100644 --- a/src/gui/windows/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h @@ -54,7 +54,7 @@ class BuySellDialog final : public Window, void init(); - void setVisible(bool visible); + void setVisible(bool visible) override final; /** * Called when receiving actions from the widgets. diff --git a/src/gui/windows/chardeleteconfirm.h b/src/gui/windows/chardeleteconfirm.h index 06bc7db9c..326f39261 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) + void action(const ActionEvent &event) override final { if (event.getId() == "yes" && mMaster) mMaster->askPasswordForDeletion(mIndex); diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 57ef51629..dd28ca74f 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -155,7 +155,7 @@ class ChatWindow final : public Window, void addItemText(const std::string &item); /** Override to reset mTmpVisible */ - void setVisible(bool visible); + void setVisible(bool visible) override final; /** * Handles mouse when dragged. diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index 8ab9ea984..9d84a8256 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -63,7 +63,7 @@ class DidYouKnowWindow final : public Window, void loadData(int num = 0); - void setVisible(bool visible); + void setVisible(bool visible) override final; private: void loadFile(const int num); diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 119de9e94..209e9c171 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -128,9 +128,9 @@ class InventoryWindow final : public Window, * Closes the Storage Window, as well as telling the server that the * window has been closed. */ - void close(); + void close() override final; - void slotsChanged(Inventory *const inventory); + void slotsChanged(Inventory *const inventory) override final; bool isMainInventory() const A_WARN_UNUSED { return mInventory->isMainInventory(); } diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index a82809730..8ce4f13c6 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -81,7 +81,7 @@ class ItemAmountWindow final : public Window, /** * Schedules the Item Amount window for deletion. */ - void close(); + void close() override final; void keyReleased(KeyEvent &event) override final; diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h index 2c861e330..8d7ffc2a8 100644 --- a/src/gui/windows/minimap.h +++ b/src/gui/windows/minimap.h @@ -71,7 +71,7 @@ class Minimap final : public Window, public ConfigListener void screenToMap(int &x, int &y); - void optionChanged(const std::string &name); + void optionChanged(const std::string &name) override final; private: void deleteMapImage(); diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 38e784ba9..548344728 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -67,7 +67,7 @@ class MiniStatusWindow final : public Window, void drawIcons(Graphics *const graphics); - void updateStatus(); + void updateStatus() override final; void logic() override final; @@ -98,7 +98,7 @@ class MiniStatusWindow final : public Window, const int oldVal1, const int oldVal2) override final; - void arrowsChanged(); + void arrowsChanged() override final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 8d04cb0d5..72a42701b 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -210,7 +210,7 @@ class NpcDialog final : public Window, void clearRows(); - void mousePressed(MouseEvent &event); + void mousePressed(MouseEvent &event) override final; int isCloseState() const { return mActionState == NPC_ACTION_CLOSE; } diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index 26860d117..d5f015e5d 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -129,9 +129,9 @@ class SocialWindow final : public Window, void updateGuildCounter(const int online = 0, const int total = 0); - void updatedPlayer(const std::string &name); + void updatedPlayer(const std::string &name) override final; - void updateAll(); + void updateAll() override final; #ifdef USE_PROFILER void logicChildren(); diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index c774d521d..f08d88963 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -143,7 +143,7 @@ class TradeWindow final : public Window, /** * Clear auto trade items. */ - void clear(); + void clear() override final; /** * Add item what will be added to trade. -- cgit v1.2.3-70-g09d2