diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-06-17 16:39:24 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-06-17 16:51:41 -0400 |
| commit | ec60027f56bde17ef32a80b9f002225542c5859a (patch) | |
| tree | 3ef54d831d8690467348db2ad69f50868ed0e3fe /Source/Core/InputCommon/ControllerInterface/Quartz | |
| parent | 8e030a4a456cc74289cbed89ee8bbca60c9acc34 (diff) | |
InputCommon: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Quartz')
4 files changed, 8 insertions, 20 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h index ca1bbc7725..d36dcdf8bd 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h @@ -4,11 +4,8 @@ #pragma once -namespace ciface -{ -namespace Quartz +namespace ciface::Quartz { void PopulateDevices(void* window); void DeInit(); -} // namespace Quartz -} // namespace ciface +} // namespace ciface::Quartz diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm index 30802182a8..1201232223 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm @@ -6,9 +6,7 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h" -namespace ciface -{ -namespace Quartz +namespace ciface::Quartz { void PopulateDevices(void* window) { @@ -21,5 +19,4 @@ void PopulateDevices(void* window) void DeInit() { } -} // namespace Quartz -} // namespace ciface +} // namespace ciface::Quartz diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h index 8997fc0e53..902621cddc 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h @@ -8,9 +8,7 @@ #include "InputCommon/ControllerInterface/Device.h" -namespace ciface -{ -namespace Quartz +namespace ciface::Quartz { std::string KeycodeToName(const CGKeyCode keycode); @@ -73,5 +71,4 @@ private: uint32_t m_windowid; }; -} // namespace Quartz -} // namespace ciface +} // namespace ciface::Quartz diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index a52f8df4b0..6cbc0a3f11 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -9,9 +9,7 @@ #include <Carbon/Carbon.h> #include <Cocoa/Cocoa.h> -namespace ciface -{ -namespace Quartz +namespace ciface::Quartz { std::string KeycodeToName(const CGKeyCode keycode) { @@ -223,5 +221,4 @@ std::string KeyboardAndMouse::Button::GetName() const return "Right Click"; return std::string("Click ") + char('0' + m_button); } -} // namespace Quartz -} // namespace ciface +} // namespace ciface::Quartz |