Merge pull request #13117 from mitaclaw/ranges-modernization-9-trivial-find

Ranges Algorithms Modernization - Find
This commit is contained in:
Tilka
2024-10-11 20:27:18 +01:00
committed by GitHub
32 changed files with 71 additions and 84 deletions

View File

@ -396,7 +396,7 @@ void GeckoCodeWidget::DownloadCodes()
for (const auto& code : codes)
{
auto it = std::find(m_gecko_codes.begin(), m_gecko_codes.end(), code);
auto it = std::ranges::find(m_gecko_codes, code);
if (it == m_gecko_codes.end())
{

View File

@ -162,10 +162,9 @@ void GekkoSyntaxHighlight::highlightBlock(const QString& text)
}
else if (m_mode == 1)
{
auto paren_it = std::find_if(info->parens.begin(), info->parens.end(),
[this](const std::pair<int, int>& p) {
return p.first == m_cursor_loc || p.second == m_cursor_loc;
});
auto paren_it = std::ranges::find_if(info->parens, [this](const std::pair<int, int>& p) {
return p.first == m_cursor_loc || p.second == m_cursor_loc;
});
if (paren_it != info->parens.end())
{
HighlightSubstr(paren_it->first, 1, HighlightFormat::Paren);

View File

@ -5,6 +5,7 @@
#include <algorithm>
#include <bit>
#include <ranges>
#include <QGroupBox>
#include <QHBoxLayout>
@ -472,9 +473,8 @@ void FIFOAnalyzer::FindNext()
const int index = m_detail_list->currentRow();
ASSERT(index >= 0);
auto next_result =
std::find_if(m_search_results.begin(), m_search_results.end(),
[index](auto& result) { return result.m_cmd > static_cast<u32>(index); });
auto next_result = std::ranges::find_if(
m_search_results, [index](auto& result) { return result.m_cmd > static_cast<u32>(index); });
if (next_result != m_search_results.end())
{
ShowSearchResult(next_result - m_search_results.begin());
@ -487,8 +487,9 @@ void FIFOAnalyzer::FindPrevious()
ASSERT(index >= 0);
auto prev_result =
std::find_if(m_search_results.rbegin(), m_search_results.rend(),
[index](auto& result) { return result.m_cmd < static_cast<u32>(index); });
std::ranges::find_if(m_search_results | std::views::reverse, [index](auto& result) {
return result.m_cmd < static_cast<u32>(index);
});
if (prev_result != m_search_results.rend())
{
ShowSearchResult((m_search_results.rend() - prev_result) - 1);

View File

@ -145,8 +145,7 @@ void GameDigestDialog::SetResult(int pid, const std::string& result)
auto client = Settings::Instance().GetNetPlayClient();
if (client && m_results.size() >= client->GetPlayers().size())
{
if (std::adjacent_find(m_results.begin(), m_results.end(), std::not_equal_to<>()) ==
m_results.end())
if (std::ranges::adjacent_find(m_results, std::ranges::not_equal_to{}) == m_results.end())
{
m_check_label->setText(tr("The hashes match!"));
}