diff options
author | bunnei <bunneidev@gmail.com> | 2020-10-27 02:49:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-27 02:49:26 +0100 |
commit | 9f08cea2c41cf3ee00c899ee333893cecbba3ae9 (patch) | |
tree | 358896744bc49e77e84ad6f0875d644df0574c27 | |
parent | Merge pull request #4827 from lioncash/trunc (diff) | |
parent | controller: Pass ControllerParameters by reference in ReconfigureControllers() (diff) | |
download | yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar.gz yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar.bz2 yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar.lz yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar.xz yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.tar.zst yuzu-9f08cea2c41cf3ee00c899ee333893cecbba3ae9.zip |
-rw-r--r-- | src/core/frontend/applets/controller.cpp | 2 | ||||
-rw-r--r-- | src/core/frontend/applets/controller.h | 4 | ||||
-rw-r--r-- | src/yuzu/applets/controller.cpp | 2 | ||||
-rw-r--r-- | src/yuzu/applets/controller.h | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index c5d65f2d0..5582091f4 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -19,7 +19,7 @@ DefaultControllerApplet::DefaultControllerApplet(Service::SM::ServiceManager& se DefaultControllerApplet::~DefaultControllerApplet() = default; void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, - ControllerParameters parameters) const { + const ControllerParameters& parameters) const { LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); auto& npad = diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h index 3e49cdbb9..dff71d8d9 100644 --- a/src/core/frontend/applets/controller.h +++ b/src/core/frontend/applets/controller.h @@ -38,7 +38,7 @@ public: virtual ~ControllerApplet(); virtual void ReconfigureControllers(std::function<void()> callback, - ControllerParameters parameters) const = 0; + const ControllerParameters& parameters) const = 0; }; class DefaultControllerApplet final : public ControllerApplet { @@ -47,7 +47,7 @@ public: ~DefaultControllerApplet() override; void ReconfigureControllers(std::function<void()> callback, - ControllerParameters parameters) const override; + const ControllerParameters& parameters) const override; private: Service::SM::ServiceManager& service_manager; diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp index d6fbbbf2b..c6fa3e4f6 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/controller.cpp @@ -589,7 +589,7 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) { QtControllerSelector::~QtControllerSelector() = default; void QtControllerSelector::ReconfigureControllers( - std::function<void()> callback, Core::Frontend::ControllerParameters parameters) const { + std::function<void()> callback, const Core::Frontend::ControllerParameters& parameters) const { this->callback = std::move(callback); emit MainWindowReconfigureControllers(parameters); } diff --git a/src/yuzu/applets/controller.h b/src/yuzu/applets/controller.h index 2d6d588c6..729ecc831 100644 --- a/src/yuzu/applets/controller.h +++ b/src/yuzu/applets/controller.h @@ -120,11 +120,13 @@ public: explicit QtControllerSelector(GMainWindow& parent); ~QtControllerSelector() override; - void ReconfigureControllers(std::function<void()> callback, - Core::Frontend::ControllerParameters parameters) const override; + void ReconfigureControllers( + std::function<void()> callback, + const Core::Frontend::ControllerParameters& parameters) const override; signals: - void MainWindowReconfigureControllers(Core::Frontend::ControllerParameters parameters) const; + void MainWindowReconfigureControllers( + const Core::Frontend::ControllerParameters& parameters) const; private: void MainWindowReconfigureFinished(); |