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 <pierre.rossi@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

1 files changed, 0 insertions, 111 deletions

diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h
index 0aa8c1f784..bcad1d5fe3 100644
--- a/src/corelib/tools/qunicodetables_p.h
+++ b/src/corelib/tools/qunicodetables_p.h
@@ -89,113 +89,6 @@ struct Properties {
 Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4);
 Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2);
 
-// See http://www.unicode.org/reports/tr24/tr24-5.html
-enum Script {
-    Common,
-    Greek,
-    Cyrillic,
-    Armenian,
-    Hebrew,
-    Arabic,
-    Syriac,
-    Thaana,
-    Devanagari,
-    Bengali,
-    Gurmukhi,
-    Gujarati,
-    Oriya,
-    Tamil,
-    Telugu,
-    Kannada,
-    Malayalam,
-    Sinhala,
-    Thai,
-    Lao,
-    Tibetan,
-    Myanmar,
-    Georgian,
-    Hangul,
-    Ogham,
-    Runic,
-    Khmer,
-    Nko,
-    Inherited,
-    ScriptCount = Inherited,
-    Latin = Common,
-    Ethiopic = Common,
-    Cherokee = Common,
-    CanadianAboriginal = Common,
-    Mongolian = Common,
-    Hiragana = Common,
-    Katakana = Common,
-    Bopomofo = Common,
-    Han = Common,
-    Yi = Common,
-    OldItalic = Common,
-    Gothic = Common,
-    Deseret = Common,
-    Tagalog = Common,
-    Hanunoo = Common,
-    Buhid = Common,
-    Tagbanwa = Common,
-    Limbu = Common,
-    TaiLe = Common,
-    LinearB = Common,
-    Ugaritic = Common,
-    Shavian = Common,
-    Osmanya = Common,
-    Cypriot = Common,
-    Braille = Common,
-    Buginese = Common,
-    Coptic = Common,
-    NewTaiLue = Common,
-    Glagolitic = Common,
-    Tifinagh = Common,
-    SylotiNagri = Common,
-    OldPersian = Common,
-    Kharoshthi = Common,
-    Balinese = Common,
-    Cuneiform = Common,
-    Phoenician = Common,
-    PhagsPa = Common,
-    Sundanese = Common,
-    Lepcha = Common,
-    OlChiki = Common,
-    Vai = Common,
-    Saurashtra = Common,
-    KayahLi = Common,
-    Rejang = Common,
-    Lycian = Common,
-    Carian = Common,
-    Lydian = Common,
-    Cham = Common,
-    TaiTham = Common,
-    TaiViet = Common,
-    Avestan = Common,
-    EgyptianHieroglyphs = Common,
-    Samaritan = Common,
-    Lisu = Common,
-    Bamum = Common,
-    Javanese = Common,
-    MeeteiMayek = Common,
-    ImperialAramaic = Common,
-    OldSouthArabian = Common,
-    InscriptionalParthian = Common,
-    InscriptionalPahlavi = Common,
-    OldTurkic = Common,
-    Kaithi = Common,
-    Batak = Common,
-    Brahmi = Common,
-    Mandaic = Common,
-    Chakma = Common,
-    MeroiticCursive = Common,
-    MeroiticHieroglyphs = Common,
-    Miao = Common,
-    Sharada = Common,
-    SoraSompeng = Common,
-    Takri = Common
-};
-
 enum GraphemeBreakClass {
     GraphemeBreak_Other,
     GraphemeBreak_CR,
@@ -274,10 +167,6 @@ Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4);
 inline LineBreakClass lineBreakClass(QChar ch)
 { return lineBreakClass(ch.unicode()); }
 
-Q_CORE_EXPORT Script QT_FASTCALL script(uint ucs4);
-inline Script script(QChar ch)
-{ return script(ch.unicode()); }
-
 } // namespace QUnicodeTables
 
 QT_END_NAMESPACE