From fe352b5da9e990a6456cedd8d8cfc3fb56cbd8ae Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sun, 17 Dec 2017 13:31:08 +0100
Subject: [PATCH] remove underscore-prefix from some class members

---
 src/emotemanager.cpp | 18 +++++++++---------
 src/emotemanager.hpp |  8 +++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/emotemanager.cpp b/src/emotemanager.cpp
index be289d631..5d17fe86c 100644
--- a/src/emotemanager.cpp
+++ b/src/emotemanager.cpp
@@ -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
diff --git a/src/emotemanager.hpp b/src/emotemanager.hpp
index 0d6d7a175..d8b18f063 100644
--- a/src/emotemanager.hpp
+++ b/src/emotemanager.hpp
@@ -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);