diff options
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/basiccontainer.h | 19 | ||||
| -rw-r--r-- | src/gui/widgets/popup.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/setupitem.h | 4 | ||||
| -rw-r--r-- | src/gui/widgets/shortcutcontainer.h | 12 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setuptabscroll.h | 11 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/window.h | 6 |
8 files changed, 28 insertions, 30 deletions
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h index eaa354f6e..2888950b8 100644 --- a/src/gui/widgets/basiccontainer.h +++ b/src/gui/widgets/basiccontainer.h @@ -109,28 +109,27 @@ class BasicContainer notfinal : public Widget, // Inherited from Widget - virtual void moveToTop(Widget* widget) override; + void moveToTop(Widget* widget) override; - virtual void moveToBottom(Widget* widget) override; + void moveToBottom(Widget* widget) override; - virtual Rect getChildrenArea() override A_WARN_UNUSED; + Rect getChildrenArea() override A_WARN_UNUSED; - virtual void focusNext() override; + void focusNext() override; - virtual void focusPrevious() override; + void focusPrevious() override; - virtual void logic() override; + void logic() override; - virtual void setFocusHandler(FocusHandler *const focusHandler) - override; + void setFocusHandler(FocusHandler *const focusHandler) override; void setInternalFocusHandler(FocusHandler* focusHandler); - virtual Widget *getWidgetAt(int x, int y) override A_WARN_UNUSED; + Widget *getWidgetAt(int x, int y) override A_WARN_UNUSED; // Inherited from WidgetDeathListener - virtual void death(const Event& event) override; + void death(const Event& event) override; Widget *findFirstWidget(const std::set<Widget*> &list); diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 4e0222775..a375a90c7 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -152,7 +152,7 @@ class Popup notfinal : public Container, // Inherited from BasicContainer - virtual Rect getChildrenArea() override; + Rect getChildrenArea() override; /** * Sets the location to display the popup. Tries to horizontally center diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 4fbb81e23..bc6443bb3 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -75,7 +75,7 @@ class SetupItem notfinal : public ActionListener, virtual std::string getActionEventId() const A_WARN_UNUSED; - virtual void action(const ActionEvent &event) override; + void action(const ActionEvent &event) override; virtual void doAction(); @@ -474,7 +474,7 @@ class SetupItemSliderList notfinal : public SetupItem void toWidget() override; - virtual void action(const ActionEvent &event) override; + void action(const ActionEvent &event) override; void apply(const std::string &eventName) override final; diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index d7870490f..e10d91f3c 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -51,34 +51,34 @@ class ShortcutContainer notfinal : public Widget, /** * Draws the shortcuts */ - virtual void draw(Graphics *graphics) override = 0; + void draw(Graphics *graphics) override = 0; /** * Invoked when a widget changes its size. This is used to determine * the new height of the container. */ - virtual void widgetResized(const Event &event) override final; + void widgetResized(const Event &event) override final; - virtual void widgetMoved(const Event& event) override final; + void widgetMoved(const Event& event) override final; /** * Handles mouse when dragged. */ - virtual void mouseDragged(MouseEvent &event A_UNUSED) override + void mouseDragged(MouseEvent &event A_UNUSED) override { } /** * Handles mouse when pressed. */ - virtual void mousePressed(MouseEvent &event A_UNUSED) override + void mousePressed(MouseEvent &event A_UNUSED) override { } /** * Handles mouse release. */ - virtual void mouseReleased(MouseEvent &event A_UNUSED) override + void mouseReleased(MouseEvent &event A_UNUSED) override { } diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 762158e8a..ac6129194 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -179,7 +179,7 @@ class ChatTab notfinal : public Tab friend class ChatWindow; friend class WhisperWindow; - virtual void setCurrent() override final + void setCurrent() override final { setFlash(0); } virtual void handleInput(const std::string &msg); diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index f701ea6ed..ae5f7bcd4 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -45,16 +45,15 @@ class SetupTabScroll notfinal : public SetupTab VertContainer *getContainer() const A_WARN_UNUSED { return mContainer; } - virtual void apply() override; + void apply() override; - virtual void cancel() override final; + void cancel() override final; - virtual void externalUpdated() override; + void externalUpdated() override; - virtual void externalUnloaded() override; + void externalUnloaded() override; - virtual void action(const ActionEvent &event A_UNUSED) - override final + void action(const ActionEvent &event A_UNUSED) override final { } int getPreferredFirstItemSize() const A_WARN_UNUSED diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index e7d6977c7..bb512e281 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -103,7 +103,7 @@ class TextField notfinal : public Widget, /** * Draws the text field. */ - virtual void draw(Graphics *graphics) override; + void draw(Graphics *graphics) override; /** * Update the alpha value to the graphic components. diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index dd59242e8..d04b16cdf 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -158,14 +158,14 @@ class Window notfinal : public BasicContainer2, /** * Called whenever the widget changes size. */ - virtual void widgetResized(const Event &event) override; + void widgetResized(const Event &event) override; - virtual void widgetMoved(const Event& event) override; + void widgetMoved(const Event& event) override; /** * Called whenever the widget is hidden. */ - virtual void widgetHidden(const Event &event) override; + void widgetHidden(const Event &event) override; /** * Sets whether or not the window has a close button. |