Changeset 11054 for code/branches/cpp11_v3/src/libraries/core/input/InputBuffer.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/libraries/core/input/InputBuffer.h (modified) (3 diffs)

code/branches/cpp11_v3/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() { }
-        void callFunction()
+        virtual ~InputBufferListenerTuple() = default;
+        virtual void callFunction() override
         {
             (listener_->*function_)();
@@ -165 +165 @@
                 { if (this->cursor_ > 0) { --this->cursor_; } }
 
-            void buttonPressed(const KeyEvent& evt);
+            virtual void buttonPressed(const KeyEvent& evt) override;
 
         private:
             bool charIsAllowed(const char& input);
 
-            void buttonHeld   (const KeyEvent& evt);
-            void processKey   (const KeyEvent& evt);
+            virtual void buttonHeld (const KeyEvent& evt) override;
+            void processKey (const KeyEvent& evt);
 
-            void keyboardUpdated(float dt);
+            virtual void keyboardUpdated(float dt) override;
 
             std::string buffer_;