From 03962db367299b5a016fa39c738c6198f6c817eb Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Tue, 26 Dec 2017 11:59:26 +0100
Subject: [PATCH] move some logic abou updated state to twitchuser

---
 src/accountmanager.cpp     |  7 +++----
 src/twitch/twitchuser.cpp  | 16 ++++++++++++++--
 src/twitch/twitchuser.hpp  | 11 ++++++++---
 src/widgets/basewidget.hpp |  2 --
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/accountmanager.cpp b/src/accountmanager.cpp
index a6d3cf086..7eff95fc6 100644
--- a/src/accountmanager.cpp
+++ b/src/accountmanager.cpp
@@ -170,13 +170,12 @@ TwitchAccountManager::AddUserResponse TwitchAccountManager::addUser(
     auto previousUser = this->findUserByUsername(userData.username);
     if (previousUser) {
         bool userUpdated = false;
-        if (previousUser->getOAuthClient().compare(userData.clientID) != 0) {
-            previousUser->setOAuthClient(userData.clientID);
+
+        if (previousUser->setOAuthClient(userData.clientID)) {
             userUpdated = true;
         }
 
-        if (previousUser->getOAuthToken().compare(userData.oauthToken) != 0) {
-            previousUser->setOAuthToken(userData.oauthToken);
+        if (previousUser->setOAuthToken(userData.oauthToken)) {
             userUpdated = true;
         }
 
diff --git a/src/twitch/twitchuser.cpp b/src/twitch/twitchuser.cpp
index 6d6b75cd1..5962096be 100644
--- a/src/twitch/twitchuser.cpp
+++ b/src/twitch/twitchuser.cpp
@@ -34,14 +34,26 @@ void TwitchUser::setUserId(const QString &id)
     this->_userId = id;
 }
 
-void TwitchUser::setOAuthClient(const QString &newClientID)
+bool TwitchUser::setOAuthClient(const QString &newClientID)
 {
+    if (this->_oauthClient.compare(newClientID) == 0) {
+        return false;
+    }
+
     this->_oauthClient = newClientID;
+
+    return true;
 }
 
-void TwitchUser::setOAuthToken(const QString &newOAuthToken)
+bool TwitchUser::setOAuthToken(const QString &newOAuthToken)
 {
+    if (this->_oauthToken.compare(newOAuthToken) == 0) {
+        return false;
+    }
+
     this->_oauthToken = newOAuthToken;
+
+    return true;
 }
 
 bool TwitchUser::isAnon() const
diff --git a/src/twitch/twitchuser.hpp b/src/twitch/twitchuser.hpp
index 7e4f799fb..c7562b200 100644
--- a/src/twitch/twitchuser.hpp
+++ b/src/twitch/twitchuser.hpp
@@ -17,8 +17,13 @@ public:
     const QString &getUserId() const;
     void setUserId(const QString &id);
 
-    void setOAuthClient(const QString &newClientID);
-    void setOAuthToken(const QString &newClientID);
+    // Attempts to update the users OAuth Client ID
+    // Returns true if the value has changed, otherwise false
+    bool setOAuthClient(const QString &newClientID);
+
+    // Attempts to update the users OAuth Token
+    // Returns true if the value has changed, otherwise false
+    bool setOAuthToken(const QString &newOAuthToken);
 
     bool isAnon() const;
 
@@ -26,7 +31,7 @@ private:
     QString _oauthClient;
     QString _oauthToken;
     QString _userId;
-    bool _isAnon;
+    const bool _isAnon;
 };
 
 }  // namespace twitch
diff --git a/src/widgets/basewidget.hpp b/src/widgets/basewidget.hpp
index 0d400bb18..d696f90a3 100644
--- a/src/widgets/basewidget.hpp
+++ b/src/widgets/basewidget.hpp
@@ -31,8 +31,6 @@ protected:
     virtual void changeEvent(QEvent *) override;
     virtual void leaveEvent(QEvent *) override;
 
-    // XXX: Should this be pure virtual?
-    // fourtf: hell no
     virtual void dpiMultiplierChanged(float /*oldDpi*/, float /*newDpi*/)
     {
     }