From 0780458069abacf9ca1b33c2f4c523f0a8d8bde9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 7 Jun 2025 15:28:52 -0500 Subject: [PATCH] InputCommon: Make InputDetector::Start take a span instead of a vector. --- Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp | 3 ++- Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp | 2 +- Source/Core/InputCommon/ControllerInterface/CoreDevice.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp index 82af157df5..53da173bba 100644 --- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp @@ -3,6 +3,7 @@ #include "DolphinQt/Config/Mapping/IOWindow.h" +#include #include #include @@ -532,7 +533,7 @@ void IOWindow::ConnectWidgets() m_detect_button->setText(tr("[ Press Now ]")); m_input_detector = std::make_unique(); const auto lock = m_controller->GetStateLock(); - m_input_detector->Start(g_controller_interface, {m_devq.ToString()}); + m_input_detector->Start(g_controller_interface, std::array{m_devq.ToString()}); QtUtils::InstallKeyboardBlocker(m_detect_button, this, &IOWindow::DetectInputComplete); }); connect(this, &IOWindow::DetectInputComplete, diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp index 5a370cadc8..41ef16c330 100644 --- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp @@ -391,7 +391,7 @@ InputDetector::InputDetector() : m_start_time{}, m_state{} } void InputDetector::Start(const DeviceContainer& container, - const std::vector& device_strings) + std::span device_strings) { m_start_time = Clock::now(); diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h index 5318a102f9..c8be0aeb65 100644 --- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -255,7 +256,7 @@ public: InputDetector(); ~InputDetector(); - void Start(const DeviceContainer& container, const std::vector& device_strings); + void Start(const DeviceContainer& container, std::span device_strings); void Update(std::chrono::milliseconds initial_wait, std::chrono::milliseconds confirmation_wait, std::chrono::milliseconds maximum_wait); bool IsComplete() const;