diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qchar.cpp | 11 | ||||
| -rw-r--r-- | src/corelib/tools/qchar.h | 9 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index a1978037c1..56773bd527 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -591,10 +591,17 @@ bool QChar::isNumber() const } /*! + \fn bool QChar::isLetterOrNumber() const + Returns true if the character is a letter or number (Letter_* or Number_* categories); otherwise returns false. */ -bool QChar::isLetterOrNumber() const + +/*! + \internal + \overload +*/ +bool QChar::isLetterOrNumber(ushort ucs2) { const int test = FLAG(Letter_Uppercase) | FLAG(Letter_Lowercase) | @@ -604,7 +611,7 @@ bool QChar::isLetterOrNumber() const FLAG(Number_DecimalDigit) | FLAG(Number_Letter) | FLAG(Number_Other); - return FLAG(qGetProp(ucs)->category) & test; + return FLAG(qGetProp(ucs2)->category) & test; } /*! diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index fc5a9b051d..36e185ebce 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -240,7 +240,13 @@ public: || (ucs > 127 && isLetter(ucs)); } bool isNumber() const; - bool isLetterOrNumber() const; + inline bool isLetterOrNumber() const + { + return (ucs >= 'a' && ucs <= 'z') + || (ucs <= 'Z' && ucs >= 'A') + || (ucs <= '9' && ucs >= '0') + || (ucs > 127 && isLetterOrNumber(ucs)); + } inline bool isDigit() const { return (ucs <= '9' && ucs >= '0') || (ucs > 127 && isDigit(ucs)); } bool isSymbol() const; @@ -322,6 +328,7 @@ public: private: static bool QT_FASTCALL isDigit(ushort ucs2); static bool QT_FASTCALL isLetter(ushort ucs2); + static bool QT_FASTCALL isLetterOrNumber(ushort ucs2); #ifdef QT_NO_CAST_FROM_ASCII QChar(char c); |