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/tabbedarea.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/tabbedarea.h')
-rw-r--r-- | src/gui/widgets/tabbedarea.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 5c3b1d0e3..083f178f7 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -97,14 +97,14 @@ class TabbedArea final : public ActionListener, ~TabbedArea(); - void postInit() final; + void postInit() override final; /** * Draw the tabbed area. */ - 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); /** * Return how many tabs have been created. @@ -160,7 +160,7 @@ class TabbedArea final : public ActionListener, /** * Overload the logic function since it's broken in guichan 0.8. */ - void logic() final; + void logic() override final; int getContainerHeight() const A_WARN_UNUSED { return mWidgetContainer->getHeight(); } @@ -184,7 +184,7 @@ class TabbedArea final : public ActionListener, void setSelectedTabByName(const std::string &name); - void widgetResized(const Event &event) final; + void widgetResized(const Event &event) override final; /* void moveLeft(Tab *tab); @@ -193,11 +193,11 @@ class TabbedArea final : public ActionListener, */ void adjustTabPositions(); - void action(const ActionEvent& actionEvent) final; + void action(const ActionEvent& actionEvent) override final; // Inherited from MouseListener - void mousePressed(MouseEvent &event) final; + void mousePressed(MouseEvent &event) override final; void enableScrollButtons(const bool enable); @@ -213,7 +213,7 @@ class TabbedArea final : public ActionListener, bool getFollowDownScroll() const A_WARN_UNUSED { return mFollowDownScroll; } - void keyPressed(KeyEvent& event) final; + void keyPressed(KeyEvent& event) override final; void setBlockSwitching(const bool b) { mBlockSwitching = b; } @@ -226,7 +226,7 @@ class TabbedArea final : public ActionListener, void setDimension(const Rect &dimension); - void death(const Event &event) final; + void death(const Event &event) override final; void setResizeHeight(bool b) { mResizeHeight = b; } |