summaryrefslogtreecommitdiff
path: root/src/input_common
diff options
context:
space:
mode:
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/main.h4
-rw-r--r--src/input_common/touch_from_button.cpp2
-rw-r--r--src/input_common/touch_from_button.h2
3 files changed, 2 insertions, 6 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h
index 512215e7e..f3fbf696e 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -21,9 +21,6 @@ namespace Settings::NativeButton {
21enum Values : int; 21enum Values : int;
22} 22}
23 23
24/// Reloads the input devices
25void ReloadInputDevices();
26
27namespace InputCommon { 24namespace InputCommon {
28namespace Polling { 25namespace Polling {
29 26
@@ -118,6 +115,7 @@ public:
118 /// Retrieves the underlying GameCube button handler. 115 /// Retrieves the underlying GameCube button handler.
119 [[nodiscard]] const GCButtonFactory* GetGCButtons() const; 116 [[nodiscard]] const GCButtonFactory* GetGCButtons() const;
120 117
118 /// Reloads the input devices
121 void ReloadInputDevices(); 119 void ReloadInputDevices();
122 120
123 /// Get all DevicePoller from all backends for a specific device type 121 /// Get all DevicePoller from all backends for a specific device type
diff --git a/src/input_common/touch_from_button.cpp b/src/input_common/touch_from_button.cpp
index d028dfa0d..98da0ef1a 100644
--- a/src/input_common/touch_from_button.cpp
+++ b/src/input_common/touch_from_button.cpp
@@ -2,6 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "core/frontend/framebuffer_layout.h"
5#include "core/settings.h" 6#include "core/settings.h"
6#include "input_common/touch_from_button.h" 7#include "input_common/touch_from_button.h"
7 8
@@ -43,7 +44,6 @@ private:
43 44
44std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create( 45std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(
45 const Common::ParamPackage& params) { 46 const Common::ParamPackage& params) {
46
47 return std::make_unique<TouchFromButtonDevice>(); 47 return std::make_unique<TouchFromButtonDevice>();
48} 48}
49 49
diff --git a/src/input_common/touch_from_button.h b/src/input_common/touch_from_button.h
index cfb82f108..8b4d1aa96 100644
--- a/src/input_common/touch_from_button.h
+++ b/src/input_common/touch_from_button.h
@@ -5,7 +5,6 @@
5#pragma once 5#pragma once
6 6
7#include <memory> 7#include <memory>
8#include "core/frontend/framebuffer_layout.h"
9#include "core/frontend/input.h" 8#include "core/frontend/input.h"
10 9
11namespace InputCommon { 10namespace InputCommon {
@@ -17,7 +16,6 @@ class TouchFromButtonFactory final : public Input::Factory<Input::TouchDevice> {
17public: 16public:
18 /** 17 /**
19 * Creates a touch device from a list of button devices 18 * Creates a touch device from a list of button devices
20 * @param unused
21 */ 19 */
22 std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override; 20 std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override;
23}; 21};