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 -43
View File
@@ -1,22 +1,10 @@
#include "emotemanager.hpp"
#include "singletons/emotemanager.hpp"
#include "application.hpp"
#include "common.hpp"
#include "singletons/settingsmanager.hpp"
#include "singletons/windowmanager.hpp"
#include "util/urlfetch.hpp"
#include "controllers/accounts/accountcontroller.hpp"
#include <QDebug>
#include <QFile>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
#include <memory>
using namespace chatterino::providers::twitch;
using namespace chatterino::messages;
@@ -41,6 +29,8 @@ void EmoteManager::initialize()
this->loadEmojis();
this->bttv.loadGlobalEmotes();
this->ffz.loadGlobalEmotes();
this->gifTimer.initialize();
}
util::EmoteMap &EmoteManager::getChatterinoEmotes()
@@ -234,35 +224,6 @@ util::EmoteData EmoteManager::getCheerImage(long long amount, bool animated)
return util::EmoteData();
}
pajlada::Signals::NoArgSignal &EmoteManager::getGifUpdateSignal()
{
if (!this->gifUpdateTimerInitiated) {
auto app = getApp();
this->gifUpdateTimerInitiated = true;
this->gifUpdateTimer.setInterval(30);
this->gifUpdateTimer.start();
app->settings->enableGifAnimations.connect([this](bool enabled, auto) {
if (enabled) {
this->gifUpdateTimer.start();
} else {
this->gifUpdateTimer.stop();
}
});
QObject::connect(&this->gifUpdateTimer, &QTimer::timeout, [this] {
this->gifUpdateTimerSignal.invoke();
// fourtf:
auto app = getApp();
app->windows->repaintGifEmotes();
});
}
return this->gifUpdateTimerSignal;
}
} // namespace singletons
} // namespace chatterino