From 13226c21a99d70dacd26aee69f3982ee72ff431a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 3 Oct 2015 14:39:19 +0200 Subject: Add missing overrides. --- plugingui/button.h | 15 ++++++++------- plugingui/checkbox.h | 1 + plugingui/knob.h | 1 + plugingui/layout.h | 9 ++++++--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/plugingui/button.h b/plugingui/button.h index 7302b87..c13f7dd 100644 --- a/plugingui/button.h +++ b/plugingui/button.h @@ -39,8 +39,9 @@ public: Button(Widget *parent); ~Button(); - bool isFocusable() { return true; } - bool catchMouse() { return true; } + // From Widget: + bool isFocusable() override { return true; } + bool catchMouse() override { return true; } void setText(std::string text); @@ -49,11 +50,11 @@ public: protected: virtual void clicked() {} - virtual void repaintEvent(RepaintEvent *e); - virtual void buttonEvent(ButtonEvent *e); - - virtual void mouseLeaveEvent(); - virtual void mouseEnterEvent(); + // From Widget: + virtual void repaintEvent(RepaintEvent *e) override; + virtual void buttonEvent(ButtonEvent *e) override; + virtual void mouseLeaveEvent() override; + virtual void mouseEnterEvent() override; private: bool in_button; diff --git a/plugingui/checkbox.h b/plugingui/checkbox.h index 4cfeef0..ce2ca45 100644 --- a/plugingui/checkbox.h +++ b/plugingui/checkbox.h @@ -38,6 +38,7 @@ public: void setText(std::string text); + // From Widget: bool isFocusable() override { return true; } bool checked(); diff --git a/plugingui/knob.h b/plugingui/knob.h index a0a093f..469f238 100644 --- a/plugingui/knob.h +++ b/plugingui/knob.h @@ -38,6 +38,7 @@ class Knob : public Widget { public: Knob(Widget *parent); + // From Widget: bool catchMouse() override { return true; } bool isFocusable() override { return true; } diff --git a/plugingui/layout.h b/plugingui/layout.h index a81f004..9814f7e 100644 --- a/plugingui/layout.h +++ b/plugingui/layout.h @@ -78,7 +78,8 @@ public: //! \brief Set to false to only move the items, not scale them. void setResizeChildren(bool resize_children); - virtual void layout() = 0; + // From Layout: + virtual void layout() override = 0; protected: bool resize_children; @@ -97,7 +98,8 @@ public: void setHAlignment(alignment_t alignment); - virtual void layout(); + // From BoxLayout: + virtual void layout() override; protected: alignment_t align; @@ -116,7 +118,8 @@ public: void setVAlignment(alignment_t alignment); - virtual void layout(); + // From BoxLayout: + virtual void layout() override; protected: alignment_t align; -- cgit v1.2.3