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 /tests/auto/corelib/tools/qchar | |
| 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 'tests/auto/corelib/tools/qchar')
| -rw-r--r-- | tests/auto/corelib/tools/qchar/tst_qchar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp index ae2622eb07..142b7fbefe 100644 --- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp @@ -339,7 +339,7 @@ void tst_QChar::isUpper() QVERIFY(QChar(0xC2).isUpper()); // A with ^ QVERIFY(!QChar(0xE2).isUpper()); // a with ^ - for (uint codepoint = 0; codepoint <= UNICODE_LAST_CODEPOINT; ++codepoint) { + for (uint codepoint = 0; codepoint <= QChar::LastValidCodePoint; ++codepoint) { if (QChar::isUpper(codepoint)) QVERIFY(codepoint == QChar::toUpper(codepoint)); } @@ -355,7 +355,7 @@ void tst_QChar::isLower() QVERIFY(!QChar(0xC2).isLower()); // A with ^ QVERIFY(QChar(0xE2).isLower()); // a with ^ - for (uint codepoint = 0; codepoint <= UNICODE_LAST_CODEPOINT; ++codepoint) { + for (uint codepoint = 0; codepoint <= QChar::LastValidCodePoint; ++codepoint) { if (QChar::isLower(codepoint)) QVERIFY(codepoint == QChar::toLower(codepoint)); } @@ -363,7 +363,7 @@ void tst_QChar::isLower() void tst_QChar::isTitleCase() { - for (uint codepoint = 0; codepoint <= UNICODE_LAST_CODEPOINT; ++codepoint) { + for (uint codepoint = 0; codepoint <= QChar::LastValidCodePoint; ++codepoint) { if (QChar::isTitleCase(codepoint)) QVERIFY(codepoint == QChar::toTitleCase(codepoint)); } @@ -575,7 +575,7 @@ void tst_QChar::digitValue() QVERIFY(QChar::digitValue((uint)0x1040) == 0); QVERIFY(QChar::digitValue((ushort)0xd800) == -1); - QVERIFY(QChar::digitValue((uint)UNICODE_LAST_CODEPOINT + 1) == -1); + QVERIFY(QChar::digitValue((uint)0x110000u) == -1); } void tst_QChar::mirroredChar() |