summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/frontend/applets/controller.cpp2
-rw-r--r--src/core/frontend/applets/controller.h6
-rw-r--r--src/yuzu/applets/qt_controller.cpp2
-rw-r--r--src/yuzu/applets/qt_controller.h4
4 files changed, 8 insertions, 6 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp
index 6c230f619..52919484e 100644
--- a/src/core/frontend/applets/controller.cpp
+++ b/src/core/frontend/applets/controller.cpp
@@ -16,7 +16,7 @@ DefaultControllerApplet::DefaultControllerApplet(HID::HIDCore& hid_core_) : hid_
16 16
17DefaultControllerApplet::~DefaultControllerApplet() = default; 17DefaultControllerApplet::~DefaultControllerApplet() = default;
18 18
19void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, 19void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callback,
20 const ControllerParameters& parameters) const { 20 const ControllerParameters& parameters) const {
21 LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); 21 LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!");
22 22
diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h
index 71698df74..adb2feefd 100644
--- a/src/core/frontend/applets/controller.h
+++ b/src/core/frontend/applets/controller.h
@@ -36,9 +36,11 @@ struct ControllerParameters {
36 36
37class ControllerApplet { 37class ControllerApplet {
38public: 38public:
39 using ReconfigureCallback = std::function<void()>;
40
39 virtual ~ControllerApplet(); 41 virtual ~ControllerApplet();
40 42
41 virtual void ReconfigureControllers(std::function<void()> callback, 43 virtual void ReconfigureControllers(ReconfigureCallback callback,
42 const ControllerParameters& parameters) const = 0; 44 const ControllerParameters& parameters) const = 0;
43}; 45};
44 46
@@ -47,7 +49,7 @@ public:
47 explicit DefaultControllerApplet(HID::HIDCore& hid_core_); 49 explicit DefaultControllerApplet(HID::HIDCore& hid_core_);
48 ~DefaultControllerApplet() override; 50 ~DefaultControllerApplet() override;
49 51
50 void ReconfigureControllers(std::function<void()> callback, 52 void ReconfigureControllers(ReconfigureCallback callback,
51 const ControllerParameters& parameters) const override; 53 const ControllerParameters& parameters) const override;
52 54
53private: 55private:
diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp
index 12efdc216..c30b54499 100644
--- a/src/yuzu/applets/qt_controller.cpp
+++ b/src/yuzu/applets/qt_controller.cpp
@@ -685,7 +685,7 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) {
685QtControllerSelector::~QtControllerSelector() = default; 685QtControllerSelector::~QtControllerSelector() = default;
686 686
687void QtControllerSelector::ReconfigureControllers( 687void QtControllerSelector::ReconfigureControllers(
688 std::function<void()> callback_, const Core::Frontend::ControllerParameters& parameters) const { 688 ReconfigureCallback callback_, const Core::Frontend::ControllerParameters& parameters) const {
689 callback = std::move(callback_); 689 callback = std::move(callback_);
690 emit MainWindowReconfigureControllers(parameters); 690 emit MainWindowReconfigureControllers(parameters);
691} 691}
diff --git a/src/yuzu/applets/qt_controller.h b/src/yuzu/applets/qt_controller.h
index cf948d2b5..16e99f507 100644
--- a/src/yuzu/applets/qt_controller.h
+++ b/src/yuzu/applets/qt_controller.h
@@ -157,7 +157,7 @@ public:
157 ~QtControllerSelector() override; 157 ~QtControllerSelector() override;
158 158
159 void ReconfigureControllers( 159 void ReconfigureControllers(
160 std::function<void()> callback_, 160 ReconfigureCallback callback_,
161 const Core::Frontend::ControllerParameters& parameters) const override; 161 const Core::Frontend::ControllerParameters& parameters) const override;
162 162
163signals: 163signals:
@@ -167,5 +167,5 @@ signals:
167private: 167private:
168 void MainWindowReconfigureFinished(); 168 void MainWindowReconfigureFinished();
169 169
170 mutable std::function<void()> callback; 170 mutable ReconfigureCallback callback;
171}; 171};