path: root/src/corelib/tools/qunicodetables.cpp
diff options
authorKonstantin Ritt <>2012-12-21 18:35:58 +0200
committerThe Qt Project <>2012-12-21 19:01:35 +0100
commit9b0fab6b62df98519ebfab117f14b9d3465d8c68 (patch)
tree0f2e28b46868b0f1eebc641ea258547aa00ecc07 /src/corelib/tools/qunicodetables.cpp
parentdde09c429ae8b7ad0df4e4b36b8459d2b85a1219 (diff)
Update Qt internals to use QChar::Script
...and remove the outdated QUnicodeTables::Script enum. QFontEngineData now has one extra slot that never used (engines[QChar::Script_Inherited]). engines[QChar::Script_Unknown], if accessed, would be set with a Box engine instance, and could be used as a minor optimization some time later. In order to preserve the existing behavior, we map all scripts up to Latin to Common. Change-Id: Ide4182a0f8447b4bf25713ecc3fe8097b8fed040 Reviewed-by: Pierre Rossi <> Reviewed-by: Konstantin Ritt <>
Diffstat (limited to 'src/corelib/tools/qunicodetables.cpp')
1 files changed, 0 insertions, 37 deletions
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp
index 927fb7462b..8b85ff7565 100644
--- a/src/corelib/tools/qunicodetables.cpp
+++ b/src/corelib/tools/qunicodetables.cpp
@@ -6724,43 +6724,6 @@ Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4)
return (LineBreakClass)qGetProp(ucs4)->lineBreakClass;
-Q_CORE_EXPORT Script QT_FASTCALL script(uint ucs4)
- switch (qGetProp(ucs4)->script) {
- case QChar::Script_Inherited: return Inherited;
- case QChar::Script_Common: return Common;
- case QChar::Script_Arabic: return Arabic;
- case QChar::Script_Armenian: return Armenian;
- case QChar::Script_Bengali: return Bengali;
- case QChar::Script_Cyrillic: return Cyrillic;
- case QChar::Script_Devanagari: return Devanagari;
- case QChar::Script_Georgian: return Georgian;
- case QChar::Script_Greek: return Greek;
- case QChar::Script_Gujarati: return Gujarati;
- case QChar::Script_Gurmukhi: return Gurmukhi;
- case QChar::Script_Hangul: return Hangul;
- case QChar::Script_Hebrew: return Hebrew;
- case QChar::Script_Kannada: return Kannada;
- case QChar::Script_Khmer: return Khmer;
- case QChar::Script_Lao: return Lao;
- case QChar::Script_Malayalam: return Malayalam;
- case QChar::Script_Myanmar: return Myanmar;
- case QChar::Script_Ogham: return Ogham;
- case QChar::Script_Oriya: return Oriya;
- case QChar::Script_Runic: return Runic;
- case QChar::Script_Sinhala: return Sinhala;
- case QChar::Script_Syriac: return Syriac;
- case QChar::Script_Tamil: return Tamil;
- case QChar::Script_Telugu: return Telugu;
- case QChar::Script_Thaana: return Thaana;
- case QChar::Script_Thai: return Thai;
- case QChar::Script_Tibetan: return Tibetan;
- case QChar::Script_Nko: return Nko;
- default: break;
- };
- return Common;
static const ushort specialCaseMap[] = {
0x0, // placeholder