Changeset 10817 for code/branches/cpp11_v2/src/libraries/core/input/InputDevice.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/InputDevice.h (modified) (6 diffs)

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

@@ -153 +153 @@
 
         //! Captures OIS events (which then get distributed to the derived class) and creates the button held events
-        void update(const Clock& time)
+        void update(const Clock& time) override
         {
             oisDevice_->capture();
@@ -160 +160 @@
             for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
                 for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
-                    inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
+                    inputStates_[iS]->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
                         this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
 
@@ -171 +171 @@
 
         //! Clears the list of pressed buttons and calls the derived class's method
-        void clearBuffers()
+        void clearBuffers() override
         {
             pressedButtons_.clear();
@@ -180 +180 @@
         OISDeviceClass* getOISDevice()   { return this->oisDevice_; }
         // Returns the name of the derived class as string
-        std::string getClassName() const { return DeviceClass::getClassNameImpl(); }
+        std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
 
     protected:
@@ -197 +197 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
@@ -219 +219 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }