piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify std::count_if with std::ranges::count and projections

Browse Source
This commit is contained in:
mitaclaw
2024-09-29 15:07:08 -07:00
parent 62b2b939b5
commit 00e147c722
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/NetPlayClient.cpp
View File

@ -2407,22 +2407,14 @@ bool NetPlayClient::IsFirstInGamePad(int ingame_pad) const
[](auto mapping) { return mapping > 0; }); [](auto mapping) { return mapping > 0; });
} }
static int CountLocalPads(const PadMappingArray& pad_map, const PlayerId& local_player_pid)
{
return static_cast<int>(
std::count_if(pad_map.begin(), pad_map.end(), [&local_player_pid](const auto& mapping) {
return mapping == local_player_pid;
}));
}
int NetPlayClient::NumLocalPads() const 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 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) static int InGameToLocal(int ingame_pad, const PadMappingArray& pad_map, PlayerId local_player_pid)

7
Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
View File

@ -154,10 +154,9 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con
[group_enable_checkbox, group] { group_enable_checkbox->setChecked(group->enabled); }); [group_enable_checkbox, group] { group_enable_checkbox->setChecked(group->enabled); });
} }
const auto advanced_setting_count = std::count_if( const auto advanced_setting_count =
group->numeric_settings.begin(), group->numeric_settings.end(), [](auto& setting) { std::ranges::count(group->numeric_settings, ControllerEmu::SettingVisibility::Advanced,
return setting->GetVisibility() == ControllerEmu::SettingVisibility::Advanced; &ControllerEmu::NumericSettingBase::GetVisibility);
});
if (advanced_setting_count != 0) if (advanced_setting_count != 0)
{ {