1 files changed, 8 insertions, 34 deletions

diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h
index 358780a33d..0b0d70f462 100644
--- a/src/tools/moc/utils.h
+++ b/src/tools/moc/utils.h
@@ -5,6 +5,9 @@
 #define UTILS_H
 
 #include <QtCore/qglobal.h>
+#include <private/qtools_p.h>
+
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
@@ -20,49 +23,20 @@ inline bool is_space(char s)
 
 inline bool is_ident_start(char s)
 {
-    return ((s >= 'a' && s <= 'z')
-            || (s >= 'A' && s <= 'Z')
-            || s == '_' || s == '$'
-       );
+    using namespace QtMiscUtils;
+    return isAsciiLower(s) || isAsciiUpper(s) || s == '_' || s == '$';
 }
 
 inline bool is_ident_char(char s)
 {
-    return ((s >= 'a' && s <= 'z')
-            || (s >= 'A' && s <= 'Z')
-            || (s >= '0' && s <= '9')
-            || s == '_' || s == '$'
-       );
+    return QtMiscUtils::isAsciiLetterOrNumber(s) || s == '_' || s == '$';
 }
 
-inline bool is_identifier(const char *s, int len)
+inline bool is_identifier(const char *s, qsizetype len)
 {
     if (len < 1)
         return false;
-    if (!is_ident_start(*s))
-        return false;
-    for (int i = 1; i < len; ++i)
-        if (!is_ident_char(s[i]))
-            return false;
-    return true;
-}
-
-inline bool is_digit_char(char s)
-{
-    return (s >= '0' && s <= '9');
-}
-
-inline bool is_octal_char(char s)
-{
-    return (s >= '0' && s <= '7');
-}
-
-inline bool is_hex_char(char s)
-{
-    return ((s >= 'a' && s <= 'f')
-            || (s >= 'A' && s <= 'F')
-            || (s >= '0' && s <= '9')
-       );
+    return std::all_of(s, s + len, is_ident_char);
 }
 
 inline const char *skipQuote(const char *data)