From b0affe5bf2c7240afb8f16c9b9476a049941439f Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 28 Mar 2018 12:47:23 +0200 Subject: GUI: Added override specifiers --- gui/Tooltip.h | 14 +++++++------- gui/console.h | 14 +++++++------- gui/widgets/popup.cpp | 8 ++++---- gui/widgets/tab.h | 18 +++++++++--------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gui/Tooltip.h b/gui/Tooltip.h index 64496fff9d..e812ebed8c 100644 --- a/gui/Tooltip.h +++ b/gui/Tooltip.h @@ -42,29 +42,29 @@ public: void drawDialog(DrawLayer layerToDraw) override; - virtual void receivedFocus(int x = -1, int y = -1) {} + virtual void receivedFocus(int x = -1, int y = -1) override {} protected: - virtual void handleMouseDown(int x, int y, int button, int clickCount) { + virtual void handleMouseDown(int x, int y, int button, int clickCount) override { close(); _parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount); } - virtual void handleMouseUp(int x, int y, int button, int clickCount) { + virtual void handleMouseUp(int x, int y, int button, int clickCount) override { close(); _parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount); } - virtual void handleMouseWheel(int x, int y, int direction) { + virtual void handleMouseWheel(int x, int y, int direction) override { close(); _parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction); } - virtual void handleKeyDown(Common::KeyState state) { + virtual void handleKeyDown(Common::KeyState state) override { close(); _parent->handleKeyDown(state); } - virtual void handleKeyUp(Common::KeyState state) { + virtual void handleKeyUp(Common::KeyState state) override { close(); _parent->handleKeyUp(state); } - virtual void handleMouseMoved(int x, int y, int button) { + virtual void handleMouseMoved(int x, int y, int button) override { close(); } diff --git a/gui/console.h b/gui/console.h index 04ad5526a6..5cd0e43e56 100644 --- a/gui/console.h +++ b/gui/console.h @@ -130,15 +130,15 @@ protected: public: ConsoleDialog(float widthPercent, float heightPercent); - void open(); - void close(); + void open() override; + void close() override; void drawDialog(DrawLayer layerToDraw) override; - void handleTickle(); - void reflowLayout(); - void handleMouseWheel(int x, int y, int direction); - void handleKeyDown(Common::KeyState state); - void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); + void handleTickle() override; + void reflowLayout() override; + void handleMouseWheel(int x, int y, int direction) override; + void handleKeyDown(Common::KeyState state) override; + void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override; int printFormat(int dummy, const char *format, ...) GCC_PRINTF(3, 4); int vprintFormat(int dummy, const char *format, va_list argptr); diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp index 40af769a34..65c9dea605 100644 --- a/gui/widgets/popup.cpp +++ b/gui/widgets/popup.cpp @@ -50,10 +50,10 @@ public: void drawDialog(DrawLayer layerToDraw) override; - void handleMouseUp(int x, int y, int button, int clickCount); - void handleMouseWheel(int x, int y, int direction); // Scroll through entries with scroll wheel - void handleMouseMoved(int x, int y, int button); // Redraw selections depending on mouse position - void handleKeyDown(Common::KeyState state); // Scroll through entries with arrow keys etc. + void handleMouseUp(int x, int y, int button, int clickCount) override; + void handleMouseWheel(int x, int y, int direction) override; // Scroll through entries with scroll wheel + void handleMouseMoved(int x, int y, int button) override; // Redraw selections depending on mouse position + void handleKeyDown(Common::KeyState state) override; // Scroll through entries with arrow keys etc. protected: void drawMenuEntry(int entry, bool hilite); diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h index bdd3e56b46..f85d30a9c6 100644 --- a/gui/widgets/tab.h +++ b/gui/widgets/tab.h @@ -101,15 +101,15 @@ public: _tabs[tabID].title = title; } - virtual void handleMouseDown(int x, int y, int button, int clickCount); - virtual bool handleKeyDown(Common::KeyState state); - virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); + virtual void handleMouseDown(int x, int y, int button, int clickCount) override; + virtual bool handleKeyDown(Common::KeyState state) override; + virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override; virtual int getFirstVisible() const; virtual void setFirstVisible(int tabID, bool adjustIfRoom = false); - virtual bool containsWidget(Widget *) const; + virtual bool containsWidget(Widget *) const override; - virtual void reflowLayout(); + virtual void reflowLayout() override; void draw() override; void markAsDirty() override; @@ -117,12 +117,12 @@ public: protected: // We overload getChildY to make sure child widgets are positioned correctly. // Essentially this compensates for the space taken up by the tab title header. - virtual int16 getChildY() const; - virtual uint16 getHeight() const; + virtual int16 getChildY() const override; + virtual uint16 getHeight() const override; - virtual void drawWidget(); + virtual void drawWidget() override; - virtual Widget *findWidget(int x, int y); + virtual Widget *findWidget(int x, int y) override; virtual void adjustTabs(int value); -- cgit v1.2.3