From 22495cd86a77c8dce6a033d51141a2712c95480d Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 10 Jan 2023 05:46:14 +0100 Subject: [PATCH] Properly regenerate emoji using regional indicators fixes #1245 closes #1246 --- src/emoji/Provider.cpp | 106 ++++++++++++++++++++++++++++++++++++++++- src/emoji/Provider.h | 2 +- 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/src/emoji/Provider.cpp b/src/emoji/Provider.cpp index 1871a47a..129dc462 100644 --- a/src/emoji/Provider.cpp +++ b/src/emoji/Provider.cpp @@ -8,7 +8,7 @@ using namespace emoji; -const std::array emoji::Provider::emoji = { +const std::array emoji::Provider::emoji = { // People Emoji{QStringLiteral(u"\U0001F600"), QStringLiteral(u"grinning"), @@ -12887,6 +12887,110 @@ const std::array emoji::Provider::emoji = { QStringLiteral(u"identification card"), emoji::Emoji::Category::Objects}, // Symbols + Emoji{QStringLiteral(u"\U0000200C\U0001F1E6\U0000200C"), + QStringLiteral(u"regional_indicator_a"), + QStringLiteral(u"regional indicator a"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1E7\U0000200C"), + QStringLiteral(u"regional_indicator_b"), + QStringLiteral(u"regional indicator b"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1E8\U0000200C"), + QStringLiteral(u"regional_indicator_c"), + QStringLiteral(u"regional indicator c"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1E9\U0000200C"), + QStringLiteral(u"regional_indicator_d"), + QStringLiteral(u"regional indicator d"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1EA\U0000200C"), + QStringLiteral(u"regional_indicator_e"), + QStringLiteral(u"regional indicator e"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1EB\U0000200C"), + QStringLiteral(u"regional_indicator_f"), + QStringLiteral(u"regional indicator f"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1EC\U0000200C"), + QStringLiteral(u"regional_indicator_g"), + QStringLiteral(u"regional indicator g"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1ED\U0000200C"), + QStringLiteral(u"regional_indicator_h"), + QStringLiteral(u"regional indicator h"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1EE\U0000200C"), + QStringLiteral(u"regional_indicator_i"), + QStringLiteral(u"regional indicator i"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1EF\U0000200C"), + QStringLiteral(u"regional_indicator_j"), + QStringLiteral(u"regional indicator j"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F0\U0000200C"), + QStringLiteral(u"regional_indicator_k"), + QStringLiteral(u"regional indicator k"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F1\U0000200C"), + QStringLiteral(u"regional_indicator_l"), + QStringLiteral(u"regional indicator l"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F2\U0000200C"), + QStringLiteral(u"regional_indicator_m"), + QStringLiteral(u"regional indicator m"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F3\U0000200C"), + QStringLiteral(u"regional_indicator_n"), + QStringLiteral(u"regional indicator n"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F4\U0000200C"), + QStringLiteral(u"regional_indicator_o"), + QStringLiteral(u"regional indicator o"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F5\U0000200C"), + QStringLiteral(u"regional_indicator_p"), + QStringLiteral(u"regional indicator p"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F6\U0000200C"), + QStringLiteral(u"regional_indicator_q"), + QStringLiteral(u"regional indicator q"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F7\U0000200C"), + QStringLiteral(u"regional_indicator_r"), + QStringLiteral(u"regional indicator r"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F8\U0000200C"), + QStringLiteral(u"regional_indicator_s"), + QStringLiteral(u"regional indicator s"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1F9\U0000200C"), + QStringLiteral(u"regional_indicator_t"), + QStringLiteral(u"regional indicator t"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FA\U0000200C"), + QStringLiteral(u"regional_indicator_u"), + QStringLiteral(u"regional indicator u"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FB\U0000200C"), + QStringLiteral(u"regional_indicator_v"), + QStringLiteral(u"regional indicator v"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FC\U0000200C"), + QStringLiteral(u"regional_indicator_w"), + QStringLiteral(u"regional indicator w"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FD\U0000200C"), + QStringLiteral(u"regional_indicator_x"), + QStringLiteral(u"regional indicator x"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FE\U0000200C"), + QStringLiteral(u"regional_indicator_y"), + QStringLiteral(u"regional indicator y"), + emoji::Emoji::Category::Symbols}, + Emoji{QStringLiteral(u"\U0000200C\U0001F1FF\U0000200C"), + QStringLiteral(u"regional_indicator_z"), + QStringLiteral(u"regional indicator z"), + emoji::Emoji::Category::Symbols}, Emoji{QStringLiteral(u"\U0001F3E7"), QStringLiteral(u"atm_sign"), QStringLiteral(u"ATM sign"), diff --git a/src/emoji/Provider.h b/src/emoji/Provider.h index 07b6375f..d560267b 100644 --- a/src/emoji/Provider.h +++ b/src/emoji/Provider.h @@ -47,7 +47,7 @@ class Provider { public: // all emoji for QML purposes - static const std::array emoji; + static const std::array emoji; }; } // namespace emoji