Refactor ConcurrentMap

* Add operator[] to ConcurrentMap which returns a TValue reference
* BTTV/FFZ channel emotes are now stored in the Emote Manager, and each Channel object has a reference to their own BTTV/FFZ channel emote map.
* Restructure EmoteManager a bit (simplify the ConcurrentMap havoc).
* Add EmoteData struct which can store emote data (for now only messages::LazyLoadedImage*)
* Add CompletionManager that does nothing
This commit is contained in:
Rasmus Karlsson
2017-07-09 17:58:59 +02:00
parent 1f1b0d7f03
commit 5aa892e834
11 changed files with 239 additions and 139 deletions
+2 -2
View File
@@ -1,5 +1,6 @@
#pragma once
#include "emotemanager.hpp"
#include "messages/messagebuilder.hpp"
#include "resources.hpp"
@@ -8,7 +9,6 @@
namespace chatterino {
class EmoteManager;
class WindowManager;
class Channel;
class ColorScheme;
@@ -55,7 +55,7 @@ private:
void appendModerationButtons();
void appendTwitchEmote(const Communi::IrcPrivateMessage *ircMessage, const QString &emote,
std::vector<std::pair<long int, messages::LazyLoadedImage *>> &vec,
std::vector<std::pair<long, EmoteData>> &vec,
EmoteManager &emoteManager);
void parseTwitchBadges();