Merge pull request #8199 from lioncash/namespace

General: Use nested namespace specifiers where applicable

2 files changed, 4 insertions, 10 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 77acf8d1d3..30f10c8537 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -46,9 +46,7 @@
 // more responsive. This might be useful as a user-customizable option.
 #define MOUSE_AXIS_SMOOTHING 1.5f
 
-namespace ciface
-{
-namespace XInput2
+namespace ciface::XInput2
 {
 // This function will add zero or more KeyboardMouse objects to devices.
 void PopulateDevices(void* const hwnd)
@@ -369,5 +367,4 @@ ControlState KeyboardMouse::Axis::GetState() const
 {
   return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
 }
-}  // namespace XInput2
-}  // namespace ciface
+}  // namespace ciface::XInput2
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index 72ea347461..e657f8b8df 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -14,9 +14,7 @@ extern "C" {
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
-namespace ciface
-{
-namespace XInput2
+namespace ciface::XInput2
 {
 void PopulateDevices(void* const hwnd);
 
@@ -113,5 +111,4 @@ private:
   const int pointer_deviceid, keyboard_deviceid;
   std::string name;
 };
-}  // namespace XInput2
-}  // namespace ciface
+}  // namespace ciface::XInput2