1 files changed, 10 insertions, 61 deletions

diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h
index 4cb1d90345..0b0d70f462 100644
--- a/src/tools/moc/utils.h
+++ b/src/tools/moc/utils.h
@@ -1,35 +1,13 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef UTILS_H
 #define UTILS_H
 
 #include <QtCore/qglobal.h>
+#include <private/qtools_p.h>
+
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,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)