summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/basiccontainer.h2
-rw-r--r--src/gui/widgets/basiccontainer2.h6
-rw-r--r--src/gui/widgets/chatinput.h2
-rw-r--r--src/gui/widgets/guitable.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h2
-rw-r--r--src/gui/widgets/selldialog.h2
-rw-r--r--src/gui/widgets/skilllistbox.h14
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/tabs/chat/partytab.h2
-rw-r--r--src/gui/widgets/tabs/setup_relations.h4
-rw-r--r--src/gui/widgets/tabs/setuptabscroll.h2
-rw-r--r--src/gui/widgets/tabs/socialguildtab.h2
-rw-r--r--src/gui/widgets/tabs/socialguildtab2.h2
-rw-r--r--src/gui/widgets/tabs/socialpartytab.h2
-rw-r--r--src/gui/widgets/textfield.h2
-rw-r--r--src/gui/widgets/vertcontainer.h2
-rw-r--r--src/gui/widgets/widgetgroup.h2
-rw-r--r--src/gui/widgets/window.h2
18 files changed, 27 insertions, 27 deletions
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<SellDialog*> 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<SkillModel*>(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<SetupItem*> &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.
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-04 07:35:48 +0000