From 4a5cdfe19cbb50e3b58149c6e91312366ee4b771 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Sep 2012 02:34:48 +0300 Subject: Add override keyword to most overriden methods. --- src/guichan/include/guichan/widgets/button.hpp | 8 ++++---- src/guichan/include/guichan/widgets/checkbox.hpp | 6 +++--- src/guichan/include/guichan/widgets/dropdown.hpp | 12 ++++++------ src/guichan/include/guichan/widgets/listbox.hpp | 10 +++++----- src/guichan/include/guichan/widgets/radiobutton.hpp | 6 +++--- src/guichan/include/guichan/widgets/scrollarea.hpp | 10 +++++----- src/guichan/include/guichan/widgets/slider.hpp | 10 +++++----- src/guichan/include/guichan/widgets/tab.hpp | 4 ++-- src/guichan/include/guichan/widgets/tabbedarea.hpp | 2 +- src/guichan/include/guichan/widgets/textbox.hpp | 6 +++--- src/guichan/include/guichan/widgets/textfield.hpp | 4 ++-- src/guichan/include/guichan/widgets/window.hpp | 6 +++--- 12 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src/guichan/include') diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp index 4382f3f7e..290ff0258 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/guichan/include/guichan/widgets/button.hpp @@ -148,13 +148,13 @@ namespace gcn // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseEntered(MouseEvent& mouseEvent); + virtual void mouseEntered(MouseEvent& mouseEvent) override; - virtual void mouseExited(MouseEvent& mouseEvent); + virtual void mouseExited(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp index 08aba7aac..529b69ac1 100644 --- a/src/guichan/include/guichan/widgets/checkbox.hpp +++ b/src/guichan/include/guichan/widgets/checkbox.hpp @@ -130,13 +130,13 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; // Inherited from MouseListener - virtual void mouseClicked(MouseEvent& mouseEvent); + virtual void mouseClicked(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp index 62a129082..a2649ca19 100644 --- a/src/guichan/include/guichan/widgets/dropdown.hpp +++ b/src/guichan/include/guichan/widgets/dropdown.hpp @@ -201,20 +201,20 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent) = 0; + virtual void keyPressed(KeyEvent& keyEvent) override = 0; // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseReleased(MouseEvent& mouseEvent); + virtual void mouseReleased(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedUp(MouseEvent& mouseEvent); + virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedDown(MouseEvent& mouseEvent); + virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; // Inherited from SelectionListener diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp index ce056acbd..75c32067b 100644 --- a/src/guichan/include/guichan/widgets/listbox.hpp +++ b/src/guichan/include/guichan/widgets/listbox.hpp @@ -197,18 +197,18 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedUp(MouseEvent& mouseEvent); + virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedDown(MouseEvent& mouseEvent); + virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp index fc9377787..062040de9 100644 --- a/src/guichan/include/guichan/widgets/radiobutton.hpp +++ b/src/guichan/include/guichan/widgets/radiobutton.hpp @@ -155,14 +155,14 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; // Inherited from MouseListener - virtual void mouseClicked(MouseEvent& mouseEvent); + virtual void mouseClicked(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp index 84649d530..1abc24e41 100644 --- a/src/guichan/include/guichan/widgets/scrollarea.hpp +++ b/src/guichan/include/guichan/widgets/scrollarea.hpp @@ -349,15 +349,15 @@ namespace gcn // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseReleased(MouseEvent& mouseEvent); + virtual void mouseReleased(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedUp(MouseEvent& mouseEvent); + virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedDown(MouseEvent& mouseEvent); + virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp index bf2ce5937..e2d1f526f 100644 --- a/src/guichan/include/guichan/widgets/slider.hpp +++ b/src/guichan/include/guichan/widgets/slider.hpp @@ -208,18 +208,18 @@ namespace gcn // Inherited from MouseListener. - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedUp(MouseEvent& mouseEvent); + virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override; - virtual void mouseWheelMovedDown(MouseEvent& mouseEvent); + virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override; // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; protected: diff --git a/src/guichan/include/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp index 0e490129f..1936d59b7 100644 --- a/src/guichan/include/guichan/widgets/tab.hpp +++ b/src/guichan/include/guichan/widgets/tab.hpp @@ -124,9 +124,9 @@ namespace gcn // Inherited from MouseListener - virtual void mouseEntered(MouseEvent& mouseEvent); + virtual void mouseEntered(MouseEvent& mouseEvent) override; - virtual void mouseExited(MouseEvent& mouseEvent); + virtual void mouseExited(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/tabbedarea.hpp b/src/guichan/include/guichan/widgets/tabbedarea.hpp index ea378d1d6..087d15772 100644 --- a/src/guichan/include/guichan/widgets/tabbedarea.hpp +++ b/src/guichan/include/guichan/widgets/tabbedarea.hpp @@ -211,7 +211,7 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; // Inherited from MouseListener diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp index ef12e36fe..f440834c4 100644 --- a/src/guichan/include/guichan/widgets/textbox.hpp +++ b/src/guichan/include/guichan/widgets/textbox.hpp @@ -235,14 +235,14 @@ namespace gcn // Inherited from KeyListener - virtual void keyPressed(KeyEvent& keyEvent); + virtual void keyPressed(KeyEvent& keyEvent) override; // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp index c6f2709dd..d747aeac1 100644 --- a/src/guichan/include/guichan/widgets/textfield.hpp +++ b/src/guichan/include/guichan/widgets/textfield.hpp @@ -127,9 +127,9 @@ namespace gcn // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; protected: /** diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp index a9138609b..3949d9f59 100644 --- a/src/guichan/include/guichan/widgets/window.hpp +++ b/src/guichan/include/guichan/widgets/window.hpp @@ -188,11 +188,11 @@ namespace gcn // Inherited from MouseListener - virtual void mousePressed(MouseEvent& mouseEvent); + virtual void mousePressed(MouseEvent& mouseEvent) override; - virtual void mouseDragged(MouseEvent& mouseEvent); + virtual void mouseDragged(MouseEvent& mouseEvent) override; - virtual void mouseReleased(MouseEvent& mouseEvent); + virtual void mouseReleased(MouseEvent& mouseEvent) override; protected: /** -- cgit v1.2.3-70-g09d2