diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-01-17 20:54:52 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-02-07 20:04:11 +0200 |
| commit | 498f3452285aa44580e1d03baeec126d475f8401 (patch) | |
| tree | 6307934b58045f6b6761023f769844d87cdc63ca /src/corelib/serialization/qxmlstream.cpp | |
| parent | 9a8b9473d5f0fd4639193481ba9b344d91f3f00a (diff) | |
QtMiscUtils: add some more character helpers
isHexDigit, isOctalDigit, isAsciiDigit, isAsciiLower, isAsciiUpper,
isAsciiLetterOrNumber.
This de-duplicates some code through out.
Rename two local lambdas that were called "isAsciiLetterOrNumber" to not
conflict with the method in QtMiscUtils.
Change-Id: I5b631f95b9f109136d19515f7e20b8e2fbca3d43
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qxmlstream.cpp')
| -rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 82212a54094..e1c0e55eb4b 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -16,6 +16,7 @@ #include <qcoreapplication.h> #include <private/qoffsetstringarray_p.h> +#include <private/qtools_p.h> #include <iterator> #include "qxmlstream_p.h" @@ -26,6 +27,7 @@ QT_BEGIN_NAMESPACE using namespace QtPrivate; using namespace Qt::StringLiterals; +using namespace QtMiscUtils; enum { StreamEOF = ~0U }; @@ -1731,9 +1733,7 @@ void QXmlStreamReaderPrivate::checkPublicLiteral(QStringView publicId) case '$': case '_': case '%': case '\'': case '\"': continue; default: - if ((c >= 'a' && c <= 'z') - || (c >= 'A' && c <= 'Z') - || (c >= '0' && c <= '9')) + if (isAsciiLetterOrNumber(c)) continue; } break; |