summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2020-08-30 00:07:38 +0200
committerFearlessTobi <thm.frey@gmail.com>2020-08-30 00:43:25 +0200
commitd1e1ea0fef0ddfe914f14a2d547b922b71081695 (patch)
tree5109a1542775eb682e84fa2cc1f3bff160a01759 /src/input_common
parentReolve reorder warning (diff)
downloadyuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar.gz
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar.bz2
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar.lz
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar.xz
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.tar.zst
yuzu-d1e1ea0fef0ddfe914f14a2d547b922b71081695.zip
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 {
enum Values : int;
}
-/// Reloads the input devices
-void ReloadInputDevices();
-
namespace InputCommon {
namespace Polling {
@@ -118,6 +115,7 @@ public:
/// Retrieves the underlying GameCube button handler.
[[nodiscard]] const GCButtonFactory* GetGCButtons() const;
+ /// Reloads the input devices
void ReloadInputDevices();
/// 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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "core/frontend/framebuffer_layout.h"
#include "core/settings.h"
#include "input_common/touch_from_button.h"
@@ -43,7 +44,6 @@ private:
std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(
const Common::ParamPackage& params) {
-
return std::make_unique<TouchFromButtonDevice>();
}
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 @@
#pragma once
#include <memory>
-#include "core/frontend/framebuffer_layout.h"
#include "core/frontend/input.h"
namespace InputCommon {
@@ -17,7 +16,6 @@ class TouchFromButtonFactory final : public Input::Factory<Input::TouchDevice> {
public:
/**
* Creates a touch device from a list of button devices
- * @param unused
*/
std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override;
};