diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-06-18 11:33:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 11:33:08 +0200 |
| commit | ff96dc0e6ffd250b23ccb5ebceb12623da604435 (patch) | |
| tree | 1a1279d6bff0945ae575c195ec357af239896d8f /Source/Core/InputCommon/ControllerInterface/Quartz | |
| parent | ac562279c3a9fe9cc660b703ed0fd3f8ab2be758 (diff) | |
| parent | 72b04a353ddfa79ec10fe447bef8eeaefc824976 (diff) | |
Merge pull request #8199 from lioncash/namespace
General: 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 |