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/textfield.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/textfield.h')
-rw-r--r-- | src/gui/widgets/textfield.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 19bfca820..89606d27c 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -119,9 +119,9 @@ class TextField notfinal : public Widget, /** * Draws the background and border. */ - void drawFrame(Graphics *const graphics) final A_NONNULL(2); + void drawFrame(Graphics *const graphics) override final A_NONNULL(2); - void safeDrawFrame(Graphics *const graphics) final + void safeDrawFrame(Graphics *const graphics) override final A_NONNULL(2); /** @@ -170,16 +170,16 @@ class TextField notfinal : public Widget, void setCaretPosition(unsigned int position); - void mousePressed(MouseEvent &event) final; + void mousePressed(MouseEvent &event) override final; void handlePaste(); void handleCopy() const; #ifdef ANDROID - void focusGained(const Event &event) final; + void focusGained(const Event &event) override final; #else - void focusGained(const Event &event) final A_CONST; + void focusGained(const Event &event) override final A_CONST; #endif void focusLost(const Event &event) override A_CONST; @@ -231,13 +231,13 @@ class TextField notfinal : public Widget, unsigned int getCaretPosition() const { return mCaretPosition; } - void mouseDragged(MouseEvent& event) final; + void mouseDragged(MouseEvent& event) override final; - void widgetHidden(const Event &event) final; + void widgetHidden(const Event &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; protected: void drawCaret(Graphics* graphics, int x) A_NONNULL(2); |