mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: sonarcloud cpp:S6005 (#4268)

This commit is contained in:
Charles Kerr 2022-11-28 18:26:03 -06:00 committed by GitHub
parent 8085ef6acb
commit 4adda4dc1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtransmission/announcer.cc
View File

@ -539,9 +539,9 @@ struct tr_torrent_announcer
tier_to_infos[info.tier].emplace_back(&info);
}
for (auto const& tt : tier_to_infos)
for (auto const& [tier_num, infos] : tier_to_infos)
{
tiers.emplace_back(announcer, tor, tt.second);
tiers.emplace_back(announcer, tor, infos);
}
}

6
libtransmission/clients.cc
View File

@ -668,10 +668,10 @@ void tr_clientForId(char* buf, size_t buflen, tr_peer_id_t peer_id)
}
};
auto eq = std::equal_range(std::begin(Clients), std::end(Clients), key, Compare{});
if (eq.first != std::end(Clients) && eq.first != eq.second)
if (auto const [eq_begin, eq_end] = std::equal_range(std::begin(Clients), std::end(Clients), key, Compare{});
eq_begin != std::end(Clients) && eq_begin != eq_end)
{
eq.first->formatter(buf, buflen, eq.first->name, peer_id);
eq_begin->formatter(buf, buflen, eq_begin->name, peer_id);
return;
}

16
qt/Prefs.cc
View File

@ -254,8 +254,8 @@ Prefs::Prefs(QString config_dir)
};
// NOLINTNEXTLINE(readability-qualified-auto)
auto const it = std::find_if(std::cbegin(SortModes), std::cend(SortModes), test);
auto const& pair = it == std::end(SortModes) ? SortModes.front() : *it;
values_[i] = QVariant::fromValue(SortMode(pair.first));
auto const& [mode, mode_str] = it == std::end(SortModes) ? SortModes.front() : *it;
values_[i] = QVariant::fromValue(SortMode{ mode });
}
break;
@ -268,8 +268,8 @@ Prefs::Prefs(QString config_dir)
};
// NOLINTNEXTLINE(readability-qualified-auto)
auto const it = std::find_if(std::cbegin(FilterModes), std::cend(FilterModes), test);
auto const& pair = it == std::end(FilterModes) ? FilterModes.front() : *it;
values_[i] = QVariant::fromValue(FilterMode(pair.first));
auto const& [mode, mode_str] = it == std::end(FilterModes) ? FilterModes.front() : *it;
values_[i] = QVariant::fromValue(FilterMode{ mode });
}
break;
@ -352,8 +352,8 @@ Prefs::~Prefs()
};
// NOLINTNEXTLINE(readability-qualified-auto)
auto const it = std::find_if(std::cbegin(SortModes), std::cend(SortModes), test);
auto const& pair = it == std::end(SortModes) ? SortModes.front() : *it;
dictAdd(&current_settings, key, pair.second);
auto const& [mode_val, mode_str] = it == std::end(SortModes) ? SortModes.front() : *it;
dictAdd(&current_settings, key, mode_str);
break;
}
@ -366,8 +366,8 @@ Prefs::~Prefs()
};
// NOLINTNEXTLINE(readability-qualified-auto)
auto const it = std::find_if(std::cbegin(FilterModes), std::cend(FilterModes), test);
auto const& pair = it == std::end(FilterModes) ? FilterModes.front() : *it;
dictAdd(&current_settings, key, pair.second);
auto const& [mode_val, mode_str] = it == std::end(FilterModes) ? FilterModes.front() : *it;
dictAdd(&current_settings, key, mode_str);
break;
}