diff options
Diffstat (limited to 'src/gui/widgets/tabs')
31 files changed, 94 insertions, 94 deletions
diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h index c7015cd41..9b723a7dc 100644 --- a/src/gui/widgets/tabs/chat/channeltab.h +++ b/src/gui/widgets/tabs/chat/channeltab.h @@ -39,13 +39,13 @@ class ChannelTab final : public ChatTab ~ChannelTab(); protected: - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; bool handleCommand(const std::string &restrict type, - const std::string &restrict args) final; + const std::string &restrict args) override final; void getAutoCompleteCommands(StringVect& commands) - const final; + const override final; }; #endif // GUI_WIDGETS_TABS_CHAT_CHANNELTAB_H diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 16c834503..dc2062946 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -184,7 +184,7 @@ class ChatTab notfinal : public Tab friend class ChatWindow; friend class WhisperWindow; - void setCurrent() final + void setCurrent() override final { setFlash(0); } virtual void handleInput(const std::string &msg); diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h index 8724aee75..96eed73a6 100644 --- a/src/gui/widgets/tabs/chat/emulateguildtab.h +++ b/src/gui/widgets/tabs/chat/emulateguildtab.h @@ -41,18 +41,18 @@ class EmulateGuildTab final : public ChatTab, ~EmulateGuildTab(); bool handleCommand(const std::string &restrict type, - const std::string &restrict args) final; + const std::string &restrict args) override final; - void playNewMessageSound() const final; + void playNewMessageSound() const override final; - void optionChanged(const std::string &value) final; + void optionChanged(const std::string &value) override final; protected: - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; - void getAutoCompleteList(StringVect &names) const final; + void getAutoCompleteList(StringVect &names) const override final; - void getAutoCompleteCommands(StringVect &names) const final; + void getAutoCompleteCommands(StringVect &names) const override final; }; #endif // TMWA_SUPPORT diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h index 084034c0a..797084a76 100644 --- a/src/gui/widgets/tabs/chat/gmtab.h +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -37,11 +37,11 @@ class GmTab final : public ChatTab protected: void getAutoCompleteList(StringVect &names) const - final A_CONST; + override final A_CONST; - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; - void handleCommandStr(const std::string &msg) final A_CONST; + void handleCommandStr(const std::string &msg) override final A_CONST; }; extern GmTab *gmChatTab; diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h index 51995dc6b..005485c98 100644 --- a/src/gui/widgets/tabs/chat/guildtab.h +++ b/src/gui/widgets/tabs/chat/guildtab.h @@ -39,18 +39,18 @@ class GuildTab notfinal : public ChatTab, virtual ~GuildTab(); bool handleCommand(const std::string &restrict type, - const std::string &restrict args) final; + const std::string &restrict args) override final; - void playNewMessageSound() const final; + void playNewMessageSound() const override final; - void optionChanged(const std::string &value) final; + void optionChanged(const std::string &value) override final; protected: - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; - void getAutoCompleteList(StringVect &names) const final; + void getAutoCompleteList(StringVect &names) const override final; - void getAutoCompleteCommands(StringVect &names) const final; + void getAutoCompleteCommands(StringVect &names) const override final; }; #endif // GUI_WIDGETS_TABS_CHAT_GUILDTAB_H diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h index 3c5262184..91d4391fd 100644 --- a/src/gui/widgets/tabs/chat/partytab.h +++ b/src/gui/widgets/tabs/chat/partytab.h @@ -39,18 +39,18 @@ class PartyTab notfinal : public ChatTab, virtual ~PartyTab(); bool handleCommand(const std::string &restrict type, - const std::string &restrict args) final; + const std::string &restrict args) override final; - void playNewMessageSound() const final; + void playNewMessageSound() const override final; - void optionChanged(const std::string &value) final; + void optionChanged(const std::string &value) override final; protected: - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; - void getAutoCompleteList(StringVect&) const final; + void getAutoCompleteList(StringVect&) const override final; - void getAutoCompleteCommands(StringVect &names) const final; + void getAutoCompleteCommands(StringVect &names) const override final; }; extern PartyTab *partyTab; diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h index 848cd5e1c..47057da4c 100644 --- a/src/gui/widgets/tabs/chat/tradetab.h +++ b/src/gui/widgets/tabs/chat/tradetab.h @@ -38,7 +38,7 @@ class TradeTab final : public ChatTab ~TradeTab(); protected: - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; }; extern TradeTab *tradeChatTab; diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h index 0513d40f3..f298bf164 100644 --- a/src/gui/widgets/tabs/chat/whispertab.h +++ b/src/gui/widgets/tabs/chat/whispertab.h @@ -37,7 +37,7 @@ class WhisperTab final : public ChatTab { return mNick; } bool handleCommand(const std::string &restrict type, - const std::string &restrict args) final; + const std::string &restrict args) override final; void setWhisperTabColors(); @@ -46,10 +46,10 @@ class WhisperTab final : public ChatTab protected: friend class ChatWindow; - void getAutoCompleteList(StringVect &names) const final; + void getAutoCompleteList(StringVect &names) const override final; void getAutoCompleteCommands(StringVect& commands) - const final; + const override final; /** * Constructor. @@ -62,9 +62,9 @@ class WhisperTab final : public ChatTab ~WhisperTab(); - void handleInput(const std::string &msg) final; + void handleInput(const std::string &msg) override final; - void handleCommandStr(const std::string &msg) final; + void handleCommandStr(const std::string &msg) override final; private: std::string mNick; diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h index 2f9cd0e65..1dd92b39d 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.h +++ b/src/gui/widgets/tabs/debugwindowtabs.h @@ -56,7 +56,7 @@ class MapDebugTab final : public DebugTab A_DELETE_COPY(MapDebugTab) - void logic() final; + void logic() override final; private: Label *mMusicFileLabel A_NONNULLPOINTER; @@ -88,7 +88,7 @@ class TargetDebugTab final : public DebugTab A_DELETE_COPY(TargetDebugTab) - void logic() final; + void logic() override final; private: Label *mTargetLabel A_NONNULLPOINTER; @@ -116,7 +116,7 @@ class NetDebugTab final : public DebugTab A_DELETE_COPY(NetDebugTab) - void logic() final; + void logic() override final; private: Label *mPingLabel A_NONNULLPOINTER; diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h index 311816df4..a93a20b38 100644 --- a/src/gui/widgets/tabs/setup_audio.h +++ b/src/gui/widgets/tabs/setup_audio.h @@ -36,7 +36,7 @@ class Setup_Audio final : public SetupTabScroll ~Setup_Audio(); - void apply() final; + void apply() override final; private: ListModel *mSoundModel; diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h index e83887913..4feeb703a 100644 --- a/src/gui/widgets/tabs/setup_chat.h +++ b/src/gui/widgets/tabs/setup_chat.h @@ -32,9 +32,9 @@ class Setup_Chat final : public SetupTabScroll A_DELETE_COPY(Setup_Chat) - void apply() final; + void apply() override final; - void externalUpdated() final; + void externalUpdated() override final; }; #endif // GUI_WIDGETS_TABS_SETUP_CHAT_H diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h index ab433d288..da4fb6c90 100644 --- a/src/gui/widgets/tabs/setup_colors.h +++ b/src/gui/widgets/tabs/setup_colors.h @@ -44,13 +44,13 @@ class Setup_Colors final : public SetupTab, ~Setup_Colors(); - void apply() final; + void apply() override final; - void cancel() final; + void cancel() override final; - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; - void valueChanged(const SelectionEvent &event) final; + void valueChanged(const SelectionEvent &event) override final; private: static const char *const rawmsg; diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h index df6b2a957..fbbbcadd5 100644 --- a/src/gui/widgets/tabs/setup_input.h +++ b/src/gui/widgets/tabs/setup_input.h @@ -51,11 +51,11 @@ class Setup_Input final : public SetupTab */ ~Setup_Input(); - void apply() final; + void apply() override final; - void cancel() final; + void cancel() override final; - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; /** * Get an update on the assigned key. diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h index d9c16d683..11af99b23 100644 --- a/src/gui/widgets/tabs/setup_joystick.h +++ b/src/gui/widgets/tabs/setup_joystick.h @@ -40,11 +40,11 @@ class Setup_Joystick final : public SetupTab ~Setup_Joystick(); - void apply() final; + void apply() override final; - void cancel() final; + void cancel() override final; - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; void setTempEnabled(const bool sel); diff --git a/src/gui/widgets/tabs/setup_mods.h b/src/gui/widgets/tabs/setup_mods.h index 3f488eaa9..e9f47fbd0 100644 --- a/src/gui/widgets/tabs/setup_mods.h +++ b/src/gui/widgets/tabs/setup_mods.h @@ -34,11 +34,11 @@ class Setup_Mods final : public SetupTabScroll ~Setup_Mods(); - void apply() final; + void apply() override final; - void externalUpdated() final; + void externalUpdated() override final; - void externalUnloaded() final; + void externalUnloaded() override final; void loadMods(); diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h index 85b018e95..d73cf0d4b 100644 --- a/src/gui/widgets/tabs/setup_other.h +++ b/src/gui/widgets/tabs/setup_other.h @@ -36,9 +36,9 @@ class Setup_Other final : public SetupTabScroll ~Setup_Other(); - void apply() final; + void apply() override final; - void externalUpdated() final; + void externalUpdated() override final; protected: NamesModel *mProxyTypeList; diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index 1173731a7..b86856782 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -46,19 +46,19 @@ class Setup_Relations final : public SetupTab, ~Setup_Relations(); - void apply() final; + void apply() override final; - void cancel() final A_CONST; + void cancel() override final A_CONST; void reset(); - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; - void updatedPlayer(const std::string &name) final; + void updatedPlayer(const std::string &name) override final; - void updateAll() final; + void updateAll() override final; - void externalUpdated() final; + void externalUpdated() override final; private: StaticTableModel *mPlayerTableTitleModel; diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h index 1c9d885fe..526ebdd8f 100644 --- a/src/gui/widgets/tabs/setup_theme.h +++ b/src/gui/widgets/tabs/setup_theme.h @@ -42,11 +42,11 @@ class Setup_Theme final : public SetupTab ~Setup_Theme(); - void apply() final; + void apply() override final; - void cancel() final; + void cancel() override final; - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; void updateInfo(); diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h index 2dd53f3bc..e1a94557e 100644 --- a/src/gui/widgets/tabs/setup_video.h +++ b/src/gui/widgets/tabs/setup_video.h @@ -47,11 +47,11 @@ class Setup_Video final : public SetupTab, ~Setup_Video(); - void apply() final; + void apply() override final; - void cancel() final; + void cancel() override final; - void action(const ActionEvent &event) final; + void action(const ActionEvent &event) override final; private: bool mFullScreenEnabled; diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h index 3c71cb083..6a645e50a 100644 --- a/src/gui/widgets/tabs/setup_visual.h +++ b/src/gui/widgets/tabs/setup_visual.h @@ -37,7 +37,7 @@ class Setup_Visual final : public SetupTabScroll ~Setup_Visual(); - void apply() final; + void apply() override final; private: NamesModel *mSpeachList; diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index 5afe4ac46..30e771c05 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -47,23 +47,23 @@ class SetupTabScroll notfinal : public SetupTab void apply() override; - void cancel() final; + void cancel() override final; void externalUpdated() override; void externalUnloaded() override; - void action(const ActionEvent &event A_UNUSED) final + void action(const ActionEvent &event A_UNUSED) override final { } int getPreferredFirstItemSize() const A_WARN_UNUSED { return mPreferredFirstItemSize; } - void widgetResized(const Event &event) final; + void widgetResized(const Event &event) override final; void reread(const std::string &name); - void clear() final; + void clear() override final; const std::set<SetupItem*> &getAllItems() const { return mAllItems; } diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h index 4787a990a..31cafd1ff 100644 --- a/src/gui/widgets/tabs/socialattacktab.h +++ b/src/gui/widgets/tabs/socialattacktab.h @@ -58,7 +58,7 @@ class SocialAttackTab final : public SocialTab delete2(mBeings) } - void updateList() final + void updateList() override final { updateAtkListStart(); // TRANSLATORS: mobs group name in social window diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index a2a97ce98..b53138e10 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -63,7 +63,7 @@ class SocialFriendsTab final : public SocialTab delete2(mBeings) } - void updateList() final + void updateList() override final { getPlayersAvatars(); } diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index 081d3a5f1..942ce9d59 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -69,7 +69,7 @@ class SocialGuildTab final : public SocialTab, delete2(mScroll) } - void action(const ActionEvent &event) final + void action(const ActionEvent &event) override final { const std::string &eventId = event.getId(); if (eventId == "do invite") @@ -111,7 +111,7 @@ class SocialGuildTab final : public SocialTab, } } - void invite() final + void invite() override final { CREATEWIDGETV(mInviteDialog, TextDialog, // TRANSLATORS: guild invite message @@ -123,7 +123,7 @@ class SocialGuildTab final : public SocialTab, mInviteDialog->addActionListener(this); } - void leave() final + void leave() override final { CREATEWIDGETV(mConfirmDialog, ConfirmDialog, // TRANSLATORS: guild leave message @@ -134,7 +134,7 @@ class SocialGuildTab final : public SocialTab, mConfirmDialog->addActionListener(this); } - void buildCounter(const int online0, const int total0) final + void buildCounter(const int online0, const int total0) override final { if (online0 || total0) { diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index 61fc7ea33..c216c6d36 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -69,12 +69,12 @@ class SocialGuildTab2 final : public SocialTab, delete2(mScroll) } - void action(const ActionEvent &event A_UNUSED) final + void action(const ActionEvent &event A_UNUSED) override final { } void buildCounter(const int online0 A_UNUSED, - const int total0 A_UNUSED) final + const int total0 A_UNUSED) override final { if (!localPlayer) return; diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index d15167945..e673c689b 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -69,7 +69,7 @@ class SocialNavigationTab final : public SocialTab delete2(mBeings) } - void updateList() final + void updateList() override final { if (!socialWindow || !localPlayer) return; @@ -164,7 +164,7 @@ class SocialNavigationTab final : public SocialTab updateCounter(); } - void selectIndex(const unsigned num) final + void selectIndex(const unsigned num) override final { if (!localPlayer) return; diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index f7da18c88..153c1b3ec 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -71,7 +71,7 @@ class SocialPartyTab final : public SocialTab, delete2(mScroll) } - void action(const ActionEvent &event) final + void action(const ActionEvent &event) override final { const std::string &eventId = event.getId(); if (eventId == "do invite") @@ -112,7 +112,7 @@ class SocialPartyTab final : public SocialTab, } } - void invite() final + void invite() override final { CREATEWIDGETV(mInviteDialog, TextDialog, // TRANSLATORS: party invite message @@ -124,7 +124,7 @@ class SocialPartyTab final : public SocialTab, mInviteDialog->addActionListener(this); } - void leave() final + void leave() override final { CREATEWIDGETV(mConfirmDialog, ConfirmDialog, // TRANSLATORS: party leave message @@ -136,7 +136,7 @@ class SocialPartyTab final : public SocialTab, } void buildCounter(const int online0 A_UNUSED, - const int total0 A_UNUSED) final + const int total0 A_UNUSED) override final { if (!localPlayer) return; diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h index daffe3fe7..7c0c6fd35 100644 --- a/src/gui/widgets/tabs/socialpickuptab.h +++ b/src/gui/widgets/tabs/socialpickuptab.h @@ -58,7 +58,7 @@ class SocialPickupTab final : public SocialTab delete2(mBeings) } - void updateList() final + void updateList() override final { updateAtkListStart(); // TRANSLATORS: items group name in social window diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 22ffbe67d..50d86e33c 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -63,12 +63,12 @@ class SocialPlayersTab final : public SocialTab delete2(mBeings) } - void updateList() final + void updateList() override final { getPlayersAvatars(); } - void updateAvatar(const std::string &name) final + void updateAvatar(const std::string &name) override final { if (!actorManager) return; @@ -100,7 +100,7 @@ class SocialPlayersTab final : public SocialTab BLOCK_END("SocialPlayersTab::updateAvatar") } - void resetDamage(const std::string &name) final + void resetDamage(const std::string &name) override final { if (!actorManager) return; diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h index 7c41dda4b..dfd6ad828 100644 --- a/src/gui/widgets/tabs/socialtab.h +++ b/src/gui/widgets/tabs/socialtab.h @@ -113,7 +113,7 @@ class SocialTab notfinal : public Tab mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); } - void setCurrent() final + void setCurrent() override final { updateCounter(); } diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 42c7e0f06..d32cc176c 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -109,9 +109,9 @@ class Tab notfinal : public BasicContainer, /** * Draw the tabbed area. */ - void draw(Graphics *const graphics) final A_NONNULL(2); + void draw(Graphics *const graphics) override final A_NONNULL(2); - void safeDraw(Graphics *const graphics) final A_NONNULL(2); + void safeDraw(Graphics *const graphics) override final A_NONNULL(2); /** * Set the normal color for the tab's text. @@ -177,9 +177,9 @@ class Tab notfinal : public BasicContainer, int getFlash() const A_WARN_UNUSED { return mFlash; } - void widgetResized(const Event &event) final; + void widgetResized(const Event &event) override final; - void widgetMoved(const Event &event) final; + void widgetMoved(const Event &event) override final; void setLabelFont(Font *const font); @@ -196,9 +196,9 @@ class Tab notfinal : public BasicContainer, const std::string &getCaption() const A_WARN_UNUSED; - void mouseEntered(MouseEvent &event) final; + void mouseEntered(MouseEvent &event) override final; - void mouseExited(MouseEvent &event) final; + void mouseExited(MouseEvent &event) override final; void setImage(Image *const image); |