VERY experimental Nintendo Switch 2 emulator
C++
applets/controller: Use aliases for callbacks
Lioncasha3e4ad2cf565
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cppindex 6c230f6196..52919484e2 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_DefaultControllerApplet::~DefaultControllerApplet() = default;-void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback,+void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callback,const ControllerParameters& parameters) const {LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!");diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.hindex 71698df742..adb2feefd9 100644--- a/src/core/frontend/applets/controller.h+++ b/src/core/frontend/applets/controller.h@@ -36,9 +36,11 @@ struct ControllerParameters {class ControllerApplet {public:+ using ReconfigureCallback = std::function<void()>;+virtual ~ControllerApplet();- virtual void ReconfigureControllers(std::function<void()> callback,+ virtual void ReconfigureControllers(ReconfigureCallback callback,const ControllerParameters& parameters) const = 0;};@@ -47,7 +49,7 @@ public:explicit DefaultControllerApplet(HID::HIDCore& hid_core_);~DefaultControllerApplet() override;- void ReconfigureControllers(std::function<void()> callback,+ void ReconfigureControllers(ReconfigureCallback callback,const ControllerParameters& parameters) const override;private:diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cppindex 12efdc2162..c30b54499c 100644--- a/src/yuzu/applets/qt_controller.cpp+++ b/src/yuzu/applets/qt_controller.cpp@@ -685,7 +685,7 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) {QtControllerSelector::~QtControllerSelector() = default;void QtControllerSelector::ReconfigureControllers(- std::function<void()> callback_, const Core::Frontend::ControllerParameters& parameters) const {+ ReconfigureCallback callback_, const Core::Frontend::ControllerParameters& parameters) const {callback = std::move(callback_);emit MainWindowReconfigureControllers(parameters);}diff --git a/src/yuzu/applets/qt_controller.h b/src/yuzu/applets/qt_controller.hindex cf948d2b56..16e99f5077 100644--- a/src/yuzu/applets/qt_controller.h+++ b/src/yuzu/applets/qt_controller.h@@ -157,7 +157,7 @@ public:~QtControllerSelector() override;void ReconfigureControllers(- std::function<void()> callback_,+ ReconfigureCallback callback_,const Core::Frontend::ControllerParameters& parameters) const override;signals:@@ -167,5 +167,5 @@ signals:private:void MainWindowReconfigureFinished();- mutable std::function<void()> callback;+ mutable ReconfigureCallback callback;};