Просмотр исходного кода

applets/controller: Use aliases for callbacks

Lioncash 3 лет назад
Родитель
Сommit
fedd857054

+ 1 - 1
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!");
 

+ 4 - 2
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:

+ 1 - 1
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);
 }

+ 2 - 2
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;
 };