From 4cc5e1972ae5643af001276758c4456ee7292f41 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sat, 21 Sep 2024 18:24:22 -0700 Subject: Modernize `std::count_if` with ranges --- Source/Core/Common/StringUtil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 508ba8baf8..9881708a27 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -403,8 +403,7 @@ void StringPopBackIf(std::string* s, char c) size_t StringUTF8CodePointCount(std::string_view str) { - return str.size() - - std::count_if(str.begin(), str.end(), [](char c) -> bool { return (c & 0xC0) == 0x80; }); + return str.size() - std::ranges::count_if(str, [](char c) -> bool { return (c & 0xC0) == 0x80; }); } #ifdef _WIN32 -- cgit v1.2.3 From 72436a0d1f0c9c4c67f8763e0ec2f0941a975e02 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sun, 29 Sep 2024 10:44:00 -0700 Subject: Modernize `std::transform` with ranges In StringUtil.h, the lambdas wrapping `Common::ToLower(char)` and `Common::ToUpper(char)` were only necessary due to the function names being overloaded. --- Source/Core/Common/StringUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 9881708a27..d3e7caacdf 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -655,12 +655,12 @@ std::string GetEscapedHtml(std::string html) void ToLower(std::string* str) { - std::transform(str->begin(), str->end(), str->begin(), [](char c) { return Common::ToLower(c); }); + std::ranges::transform(*str, str->begin(), static_cast(Common::ToLower)); } void ToUpper(std::string* str) { - std::transform(str->begin(), str->end(), str->begin(), [](char c) { return Common::ToUpper(c); }); + std::ranges::transform(*str, str->begin(), static_cast(Common::ToUpper)); } bool CaseInsensitiveEquals(std::string_view a, std::string_view b) -- cgit v1.2.3 From 0a80243a926fdab20ef0a57411e80bead989128f Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:08:08 -0700 Subject: Modernize `std::replace` with ranges --- Source/Core/Common/StringUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index d3e7caacdf..935db75d2f 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -234,8 +234,8 @@ std::string_view StripQuotes(std::string_view s) // Turns "\n\rhello" into " hello". void ReplaceBreaksWithSpaces(std::string& str) { - std::replace(str.begin(), str.end(), '\r', ' '); - std::replace(str.begin(), str.end(), '\n', ' '); + std::ranges::replace(str, '\r', ' '); + std::ranges::replace(str, '\n', ' '); } void TruncateToCString(std::string* s) -- cgit v1.2.3