summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-11-22 15:19:45 -0500
committerLioncash <mathew1800@gmail.com>2019-11-22 15:41:38 -0500
commit91993b46d9ca78418e549ca422b7399a15ec670c (patch)
treec6e56b0925c5e0fce394c6af6b42f59e880f538f /Source/Core/InputCommon/ControllerEmu/ControlGroup
parentbc449fb98f3b741f78d8881e2c02d588829aad74 (diff)
InputCommon/IMU*: Remove unnecessary includes
Trims out unnecessary includes to avoid unnecessary header dependencies. This also resolves indirect inclusions of <optional> within IMUAccelerometer.h and IMUGyroscope.h
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp3
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp7
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h2
6 files changed, 9 insertions, 16 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
index e994ceba5d..52a9d47a1a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
@@ -4,16 +4,13 @@
#include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h"
-#include "Common/Common.h"
-#include "Common/MathUtil.h"
+#include <memory>
+#include "Common/Common.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/Control/Control.h"
#include "InputCommon/ControllerEmu/Control/Input.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h
index 7ac41ede7a..b5d8e0c935 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h
@@ -4,11 +4,11 @@
#pragma once
+#include <optional>
#include <string>
#include "Common/Matrix.h"
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
-#include "InputCommon/ControllerInterface/Device.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
index 9eedbf0747..3e6aecb348 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
@@ -4,6 +4,7 @@
#include "InputCommon/ControllerEmu/ControlGroup/IMUCursor.h"
+#include <memory>
#include <string>
#include "Common/Common.h"
@@ -12,8 +13,6 @@
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/Control/Control.h"
#include "InputCommon/ControllerEmu/Control/Input.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
index 578762fb85..95a7d89dad 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
@@ -4,10 +4,10 @@
#pragma once
-#include <chrono>
#include <string>
-#include "InputCommon/ControllerEmu/StickGate.h"
+#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
+#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
#include "InputCommon/ControllerInterface/Device.h"
namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
index 7bae049fff..3a1ed14b7d 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
@@ -4,16 +4,13 @@
#include "InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h"
-#include "Common/Common.h"
-#include "Common/MathUtil.h"
+#include <memory>
-#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "Common/Common.h"
#include "InputCommon/ControlReference/ControlReference.h"
#include "InputCommon/ControllerEmu/Control/Control.h"
#include "InputCommon/ControllerEmu/Control/Input.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h
index dac30143dc..c173c2f8b2 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h
@@ -4,11 +4,11 @@
#pragma once
+#include <optional>
#include <string>
#include "Common/Matrix.h"
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
-#include "InputCommon/ControllerInterface/Device.h"
namespace ControllerEmu
{