chatterino2
Code Issues

another try forsenT

Browse Source
This commit is contained in:
Rasmus Karlsson
2018-06-06 12:53:19 +02:00
parent 712b1c4f12
commit ba1767ce10
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/emoji/emojis.cpp
+9 -9
View File
@@ -88,6 +88,14 @@ void Emojis::load()
void Emojis::loadEmojis() void Emojis::loadEmojis()
{ {
static std::map<std::string, QString> toneNames{
{"1F3FB", "tone1"}, //
{"1F3FC", "tone2"}, //
{"1F3FD", "tone3"}, //
{"1F3FE", "tone4"}, //
{"1F3FF", "tone5"}, //
};
QFile file(":/emoji.json"); QFile file(":/emoji.json");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QTextStream s1(&file); QTextStream s1(&file);
@@ -114,17 +122,9 @@ void Emojis::loadEmojis()
if (unparsedEmoji.HasMember("skin_variations")) { if (unparsedEmoji.HasMember("skin_variations")) {
for (const auto &skinVariation : unparsedEmoji["skin_variations"].GetObject()) { 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; const auto &variation = skinVariation.value;
static std::map<QString, QString> toneNames{
{"1F3FB", "tone1"}, //
{"1F3FC", "tone2"}, //
{"1F3FD", "tone3"}, //
{"1F3FE", "tone4"}, //
{"1F3FF", "tone5"}, //
};
auto variationEmojiData = std::make_shared<EmojiData>(); auto variationEmojiData = std::make_shared<EmojiData>();
auto toneNameIt = toneNames.find(tone); auto toneNameIt = toneNames.find(tone);