diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-05-14 20:08:20 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-06-22 02:20:29 +0300 |
| commit | 0344332c769db98920c821652c6a6b3fa2502f72 (patch) | |
| tree | e15b8cecf92f8c6055ec3ab2b22d31ea686b9557 /src/tools/moc/utils.h | |
| parent | 8726b6a35a7458e33a8dba922ebe659f25694e8d (diff) | |
MOC: use methods from QtMiscUtils
Change-Id: I20600357841aff36f68bcc9a81bfb3e96bf6e264
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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 != '\"')) { |