From a211cb81eed62205c1d1f20d0165987b9bd5f1b2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 7 Mar 2025 11:29:37 +0100 Subject: [PATCH] QUnicodeTools: collapse adjacent identical case statements They were left in to for easier reviewing when the old function pointer table was changed to this switch. In this second step, we can now collapse adjacent duplicates into one each. Pick-to: 6.8 6.5 Change-Id: I7b7fa8991817895a01c63251ab3b0ecc95b5756b Reviewed-by: Thiago Macieira (cherry picked from commit 455e0ff42a68849b8d76dd8fbac58a35fa2dc866) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qunicodetools.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/corelib/text/qunicodetools.cpp b/src/corelib/text/qunicodetools.cpp index 6e5ae577162..332f24773e5 100644 --- a/src/corelib/text/qunicodetools.cpp +++ b/src/corelib/text/qunicodetools.cpp @@ -2575,45 +2575,26 @@ static CharAttributeFunction charAttributeFunction(QChar::Script script) { switch (script) { case QChar::Script_Unknown: - return nullptr; case QChar::Script_Inherited: - return nullptr; case QChar::Script_Common: - return nullptr; case QChar::Script_Latin: - return nullptr; case QChar::Script_Greek: - return nullptr; case QChar::Script_Cyrillic: - return nullptr; case QChar::Script_Armenian: - return nullptr; case QChar::Script_Hebrew: - return nullptr; case QChar::Script_Arabic: - return nullptr; case QChar::Script_Syriac: - return nullptr; case QChar::Script_Thaana: return nullptr; case QChar::Script_Devanagari: - return &indicAttributes; case QChar::Script_Bengali: - return &indicAttributes; case QChar::Script_Gurmukhi: - return &indicAttributes; case QChar::Script_Gujarati: - return &indicAttributes; case QChar::Script_Oriya: - return &indicAttributes; case QChar::Script_Tamil: - return &indicAttributes; case QChar::Script_Telugu: - return &indicAttributes; case QChar::Script_Kannada: - return &indicAttributes; case QChar::Script_Malayalam: - return &indicAttributes; case QChar::Script_Sinhala: return &indicAttributes; case QChar::Script_Thai: @@ -2625,17 +2606,11 @@ static CharAttributeFunction charAttributeFunction(QChar::Script script) case QChar::Script_Myanmar: return &myanmarAttributes; case QChar::Script_Georgian: - return nullptr; case QChar::Script_Hangul: - return nullptr; case QChar::Script_Ethiopic: - return nullptr; case QChar::Script_Cherokee: - return nullptr; case QChar::Script_CanadianAboriginal: - return nullptr; case QChar::Script_Ogham: - return nullptr; case QChar::Script_Runic: return nullptr; case QChar::Script_Khmer: