diff options
| author | Mat M <mathew1800@gmail.com> | 2016-10-03 13:22:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 13:22:06 -0400 |
| commit | e0bf9a1858fdbcc5fc447731f9c8ce0e8f792029 (patch) | |
| tree | 9b1229e4f4292f80bb2b44220b7b2c760b618913 /Source/Core/InputCommon/ControllerInterface | |
| parent | cc66f0336f37104d55915270094f333dcda268dd (diff) | |
| parent | fad17246db88dc47e7ce455684af477a7dc6100e (diff) | |
Merge pull request #4282 from leoetlino/quartz-formatting
InputCommon: Fix formatting issues in Quartz
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h | 1 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h index 5c0daa6846..8997fc0e53 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h @@ -12,7 +12,6 @@ namespace ciface { namespace Quartz { - std::string KeycodeToName(const CGKeyCode keycode); class KeyboardAndMouse : public Core::Device diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index 18f3e553f3..8aa83370dd 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -11,8 +11,8 @@ namespace ciface { namespace Quartz { - -std::string KeycodeToName(const CGKeyCode keycode) { +std::string KeycodeToName(const CGKeyCode keycode) +{ static const std::map<CGKeyCode, std::string> named_keys = { {kVK_ANSI_A, "A"}, {kVK_ANSI_B, "B"}, |