Move gif timer stuff to its own class

Clean up unused includes
This commit is contained in:
Rasmus Karlsson
2018-06-05 18:30:26 +02:00
committed by fourtf
parent 78664f79ee
commit 8e70f02e3b
7 changed files with 63 additions and 53 deletions
+4 -7
View File
@@ -8,6 +8,7 @@
#include "providers/ffz/ffzemotes.hpp"
#include "providers/twitch/twitchemotes.hpp"
#include "signalvector.hpp"
#include "singletons/helper/giftimer.hpp"
#include "util/concurrentmap.hpp"
#include "util/emotemap.hpp"
@@ -16,7 +17,6 @@
#include <QRegularExpression>
#include <QString>
#include <QTimer>
#include <pajlada/signals/signal.hpp>
namespace chatterino {
namespace singletons {
@@ -32,6 +32,8 @@ public:
providers::bttv::BTTVEmotes bttv;
providers::ffz::FFZEmotes ffz;
GIFTimer gifTimer;
void initialize();
util::EmoteMap &getChatterinoEmotes();
@@ -39,9 +41,8 @@ public:
util::EmoteData getCheerImage(long long int amount, bool animated);
pajlada::Signals::NoArgSignal &getGifUpdateSignal();
// Bit badge/emotes?
// TODO: Move to twitch emote provider
util::ConcurrentMap<QString, messages::Image *> miscImageCache;
private:
@@ -68,10 +69,6 @@ public:
/// Chatterino emotes
util::EmoteMap _chatterinoEmotes;
pajlada::Signals::NoArgSignal gifUpdateTimerSignal;
QTimer gifUpdateTimer;
bool gifUpdateTimerInitiated = false;
};
} // namespace singletons