summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/XInput
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-17 16:39:24 -0400
committerLioncash <mathew1800@gmail.com>2019-06-17 16:51:41 -0400
commitec60027f56bde17ef32a80b9f002225542c5859a (patch)
tree3ef54d831d8690467348db2ad69f50868ed0e3fe /Source/Core/InputCommon/ControllerInterface/XInput
parent8e030a4a456cc74289cbed89ee8bbca60c9acc34 (diff)
InputCommon: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerInterface/XInput/XInput.h7
2 files changed, 4 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
index d6ecdb9d81..cda20a08db 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
@@ -8,9 +8,7 @@
#define XINPUT_GAMEPAD_GUIDE 0x0400
#endif
-namespace ciface
-{
-namespace XInput
+namespace ciface::XInput
{
static const struct
{
@@ -243,5 +241,4 @@ void Device::Motor::SetState(ControlState state)
m_motor = (WORD)(state * m_range);
m_parent->UpdateMotors();
}
-} // namespace XInput
-} // namespace ciface
+} // namespace ciface::XInput
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
index 0b299e6324..3c543fb18f 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@@ -18,9 +18,7 @@
#error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong.
#endif
-namespace ciface
-{
-namespace XInput
+namespace ciface::XInput
{
void Init();
void PopulateDevices();
@@ -105,5 +103,4 @@ private:
const BYTE m_subtype;
const u8 m_index;
};
-} // namespace XInput
-} // namespace ciface
+} // namespace ciface::XInput