diff options
Diffstat (limited to 'src/tools/moc/utils.h')
| -rw-r--r-- | src/tools/moc/utils.h | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h index cb118fab38..0b0d70f462 100644 --- a/src/tools/moc/utils.h +++ b/src/tools/moc/utils.h @@ -5,6 +5,7 @@ #define UTILS_H #include <QtCore/qglobal.h> +#include <private/qtools_p.h> #include <algorithm> @@ -22,19 +23,13 @@ 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, qsizetype len) @@ -44,24 +39,6 @@ inline bool is_identifier(const char *s, qsizetype len) return std::all_of(s, s + len, is_ident_char); } -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') - ); -} - inline const char *skipQuote(const char *data) { while (*data && (*data != '\"')) { |