- Timestamp:
- Jan 10, 2016, 1:54:11 PM (9 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/core/input/InputManager.h
r8729 r11054 35 35 #include <string> 36 36 #include <vector> 37 #include < boost/function.hpp>37 #include <functional> 38 38 39 39 #include "util/Singleton.h" … … 134 134 Returns a pointer to a InputState referenced by name. 135 135 @return 136 Returns NULLif state was not found.136 Returns nullptr if state was not found. 137 137 */ 138 138 InputState* getState(const std::string& name); … … 186 186 // Function call caching 187 187 //------------------------------- 188 void pushCall(const boost::function<void ()>& function)188 void pushCall(const std::function<void ()>& function) 189 189 { this->callBuffer_.push_back(function); } 190 190 … … 192 192 193 193 private: // functions 194 // don't mess with a Singleton 195 InputManager(const InputManager&); 194 // non-copyable: 195 InputManager(const InputManager&) = delete; 196 InputManager& operator=(const InputManager&) = delete; 196 197 197 198 // Internal methods … … 208 209 209 210 // From WindowEventListener 210 v oid windowFocusChanged(bool bFocus);211 virtual void windowFocusChanged(bool bFocus) override; 211 212 212 213 private: // variables … … 225 226 std::vector<InputState*> activeStatesTicked_; //!< Like activeStates_, but only contains the ones that currently receive events 226 227 227 std::vector< boost::function<void ()>> callBuffer_; //!< Caches all calls from InputStates to be executed afterwards (see preUpdate)228 std::vector<std::function<void ()>> callBuffer_; //!< Caches all calls from InputStates to be executed afterwards (see preUpdate) 228 229 229 230 static InputManager* singletonPtr_s; //!< Pointer reference to the singleton
Note: See TracChangeset
for help on using the changeset viewer.