From fd117e8f3a9cb84da5dec512e9b53e3448e3a8d8 Mon Sep 17 00:00:00 2001
From: Dennis Oberst <dennis.oberst@qt.io>
Date: Thu, 27 Mar 2025 19:17:57 +0100
Subject: [PATCH] tools [utils]: misc. improvements

- sort / restructure header usage
- use utils::toAsciiLower, same as asciiToUpper()

Change-Id: Ic5e7a369cea64cdb561471fb8c1246036263698d
Pick-to: 6.9 6.8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
 src/tools/qtprotoccommon/utils.cpp | 12 ++----------
 src/tools/qtprotoccommon/utils.h   |  3 ++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/tools/qtprotoccommon/utils.cpp b/src/tools/qtprotoccommon/utils.cpp
index ce7d730b..1fb569f7 100644
--- a/src/tools/qtprotoccommon/utils.cpp
+++ b/src/tools/qtprotoccommon/utils.cpp
@@ -4,11 +4,8 @@
 
 #include "utils.h"
 
-#include <string_view>
-
-#include <cctype>
 #include <cassert>
-#include <regex>
+#include <cctype>
 #include <filesystem>
 
 namespace {
@@ -65,12 +62,7 @@ std::string replace(std::string_view where, std::string_view from, std::string_v
 
 void asciiToLower(std::string &str)
 {
-    const auto toLower = [](char c) {
-        if (!isAsciiAlpha(c))
-            return c;
-        return char(c | char(0x20));
-    };
-    std::transform(std::begin(str), std::end(str), std::begin(str), toLower);
+    std::transform(std::begin(str), std::end(str), std::begin(str), utils::toAsciiLower);
 }
 
 void asciiToUpper(std::string &str)
diff --git a/src/tools/qtprotoccommon/utils.h b/src/tools/qtprotoccommon/utils.h
index bd2b30c8..8f695a33 100644
--- a/src/tools/qtprotoccommon/utils.h
+++ b/src/tools/qtprotoccommon/utils.h
@@ -6,6 +6,7 @@
 #define QTPROTOBUFGEN_UTILS_H
 
 #include <string>
+#include <string_view>
 #include <vector>
 #include <algorithm>
 #include <set>
@@ -68,7 +69,7 @@ std::string join(const T &container, std::string_view separator, std::string_vie
 
 size_t count(std::string_view s, char c);
 
-// ASCI check functions
+// ASCII check functions
 constexpr bool isAsciiUpper(char32_t c) noexcept
 {
     return c >= 'A' && c <= 'Z';