diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/gui/widgets/button.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/button.h')
-rw-r--r-- | src/gui/widgets/button.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 7bd5e90b9..2e20be616 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -153,16 +153,16 @@ class Button final : public Widget, /** * Draws the button. */ - 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); /** * Update the alpha value to the button components. */ static void updateAlpha(); - void mouseReleased(MouseEvent& event) final; + void mouseReleased(MouseEvent& event) override final; void setDescription(const std::string &text) { mDescription = text; } @@ -185,11 +185,11 @@ class Button final : public Widget, void setPressed(bool b) { mPressed = b; } - 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 widgetHidden(const Event &event) final; + void widgetHidden(const Event &event) override final; void loadImage(const std::string &imageName); @@ -197,9 +197,9 @@ class Button final : public Widget, void adjustSize(); - void keyPressed(KeyEvent &event) final; + void keyPressed(KeyEvent &event) override final; - void keyReleased(KeyEvent &event) final; + void keyReleased(KeyEvent &event) override final; bool isPressed2() const A_WARN_UNUSED; @@ -241,19 +241,19 @@ class Button final : public Widget, Graphics::Alignment getAlignment() const { return mAlignment; } - void focusLost(const Event& event) final; + void focusLost(const Event& event) override final; - void mousePressed(MouseEvent& event) final; + void mousePressed(MouseEvent& event) override final; - void mouseEntered(MouseEvent& event) final; + void mouseEntered(MouseEvent& event) override final; - void mouseExited(MouseEvent& event) final; + void mouseExited(MouseEvent& event) override final; - void mouseDragged(MouseEvent& event) final; + void mouseDragged(MouseEvent& event) override final; - void setParent(Widget *widget) final; + void setParent(Widget *widget) override final; - void setWindow(Widget *const widget) final; + void setWindow(Widget *const widget) override final; void setImageWidth(const int width) { mImageWidth = width; } |