diff options
| author | 2018-10-17 20:34:25 -0400 | |
|---|---|---|
| committer | 2018-10-17 20:52:43 -0400 | |
| commit | 46202e984e176241fd5a2f766907035e87198c99 (patch) | |
| tree | c1249f47c18b0716f8b086708370b26e7c3c74b6 /src | |
| parent | controller_base: Default the base class constructor and destructor in the cpp... (diff) | |
| download | yuzu-46202e984e176241fd5a2f766907035e87198c99.tar.gz yuzu-46202e984e176241fd5a2f766907035e87198c99.tar.xz yuzu-46202e984e176241fd5a2f766907035e87198c99.zip | |
hid/controller: Default the destructors of all controller types in the cpp file
These classes are non-trivial and are definitely going to be changed in
the future, so we default these to prevent issues with forward
declarations, and to keep the compiler from inlining tear-down code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/debug_pad.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/debug_pad.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/gesture.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/gesture.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/keyboard.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/keyboard.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/mouse.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/mouse.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/stubbed.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/stubbed.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/xpad.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/xpad.h | 1 |
16 files changed, 16 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/core/hle/service/hid/controllers/debug_pad.cpp index 6f8ef6e3f..098f8c9f5 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.cpp +++ b/src/core/hle/service/hid/controllers/debug_pad.cpp | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | namespace Service::HID { | 11 | namespace Service::HID { |
| 12 | 12 | ||
| 13 | Controller_DebugPad::Controller_DebugPad() = default; | 13 | Controller_DebugPad::Controller_DebugPad() = default; |
| 14 | Controller_DebugPad::~Controller_DebugPad() = default; | ||
| 14 | 15 | ||
| 15 | void Controller_DebugPad::OnInit() {} | 16 | void Controller_DebugPad::OnInit() {} |
| 16 | 17 | ||
diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/core/hle/service/hid/controllers/debug_pad.h index e35675fa1..62b4f2682 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.h +++ b/src/core/hle/service/hid/controllers/debug_pad.h | |||
| @@ -14,6 +14,7 @@ namespace Service::HID { | |||
| 14 | class Controller_DebugPad final : public ControllerBase { | 14 | class Controller_DebugPad final : public ControllerBase { |
| 15 | public: | 15 | public: |
| 16 | Controller_DebugPad(); | 16 | Controller_DebugPad(); |
| 17 | ~Controller_DebugPad() override; | ||
| 17 | 18 | ||
| 18 | // Called when the controller is initialized | 19 | // Called when the controller is initialized |
| 19 | void OnInit() override; | 20 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index b473b9e2b..76e7bde96 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp | |||
| @@ -12,6 +12,7 @@ namespace Service::HID { | |||
| 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00; | 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00; |
| 13 | 13 | ||
| 14 | Controller_Gesture::Controller_Gesture() = default; | 14 | Controller_Gesture::Controller_Gesture() = default; |
| 15 | Controller_Gesture::~Controller_Gesture() = default; | ||
| 15 | 16 | ||
| 16 | void Controller_Gesture::OnInit() {} | 17 | void Controller_Gesture::OnInit() {} |
| 17 | 18 | ||
diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h index 0ced50dfd..1056ffbcd 100644 --- a/src/core/hle/service/hid/controllers/gesture.h +++ b/src/core/hle/service/hid/controllers/gesture.h | |||
| @@ -13,6 +13,7 @@ namespace Service::HID { | |||
| 13 | class Controller_Gesture final : public ControllerBase { | 13 | class Controller_Gesture final : public ControllerBase { |
| 14 | public: | 14 | public: |
| 15 | Controller_Gesture(); | 15 | Controller_Gesture(); |
| 16 | ~Controller_Gesture() override; | ||
| 16 | 17 | ||
| 17 | // Called when the controller is initialized | 18 | // Called when the controller is initialized |
| 18 | void OnInit() override; | 19 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/core/hle/service/hid/controllers/keyboard.cpp index 089c02ac4..78658b2d0 100644 --- a/src/core/hle/service/hid/controllers/keyboard.cpp +++ b/src/core/hle/service/hid/controllers/keyboard.cpp | |||
| @@ -12,6 +12,7 @@ namespace Service::HID { | |||
| 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800; | 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800; |
| 13 | 13 | ||
| 14 | Controller_Keyboard::Controller_Keyboard() = default; | 14 | Controller_Keyboard::Controller_Keyboard() = default; |
| 15 | Controller_Keyboard::~Controller_Keyboard() = default; | ||
| 15 | 16 | ||
| 16 | void Controller_Keyboard::OnInit() {} | 17 | void Controller_Keyboard::OnInit() {} |
| 17 | 18 | ||
diff --git a/src/core/hle/service/hid/controllers/keyboard.h b/src/core/hle/service/hid/controllers/keyboard.h index 778e14f7e..493e68fce 100644 --- a/src/core/hle/service/hid/controllers/keyboard.h +++ b/src/core/hle/service/hid/controllers/keyboard.h | |||
| @@ -14,6 +14,7 @@ namespace Service::HID { | |||
| 14 | class Controller_Keyboard final : public ControllerBase { | 14 | class Controller_Keyboard final : public ControllerBase { |
| 15 | public: | 15 | public: |
| 16 | Controller_Keyboard(); | 16 | Controller_Keyboard(); |
| 17 | ~Controller_Keyboard() override; | ||
| 17 | 18 | ||
| 18 | // Called when the controller is initialized | 19 | // Called when the controller is initialized |
| 19 | void OnInit() override; | 20 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/core/hle/service/hid/controllers/mouse.cpp index 78e9b5e9e..29984bd4c 100644 --- a/src/core/hle/service/hid/controllers/mouse.cpp +++ b/src/core/hle/service/hid/controllers/mouse.cpp | |||
| @@ -12,6 +12,7 @@ namespace Service::HID { | |||
| 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400; | 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400; |
| 13 | 13 | ||
| 14 | Controller_Mouse::Controller_Mouse() = default; | 14 | Controller_Mouse::Controller_Mouse() = default; |
| 15 | Controller_Mouse::~Controller_Mouse() = default; | ||
| 15 | 16 | ||
| 16 | void Controller_Mouse::OnInit() {} | 17 | void Controller_Mouse::OnInit() {} |
| 17 | 18 | ||
diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/core/hle/service/hid/controllers/mouse.h index 05358a4f5..543b0b71f 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/core/hle/service/hid/controllers/mouse.h | |||
| @@ -13,6 +13,7 @@ namespace Service::HID { | |||
| 13 | class Controller_Mouse final : public ControllerBase { | 13 | class Controller_Mouse final : public ControllerBase { |
| 14 | public: | 14 | public: |
| 15 | Controller_Mouse(); | 15 | Controller_Mouse(); |
| 16 | ~Controller_Mouse() override; | ||
| 16 | 17 | ||
| 17 | // Called when the controller is initialized | 18 | // Called when the controller is initialized |
| 18 | void OnInit() override; | 19 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index d17e64b2a..5b70a344d 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -31,6 +31,7 @@ constexpr u32 BATTERY_FULL = 2; | |||
| 31 | enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right }; | 31 | enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right }; |
| 32 | 32 | ||
| 33 | Controller_NPad::Controller_NPad() = default; | 33 | Controller_NPad::Controller_NPad() = default; |
| 34 | Controller_NPad::~Controller_NPad() = default; | ||
| 34 | 35 | ||
| 35 | void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) { | 36 | void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) { |
| 36 | const auto controller_type = connected_controllers[controller_idx].type; | 37 | const auto controller_type = connected_controllers[controller_idx].type; |
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 9d07d258d..63ef766bb 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h | |||
| @@ -15,6 +15,7 @@ namespace Service::HID { | |||
| 15 | class Controller_NPad final : public ControllerBase { | 15 | class Controller_NPad final : public ControllerBase { |
| 16 | public: | 16 | public: |
| 17 | Controller_NPad(); | 17 | Controller_NPad(); |
| 18 | ~Controller_NPad() override; | ||
| 18 | 19 | ||
| 19 | // Called when the controller is initialized | 20 | // Called when the controller is initialized |
| 20 | void OnInit() override; | 21 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/core/hle/service/hid/controllers/stubbed.cpp index 3a13d5991..f7807072a 100644 --- a/src/core/hle/service/hid/controllers/stubbed.cpp +++ b/src/core/hle/service/hid/controllers/stubbed.cpp | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | namespace Service::HID { | 11 | namespace Service::HID { |
| 12 | 12 | ||
| 13 | Controller_Stubbed::Controller_Stubbed() = default; | 13 | Controller_Stubbed::Controller_Stubbed() = default; |
| 14 | Controller_Stubbed::~Controller_Stubbed() = default; | ||
| 14 | 15 | ||
| 15 | void Controller_Stubbed::OnInit() {} | 16 | void Controller_Stubbed::OnInit() {} |
| 16 | 17 | ||
diff --git a/src/core/hle/service/hid/controllers/stubbed.h b/src/core/hle/service/hid/controllers/stubbed.h index 9c1b57f83..4a21c643e 100644 --- a/src/core/hle/service/hid/controllers/stubbed.h +++ b/src/core/hle/service/hid/controllers/stubbed.h | |||
| @@ -11,6 +11,7 @@ namespace Service::HID { | |||
| 11 | class Controller_Stubbed final : public ControllerBase { | 11 | class Controller_Stubbed final : public ControllerBase { |
| 12 | public: | 12 | public: |
| 13 | Controller_Stubbed(); | 13 | Controller_Stubbed(); |
| 14 | ~Controller_Stubbed() override; | ||
| 14 | 15 | ||
| 15 | // Called when the controller is initialized | 16 | // Called when the controller is initialized |
| 16 | void OnInit() override; | 17 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp index e97f84ea1..d6a11cd56 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/core/hle/service/hid/controllers/touchscreen.cpp | |||
| @@ -15,6 +15,7 @@ namespace Service::HID { | |||
| 15 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400; | 15 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400; |
| 16 | 16 | ||
| 17 | Controller_Touchscreen::Controller_Touchscreen() = default; | 17 | Controller_Touchscreen::Controller_Touchscreen() = default; |
| 18 | Controller_Touchscreen::~Controller_Touchscreen() = default; | ||
| 18 | 19 | ||
| 19 | void Controller_Touchscreen::OnInit() {} | 20 | void Controller_Touchscreen::OnInit() {} |
| 20 | 21 | ||
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h index 1d97b6c2a..e5db6e6ba 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/core/hle/service/hid/controllers/touchscreen.h | |||
| @@ -14,6 +14,7 @@ namespace Service::HID { | |||
| 14 | class Controller_Touchscreen final : public ControllerBase { | 14 | class Controller_Touchscreen final : public ControllerBase { |
| 15 | public: | 15 | public: |
| 16 | Controller_Touchscreen(); | 16 | Controller_Touchscreen(); |
| 17 | ~Controller_Touchscreen() override; | ||
| 17 | 18 | ||
| 18 | // Called when the controller is initialized | 19 | // Called when the controller is initialized |
| 19 | void OnInit() override; | 20 | void OnInit() override; |
diff --git a/src/core/hle/service/hid/controllers/xpad.cpp b/src/core/hle/service/hid/controllers/xpad.cpp index df0b48451..bc03e8990 100644 --- a/src/core/hle/service/hid/controllers/xpad.cpp +++ b/src/core/hle/service/hid/controllers/xpad.cpp | |||
| @@ -12,6 +12,7 @@ namespace Service::HID { | |||
| 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00; | 12 | constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00; |
| 13 | 13 | ||
| 14 | Controller_XPad::Controller_XPad() = default; | 14 | Controller_XPad::Controller_XPad() = default; |
| 15 | Controller_XPad::~Controller_XPad() = default; | ||
| 15 | 16 | ||
| 16 | void Controller_XPad::OnInit() {} | 17 | void Controller_XPad::OnInit() {} |
| 17 | 18 | ||
diff --git a/src/core/hle/service/hid/controllers/xpad.h b/src/core/hle/service/hid/controllers/xpad.h index e2007183d..cf93c8f64 100644 --- a/src/core/hle/service/hid/controllers/xpad.h +++ b/src/core/hle/service/hid/controllers/xpad.h | |||
| @@ -14,6 +14,7 @@ namespace Service::HID { | |||
| 14 | class Controller_XPad final : public ControllerBase { | 14 | class Controller_XPad final : public ControllerBase { |
| 15 | public: | 15 | public: |
| 16 | Controller_XPad(); | 16 | Controller_XPad(); |
| 17 | ~Controller_XPad() override; | ||
| 17 | 18 | ||
| 18 | // Called when the controller is initialized | 19 | // Called when the controller is initialized |
| 19 | void OnInit() override; | 20 | void OnInit() override; |