diff --git a/src/os/macos.cpp b/src/os/macos.cpp index cc6bb4f..282e4ff 100644 --- a/src/os/macos.cpp +++ b/src/os/macos.cpp @@ -20,12 +20,9 @@ using util::error::DracError, util::error::DracErrorCode; using util::helpers::GetEnv; namespace { - fn StrEqualsIgnoreCase(std::string_view strA, std::string_view strB) -> bool { - if (strA.length() != strB.length()) - return false; - - return std::equal(strA.begin(), strA.end(), strB.begin(), [](char aChar, char bChar) { - return std::tolower(static_cast(aChar)) == std::tolower(static_cast(bChar)); + fn StrEqualsIgnoreCase(StringView strA, StringView strB) -> bool { + return std::ranges::equal(strA, strB, [](char aChar, char bChar) { + return std::tolower(static_cast(aChar)) == std::tolower(static_cast(bChar)); }); } @@ -34,7 +31,7 @@ namespace { return None; String result(sview); - result[0] = static_cast(std::toupper(static_cast(result[0]))); + result.front() = static_cast(std::toupper(static_cast(result.front()))); return result; } @@ -58,7 +55,7 @@ namespace os { fn GetDesktopEnvironment() -> Result { return "Aqua"; } fn GetWindowManager() -> Result { - constexpr std::array knownWms = { + constexpr Array knownWms = { "yabai", "kwm", "chunkwm", "amethyst", "spectacle", "rectangle", };