cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: use std::ranges whenever possible (#10584)

Browse source
This commit is contained in:
Kamikadze 2025-05-30 18:25:59 +05:00 • committed by GitHub
parent 9bf1b49144
commit 9190443d95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 137 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/helpers/MiscFunctions.cpp
View file

@ -243,7 +243,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
namedWSes.push_back(ws->m_id);
}
std::sort(namedWSes.begin(), namedWSes.end());
std::ranges::sort(namedWSes);
if (absolute) {
// 1-index
@ -388,7 +388,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
validWSes.push_back(ws->m_id);
}
std::sort(validWSes.begin(), validWSes.end());
std::ranges::sort(validWSes);
ssize_t currentItem = -1;
@ -623,7 +623,7 @@ std::expected<int64_t, std::string> configStringToInt(const std::string& VALUE)
const auto VALUEWITHOUTFUNC = trim(VALUE.substr(5, VALUE.length() - 6));
// try doing it the comma way first
if (std::count(VALUEWITHOUTFUNC.begin(), VALUEWITHOUTFUNC.end(), ',') == 3) {
if (std::ranges::count(VALUEWITHOUTFUNC, ',') == 3) {
// cool
std::string rolling = VALUEWITHOUTFUNC;
auto r = configStringToInt(trim(rolling.substr(0, rolling.find(','))));
@ -657,7 +657,7 @@ std::expected<int64_t, std::string> configStringToInt(const std::string& VALUE)
const auto VALUEWITHOUTFUNC = trim(VALUE.substr(4, VALUE.length() - 5));
// try doing it the comma way first
if (std::count(VALUEWITHOUTFUNC.begin(), VALUEWITHOUTFUNC.end(), ',') == 2) {
if (std::ranges::count(VALUEWITHOUTFUNC, ',') == 2) {
// cool
std::string rolling = VALUEWITHOUTFUNC;
auto r = configStringToInt(trim(rolling.substr(0, rolling.find(','))));

12
src/helpers/Monitor.cpp
View file

@ -32,6 +32,8 @@
#include <hyprutils/utils/ScopeGuard.hpp>
#include <cstring>
#include <ranges>
#include <vector>
#include <algorithm>
using namespace Hyprutils::String;
using namespace Hyprutils::Utils;
@ -189,7 +191,7 @@ void CMonitor::onConnect(bool noRule) {
RASSERT(thisWrapper->get(), "CMonitor::onConnect: Had no wrapper???");
if (std::find_if(g_pCompositor->m_monitors.begin(), g_pCompositor->m_monitors.end(), [&](auto& other) { return other.get() == this; }) == g_pCompositor->m_monitors.end())
if (std::ranges::find_if(g_pCompositor->m_monitors, [&](auto& other) { return other.get() == this; }) == g_pCompositor->m_monitors.end())
g_pCompositor->m_monitors.push_back(*thisWrapper);
m_enabled = true;
@ -320,7 +322,7 @@ void CMonitor::onDisconnect(bool destroy) {
// remove mirror
if (m_mirrorOf) {
m_mirrorOf->m_mirrors.erase(std::find_if(m_mirrorOf->m_mirrors.begin(), m_mirrorOf->m_mirrors.end(), [&](const auto& other) { return other == m_self; }));
m_mirrorOf->m_mirrors.erase(std::ranges::find_if(m_mirrorOf->m_mirrors, [&](const auto& other) { return other == m_self; }));
// unlock software for mirrored monitor
g_pPointerManager->unlockSoftwareForMonitor(m_mirrorOf.lock());
@ -486,7 +488,7 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
std::ranges::sort(sortedModes, sortFunc);
if (sortedModes.size() > 3)
sortedModes.erase(sortedModes.begin() + 3, sortedModes.end());
requestedModes.insert(requestedModes.end(), sortedModes.rbegin(), sortedModes.rend());
requestedModes.insert_range(requestedModes.end(), sortedModes | std::views::reverse);
};
// last fallback is always preferred mode
@ -1019,7 +1021,7 @@ void CMonitor::setMirror(const std::string& mirrorOf) {
// disable mirroring
if (m_mirrorOf) {
m_mirrorOf->m_mirrors.erase(std::find_if(m_mirrorOf->m_mirrors.begin(), m_mirrorOf->m_mirrors.end(), [&](const auto& other) { return other == m_self; }));
m_mirrorOf->m_mirrors.erase(std::ranges::find_if(m_mirrorOf->m_mirrors, [&](const auto& other) { return other == m_self; }));
// unlock software for mirrored monitor
g_pPointerManager->unlockSoftwareForMonitor(m_mirrorOf.lock());
@ -1046,7 +1048,7 @@ void CMonitor::setMirror(const std::string& mirrorOf) {
RASSERT(thisWrapper->get(), "CMonitor::setMirror: Had no wrapper???");
if (std::find_if(g_pCompositor->m_monitors.begin(), g_pCompositor->m_monitors.end(), [&](auto& other) { return other.get() == this; }) == g_pCompositor->m_monitors.end()) {
if (std::ranges::find_if(g_pCompositor->m_monitors, [&](auto& other) { return other.get() == this; }) == g_pCompositor->m_monitors.end()) {
g_pCompositor->m_monitors.push_back(*thisWrapper);
}