From 00e147c722fd1e70eb15f5d49b604cdd4652b7ab Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sun, 29 Sep 2024 15:07:08 -0700 Subject: [PATCH] Simplify `std::count_if` with `std::ranges::count` and projections --- Source/Core/Core/NetPlayClient.cpp | 12 ++---------- .../Core/DolphinQt/Config/Mapping/MappingWidget.cpp | 7 +++---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 02e6df254e..b646a3586a 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -2407,22 +2407,14 @@ bool NetPlayClient::IsFirstInGamePad(int ingame_pad) const [](auto mapping) { return mapping > 0; }); } -static int CountLocalPads(const PadMappingArray& pad_map, const PlayerId& local_player_pid) -{ - return static_cast( - std::count_if(pad_map.begin(), pad_map.end(), [&local_player_pid](const auto& mapping) { - return mapping == local_player_pid; - })); -} - int NetPlayClient::NumLocalPads() const { - return CountLocalPads(m_pad_map, m_local_player->pid); + return std::ranges::count(m_pad_map, m_local_player->pid); } int NetPlayClient::NumLocalWiimotes() const { - return CountLocalPads(m_wiimote_map, m_local_player->pid); + return std::ranges::count(m_wiimote_map, m_local_player->pid); } static int InGameToLocal(int ingame_pad, const PadMappingArray& pad_map, PlayerId local_player_pid) diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp index 036e9c512e..cfb4b35738 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp @@ -154,10 +154,9 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con [group_enable_checkbox, group] { group_enable_checkbox->setChecked(group->enabled); }); } - const auto advanced_setting_count = std::count_if( - group->numeric_settings.begin(), group->numeric_settings.end(), [](auto& setting) { - return setting->GetVisibility() == ControllerEmu::SettingVisibility::Advanced; - }); + const auto advanced_setting_count = + std::ranges::count(group->numeric_settings, ControllerEmu::SettingVisibility::Advanced, + &ControllerEmu::NumericSettingBase::GetVisibility); if (advanced_setting_count != 0) {