diff options
| author | 2022-02-05 12:35:39 -0500 | |
|---|---|---|
| committer | 2022-02-05 13:56:21 -0500 | |
| commit | 25db62ce1534cbd8b93b4284869229e4bd7de54d (patch) | |
| tree | dd74d3fc6ba14a0de5e88778cad5b5c65fcba248 /src/input_common/input_poller.cpp | |
| parent | profile: Migrate to the new UUID implementation (diff) | |
| download | yuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.tar.gz yuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.tar.xz yuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.zip | |
general: Rename NewUUID to UUID, and remove the previous UUID impl
This completes the removal of the old UUID implementation.
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/input_poller.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 313703f5f..2f3c0735a 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp | |||
| @@ -691,7 +691,7 @@ private: | |||
| 691 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateButtonDevice( | 691 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateButtonDevice( |
| 692 | const Common::ParamPackage& params) { | 692 | const Common::ParamPackage& params) { |
| 693 | const PadIdentifier identifier = { | 693 | const PadIdentifier identifier = { |
| 694 | .guid = Common::NewUUID{params.Get("guid", "")}, | 694 | .guid = Common::UUID{params.Get("guid", "")}, |
| 695 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 695 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 696 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 696 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 697 | }; | 697 | }; |
| @@ -714,7 +714,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateButtonDevice( | |||
| 714 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateHatButtonDevice( | 714 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateHatButtonDevice( |
| 715 | const Common::ParamPackage& params) { | 715 | const Common::ParamPackage& params) { |
| 716 | const PadIdentifier identifier = { | 716 | const PadIdentifier identifier = { |
| 717 | .guid = Common::NewUUID{params.Get("guid", "")}, | 717 | .guid = Common::UUID{params.Get("guid", "")}, |
| 718 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 718 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 719 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 719 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 720 | }; | 720 | }; |
| @@ -736,7 +736,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateStickDevice( | |||
| 736 | const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f); | 736 | const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f); |
| 737 | const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f); | 737 | const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f); |
| 738 | const PadIdentifier identifier = { | 738 | const PadIdentifier identifier = { |
| 739 | .guid = Common::NewUUID{params.Get("guid", "")}, | 739 | .guid = Common::UUID{params.Get("guid", "")}, |
| 740 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 740 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 741 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 741 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 742 | }; | 742 | }; |
| @@ -768,7 +768,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateStickDevice( | |||
| 768 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateAnalogDevice( | 768 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateAnalogDevice( |
| 769 | const Common::ParamPackage& params) { | 769 | const Common::ParamPackage& params) { |
| 770 | const PadIdentifier identifier = { | 770 | const PadIdentifier identifier = { |
| 771 | .guid = Common::NewUUID{params.Get("guid", "")}, | 771 | .guid = Common::UUID{params.Get("guid", "")}, |
| 772 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 772 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 773 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 773 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 774 | }; | 774 | }; |
| @@ -789,7 +789,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateAnalogDevice( | |||
| 789 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTriggerDevice( | 789 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTriggerDevice( |
| 790 | const Common::ParamPackage& params) { | 790 | const Common::ParamPackage& params) { |
| 791 | const PadIdentifier identifier = { | 791 | const PadIdentifier identifier = { |
| 792 | .guid = Common::NewUUID{params.Get("guid", "")}, | 792 | .guid = Common::UUID{params.Get("guid", "")}, |
| 793 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 793 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 794 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 794 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 795 | }; | 795 | }; |
| @@ -820,7 +820,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTouchDevice( | |||
| 820 | const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f); | 820 | const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f); |
| 821 | const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f); | 821 | const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f); |
| 822 | const PadIdentifier identifier = { | 822 | const PadIdentifier identifier = { |
| 823 | .guid = Common::NewUUID{params.Get("guid", "")}, | 823 | .guid = Common::UUID{params.Get("guid", "")}, |
| 824 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 824 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 825 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 825 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 826 | }; | 826 | }; |
| @@ -857,7 +857,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTouchDevice( | |||
| 857 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateBatteryDevice( | 857 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateBatteryDevice( |
| 858 | const Common::ParamPackage& params) { | 858 | const Common::ParamPackage& params) { |
| 859 | const PadIdentifier identifier = { | 859 | const PadIdentifier identifier = { |
| 860 | .guid = Common::NewUUID{params.Get("guid", "")}, | 860 | .guid = Common::UUID{params.Get("guid", "")}, |
| 861 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 861 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 862 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 862 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 863 | }; | 863 | }; |
| @@ -869,7 +869,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateBatteryDevice( | |||
| 869 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice( | 869 | std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice( |
| 870 | Common::ParamPackage params) { | 870 | Common::ParamPackage params) { |
| 871 | const PadIdentifier identifier = { | 871 | const PadIdentifier identifier = { |
| 872 | .guid = Common::NewUUID{params.Get("guid", "")}, | 872 | .guid = Common::UUID{params.Get("guid", "")}, |
| 873 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 873 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 874 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 874 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 875 | }; | 875 | }; |
| @@ -963,7 +963,7 @@ OutputFactory::OutputFactory(std::shared_ptr<InputEngine> input_engine_) | |||
| 963 | std::unique_ptr<Common::Input::OutputDevice> OutputFactory::Create( | 963 | std::unique_ptr<Common::Input::OutputDevice> OutputFactory::Create( |
| 964 | const Common::ParamPackage& params) { | 964 | const Common::ParamPackage& params) { |
| 965 | const PadIdentifier identifier = { | 965 | const PadIdentifier identifier = { |
| 966 | .guid = Common::NewUUID{params.Get("guid", "")}, | 966 | .guid = Common::UUID{params.Get("guid", "")}, |
| 967 | .port = static_cast<std::size_t>(params.Get("port", 0)), | 967 | .port = static_cast<std::size_t>(params.Get("port", 0)), |
| 968 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), | 968 | .pad = static_cast<std::size_t>(params.Get("pad", 0)), |
| 969 | }; | 969 | }; |