Changeset 10845 for code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h

Timestamp:

Nov 23, 2015, 10:20:29 PM (8 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

File:

• code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h (modified) (4 diffs)

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

@@ -77 +77 @@
 
     private:
-        void calibrationStarted() override;
-        void calibrationStopped() override;
+        virtual void calibrationStarted() override;
+        virtual void calibrationStopped() override;
         void evaluateCalibration();
 
@@ -86 +86 @@
 
         //! OIS event handler
-        bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
+        virtual bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -93 +93 @@
 
         //! OIS event handler
-        bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
+        virtual bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -99 +99 @@
         }
 
-        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
-        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
-        bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
+        virtual bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
+        virtual bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
+        virtual bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
         //! OIS event handler (don't remove that because of OIS version issues!)
-        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
+        virtual bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
 
         //! Returns the class name as string