From 9f2c4ab59a29dcf4c835dea35c960c020a4b226a Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Thu, 7 Jun 2018 13:10:07 +0200
Subject: [PATCH] Make Emojis fully conform and use QString instead of
 std::string

---
 src/providers/emoji/emojis.cpp | 4 ++--
 src/providers/emoji/emojis.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/providers/emoji/emojis.cpp b/src/providers/emoji/emojis.cpp
index 0838722f4..186b40044 100644
--- a/src/providers/emoji/emojis.cpp
+++ b/src/providers/emoji/emojis.cpp
@@ -117,7 +117,7 @@ void Emojis::loadEmojis()
         parseEmoji(emojiData, unparsedEmoji);
 
         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);
 
@@ -141,7 +141,7 @@ void Emojis::loadEmojis()
 
                 this->emojiShortCodeToEmoji.insert(variationEmojiData->shortCode,
                                                    variationEmojiData);
-                this->shortCodes.push_back(variationEmojiData->shortCode.toStdString());
+                this->shortCodes.push_back(variationEmojiData->shortCode);
 
                 this->emojiFirstByte[variationEmojiData->value.at(0)].append(variationEmojiData);
 
diff --git a/src/providers/emoji/emojis.hpp b/src/providers/emoji/emojis.hpp
index fdfd626ee..b41703214 100644
--- a/src/providers/emoji/emojis.hpp
+++ b/src/providers/emoji/emojis.hpp
@@ -40,7 +40,7 @@ public:
 
     EmojiMap emojis;
 
-    std::vector<std::string> shortCodes;
+    std::vector<QString> shortCodes;
 
     void load();