noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Emojis fully conform and use QString instead of std::string

Browse source
This commit is contained in:
Rasmus Karlsson 2018-06-07 13:10:07 +02:00
parent 63c38c02d0
commit 9f2c4ab59a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/providers/emoji/emojis.cpp
View file

@ -117,7 +117,7 @@ void Emojis::loadEmojis()
parseEmoji(emojiData, unparsedEmoji); parseEmoji(emojiData, unparsedEmoji);
this->emojiShortCodeToEmoji.insert(emojiData->shortCode, emojiData); this->emojiShortCodeToEmoji.insert(emojiData->shortCode, emojiData);
this->shortCodes.push_back(emojiData->shortCode.toStdString()); this->shortCodes.emplace_back(emojiData->shortCode);
this->emojiFirstByte[emojiData->value.at(0)].append(emojiData); this->emojiFirstByte[emojiData->value.at(0)].append(emojiData);
@ -141,7 +141,7 @@ void Emojis::loadEmojis()
this->emojiShortCodeToEmoji.insert(variationEmojiData->shortCode, this->emojiShortCodeToEmoji.insert(variationEmojiData->shortCode,
variationEmojiData); variationEmojiData);
this->shortCodes.push_back(variationEmojiData->shortCode.toStdString()); this->shortCodes.push_back(variationEmojiData->shortCode);
this->emojiFirstByte[variationEmojiData->value.at(0)].append(variationEmojiData); this->emojiFirstByte[variationEmojiData->value.at(0)].append(variationEmojiData);

2
src/providers/emoji/emojis.hpp
View file

@ -40,7 +40,7 @@ public:
EmojiMap emojis; EmojiMap emojis;
std::vector<std::string> shortCodes; std::vector<QString> shortCodes;
void load(); void load();