From ba1767ce10a13950aae8242be92dcd4bb8b7a7d1 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Wed, 6 Jun 2018 12:53:19 +0200 Subject: [PATCH] another try forsenT --- src/providers/emoji/emojis.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/providers/emoji/emojis.cpp b/src/providers/emoji/emojis.cpp index 910142cdc..450944848 100644 --- a/src/providers/emoji/emojis.cpp +++ b/src/providers/emoji/emojis.cpp @@ -88,6 +88,14 @@ void Emojis::load() void Emojis::loadEmojis() { + static std::map toneNames{ + {"1F3FB", "tone1"}, // + {"1F3FC", "tone2"}, // + {"1F3FD", "tone3"}, // + {"1F3FE", "tone4"}, // + {"1F3FF", "tone5"}, // + }; + QFile file(":/emoji.json"); file.open(QFile::ReadOnly); QTextStream s1(&file); @@ -114,17 +122,9 @@ void Emojis::loadEmojis() if (unparsedEmoji.HasMember("skin_variations")) { for (const auto &skinVariation : unparsedEmoji["skin_variations"].GetObject()) { - const auto &tone = skinVariation.name.GetString(); + std::string tone = skinVariation.name.GetString(); const auto &variation = skinVariation.value; - static std::map toneNames{ - {"1F3FB", "tone1"}, // - {"1F3FC", "tone2"}, // - {"1F3FD", "tone3"}, // - {"1F3FE", "tone4"}, // - {"1F3FF", "tone5"}, // - }; - auto variationEmojiData = std::make_shared(); auto toneNameIt = toneNames.find(tone);