summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
commit55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d (patch)
treeb1108bef76eed589fcb0028c4bd97f14510e940f /src/gui/widgets/tabs
parent72b9b0b8b7f3e0b60bf7a926b44aaa589dd131e8 (diff)
downloadmv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.gz
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.bz2
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.xz
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.zip
Remove override keyword, if it present with final.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/chat/channeltab.h6
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h2
-rw-r--r--src/gui/widgets/tabs/chat/emulateguildtab.h12
-rw-r--r--src/gui/widgets/tabs/chat/gmtab.h6
-rw-r--r--src/gui/widgets/tabs/chat/guildtab.h12
-rw-r--r--src/gui/widgets/tabs/chat/partytab.h12
-rw-r--r--src/gui/widgets/tabs/chat/tradetab.h2
-rw-r--r--src/gui/widgets/tabs/chat/whispertab.h10
-rw-r--r--src/gui/widgets/tabs/debugwindowtabs.h6
-rw-r--r--src/gui/widgets/tabs/setup_audio.h2
-rw-r--r--src/gui/widgets/tabs/setup_chat.h4
-rw-r--r--src/gui/widgets/tabs/setup_colors.h8
-rw-r--r--src/gui/widgets/tabs/setup_input.h6
-rw-r--r--src/gui/widgets/tabs/setup_joystick.h6
-rw-r--r--src/gui/widgets/tabs/setup_mods.h6
-rw-r--r--src/gui/widgets/tabs/setup_other.h4
-rw-r--r--src/gui/widgets/tabs/setup_relations.h12
-rw-r--r--src/gui/widgets/tabs/setup_theme.h6
-rw-r--r--src/gui/widgets/tabs/setup_video.h6
-rw-r--r--src/gui/widgets/tabs/setup_visual.h2
-rw-r--r--src/gui/widgets/tabs/setuptabscroll.h8
-rw-r--r--src/gui/widgets/tabs/socialattacktab.h2
-rw-r--r--src/gui/widgets/tabs/socialfriendstab.h2
-rw-r--r--src/gui/widgets/tabs/socialguildtab.h8
-rw-r--r--src/gui/widgets/tabs/socialguildtab2.h4
-rw-r--r--src/gui/widgets/tabs/socialnavigationtab.h4
-rw-r--r--src/gui/widgets/tabs/socialpartytab.h8
-rw-r--r--src/gui/widgets/tabs/socialpickuptab.h2
-rw-r--r--src/gui/widgets/tabs/socialplayerstab.h6
-rw-r--r--src/gui/widgets/tabs/socialtab.h2
-rw-r--r--src/gui/widgets/tabs/tab.h12
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 9b723a7dc..c7015cd41 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) override final;
+ void handleInput(const std::string &msg) final;
bool handleCommand(const std::string &restrict type,
- const std::string &restrict args) override final;
+ const std::string &restrict args) final;
void getAutoCompleteCommands(StringVect& commands)
- const override final;
+ const 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 dc2062946..16c834503 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() override final
+ void setCurrent() 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 96eed73a6..8724aee75 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) override final;
+ const std::string &restrict args) final;
- void playNewMessageSound() const override final;
+ void playNewMessageSound() const final;
- void optionChanged(const std::string &value) override final;
+ void optionChanged(const std::string &value) final;
protected:
- void handleInput(const std::string &msg) override final;
+ void handleInput(const std::string &msg) final;
- void getAutoCompleteList(StringVect &names) const override final;
+ void getAutoCompleteList(StringVect &names) const final;
- void getAutoCompleteCommands(StringVect &names) const override final;
+ void getAutoCompleteCommands(StringVect &names) const final;
};
#endif // TMWA_SUPPORT
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index 797084a76..084034c0a 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
- override final A_CONST;
+ final A_CONST;
- void handleInput(const std::string &msg) override final;
+ void handleInput(const std::string &msg) final;
- void handleCommandStr(const std::string &msg) override final A_CONST;
+ void handleCommandStr(const std::string &msg) 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 005485c98..51995dc6b 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) override final;
+ const std::string &restrict args) final;
- void playNewMessageSound() const override final;
+ void playNewMessageSound() const final;
- void optionChanged(const std::string &value) override final;
+ void optionChanged(const std::string &value) final;
protected:
- void handleInput(const std::string &msg) override final;
+ void handleInput(const std::string &msg) final;
- void getAutoCompleteList(StringVect &names) const override final;
+ void getAutoCompleteList(StringVect &names) const final;
- void getAutoCompleteCommands(StringVect &names) const override final;
+ void getAutoCompleteCommands(StringVect &names) const 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 91d4391fd..3c5262184 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) override final;
+ const std::string &restrict args) final;
- void playNewMessageSound() const override final;
+ void playNewMessageSound() const final;
- void optionChanged(const std::string &value) override final;
+ void optionChanged(const std::string &value) final;
protected:
- void handleInput(const std::string &msg) override final;
+ void handleInput(const std::string &msg) final;
- void getAutoCompleteList(StringVect&) const override final;
+ void getAutoCompleteList(StringVect&) const final;
- void getAutoCompleteCommands(StringVect &names) const override final;
+ void getAutoCompleteCommands(StringVect &names) const final;
};
extern PartyTab *partyTab;
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 47057da4c..848cd5e1c 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) override final;
+ void handleInput(const std::string &msg) final;
};
extern TradeTab *tradeChatTab;
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index f298bf164..0513d40f3 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) override final;
+ const std::string &restrict args) final;
void setWhisperTabColors();
@@ -46,10 +46,10 @@ class WhisperTab final : public ChatTab
protected:
friend class ChatWindow;
- void getAutoCompleteList(StringVect &names) const override final;
+ void getAutoCompleteList(StringVect &names) const final;
void getAutoCompleteCommands(StringVect& commands)
- const override final;
+ const final;
/**
* Constructor.
@@ -62,9 +62,9 @@ class WhisperTab final : public ChatTab
~WhisperTab();
- void handleInput(const std::string &msg) override final;
+ void handleInput(const std::string &msg) final;
- void handleCommandStr(const std::string &msg) override final;
+ void handleCommandStr(const std::string &msg) final;
private:
std::string mNick;
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index 1dd92b39d..2f9cd0e65 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() override final;
+ void logic() final;
private:
Label *mMusicFileLabel A_NONNULLPOINTER;
@@ -88,7 +88,7 @@ class TargetDebugTab final : public DebugTab
A_DELETE_COPY(TargetDebugTab)
- void logic() override final;
+ void logic() final;
private:
Label *mTargetLabel A_NONNULLPOINTER;
@@ -116,7 +116,7 @@ class NetDebugTab final : public DebugTab
A_DELETE_COPY(NetDebugTab)
- void logic() override final;
+ void logic() 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 a93a20b38..311816df4 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() override final;
+ void apply() final;
private:
ListModel *mSoundModel;
diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index 4feeb703a..e83887913 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() override final;
+ void apply() final;
- void externalUpdated() override final;
+ void externalUpdated() 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 da4fb6c90..ab433d288 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() override final;
+ void apply() final;
- void cancel() override final;
+ void cancel() final;
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) final;
- void valueChanged(const SelectionEvent &event) override final;
+ void valueChanged(const SelectionEvent &event) 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 fbbbcadd5..df6b2a957 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() override final;
+ void apply() final;
- void cancel() override final;
+ void cancel() final;
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) 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 11af99b23..d9c16d683 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() override final;
+ void apply() final;
- void cancel() override final;
+ void cancel() final;
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) 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 e9f47fbd0..3f488eaa9 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() override final;
+ void apply() final;
- void externalUpdated() override final;
+ void externalUpdated() final;
- void externalUnloaded() override final;
+ void externalUnloaded() final;
void loadMods();
diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index d73cf0d4b..85b018e95 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() override final;
+ void apply() final;
- void externalUpdated() override final;
+ void externalUpdated() final;
protected:
NamesModel *mProxyTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index b86856782..1173731a7 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() override final;
+ void apply() final;
- void cancel() override final A_CONST;
+ void cancel() final A_CONST;
void reset();
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) final;
- void updatedPlayer(const std::string &name) override final;
+ void updatedPlayer(const std::string &name) final;
- void updateAll() override final;
+ void updateAll() final;
- void externalUpdated() override final;
+ void externalUpdated() final;
private:
StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 526ebdd8f..1c9d885fe 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() override final;
+ void apply() final;
- void cancel() override final;
+ void cancel() final;
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) final;
void updateInfo();
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index e1a94557e..2dd53f3bc 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() override final;
+ void apply() final;
- void cancel() override final;
+ void cancel() final;
- void action(const ActionEvent &event) override final;
+ void action(const ActionEvent &event) final;
private:
bool mFullScreenEnabled;
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 6a645e50a..3c71cb083 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() override final;
+ void apply() final;
private:
NamesModel *mSpeachList;
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 30e771c05..5afe4ac46 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() override final;
+ void cancel() final;
void externalUpdated() override;
void externalUnloaded() override;
- void action(const ActionEvent &event A_UNUSED) override final
+ void action(const ActionEvent &event A_UNUSED) final
{ }
int getPreferredFirstItemSize() const A_WARN_UNUSED
{ return mPreferredFirstItemSize; }
- void widgetResized(const Event &event) override final;
+ void widgetResized(const Event &event) final;
void reread(const std::string &name);
- void clear() override final;
+ void clear() 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 31cafd1ff..4787a990a 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() override final
+ void updateList() 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 b53138e10..a2a97ce98 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() override final
+ void updateList() final
{
getPlayersAvatars();
}
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 942ce9d59..081d3a5f1 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) override final
+ void action(const ActionEvent &event) final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -111,7 +111,7 @@ class SocialGuildTab final : public SocialTab,
}
}
- void invite() override final
+ void invite() final
{
CREATEWIDGETV(mInviteDialog, TextDialog,
// TRANSLATORS: guild invite message
@@ -123,7 +123,7 @@ class SocialGuildTab final : public SocialTab,
mInviteDialog->addActionListener(this);
}
- void leave() override final
+ void leave() 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) override final
+ void buildCounter(const int online0, const int total0) final
{
if (online0 || total0)
{
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index c216c6d36..61fc7ea33 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) override final
+ void action(const ActionEvent &event A_UNUSED) final
{
}
void buildCounter(const int online0 A_UNUSED,
- const int total0 A_UNUSED) override final
+ const int total0 A_UNUSED) final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index e673c689b..d15167945 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() override final
+ void updateList() final
{
if (!socialWindow || !localPlayer)
return;
@@ -164,7 +164,7 @@ class SocialNavigationTab final : public SocialTab
updateCounter();
}
- void selectIndex(const unsigned num) override final
+ void selectIndex(const unsigned num) final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 153c1b3ec..f7da18c88 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) override final
+ void action(const ActionEvent &event) final
{
const std::string &eventId = event.getId();
if (eventId == "do invite")
@@ -112,7 +112,7 @@ class SocialPartyTab final : public SocialTab,
}
}
- void invite() override final
+ void invite() final
{
CREATEWIDGETV(mInviteDialog, TextDialog,
// TRANSLATORS: party invite message
@@ -124,7 +124,7 @@ class SocialPartyTab final : public SocialTab,
mInviteDialog->addActionListener(this);
}
- void leave() override final
+ void leave() 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) override final
+ const int total0 A_UNUSED) final
{
if (!localPlayer)
return;
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index 7c0c6fd35..daffe3fe7 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() override final
+ void updateList() 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 50d86e33c..22ffbe67d 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() override final
+ void updateList() final
{
getPlayersAvatars();
}
- void updateAvatar(const std::string &name) override final
+ void updateAvatar(const std::string &name) final
{
if (!actorManager)
return;
@@ -100,7 +100,7 @@ class SocialPlayersTab final : public SocialTab
BLOCK_END("SocialPlayersTab::updateAvatar")
}
- void resetDamage(const std::string &name) override final
+ void resetDamage(const std::string &name) final
{
if (!actorManager)
return;
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index dfd6ad828..7c41dda4b 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() override final
+ void setCurrent() final
{
updateCounter();
}
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index d32cc176c..42c7e0f06 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) 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);
/**
* 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) override final;
+ void widgetResized(const Event &event) final;
- void widgetMoved(const Event &event) override final;
+ void widgetMoved(const Event &event) 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) override final;
+ void mouseEntered(MouseEvent &event) final;
- void mouseExited(MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) final;
void setImage(Image *const image);