refactor: use std::ranges::find_if when possible

This commit is contained in:
sithlord48
2025-07-31 20:46:08 -04:00
committed by Chris Rizzitello
parent 59c414ebad
commit 2cccc3d0c8
4 changed files with 9 additions and 16 deletions

View File

@ -95,7 +95,7 @@ std::vector<X11LayoutsParser::Lang> X11LayoutsParser::getAllLanguageData(const s
void X11LayoutsParser::appendVectorUniq(const std::vector<std::string> &source, std::vector<std::string> &dst) void X11LayoutsParser::appendVectorUniq(const std::vector<std::string> &source, std::vector<std::string> &dst)
{ {
for (const auto &elem : source) { for (const auto &elem : source) {
if (std::find_if(dst.begin(), dst.end(), [elem](const std::string_view &s) { return s == elem; }) == dst.end()) { if (std::ranges::find_if(dst, [elem](const std::string_view &s) { return s == elem; }) == dst.end()) {
dst.push_back(elem); dst.push_back(elem);
} }
} }
@ -117,8 +117,7 @@ void X11LayoutsParser::convertLayoutToISO639_2(
continue; continue;
} }
auto langIter = auto langIter = std::ranges::find_if(allLang, [&layoutName](const Lang &l) { return l.name == layoutName; });
std::find_if(allLang.begin(), allLang.end(), [&layoutName](const Lang &l) { return l.name == layoutName; });
if (langIter == allLang.end()) { if (langIter == allLang.end()) {
LOG((CLOG_WARN "language \"%s\" is unknown", layoutNames[i].c_str())); LOG((CLOG_WARN "language \"%s\" is unknown", layoutNames[i].c_str()));
continue; continue;
@ -131,9 +130,7 @@ void X11LayoutsParser::convertLayoutToISO639_2(
} else { } else {
const auto &variantName = layoutVariantNames[i]; const auto &variantName = layoutVariantNames[i];
auto langVariantIter = auto langVariantIter =
std::find_if(langIter->variants.begin(), langIter->variants.end(), [&variantName](const Lang &l) { std::ranges::find_if(langIter->variants, [&variantName](const Lang &l) { return l.name == variantName; });
return l.name == variantName;
});
if (langVariantIter == langIter->variants.end()) { if (langVariantIter == langIter->variants.end()) {
LOG( LOG(
(CLOG_WARN "variant \"%s\" of language \"%s\" is unknown", layoutVariantNames[i].c_str(), (CLOG_WARN "variant \"%s\" of language \"%s\" is unknown", layoutVariantNames[i].c_str(),
@ -202,10 +199,9 @@ std::vector<std::string> X11LayoutsParser::convertISO639_2ToISO639_1(const std::
{ {
std::vector<std::string> result; std::vector<std::string> result;
for (const auto &isoCode : iso639_2Codes) { for (const auto &isoCode : iso639_2Codes) {
const auto &tableIter = const auto &tableIter = std::ranges::find_if(ISO_Table, [&isoCode](const std::pair<std::string, std::string> &c) {
std::find_if(ISO_Table.begin(), ISO_Table.end(), [&isoCode](const std::pair<std::string, std::string> &c) { return c.first == isoCode;
return c.first == isoCode; });
});
if (tableIter == ISO_Table.end()) { if (tableIter == ISO_Table.end()) {
LOG((CLOG_WARN "the ISO 639-2 code \"%s\" is missed in table", isoCode.c_str())); LOG((CLOG_WARN "the ISO 639-2 code \"%s\" is missed in table", isoCode.c_str()));
continue; continue;

View File

@ -156,8 +156,6 @@ void ScreenSetupModel::addScreen(const Screen &newScreen)
bool ScreenSetupModel::isFull() const bool ScreenSetupModel::isFull() const
{ {
auto emptyScreen = auto emptyScreen = std::ranges::find_if(m_Screens, [](const Screen &item) { return item.isNull(); });
std::find_if(m_Screens.cbegin(), m_Screens.cend(), [](const Screen &item) { return item.isNull(); });
return (emptyScreen == m_Screens.cend()); return (emptyScreen == m_Screens.cend());
} }

View File

@ -152,7 +152,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
ui->screenSetupView->setModel(&m_ScreenSetupModel); ui->screenSetupView->setModel(&m_ScreenSetupModel);
auto &screens = serverConfig().screens(); auto &screens = serverConfig().screens();
auto server = std::find_if(screens.begin(), screens.end(), [this](const Screen &screen) { auto server = std::ranges::find_if(screens, [this](const Screen &screen) {
return (screen.name() == serverConfig().getServerName()); return (screen.name() == serverConfig().getServerName());
}); });

View File

@ -1016,8 +1016,7 @@ bool XWindowsClipboard::sendReply(Reply *reply)
LOG((CLOG_DEBUG2 " %s: <can't read property>", name)); LOG((CLOG_DEBUG2 " %s: <can't read property>", name));
} else { } else {
// convert to hex if contains non ascii symbols // convert to hex if contains non ascii symbols
if (std::find_if(data.begin(), data.end(), [](const unsigned char &c) { return c < 32 || c > 126; }) != if (std::ranges::find_if(data, [](const unsigned char &c) { return c < 32 || c > 126; }) != data.end()) {
data.end()) {
const std::string hex_digits = "0123456789abcdef"; const std::string hex_digits = "0123456789abcdef";
std::string tmp; std::string tmp;
tmp.reserve(data.length() * 3); tmp.reserve(data.length() * 3);