this commit is too big

src/providers/emoji/Emojis.hpp

@@ -2,12 +2,15 @@
 
 #include "common/Emotemap.hpp"
 #include "common/SimpleSignalVector.hpp"
+#include "messages/Emote.hpp"
 #include "util/ConcurrentMap.hpp"
 
 #include <QMap>
 #include <QRegularExpression>
-
+#include <boost/variant.hpp>
 #include <map>
+#include <set>
+#include <vector>
 
 namespace chatterino {
 
@@ -26,7 +29,7 @@ struct EmojiData {
 
     std::vector<EmojiData> variations;
 
-    EmoteData emoteData;
+    EmotePtr emote;
 };
 
 using EmojiMap = ConcurrentMap<QString, std::shared_ptr<EmojiData>>;
@@ -36,7 +39,7 @@ class Emojis
 public:
     void initialize();
     void load();
-    void parse(std::vector<std::tuple<EmoteData, QString>> &parsedWords, const QString &text);
+    std::vector<boost::variant<EmotePtr, QString>> parse(const QString &text);
 
     EmojiMap emojis;
     std::vector<QString> shortCodes;