From beee22a95ed9044950e5486f22edd813e00ffa2c Mon Sep 17 00:00:00 2001 From: Kamikadze <40305144+Kam1k4dze@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:44:56 +0500 Subject: refactor: Use new hyprutils casts (#11377) --- src/helpers/MiscFunctions.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/helpers/MiscFunctions.cpp') diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp index 57bb0f9b..2a1e0671 100644 --- a/src/helpers/MiscFunctions.cpp +++ b/src/helpers/MiscFunctions.cpp @@ -87,7 +87,7 @@ std::string escapeJSONStrings(const std::string& str) { case '\t': oss << "\\t"; break; default: if ('\x00' <= c && c <= '\x1f') { - oss << "\\u" << std::hex << std::setw(4) << std::setfill('0') << static_cast(c); + oss << "\\u" << std::hex << std::setw(4) << std::setfill('0') << sc(c); } else { oss << c; } @@ -213,7 +213,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { if (!PLUSMINUSRESULT.has_value()) return {WORKSPACE_INVALID}; - result.id = (int)PLUSMINUSRESULT.value(); + result.id = sc(PLUSMINUSRESULT.value()); WORKSPACEID remains = result.id; @@ -251,7 +251,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { remains -= 1; // traverse valid workspaces until we reach the remains - if ((size_t)remains < namedWSes.size()) { + if (sc(remains) < namedWSes.size()) { result.id = namedWSes[remains]; } else { remains -= namedWSes.size(); @@ -272,7 +272,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { char walkDir = in[1]; // sanitize. 0 means invalid oob in - - predictedWSID = std::max(predictedWSID, static_cast(0)); + predictedWSID = std::max(predictedWSID, sc(0)); // Count how many invalidWSes are in between (how bad the prediction was) WORKSPACEID beginID = in[1] == '+' ? activeWSID + 1 : predictedWSID; @@ -295,7 +295,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { } currentItem += remains; - currentItem = std::max(currentItem, static_cast(0)); + currentItem = std::max(currentItem, sc(0)); if (currentItem >= namedWSes.size()) { // At the seam between namedWSes and normal WSes. Behave like r+[diff] at imaginary ws 0 size_t diff = currentItem - (namedWSes.size() - 1); @@ -332,7 +332,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { // Need remainingWSes more auto namedWSIdx = namedWSes.size() - remainingWSes; // Sanitze - namedWSIdx = std::clamp(namedWSIdx, static_cast(0), namedWSes.size() - static_cast(1)); + namedWSIdx = std::clamp(namedWSIdx, sc(0), namedWSes.size() - sc(1)); finalWSID = namedWSes[namedWSIdx]; } else { // Couldn't find valid workspace in negative direction, search last first one back up positive direction @@ -376,10 +376,10 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { if (!PLUSMINUSRESULT.has_value()) return {WORKSPACE_INVALID}; - result.id = (int)PLUSMINUSRESULT.value(); + result.id = sc(PLUSMINUSRESULT.value()); // result now has +/- what we should move on mon - int remains = (int)result.id; + int remains = sc(result.id); std::vector validWSes; for (auto const& ws : g_pCompositor->getWorkspaces()) { @@ -400,7 +400,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { // clamp if (currentItem < 0) { currentItem = 0; - } else if (currentItem >= (ssize_t)validWSes.size()) { + } else if (currentItem >= sc(validWSes.size())) { currentItem = validWSes.size() - 1; } } else { @@ -409,7 +409,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { // get the current item WORKSPACEID activeWSID = g_pCompositor->m_lastMonitor->m_activeWorkspace ? g_pCompositor->m_lastMonitor->m_activeWorkspace->m_id : 1; - for (ssize_t i = 0; i < (ssize_t)validWSes.size(); i++) { + for (ssize_t i = 0; i < sc(validWSes.size()); i++) { if (validWSes[i] == activeWSID) { currentItem = i; break; @@ -420,7 +420,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { currentItem += remains; // sanitize - if (currentItem >= (ssize_t)validWSes.size()) { + if (currentItem >= sc(validWSes.size())) { currentItem = currentItem % validWSes.size(); } else if (currentItem < 0) { currentItem = validWSes.size() + currentItem; @@ -436,7 +436,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) { if (!PLUSMINUSRESULT.has_value()) return {WORKSPACE_INVALID}; - result.id = std::max((int)PLUSMINUSRESULT.value(), 1); + result.id = std::max(sc(PLUSMINUSRESULT.value()), 1); } else { Debug::log(ERR, "Relative workspace on no mon!"); return {WORKSPACE_INVALID}; @@ -642,7 +642,7 @@ std::expected configStringToInt(const std::string& VALUE) a = std::round(std::stof(trim(rolling.substr(0, rolling.find(',')))) * 255.f); } catch (std::exception& e) { return std::unexpected("failed parsing " + VALUEWITHOUTFUNC); } - return a * (Hyprlang::INT)0x1000000 + *r * (Hyprlang::INT)0x10000 + *g * (Hyprlang::INT)0x100 + *b; + return a * sc(0x1000000) + *r * sc(0x10000) + *g * sc(0x100) + *b; } else if (VALUEWITHOUTFUNC.length() == 8) { const auto RGBA = parseHex(VALUEWITHOUTFUNC); @@ -670,7 +670,7 @@ std::expected configStringToInt(const std::string& VALUE) if (!r || !g || !b) return std::unexpected("failed parsing " + VALUEWITHOUTFUNC); - return (Hyprlang::INT)0xFF000000 + *r * (Hyprlang::INT)0x10000 + *g * (Hyprlang::INT)0x100 + *b; + return sc(0xFF000000) + *r * sc(0x10000) + *g * sc(0x100) + *b; } else if (VALUEWITHOUTFUNC.length() == 6) { auto r = parseHex(VALUEWITHOUTFUNC); return r ? *r + 0xFF000000 : r; @@ -717,7 +717,7 @@ Vector2D configStringToVector2D(const std::string& VALUE) { if (std::getline(iss, token)) throw std::invalid_argument("Invalid string format"); - return Vector2D((double)x, (double)y); + return Vector2D(sc(x), sc(y)); } double normalizeAngleRad(double ang) { @@ -910,7 +910,7 @@ std::expected binaryNameForPid(pid_t pid) { sysctl(mib, miblen, &exe, &sz, NULL, 0); std::string path = exe; #else - std::string path = std::format("/proc/{}/exe", (uint64_t)pid); + std::string path = std::format("/proc/{}/exe", sc(pid)); #endif std::error_code ec; -- cgit v1.2.3