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 /src/corelib/tools/qchar.h | |
| 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 'src/corelib/tools/qchar.h')
| -rw-r--r-- | src/corelib/tools/qchar.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 82ff337341..266effb66a 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -288,10 +288,21 @@ public: Fraction }; + enum JoiningType { + Joining_None, + Joining_Causing, + Joining_Dual, + Joining_Right, + Joining_Left, + Joining_Transparent + }; + +#if QT_DEPRECATED_SINCE(5, 3) enum Joining { OtherJoining, Dual, Right, Center }; +#endif enum CombiningClass { @@ -340,7 +351,17 @@ public: inline Category category() const { return QChar::category(ucs); } inline Direction direction() const { return QChar::direction(ucs); } - inline Joining joining() const { return QChar::joining(ucs); } + inline JoiningType joiningType() const { return QChar::joiningType(ucs); } +#if QT_DEPRECATED_SINCE(5, 3) + QT_DEPRECATED inline Joining joining() const { + switch (QChar::joiningType(ucs)) { + case QChar::Joining_Causing: return QChar::Center; + case QChar::Joining_Dual: return QChar::Dual; + case QChar::Joining_Right: return QChar::Right; + default: return QChar::OtherJoining; + } + } +#endif inline unsigned char combiningClass() const { return QChar::combiningClass(ucs); } inline QChar mirroredChar() const { return QChar::mirroredChar(ucs); } @@ -427,7 +448,10 @@ public: static Category QT_FASTCALL category(uint ucs4); static Direction QT_FASTCALL direction(uint ucs4); - static Joining QT_FASTCALL joining(uint ucs4); + static JoiningType QT_FASTCALL joiningType(uint ucs4); +#if QT_DEPRECATED_SINCE(5, 3) + QT_DEPRECATED static Joining QT_FASTCALL joining(uint ucs4); +#endif static unsigned char QT_FASTCALL combiningClass(uint ucs4); static uint QT_FASTCALL mirroredChar(uint ucs4); |