diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-02 15:11:15 -0800 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-02 15:11:15 -0800 |
| commit | 3363b396afdc8291d7736705d630efff66b4e95c (patch) | |
| tree | 6049ebe7c2b8874db5a389af617603883a64270a /Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h | |
| parent | 70f66ad32515bce6962e1961e186449e288c497b (diff) | |
| parent | 3efb0aa5f7d6d1aef90a366754fe69fe573a92ab (diff) | |
Merge pull request #23 from lioncash/sorta-large-input-cleanup
Larger cleanup to input-related source files (this time using unique_ptr).
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 73398ca1b1..4973979052 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -21,8 +21,8 @@ class KeyboardMouse : public Core::Device private: struct State { - BYTE keyboard[256]; - DIMOUSESTATE2 mouse; + BYTE keyboard[256]; + DIMOUSESTATE2 mouse; struct { float x, y; @@ -98,13 +98,13 @@ public: std::string GetSource() const; private: - const LPDIRECTINPUTDEVICE8 m_kb_device; - const LPDIRECTINPUTDEVICE8 m_mo_device; + const LPDIRECTINPUTDEVICE8 m_kb_device; + const LPDIRECTINPUTDEVICE8 m_mo_device; - DWORD m_last_update; - State m_state_in; - unsigned char m_state_out[3]; // NUM CAPS SCROLL - bool m_current_state_out[3]; // NUM CAPS SCROLL + DWORD m_last_update; + State m_state_in; + unsigned char m_state_out[3]; // NUM CAPS SCROLL + bool m_current_state_out[3]; // NUM CAPS SCROLL }; } |