rename InputCommon/ControllerInterface/Device to CoreDevice

2025-01-24 23:11:14 +01:00 · 2020-09-15 04:34:41 -07:00 · 2020-09-15 04:34:41 -07:00 · 7e1df34735
commit 7e1df34735
parent 0be1491ef0
30 changed files with 32 additions and 32 deletions
--- a/Source/Core/Core/HW/GCPad.h
+++ b/Source/Core/Core/HW/GCPad.h
@ -5,7 +5,7 @@
 #pragma once

 #include "Common/CommonTypes.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 class InputConfig;
 enum class PadGroup;
--- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.h
+++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.h
@ -12,7 +12,7 @@
 #include <QSyntaxHighlighter>

 #include "Common/Flag.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 class ControlReference;
 class MappingWidget;
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
@ -7,7 +7,7 @@
 #include <string>
 #include <vector>

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 class QString;
 class OutputReference;
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@ -24,7 +24,7 @@
 #include "InputCommon/ControllerEmu/ControlGroup/Force.h"
 #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 #include "DolphinQt/Config/Mapping/MappingWidget.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@ -47,7 +47,7 @@

 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/InputConfig.h"

 constexpr const char* PROFILES_DIR = "Profiles/";
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
@ -8,7 +8,7 @@
 #include <QString>
 #include <memory>

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@ -54,8 +54,8 @@ add_library(inputcommon
  ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
  ControllerInterface/ControllerInterface.cpp
  ControllerInterface/ControllerInterface.h
-  ControllerInterface/Device.cpp
-  ControllerInterface/Device.h
+  ControllerInterface/CoreDevice.cpp
+  ControllerInterface/CoreDevice.h
  ControllerInterface/Wiimote/WiimoteController.cpp
  ControllerInterface/Wiimote/WiimoteController.h
  ControlReference/ControlReference.cpp
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@ -8,7 +8,7 @@
 #include <memory>

 #include "InputCommon/ControlReference/ExpressionParser.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 // ControlReference
 //
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@ -9,7 +9,7 @@
 #include <optional>
 #include <string>

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ciface::ExpressionParser
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
@ -6,7 +6,7 @@

 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
@ -8,7 +8,7 @@
 #include <string>

 #include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
@ -8,7 +8,7 @@

 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
@ -7,7 +7,7 @@
 #include <string>
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
@ -8,7 +8,7 @@

 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
@ -8,7 +8,7 @@

 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
@ -9,7 +9,7 @@

 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@ -16,7 +16,7 @@
 #include "Common/IniFile.h"
 #include "Common/MathUtil.h"
 #include "InputCommon/ControlReference/ExpressionParser.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/DynamicInputTextureManager.h"

 class ControllerInterface;
--- a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
@ -10,7 +10,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/IniFile.h"
 #include "InputCommon/ControlReference/ControlReference.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ControllerEmu
 {
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@ -12,7 +12,7 @@

 #include "Common/Matrix.h"
 #include "Common/WindowSystemInfo.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 // enable disable sources
 #ifdef _WIN32
--- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 #include <algorithm>
 #include <cmath>
--- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@ -4,7 +4,7 @@

 #pragma once

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

 namespace ciface::DInput
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@ -7,8 +7,8 @@
 #include <windows.h>

 #include "Common/Matrix.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/ControllerInterface/DInput/DInput8.h"
-#include "InputCommon/ControllerInterface/Device.h"

 namespace ciface::DInput
 {
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@ -10,7 +10,7 @@

 #include "Common/Event.h"
 #include "Common/Flag.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 #ifdef _WIN32
 #include <Windows.h>
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@ -8,7 +8,7 @@

 #include <IOKit/hid/IOHIDLib.h>

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"

 namespace ciface::OSX
--- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
@ -7,7 +7,7 @@
 #include <QuartzCore/QuartzCore.h>

 #include "Common/Matrix.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ciface::Quartz
 {
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
@ -14,7 +14,7 @@
 #include <SDL_haptic.h>
 #endif

-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ciface::SDL
 {
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
@ -16,7 +16,7 @@
 #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h"
 #include "Core/HW/WiimoteEmu/MotionPlus.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"

 namespace ciface::WiimoteController
 {
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@ -37,7 +37,7 @@
    <ClCompile Include="ControllerEmu\ControlGroup\Triggers.cpp" />
    <ClCompile Include="ControllerEmu\Setting\NumericSetting.cpp" />
    <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
-    <ClCompile Include="ControllerInterface\Device.cpp" />
+    <ClCompile Include="ControllerInterface\CoreDevice.cpp" />
    <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
    <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp" />
    <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
@ -79,7 +79,7 @@
    <ClInclude Include="ControllerEmu\ControlGroup\Triggers.h" />
    <ClInclude Include="ControllerEmu\Setting\NumericSetting.h" />
    <ClInclude Include="ControllerInterface\ControllerInterface.h" />
-    <ClInclude Include="ControllerInterface\Device.h" />
+    <ClInclude Include="ControllerInterface\CoreDevice.h" />
    <ClInclude Include="ControllerInterface\DInput\DInput.h" />
    <ClInclude Include="ControllerInterface\DInput\DInput8.h" />
    <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h" />
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@ -95,7 +95,7 @@
    <ClCompile Include="ControllerInterface\XInput\XInput.cpp">
      <Filter>ControllerInterface\XInput</Filter>
    </ClCompile>
-    <ClCompile Include="ControllerInterface\Device.cpp">
+    <ClCompile Include="ControllerInterface\CoreDevice.cpp">
      <Filter>ControllerInterface</Filter>
    </ClCompile>
    <ClCompile Include="ControllerInterface\ControllerInterface.cpp">
@ -208,7 +208,7 @@
    <ClInclude Include="ControllerInterface\ControllerInterface.h">
      <Filter>ControllerInterface</Filter>
    </ClInclude>
-    <ClInclude Include="ControllerInterface\Device.h">
+    <ClInclude Include="ControllerInterface\CoreDevice.h">
      <Filter>ControllerInterface</Filter>
    </ClInclude>
    <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h">