summaryrefslogtreecommitdiff
path: root/src/gui/widgets/scrollarea.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/gui/widgets/scrollarea.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmanaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/gui/widgets/scrollarea.h')
-rw-r--r--src/gui/widgets/scrollarea.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index eca834f81..cf02e0317 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -127,7 +127,7 @@ class ScrollArea final : public BasicContainer,
* Logic function optionally adapts width or height of contents. This
* depends on the scrollbar settings.
*/
- void logic() final;
+ void logic() override final;
/**
* Update the alpha value to the graphic components.
@@ -137,16 +137,16 @@ class ScrollArea final : public BasicContainer,
/**
* Draws the scroll 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);
/**
* Draws the background and border of the scroll area.
*/
- 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);
/**
@@ -163,27 +163,27 @@ class ScrollArea final : public BasicContainer,
/**
* Called when the mouse moves in the widget area.
*/
- void mouseMoved(MouseEvent& event) final;
+ void mouseMoved(MouseEvent& event) override final;
/**
* Called when the mouse enteres the widget area.
*/
- void mouseEntered(MouseEvent& event) final;
+ void mouseEntered(MouseEvent& event) override final;
/**
* Called when the mouse leaves the widget area.
*/
- void mouseExited(MouseEvent& event) final;
+ void mouseExited(MouseEvent& event) override final;
- void mousePressed(MouseEvent& event) final;
+ void mousePressed(MouseEvent& event) override final;
- void mouseReleased(MouseEvent& event) final;
+ void mouseReleased(MouseEvent& event) override final;
- void mouseDragged(MouseEvent &event) final;
+ void mouseDragged(MouseEvent &event) override final;
- 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;
Rect getVerticalBarDimension() const;
@@ -414,11 +414,11 @@ class ScrollArea final : public BasicContainer,
{ return mDownButtonScrollAmount; }
void showWidgetPart(Widget *const widget,
- const Rect &area) final;
+ const Rect &area) override final;
- Rect getChildrenArea() final;
+ Rect getChildrenArea() override final;
- Widget *getWidgetAt(int x, int y) final;
+ Widget *getWidgetAt(int x, int y) override final;
void setWidth(int width);
@@ -426,9 +426,9 @@ class ScrollArea final : public BasicContainer,
void setDimension(const Rect& dimension);
- void mouseWheelMovedUp(MouseEvent& event) final;
+ void mouseWheelMovedUp(MouseEvent& event) override final;
- void mouseWheelMovedDown(MouseEvent& event) final;
+ void mouseWheelMovedDown(MouseEvent& event) override final;
protected:
enum BUTTON_DIR