noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove underscore-prefix from some class members

Browse source
This commit is contained in:
Rasmus Karlsson 2017-12-17 13:31:08 +01:00
parent bb608c83d1
commit fe352b5da9
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/emotemanager.cpp
View file

@ -522,27 +522,27 @@ EmoteData EmoteManager::getCheerImage(long long amount, bool animated)
boost::signals2::signal<void()> &EmoteManager::getGifUpdateSignal()
{
if (!_gifUpdateTimerInitiated) {
_gifUpdateTimerInitiated = true;
if (!this->gifUpdateTimerInitiated) {
this->gifUpdateTimerInitiated = true;
_gifUpdateTimer.setInterval(30);
_gifUpdateTimer.start();
this->gifUpdateTimer.setInterval(30);
this->gifUpdateTimer.start();
SettingsManager::getInstance().enableGifAnimations.connect([this](bool enabled, auto) {
if (enabled) {
_gifUpdateTimer.start();
this->gifUpdateTimer.start();
} else {
_gifUpdateTimer.stop();
this->gifUpdateTimer.stop();
}
});
QObject::connect(&_gifUpdateTimer, &QTimer::timeout, [this] {
_gifUpdateTimerSignal();
QObject::connect(&this->gifUpdateTimer, &QTimer::timeout, [this] {
this->gifUpdateTimerSignal();
WindowManager::instance->repaintGifEmotes();
});
}
return _gifUpdateTimerSignal;
return this->gifUpdateTimerSignal;
}
} // namespace chatterino

8
src/emotemanager.hpp
View file

@ -157,11 +157,9 @@ private:
/// Chatterino emotes
EmoteMap _chatterinoEmotes;
boost::signals2::signal<void()> _gifUpdateTimerSignal;
QTimer _gifUpdateTimer;
bool _gifUpdateTimerInitiated = false;
int _generation = 0;
boost::signals2::signal<void()> gifUpdateTimerSignal;
QTimer gifUpdateTimer;
bool gifUpdateTimerInitiated = false;
// methods
static QString getTwitchEmoteLink(long id, qreal &scale);