summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorTechjar <tecknojar@gmail.com>2019-05-05 23:48:12 +0000
committerTechjar <tecknojar@gmail.com>2019-05-06 18:48:04 +0000
commitff972e3673cf70c67e5daf52d5cc913b1df7a1ba (patch)
tree4392c427ebeb64fd4aba1bdafb1959dc03dbfeb9 /Source/Core/InputCommon/ControllerInterface
parentd347867f2e4153c86535ef5e6eed6efa49818d65 (diff)
Reformat repo to clang-format 7.0 rules
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Android/Android.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Android/Android.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInput.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSX.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h4
14 files changed, 26 insertions, 26 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 44dcbf234a..0ff62ab48d 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -242,5 +242,5 @@ void Touchscreen::Motor::Rumble(int padID, double state)
env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetDoRumble(), padID, state);
IDCache::GetJavaVM()->DetachCurrentThread();
}
-}
-}
+} // namespace Android
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index 59919982ef..b917222864 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -65,5 +65,5 @@ public:
private:
const int _padID;
};
-}
-}
+} // namespace Android
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
index d9b0bdc0a9..1772b32817 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@@ -21,5 +21,5 @@ BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
void PopulateDevices(HWND hwnd);
-}
-}
+} // namespace DInput
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
index c873a304d5..9e704e9420 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
@@ -76,5 +76,5 @@ std::unordered_set<DWORD> GetXInputGUIDS()
SetupDiDestroyDeviceInfoList(setup_enum);
return guids;
}
-}
-}
+} // namespace DInput
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
index 232887404c..f31e9fb5a2 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
@@ -13,4 +13,4 @@ namespace DInput
{
std::unordered_set<DWORD> GetXInputGUIDS();
}
-}
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
index 84bd3bc4a5..0e684251e7 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -196,5 +196,5 @@ public:
return FFDeviceSetForceFeedbackProperty(m_device, property, &value);
}
};
-}
-}
+} // namespace ForceFeedback
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
index ac1db3e89a..64a715b246 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
@@ -13,5 +13,5 @@ void PopulateDevices(void* window);
void DeInit();
void DeviceElementDebugPrint(const void*, void*);
-}
-}
+} // namespace OSX
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index d3393218c6..d6579dc0c8 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -90,5 +90,5 @@ private:
ForceFeedback::FFDeviceAdapterReference m_ff_device;
};
-}
-}
+} // namespace OSX
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
index 298dcd4a80..0d37098a21 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
@@ -41,5 +41,5 @@ public:
}
};
-} // namespace ciface
} // namespace OSX
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index 1cb76b2d25..a0e17da549 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -161,5 +161,5 @@ void PipeDevice::ParseCommand(const std::string& command)
}
}
}
-}
-}
+} // namespace Pipes
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
index a986f120c1..86202a20f4 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
@@ -58,5 +58,5 @@ private:
std::map<std::string, PipeInput*> m_buttons;
std::map<std::string, PipeInput*> m_axes;
};
-}
-}
+} // namespace Pipes
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
index 03f6ca9993..ca1bbc7725 100644
--- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
+++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
@@ -10,5 +10,5 @@ namespace Quartz
{
void PopulateDevices(void* window);
void DeInit();
-}
-}
+} // namespace Quartz
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index e51ec5238b..77acf8d1d3 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -369,5 +369,5 @@ ControlState KeyboardMouse::Axis::GetState() const
{
return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
}
-}
-}
+} // namespace XInput2
+} // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index 5c5124cb3b..72ea347461 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -113,5 +113,5 @@ private:
const int pointer_deviceid, keyboard_deviceid;
std::string name;
};
-}
-}
+} // namespace XInput2
+} // namespace ciface