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

---
 .../ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp     | 8 ++------
 .../ControllerInterface/ForceFeedback/ForceFeedbackDevice.h       | 8 ++------
 .../ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h    | 7 ++-----
 3 files changed, 6 insertions(+), 17 deletions(-)

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

diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
index baa3018616..44fc87b712 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@@ -9,9 +9,7 @@
 
 #include "Common/Thread.h"
 
-namespace ciface
-{
-namespace ForceFeedback
+namespace ciface::ForceFeedback
 {
 // Template instantiation:
 template class ForceFeedbackDevice::TypedForce<DICONSTANTFORCE>;
@@ -257,6 +255,4 @@ void ForceFeedbackDevice::Force::Release()
   m_effect->Unload();
   m_effect->Release();
 }
-
-}  // namespace ForceFeedback
-}  // namespace ciface
+}  // namespace ciface::ForceFeedback
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
index 8f5814106e..c689cef5a5 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@@ -19,9 +19,7 @@
 #include "InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h"
 #endif
 
-namespace ciface
-{
-namespace ForceFeedback
+namespace ciface::ForceFeedback
 {
 class ForceFeedbackDevice : public Core::Device
 {
@@ -83,6 +81,4 @@ private:
   Common::Event m_update_event;
   Common::Flag m_run_thread;
 };
-
-}  // namespace ForceFeedback
-}  // namespace ciface
+}  // namespace ciface::ForceFeedback
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
index 0e684251e7..0ebd74d485 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -20,9 +20,7 @@ typedef LONG* LPLONG;  // Missing type for ForceFeedback.h
 #include "Common/CommonTypes.h"    // for LONG
 #include "DirectInputConstants.h"  // Not stricty necessary
 
-namespace ciface
-{
-namespace ForceFeedback
+namespace ciface::ForceFeedback
 {
 // Prototypes
 class IUnknownImpl;
@@ -196,5 +194,4 @@ public:
     return FFDeviceSetForceFeedbackProperty(m_device, property, &value);
   }
 };
-}  // namespace ForceFeedback
-}  // namespace ciface
+}  // namespace ciface::ForceFeedback
-- 
cgit v1.2.3