From ec60027f56bde17ef32a80b9f002225542c5859a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 17 Jun 2019 16:39:24 -0400
Subject: InputCommon: Use nested namespace specifiers where applicable

---
 Source/Core/InputCommon/ControllerInterface/OSX/OSX.h            | 7 ++-----
 Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm           | 7 ++-----
 Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h    | 7 ++-----
 Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm   | 7 ++-----
 Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h | 8 ++------
 5 files changed, 10 insertions(+), 26 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/OSX')

diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
index 64a715b246..955b426f5e 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
@@ -4,14 +4,11 @@
 
 #pragma once
 
-namespace ciface
-{
-namespace OSX
+namespace ciface::OSX
 {
 void Init(void* window);
 void PopulateDevices(void* window);
 void DeInit();
 
 void DeviceElementDebugPrint(const void*, void*);
-}  // namespace OSX
-}  // namespace ciface
+}  // namespace ciface::OSX
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
index a923c1ea26..716a56b61e 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
@@ -17,9 +17,7 @@
 #include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
 #include "InputCommon/ControllerInterface/OSX/RunLoopStopper.h"
 
-namespace ciface
-{
-namespace OSX
+namespace ciface::OSX
 {
 constexpr CFTimeInterval FOREVER = 1e20;
 static std::thread s_hotplug_thread;
@@ -227,5 +225,4 @@ void DeInit()
   IOHIDManagerClose(HIDManager, kIOHIDOptionsTypeNone);
   CFRelease(HIDManager);
 }
-}
-}
+}  // namespace ciface::OSX
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index d6579dc0c8..377f7d9b29 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -11,9 +11,7 @@
 #include "InputCommon/ControllerInterface/Device.h"
 #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
 
-namespace ciface
-{
-namespace OSX
+namespace ciface::OSX
 {
 class Joystick : public ForceFeedback::ForceFeedbackDevice
 {
@@ -90,5 +88,4 @@ private:
 
   ForceFeedback::FFDeviceAdapterReference m_ff_device;
 };
-}  // namespace OSX
-}  // namespace ciface
+}  // namespace ciface::OSX
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
index e2c08707c5..9ab06c91db 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
@@ -13,9 +13,7 @@
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 
-namespace ciface
-{
-namespace OSX
+namespace ciface::OSX
 {
 void Joystick::AddElements(CFArrayRef elements, std::set<IOHIDElementCookie>& cookies)
 {
@@ -341,5 +339,4 @@ bool Joystick::IsSameDevice(const IOHIDDeviceRef other_device) const
 {
   return m_device == other_device;
 }
-}
-}
+}  // namespace ciface::OSX
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
index 0d37098a21..c43a0383dc 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
@@ -6,9 +6,7 @@
 
 #include <Foundation/Foundation.h>
 
-namespace ciface
-{
-namespace OSX
+namespace ciface::OSX
 {
 class RunLoopStopper
 {
@@ -40,6 +38,4 @@ public:
     CFRunLoopRemoveSource(runloop, m_source, mode);
   }
 };
-
-}  // namespace OSX
-}  // namespace ciface
+}  // namespace ciface::OSX
-- 
cgit v1.2.3