diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-01-26 02:42:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 23:19:47 +0100 |
| commit | b80fcbdba62ec2324fa9ad29cbc5ac1d9a9fe8a2 (patch) | |
| tree | 97a78ec35d3e66e0f2539490d8e112322adde7ce /tests/auto/corelib/tools/qchar | |
| parent | b04d87b2263fd5d9b2b57799098a2eb5a3c91dfc (diff) | |
Introduce QChar::JoiningType enum and QChar::joiningType() method
This aimed to disctinct joining types "L", "T", and "U" from just "U".
Unicode 6.3.0 has introduced a character with joining type "L" and
Unicode 7.0 will add a few more characters of joining type "L", so
we'll have to deal with it anyways.
[ChangeLog][QtCore][QChar] Added JoiningType enum and joiningType()
method that deprecates the old QChar::Joining enum and joining() method.
Change-Id: I4be3a3f745d944e689feb9b62d4ca86d1cf371b0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
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 | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp index 80b4162156..81409eb866 100644 --- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp @@ -74,7 +74,7 @@ private slots: void isSpaceSpecial(); void category(); void direction(); - void joining(); + void joiningType(); void combiningClass(); void digitValue(); void mirroredChar(); @@ -483,30 +483,32 @@ void tst_QChar::direction() QVERIFY(QChar::direction(0x2FA17u) == QChar::DirL); } -void tst_QChar::joining() +void tst_QChar::joiningType() { - QVERIFY(QChar('a').joining() == QChar::OtherJoining); - QVERIFY(QChar('0').joining() == QChar::OtherJoining); - QVERIFY(QChar((ushort)0x627).joining() == QChar::Right); - QVERIFY(QChar((ushort)0x5d0).joining() == QChar::OtherJoining); + QVERIFY(QChar('a').joiningType() == QChar::Joining_None); + QVERIFY(QChar('0').joiningType() == QChar::Joining_None); + QVERIFY(QChar((ushort)0x0627).joiningType() == QChar::Joining_Right); + QVERIFY(QChar((ushort)0x05d0).joiningType() == QChar::Joining_None); + QVERIFY(QChar((ushort)0x00ad).joiningType() == QChar::Joining_Transparent); - QVERIFY(QChar::joining((ushort)'a') == QChar::OtherJoining); - QVERIFY(QChar::joining((ushort)'0') == QChar::OtherJoining); - QVERIFY(QChar::joining((ushort)0x627) == QChar::Right); - QVERIFY(QChar::joining((ushort)0x5d0) == QChar::OtherJoining); + QVERIFY(QChar::joiningType((ushort)'a') == QChar::Joining_None); + QVERIFY(QChar::joiningType((ushort)'0') == QChar::Joining_None); + QVERIFY(QChar::joiningType((ushort)0x0627) == QChar::Joining_Right); + QVERIFY(QChar::joiningType((ushort)0x05d0) == QChar::Joining_None); + QVERIFY(QChar::joiningType((ushort)0x00ad) == QChar::Joining_Transparent); - QVERIFY(QChar::joining((uint)'a') == QChar::OtherJoining); - QVERIFY(QChar::joining((uint)'0') == QChar::OtherJoining); - QVERIFY(QChar::joining((uint)0x627) == QChar::Right); - QVERIFY(QChar::joining((uint)0x5d0) == QChar::OtherJoining); + QVERIFY(QChar::joiningType((uint)'a') == QChar::Joining_None); + QVERIFY(QChar::joiningType((uint)'0') == QChar::Joining_None); + QVERIFY(QChar::joiningType((uint)0x0627) == QChar::Joining_Right); + QVERIFY(QChar::joiningType((uint)0x05d0) == QChar::Joining_None); + QVERIFY(QChar::joiningType((uint)0x00ad) == QChar::Joining_Transparent); - QVERIFY(QChar::joining(0xE01DAu) == QChar::OtherJoining); - QVERIFY(QChar::joining(0xf0000u) == QChar::OtherJoining); - QVERIFY(QChar::joining(0xE0030u) == QChar::OtherJoining); - QVERIFY(QChar::joining(0x2FA17u) == QChar::OtherJoining); + QVERIFY(QChar::joiningType(0xE01DAu) == QChar::Joining_Transparent); + QVERIFY(QChar::joiningType(0xf0000u) == QChar::Joining_None); + QVERIFY(QChar::joiningType(0xE0030u) == QChar::Joining_Transparent); + QVERIFY(QChar::joiningType(0x2FA17u) == QChar::Joining_None); - // ### U+A872 has joining type L - QVERIFY(QChar::joining((uint)0xA872) == QChar::OtherJoining); + QVERIFY(QChar::joiningType((uint)0xA872) == QChar::Joining_Left); } void tst_QChar::combiningClass() |