diff options
Diffstat (limited to 'src/gui/widgets')
89 files changed, 96 insertions, 105 deletions
diff --git a/src/gui/widgets/attrs/attrdisplay.h b/src/gui/widgets/attrs/attrdisplay.h index f682e41f5..7a1a1c02a 100644 --- a/src/gui/widgets/attrs/attrdisplay.h +++ b/src/gui/widgets/attrs/attrdisplay.h @@ -45,7 +45,7 @@ class AttrDisplay notfinal : public Container A_DELETE_COPY(AttrDisplay) - virtual ~AttrDisplay(); + ~AttrDisplay() override; virtual std::string update(); diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index 8af27256b..6d5ec67de 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -36,7 +36,7 @@ class AvatarListBox final : public ListBox, A_DELETE_COPY(AvatarListBox) - ~AvatarListBox(); + ~AvatarListBox() override final; /** * Draws the list box. diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h index 9ab658a76..36fc8191b 100644 --- a/src/gui/widgets/basiccontainer.h +++ b/src/gui/widgets/basiccontainer.h @@ -91,7 +91,7 @@ class BasicContainer notfinal : public Widget, /** * Destructor */ - virtual ~BasicContainer(); + ~BasicContainer() override; /** * Shows a certain part of a widget in the basic container. diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h index e26923d74..6090d4d82 100644 --- a/src/gui/widgets/basiccontainer2.h +++ b/src/gui/widgets/basiccontainer2.h @@ -90,7 +90,7 @@ class BasicContainer2: public BasicContainer /** * Destructor. */ - virtual ~BasicContainer2(); + ~BasicContainer2() override; /** * Sets the container to be opaque or not. If the container diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 66fcae2d9..80461133c 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -61,7 +61,7 @@ class BrowserBox final : public Widget, /** * Destructor. */ - ~BrowserBox(); + ~BrowserBox() override final; /** * Sets the handler for links. diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 4e6b5ba16..2ef88ce00 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -148,7 +148,7 @@ class Button final : public Widget, /** * Destructor. */ - ~Button(); + ~Button() override final; /** * Draws the button. diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h index def986b2d..6ec123e63 100644 --- a/src/gui/widgets/characterdisplay.h +++ b/src/gui/widgets/characterdisplay.h @@ -48,7 +48,7 @@ class CharacterDisplay final : public Container, A_DELETE_COPY(CharacterDisplay) - ~CharacterDisplay(); + ~CharacterDisplay() override final; void setCharacter(Net::Character *const character); diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h index ad12efb26..b444d8301 100644 --- a/src/gui/widgets/characterviewbase.h +++ b/src/gui/widgets/characterviewbase.h @@ -33,9 +33,6 @@ class CharacterViewBase notfinal : public Container, public: A_DELETE_COPY(CharacterViewBase) - virtual ~CharacterViewBase() - { } - virtual void show(const int i) = 0; virtual void resize() = 0; diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h index 344549092..04f38a3c6 100644 --- a/src/gui/widgets/characterviewnormal.h +++ b/src/gui/widgets/characterviewnormal.h @@ -34,7 +34,7 @@ class CharacterViewNormal final : public CharacterViewBase A_DELETE_COPY(CharacterViewNormal) - ~CharacterViewNormal(); + ~CharacterViewNormal() override final; void show(const int i) override final; diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h index f363c608e..7ce3fb6bf 100644 --- a/src/gui/widgets/characterviewsmall.h +++ b/src/gui/widgets/characterviewsmall.h @@ -35,7 +35,7 @@ class CharacterViewSmall final : public CharacterViewBase const int padding); A_DELETE_COPY(CharacterViewSmall) - ~CharacterViewSmall(); + ~CharacterViewSmall() override final; void show(const int i) override final; diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index d3c26153b..a29f5d213 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -104,7 +104,7 @@ class CheckBox final : public Widget, /** * Destructor. */ - ~CheckBox(); + ~CheckBox() override final; /** * Draws the caption, then calls drawBox to draw the check box. diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h index 6b0d4122b..cdfe522e9 100644 --- a/src/gui/widgets/colorpage.h +++ b/src/gui/widgets/colorpage.h @@ -34,7 +34,7 @@ class ColorPage final : public ListBox A_DELETE_COPY(ColorPage) - ~ColorPage(); + ~ColorPage() override final; void draw(Graphics *const graphics) override final A_NONNULL(2); diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 2d6e59001..2643ecc8f 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -41,7 +41,7 @@ class Container notfinal : public BasicContainer2 A_DELETE_COPY(Container) - virtual ~Container(); + ~Container() override; bool safeRemove(Widget *const widget); diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 8a655892d..ed5fd2340 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -56,7 +56,7 @@ class Desktop final : public Container, A_DELETE_COPY(Desktop) - ~Desktop(); + ~Desktop() override final; /** * Has to be called after updates have been loaded. diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index ec2e2136e..f9d398246 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -64,7 +64,7 @@ class DropDown final : public ActionListener, A_DELETE_COPY(DropDown) - ~DropDown(); + ~DropDown() override final; /** * Update the alpha value to the graphic components. diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h index a833e569f..f777be7e6 100644 --- a/src/gui/widgets/emotepage.h +++ b/src/gui/widgets/emotepage.h @@ -39,7 +39,7 @@ class EmotePage final : public Widget, A_DELETE_COPY(EmotePage) - ~EmotePage(); + ~EmotePage() override final; void draw(Graphics *const graphics) override final A_NONNULL(2); diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 14895d7a0..b8689bd92 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -44,7 +44,7 @@ class EmoteShortcutContainer final : public ShortcutContainer /** * Destructor. */ - ~EmoteShortcutContainer(); + ~EmoteShortcutContainer() override final; /** * Draws the items. diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h index b1401ac86..99c0160f3 100644 --- a/src/gui/widgets/extendedlistbox.h +++ b/src/gui/widgets/extendedlistbox.h @@ -37,7 +37,7 @@ class ExtendedListBox final : public ListBox A_DELETE_COPY(ExtendedListBox) - ~ExtendedListBox(); + ~ExtendedListBox() override final; /** * Draws the list box. diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index be91853a6..41329a06e 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -47,12 +47,6 @@ class FlowContainer final : public Container, A_DELETE_COPY(FlowContainer) /** - * Destructor. - */ - ~FlowContainer() - { } - - /** * Invoked when a widget changes its size. This is used to determine * the new height of the container. */ diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 4e7d8e50b..f21e16c33 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -60,7 +60,7 @@ class GuiTable final : public Widget, A_DELETE_COPY(GuiTable) - ~GuiTable(); + ~GuiTable() override final; /** * Sets the table model diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 8d7bdc13e..c8d034009 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -55,7 +55,7 @@ class Icon final : public Widget A_DELETE_COPY(Icon) - ~Icon(); + ~Icon() override final; /** * Gets the current Image. diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 38af6e821..d31e7d336 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -62,7 +62,7 @@ class ItemContainer final : public Widget, /** * Destructor. */ - ~ItemContainer(); + ~ItemContainer() override final; /** * Necessary for checking how full the inventory is. diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index bc90f71d1..032b0032b 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -34,7 +34,7 @@ class ItemLinkHandler final : public LinkHandler A_DELETE_COPY(ItemLinkHandler) - ~ItemLinkHandler(); + ~ItemLinkHandler() override final; void handleLink(const std::string &link, MouseEvent *event) override final; diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 146834f4d..9373c72ba 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -44,7 +44,7 @@ class ItemShortcutContainer final : public ShortcutContainer /** * Destructor. */ - ~ItemShortcutContainer(); + ~ItemShortcutContainer() override final; /** * Draws the items. diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 26790258c..2660e0173 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -103,7 +103,7 @@ class Label final : public Widget, A_DELETE_COPY(Label) - ~Label(); + ~Label() override final; void init(); diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index c0389cec3..4e8ecfdee 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -48,7 +48,7 @@ class LayoutHelper final : public WidgetListener /** * Destructor. */ - ~LayoutHelper(); + ~LayoutHelper() override final; /** * Gets the layout handler. diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 5c90058a8..2b5c36fc4 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -101,7 +101,7 @@ class ListBox notfinal : public Widget, A_DELETE_COPY(ListBox) - virtual ~ListBox(); + ~ListBox() override; void postInit() override; diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 55f5f11fc..d5308ce55 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -61,7 +61,7 @@ class PlayerBox final : public Widget, /** * Destructor. */ - ~PlayerBox(); + ~PlayerBox() override final; void init(std::string name, std::string selectedName); diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 085923d0e..ee3e13f03 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -66,7 +66,7 @@ class Popup notfinal : public Container, /** * Destructor. Deletes all the added widgets. */ - virtual ~Popup(); + ~Popup() override; /** * Sets the window container to be used by new popups. diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h index e6e27913b..94fc19d67 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -43,7 +43,7 @@ class PopupList final : public Popup, const bool extended, const Modal modal); - ~PopupList(); + ~PopupList() override final; A_DELETE_COPY(PopupList) diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 466f067b4..3c20f2ae7 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -58,7 +58,7 @@ class ProgressBar final : public Widget, A_DELETE_COPY(ProgressBar) - ~ProgressBar(); + ~ProgressBar() override final; /** * Performs progress bar logic (fading colors) diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index 6220a57c4..7bafb1fe9 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -39,7 +39,7 @@ class ProgressIndicator final : public Widget A_DELETE_COPY(ProgressIndicator) - ~ProgressIndicator(); + ~ProgressIndicator() override final; void logic() override final; diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index 10979fd39..743a52728 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -101,7 +101,7 @@ class RadioButton final : public Widget, /** * Destructor. */ - ~RadioButton(); + ~RadioButton() override final; /** * Draws the radiobutton, not the caption. diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index a2b6e0b78..bca169234 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -118,7 +118,7 @@ class ScrollArea final : public BasicContainer, /** * Destructor. Also deletes the content. */ - ~ScrollArea(); + ~ScrollArea() override final; /** * Logic function optionally adapts width or height of contents. This diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h index e17d3116a..9f07eb8d7 100644 --- a/src/gui/widgets/selldialog.h +++ b/src/gui/widgets/selldialog.h @@ -64,7 +64,7 @@ class SellDialog notfinal : public Window, /** * Destructor */ - ~SellDialog(); + ~SellDialog() override; /** * Resets the dialog, clearing inventory. diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h index b4f99328b..cb214f9c4 100644 --- a/src/gui/widgets/setupbuttonitem.h +++ b/src/gui/widgets/setupbuttonitem.h @@ -39,7 +39,7 @@ class SetupButtonItem final : public SetupItem A_DELETE_COPY(SetupButtonItem) - ~SetupButtonItem(); + ~SetupButtonItem() override final; void createControls(); diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index e8bcc0c8c..cb6ce462e 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -61,7 +61,7 @@ class SetupItem notfinal : public ActionListener, A_DELETE_COPY(SetupItem) - virtual ~SetupItem(); + ~SetupItem() override; void load(); @@ -170,7 +170,7 @@ class SetupItemCheckBox final : public SetupItem A_DELETE_COPY(SetupItemCheckBox) - ~SetupItemCheckBox(); + ~SetupItemCheckBox() override final; void createControls(); @@ -204,7 +204,7 @@ class SetupItemTextField final : public SetupItem A_DELETE_COPY(SetupItemTextField) - ~SetupItemTextField(); + ~SetupItemTextField() override final; void createControls(); @@ -259,7 +259,7 @@ class SetupItemIntTextField final : public SetupItem A_DELETE_COPY(SetupItemIntTextField) - ~SetupItemIntTextField(); + ~SetupItemIntTextField() override final; void createControls(); @@ -291,7 +291,7 @@ class SetupItemLabel final : public SetupItem A_DELETE_COPY(SetupItemLabel) - ~SetupItemLabel(); + ~SetupItemLabel() override final; void createControls(); @@ -332,7 +332,7 @@ class SetupItemDropDown final : public SetupItem A_DELETE_COPY(SetupItemDropDown) - ~SetupItemDropDown(); + ~SetupItemDropDown() override final; void createControls(); @@ -374,7 +374,7 @@ class SetupItemDropDownStr final : public SetupItem A_DELETE_COPY(SetupItemDropDownStr) - ~SetupItemDropDownStr(); + ~SetupItemDropDownStr() override final; void createControls(); @@ -422,7 +422,7 @@ class SetupItemSlider final : public SetupItem A_DELETE_COPY(SetupItemSlider) - ~SetupItemSlider(); + ~SetupItemSlider() override final; void createControls(); @@ -479,7 +479,7 @@ class SetupItemSlider2 final : public SetupItem A_DELETE_COPY(SetupItemSlider2) - ~SetupItemSlider2(); + ~SetupItemSlider2() override final; void createControls(); @@ -517,7 +517,7 @@ class SetupItemSliderList notfinal : public SetupItem public: A_DELETE_COPY(SetupItemSliderList) - virtual ~SetupItemSliderList(); + ~SetupItemSliderList() override; void createControls(); diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h index 24a9507a4..c87dd44ce 100644 --- a/src/gui/widgets/setupquickitem.h +++ b/src/gui/widgets/setupquickitem.h @@ -45,7 +45,7 @@ class SetupQuickItem final : public SetupItem, A_DELETE_COPY(SetupQuickItem) - ~SetupQuickItem(); + ~SetupQuickItem() override final; void createControls(); diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h index a485b1bd1..4f28c5492 100644 --- a/src/gui/widgets/setuptouchitem.h +++ b/src/gui/widgets/setuptouchitem.h @@ -48,7 +48,7 @@ class SetupActionDropDown final : public SetupItem A_DELETE_COPY(SetupActionDropDown) - ~SetupActionDropDown(); + ~SetupActionDropDown() override final; void createControls(); diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index b7076dfc2..26a043c71 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -46,7 +46,7 @@ class ShortcutContainer notfinal : public Widget, /** * Destructor. */ - virtual ~ShortcutContainer(); + ~ShortcutContainer() override; /** * Invoked when a widget changes its size. This is used to determine diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index f09e7d4bb..fef5f9136 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -71,7 +71,7 @@ class SkillListBox final : public ListBox A_DELETE_COPY(SkillListBox) - ~SkillListBox() + ~SkillListBox() override final { delete2(mModel) } diff --git a/src/gui/widgets/skillrectanglelistbox.h b/src/gui/widgets/skillrectanglelistbox.h index 671932d89..56f2982fd 100644 --- a/src/gui/widgets/skillrectanglelistbox.h +++ b/src/gui/widgets/skillrectanglelistbox.h @@ -121,7 +121,7 @@ class SkillRectangleListBox final : public Widget, A_DELETE_COPY(SkillRectangleListBox) - ~SkillRectangleListBox() + ~SkillRectangleListBox() override final { delete2(mModel) } diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 49acafc28..16823242f 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -107,7 +107,7 @@ class Slider final : public Widget, /** * Destructor. */ - ~Slider(); + ~Slider() override final; /** * Update the alpha value to the graphic components. diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h index 6f4336531..ab3d233d2 100644 --- a/src/gui/widgets/sliderlist.h +++ b/src/gui/widgets/sliderlist.h @@ -42,7 +42,7 @@ class SliderList final : public Container, A_DELETE_COPY(SliderList) - ~SliderList(); + ~SliderList() override final; void postInit2(ActionListener *const listener, const std::string &eventId); diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 872ca5e1a..3e5d6f431 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -44,7 +44,7 @@ class SpellShortcutContainer final : public ShortcutContainer /** * Destructor. */ - ~SpellShortcutContainer(); + ~SpellShortcutContainer() override final; /** * Draws the items. diff --git a/src/gui/widgets/staticbrowserbox.h b/src/gui/widgets/staticbrowserbox.h index 452bea681..d21b42b43 100644 --- a/src/gui/widgets/staticbrowserbox.h +++ b/src/gui/widgets/staticbrowserbox.h @@ -59,7 +59,7 @@ class StaticBrowserBox final : public Widget, /** * Destructor. */ - ~StaticBrowserBox(); + ~StaticBrowserBox() override final; /** * Sets the handler for links. diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 22e1c879e..6efcf541b 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -95,7 +95,7 @@ class TabbedArea final : public ActionListener, A_DELETE_COPY(TabbedArea) - ~TabbedArea(); + ~TabbedArea() override final; void postInit() override final; diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h index 24f69c8b9..e8cdacd65 100644 --- a/src/gui/widgets/tabs/chat/battletab.h +++ b/src/gui/widgets/tabs/chat/battletab.h @@ -35,7 +35,7 @@ class BattleTab final : public ChatTab A_DELETE_COPY(BattleTab) - ~BattleTab(); + ~BattleTab() override final; }; extern BattleTab *battleChatTab; diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h index 3ac51e59d..2f0517684 100644 --- a/src/gui/widgets/tabs/chat/channeltab.h +++ b/src/gui/widgets/tabs/chat/channeltab.h @@ -36,7 +36,7 @@ class ChannelTab final : public ChatTab A_DELETE_COPY(ChannelTab) - ~ChannelTab(); + ~ChannelTab() override final; protected: void handleInput(const std::string &msg) override final; diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index aeefe43db..088977631 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -72,7 +72,7 @@ class ChatTab notfinal : public Tab A_DELETE_COPY(ChatTab) - virtual ~ChatTab(); + ~ChatTab() override; /** * Adds a line of text to our message list. Parameters: diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h index 3cf3a0e59..fbe8aab00 100644 --- a/src/gui/widgets/tabs/chat/emulateguildtab.h +++ b/src/gui/widgets/tabs/chat/emulateguildtab.h @@ -38,7 +38,7 @@ class EmulateGuildTab final : public ChatTab, A_DELETE_COPY(EmulateGuildTab) - ~EmulateGuildTab(); + ~EmulateGuildTab() override final; bool handleCommand(const std::string &restrict type, const std::string &restrict args) override final; diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h index a8dd46fd3..609f9da75 100644 --- a/src/gui/widgets/tabs/chat/gmtab.h +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -33,7 +33,7 @@ class GmTab final : public ChatTab A_DELETE_COPY(GmTab) - ~GmTab(); + ~GmTab() override final; protected: void getAutoCompleteList(StringVect &names) const diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h index 5aa540ecb..95142c682 100644 --- a/src/gui/widgets/tabs/chat/guildtab.h +++ b/src/gui/widgets/tabs/chat/guildtab.h @@ -36,7 +36,7 @@ class GuildTab notfinal : public ChatTab, A_DELETE_COPY(GuildTab) - virtual ~GuildTab(); + ~GuildTab() override final; bool handleCommand(const std::string &restrict type, const std::string &restrict args) override final; diff --git a/src/gui/widgets/tabs/chat/langtab.h b/src/gui/widgets/tabs/chat/langtab.h index 773431e85..44173c653 100644 --- a/src/gui/widgets/tabs/chat/langtab.h +++ b/src/gui/widgets/tabs/chat/langtab.h @@ -31,7 +31,7 @@ class LangTab final : public ChatTab A_DELETE_COPY(LangTab) - ~LangTab(); + ~LangTab() override final; }; extern LangTab *langChatTab; diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h index a987c9362..71de2395f 100644 --- a/src/gui/widgets/tabs/chat/partytab.h +++ b/src/gui/widgets/tabs/chat/partytab.h @@ -36,7 +36,7 @@ class PartyTab notfinal : public ChatTab, A_DELETE_COPY(PartyTab) - virtual ~PartyTab(); + ~PartyTab() override; bool handleCommand(const std::string &restrict type, const std::string &restrict args) override final; diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h index 26c9bf8f6..ef0f8f7cb 100644 --- a/src/gui/widgets/tabs/chat/tradetab.h +++ b/src/gui/widgets/tabs/chat/tradetab.h @@ -35,7 +35,7 @@ class TradeTab final : public ChatTab A_DELETE_COPY(TradeTab) - ~TradeTab(); + ~TradeTab() override final; protected: void handleInput(const std::string &msg) override final; diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h index 1d3c03857..53ad98b6f 100644 --- a/src/gui/widgets/tabs/chat/whispertab.h +++ b/src/gui/widgets/tabs/chat/whispertab.h @@ -60,7 +60,7 @@ class WhisperTab final : public ChatTab const std::string &caption, const std::string &nick); - ~WhisperTab(); + ~WhisperTab() override final; void handleInput(const std::string &msg) override final; diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h index d76add16c..7d90bd381 100644 --- a/src/gui/widgets/tabs/setup_audio.h +++ b/src/gui/widgets/tabs/setup_audio.h @@ -34,7 +34,7 @@ class Setup_Audio final : public SetupTabScroll A_DELETE_COPY(Setup_Audio) - ~Setup_Audio(); + ~Setup_Audio() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h index 1ba74f340..cb6755371 100644 --- a/src/gui/widgets/tabs/setup_colors.h +++ b/src/gui/widgets/tabs/setup_colors.h @@ -42,7 +42,7 @@ class Setup_Colors final : public SetupTab, A_DELETE_COPY(Setup_Colors) - ~Setup_Colors(); + ~Setup_Colors() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h index 2da411b2c..f22d8f960 100644 --- a/src/gui/widgets/tabs/setup_input.h +++ b/src/gui/widgets/tabs/setup_input.h @@ -49,7 +49,7 @@ class Setup_Input final : public SetupTab /** * Destructor */ - ~Setup_Input(); + ~Setup_Input() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h index c66ab8687..286ebc824 100644 --- a/src/gui/widgets/tabs/setup_joystick.h +++ b/src/gui/widgets/tabs/setup_joystick.h @@ -38,7 +38,7 @@ class Setup_Joystick final : public SetupTab A_DELETE_COPY(Setup_Joystick) - ~Setup_Joystick(); + ~Setup_Joystick() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_misc.h b/src/gui/widgets/tabs/setup_misc.h index 787f4c181..2f5d8a179 100644 --- a/src/gui/widgets/tabs/setup_misc.h +++ b/src/gui/widgets/tabs/setup_misc.h @@ -34,7 +34,7 @@ class Setup_Misc final : public SetupTabScroll A_DELETE_COPY(Setup_Misc) - ~Setup_Misc(); + ~Setup_Misc() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_mods.h b/src/gui/widgets/tabs/setup_mods.h index 488915d31..71e35ff66 100644 --- a/src/gui/widgets/tabs/setup_mods.h +++ b/src/gui/widgets/tabs/setup_mods.h @@ -32,7 +32,7 @@ class Setup_Mods final : public SetupTabScroll A_DELETE_COPY(Setup_Mods) - ~Setup_Mods(); + ~Setup_Mods() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h index 95030a8e5..d4cadd659 100644 --- a/src/gui/widgets/tabs/setup_perfomance.h +++ b/src/gui/widgets/tabs/setup_perfomance.h @@ -34,7 +34,7 @@ class Setup_Perfomance final : public SetupTabScroll A_DELETE_COPY(Setup_Perfomance) - ~Setup_Perfomance(); + ~Setup_Perfomance() override final; private: #ifdef USE_SDL2 diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h index d29d41781..9be4f29c5 100644 --- a/src/gui/widgets/tabs/setup_players.h +++ b/src/gui/widgets/tabs/setup_players.h @@ -32,7 +32,7 @@ class Setup_Players final : public SetupTabScroll public: explicit Setup_Players(const Widget2 *const widget); - ~Setup_Players(); + ~Setup_Players() override final; A_DELETE_COPY(Setup_Players) diff --git a/src/gui/widgets/tabs/setup_quick.h b/src/gui/widgets/tabs/setup_quick.h index f174153ee..20e13d2de 100644 --- a/src/gui/widgets/tabs/setup_quick.h +++ b/src/gui/widgets/tabs/setup_quick.h @@ -34,7 +34,7 @@ class Setup_Quick final : public SetupTabScroll A_DELETE_COPY(Setup_Quick) - ~Setup_Quick(); + ~Setup_Quick() override final; protected: NamesModel *mMoveTypeList; diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index 879450891..9d5566e20 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -44,7 +44,7 @@ class Setup_Relations final : public SetupTab, A_DELETE_COPY(Setup_Relations) - ~Setup_Relations(); + ~Setup_Relations() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h index 57798f243..9a1702748 100644 --- a/src/gui/widgets/tabs/setup_theme.h +++ b/src/gui/widgets/tabs/setup_theme.h @@ -40,7 +40,7 @@ class Setup_Theme final : public SetupTab A_DELETE_COPY(Setup_Theme) - ~Setup_Theme(); + ~Setup_Theme() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h index a87a46c77..35e559934 100644 --- a/src/gui/widgets/tabs/setup_touch.h +++ b/src/gui/widgets/tabs/setup_touch.h @@ -33,7 +33,7 @@ class Setup_Touch final : public SetupTabScroll A_DELETE_COPY(Setup_Touch) - ~Setup_Touch(); + ~Setup_Touch() override final; protected: NamesModel *mSizeList; diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h index e327a29d8..809323c63 100644 --- a/src/gui/widgets/tabs/setup_video.h +++ b/src/gui/widgets/tabs/setup_video.h @@ -45,7 +45,7 @@ class Setup_Video final : public SetupTab, A_DELETE_COPY(Setup_Video) - ~Setup_Video(); + ~Setup_Video() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h index 08d1c7848..756ee5096 100644 --- a/src/gui/widgets/tabs/setup_visual.h +++ b/src/gui/widgets/tabs/setup_visual.h @@ -35,7 +35,7 @@ class Setup_Visual final : public SetupTabScroll A_DELETE_COPY(Setup_Visual) - ~Setup_Visual(); + ~Setup_Visual() override final; void apply() override final; diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index 655b98c85..e618e0d72 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -36,7 +36,7 @@ class SetupTabScroll notfinal : public SetupTab A_DELETE_COPY(SetupTabScroll) - virtual ~SetupTabScroll(); + ~SetupTabScroll() override; void addControl(SetupItem *const widget); diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h index 9086a4d0c..52ab92bdd 100644 --- a/src/gui/widgets/tabs/skilltab.h +++ b/src/gui/widgets/tabs/skilltab.h @@ -57,7 +57,7 @@ class SkillTab final : public Tab A_DELETE_COPY(SkillTab) - ~SkillTab() + ~SkillTab() override final { delete2(mListBox) delete2(mRectangleListBox) diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h index e876a60ae..e59990005 100644 --- a/src/gui/widgets/tabs/socialattacktab.h +++ b/src/gui/widgets/tabs/socialattacktab.h @@ -52,7 +52,7 @@ class SocialAttackTab final : public SocialTab A_DELETE_COPY(SocialAttackTab) - ~SocialAttackTab() + ~SocialAttackTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index d1cd942cd..8577af974 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -58,7 +58,7 @@ class SocialFriendsTab final : public SocialTab A_DELETE_COPY(SocialFriendsTab) - ~SocialFriendsTab() + ~SocialFriendsTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index a42ad1dad..d0a1f8a1d 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -66,7 +66,7 @@ class SocialGuildTab final : public SocialTab, A_DELETE_COPY(SocialGuildTab) - ~SocialGuildTab() + ~SocialGuildTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index c0dc123a4..f8dc661b7 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -65,7 +65,7 @@ class SocialGuildTab2 final : public SocialTab, A_DELETE_COPY(SocialGuildTab2) - ~SocialGuildTab2() + ~SocialGuildTab2() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index 1b049f055..d447cb6ce 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -63,7 +63,7 @@ class SocialNavigationTab final : public SocialTab A_DELETE_COPY(SocialNavigationTab) - ~SocialNavigationTab() + ~SocialNavigationTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index 17fcfd3f1..f296aa041 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -68,7 +68,7 @@ class SocialPartyTab final : public SocialTab, A_DELETE_COPY(SocialPartyTab) - ~SocialPartyTab() + ~SocialPartyTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h index 93d00e81a..626cb0a10 100644 --- a/src/gui/widgets/tabs/socialpickuptab.h +++ b/src/gui/widgets/tabs/socialpickuptab.h @@ -52,7 +52,7 @@ class SocialPickupTab final : public SocialTab A_DELETE_COPY(SocialPickupTab) - ~SocialPickupTab() + ~SocialPickupTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index c43093fca..b71ec3be7 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -57,7 +57,7 @@ class SocialPlayersTab final : public SocialTab A_DELETE_COPY(SocialPlayersTab) - ~SocialPlayersTab() + ~SocialPlayersTab() override final { delete2(mList) delete2(mScroll) diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h index 1c94aaede..85aa2c880 100644 --- a/src/gui/widgets/tabs/socialtab.h +++ b/src/gui/widgets/tabs/socialtab.h @@ -85,7 +85,7 @@ class SocialTab notfinal : public Tab { } - virtual ~SocialTab() + ~SocialTab() override { // Cleanup dialogs if (mInviteDialog != nullptr) diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index e6a816072..ccbc34f5d 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -90,7 +90,7 @@ class Tab notfinal : public BasicContainer, A_DELETE_COPY(Tab) - virtual ~Tab(); + ~Tab() override; enum { diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 6ce28ed4b..874d72f5d 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -94,7 +94,7 @@ class TextBox final : public Widget, A_DELETE_COPY(TextBox) - ~TextBox(); + ~TextBox() override final; /** * Sets the text after wrapping it to the current width of the widget. diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 73ce0c525..b3e470cb5 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -103,7 +103,7 @@ class TextField notfinal : public Widget, A_DELETE_COPY(TextField) - virtual ~TextField(); + ~TextField() override; /** * Draws the text field. diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index 7f4a5e873..e66e82c66 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -40,7 +40,7 @@ class TextPreview final : public Widget A_DELETE_COPY(TextPreview) - ~TextPreview(); + ~TextPreview() override final; inline void setTextColor(const Color *color) { mTextColor = color; adjustSize(); } diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h index 989a6c8d7..03d363226 100644 --- a/src/gui/widgets/virtshortcutcontainer.h +++ b/src/gui/widgets/virtshortcutcontainer.h @@ -46,7 +46,7 @@ class VirtShortcutContainer final : public ShortcutContainer /** * Destructor. */ - ~VirtShortcutContainer(); + ~VirtShortcutContainer() override final; /** * Draws the items. diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h index bb41054d2..fc045a24a 100644 --- a/src/gui/widgets/widget.h +++ b/src/gui/widgets/widget.h @@ -111,7 +111,7 @@ class Widget notfinal : public Widget2 /** * Default destructor. */ - virtual ~Widget(); + ~Widget() override; /** * Draws the widget. It is called by the parent widget when it is time diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index cffc2f17d..72ac52baa 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -121,7 +121,7 @@ class Window notfinal : public BasicContainer2, /** * Destructor. Deletes all the added widgets. */ - virtual ~Window(); + ~Window() override; /** * Sets the window container to be used by new windows. |