Changeset 10817 for code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

Timestamp:

Nov 19, 2015, 11:40:28 AM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

File:

• code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

@@ -84 +84 @@
         void compilePointerLists();
         // from JoyStickQuantityListener interface
-        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
-
-        void allDevicesUpdated(float dt);
-        void mouseUpdated(float dt);
-        void joyStickUpdated(unsigned int joyStick, float dt);
+        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
+
+        void allDevicesUpdated(float dt) override;
+        void mouseUpdated(float dt) override;
+        void joyStickUpdated(unsigned int joyStick, float dt) override;
         // internal
         void tickHalfAxis(HalfAxis& halfAxis);
 
-        void buttonPressed (const KeyEvent& evt);
-        void buttonReleased(const KeyEvent& evt);
-        void buttonHeld    (const KeyEvent& evt);
-
-        void buttonPressed (MouseButtonCode::ByEnum button);
-        void buttonReleased(MouseButtonCode::ByEnum button);
-        void buttonHeld    (MouseButtonCode::ByEnum button);
-        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-        void mouseScrolled (int abs, int rel);
-
-        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void axisMoved     (unsigned int device, unsigned int axis, float value);
+        void buttonPressed (const KeyEvent& evt) override;
+        void buttonReleased(const KeyEvent& evt) override;
+        void buttonHeld    (const KeyEvent& evt) override;
+
+        void buttonPressed (MouseButtonCode::ByEnum button) override;
+        void buttonReleased(MouseButtonCode::ByEnum button) override;
+        void buttonHeld    (MouseButtonCode::ByEnum button) override;
+        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+        void mouseScrolled (int abs, int rel) override;
+
+        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void axisMoved     (unsigned int device, unsigned int axis, float value) override;
 
     protected: // variables