diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-05-15 20:48:20 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 04:24:56 +0200 |
| commit | ba300f42bdbf1e033616ee8a8054d84613b55aca (patch) | |
| tree | fc234c8e70cb968c3c7b5729bbeb45519643fb34 /src/corelib/tools/qunicodetables_p.h | |
| parent | e8199b599f6c6a438365afb10a00ec8af5ae7243 (diff) | |
QChar: add isSurrogate() and isNonCharacter() to the public API
+ QChar::LastValidCodePoint enum value that supercede the UNICODE_LAST_CODEPOINT macro
replace uses of hardcoded values with the new API; remove leftovers
Change-Id: I1395c9840b85fcb6b08e241b131794a98773c952
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qunicodetables_p.h')
| -rw-r--r-- | src/corelib/tools/qunicodetables_p.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index 15d5415b0b..293f03b94f 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -61,8 +61,6 @@ QT_BEGIN_NAMESPACE #define UNICODE_DATA_VERSION QChar::Unicode_5_0 -#define UNICODE_LAST_CODEPOINT 0x10ffff - namespace QUnicodeTables { struct Properties { @@ -237,18 +235,6 @@ namespace QUnicodeTables { inline int script(QChar ch) { return script(ch.unicode()); } - - inline bool isNonCharacter(uint ucs4) - { - // Noncharacter_Code_Point: - // Unicode has a couple of "non-characters" that one can use internally, - // but are not allowed to be used for text interchange. - // Those are the last two entries each Unicode Plane (U+FFFE..U+FFFF, - // U+1FFFE..U+1FFFF, etc.) as well as the entries in range U+FDD0..U+FDEF - - return ucs4 >= 0xfdd0 && (ucs4 <= 0xfdef || (ucs4 & 0xfffe) == 0xfffe); - } - } // namespace QUnicodeTables QT_END_NAMESPACE |