diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-31 15:47:07 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-12 13:47:56 +0200 |
| commit | ca034e4e50c99634e2181c9d7ab217cec82f1639 (patch) | |
| tree | 1376696b4fe60163f3e503cab54ed2f867993b9b /src/corelib/text | |
| parent | e6ac26ea60ce411d587caf5312d20bdd111fd97d (diff) | |
Inline two macros in the unicode tables
They were only used by one function each, in unicodetables.cpp, so
don't need to be macros.
Change-Id: I3e7f9f661568862d0a0d265bb8f657a8e0782b13
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qunicodetables.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/corelib/text/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp index e38623dfc3..9c6aa477f8 100644 --- a/src/corelib/text/qunicodetables.cpp +++ b/src/corelib/text/qunicodetables.cpp @@ -6695,14 +6695,6 @@ static const unsigned short uc_property_trie[] = { 2891, 2891, 2891, 2891, 2891, 2891, 2885, 2885 }; -#define GET_PROP_INDEX(ucs4) \ - (ucs4 < 0x11000 \ - ? (uc_property_trie[uc_property_trie[ucs4>>5] + (ucs4 & 0x1f)]) \ - : (uc_property_trie[uc_property_trie[((ucs4 - 0x11000)>>8) + 0x880] + (ucs4 & 0xff)])) - -#define GET_PROP_INDEX_UCS2(ucs2) \ - (uc_property_trie[uc_property_trie[ucs2>>5] + (ucs2 & 0x1f)]) - static const Properties uc_properties[] = { { 9, 18, 0, 0, -1, 0, 1, 0, { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 21, 0, 2 }, { 9, 8, 0, 0, -1, 0, 1, 0, { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 17, 5, 2 }, @@ -9600,12 +9592,16 @@ static const Properties uc_properties[] = { Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char32_t ucs4) noexcept { - return uc_properties + GET_PROP_INDEX(ucs4); + if (ucs4 < 0x11000) + return uc_properties + uc_property_trie[uc_property_trie[ucs4 >> 5] + (ucs4 & 0x1f)]; + + return uc_properties + + uc_property_trie[uc_property_trie[((ucs4 - 0x11000) >> 8) + 0x880] + (ucs4 & 0xff)]; } Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char16_t ucs2) noexcept { - return uc_properties + GET_PROP_INDEX_UCS2(ucs2); + return uc_properties + uc_property_trie[uc_property_trie[ucs2 >> 5] + (ucs2 & 0x1f)]; } Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(char32_t ucs4) noexcept |