Changeset 10990 for code/branches/cpp11_v2/src/libraries/core/input

Timestamp:

Dec 29, 2015, 4:47:42 PM (9 years ago)

Author:

landauf

Message:

use '= delete' to explicitly delete unimplemented copy-constructors (for non-copyable classes).
use '= default' to explicitly implement default constructors/destructors.

Location:

code/branches/cpp11_v2/src/libraries/core/input

Files:

• InputBuffer.h (modified) (2 diffs)
• InputCommands.h (modified) (1 diff)
• InputDevice.h (modified) (2 diffs)
• InputHandler.h (modified) (1 diff)
• InputManager.h (modified) (1 diff)
• InputState.h (modified) (1 diff)
• JoyStick.h (modified) (1 diff)
• JoyStickQuantityListener.h (modified) (1 diff)
• KeyBinderManager.h (modified) (1 diff)
• KeyDetector.h (modified) (1 diff)
• Keyboard.h (modified) (1 diff)

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

@@ -47 +47 @@
               trueKeyFalseChar_(trueKeyFalseChar), char_(_char), key_(key)
         { }
-        virtual ~BaseInputBufferListenerTuple() { }
+        virtual ~BaseInputBufferListenerTuple() = default;
         virtual void callFunction() = 0;
         bool bListenToAllChanges_;
@@ -65 +65 @@
               listener_(listener), function_(function)
         { }
-        virtual ~InputBufferListenerTuple() { }
+        virtual ~InputBufferListenerTuple() = default;
         virtual void callFunction() override
         {

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

@@ -57 +57 @@
     public:
         BaseCommand() : bFixedKeybindMode_(false) {}
-        virtual ~BaseCommand() { }
+        virtual ~BaseCommand() = default;
 
         virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;

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

@@ -60 +60 @@
         //! Only resets the members
         InputDevice(unsigned int id) : bCalibrating_(false), deviceID_(id) { }
-        virtual ~InputDevice() { }
+        virtual ~InputDevice() = default;
         //! Returns the device class (derived) name as string
         virtual std::string getClassName() const = 0;
@@ -99 +99 @@
 
     private:
-        InputDevice(const InputDevice& rhs); //!< Don't use!
+        InputDevice(const InputDevice&) = delete;
 
         bool bCalibrating_;                  //!< Whether the device is in calibration mode

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

@@ -119 +119 @@
     {
     public:
-        virtual ~InputHandler() { }
+        virtual ~InputHandler() = default;
 
         template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::TPress)

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

@@ -192 +192 @@
 
     private: // functions
-        // don't mess with a Singleton
-        InputManager(const InputManager&);
+        InputManager(const InputManager&) = delete;
 
         // Internal methods

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

@@ -155 +155 @@
     private:
         InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority);
-        ~InputState() { }
+        ~InputState() = default;
 
         virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;

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

@@ -70 +70 @@
         //! Assigns a generated ID string and loads the calibration (if present)
         JoyStick(unsigned int id, OIS::InputManager* oisInputManager);
-        ~JoyStick() { }
+        ~JoyStick() = default;
         void setConfigValues();
 

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

@@ -48 +48 @@
     protected:
         JoyStickQuantityListener();
-        virtual ~JoyStickQuantityListener() { }
+        virtual ~JoyStickQuantityListener() = default;
 
         //! Returns a list with all JoySticks currently loaded

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

@@ -102 +102 @@
 
     private:
-        KeyBinderManager(const KeyBinderManager&);
+        KeyBinderManager(const KeyBinderManager&) = delete;
         void keybindInternal(const std::string& command, bool bTemporary);
         void keybindKeyPressed(const std::string& keyName);

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

@@ -48 +48 @@
 
     private:
-        KeyDetector(const KeyDetector&);
+        KeyDetector(const KeyDetector&) = delete;
 
         void callback(const std::string& name);

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

@@ -63 +63 @@
         //! Only resets the keyboard modifiers. Initialising is done in the base class.
         Keyboard(unsigned int id, OIS::InputManager* oisInputManager) : super(id, oisInputManager), modifiers_(0) { }
-        ~Keyboard() { }
+        ~Keyboard() = default;
 
     private: