removed Const.hpp and Credentials.hpp in favor of TwitchCommon.hpp

chatterino.pro

@@ -280,8 +280,6 @@ HEADERS  += \
     src/providers/irc/IrcChannel2.hpp \
     src/providers/irc/IrcConnection2.hpp \
     src/providers/irc/IrcServer.hpp \
-    src/providers/twitch/Const.hpp \
-    src/providers/twitch/Credentials.hpp \
     src/providers/twitch/EmoteValue.hpp \
     src/providers/twitch/IrcMessageHandler.hpp \
     src/providers/twitch/Pubsub.hpp \
@@ -385,7 +383,8 @@ HEADERS  += \
     src/widgets/splits/SplitOverlay.hpp \
     src/widgets/StreamView.hpp \
     src/widgets/TooltipWidget.hpp \
-    src/widgets/Window.hpp
+    src/widgets/Window.hpp \
+    src/providers/twitch/TwitchCommon.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \

src/common/Common.hpp

@@ -25,4 +25,6 @@ const Qt::KeyboardModifiers showSplitOverlayModifiers = Qt::ControlModifier | Qt
 const Qt::KeyboardModifiers showAddSplitRegions = Qt::ControlModifier | Qt::AltModifier;
 const Qt::KeyboardModifiers showResizeHandlesModifiers = Qt::ControlModifier;
 
+static const char *ANONYMOUS_USERNAME_LABEL ATTR_UNUSED = " - anonymous - ";
+
 }  // namespace chatterino

src/common/UrlFetch.hpp

@@ -4,7 +4,7 @@
 #include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "debug/Log.hpp"
-#include "providers/twitch/Credentials.hpp"
+#include "providers/twitch/TwitchCommon.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>

src/providers/twitch/Const.hpp

@@ -1,10 +0,0 @@
-#pragma once
-
-#include <QString>
-
-namespace chatterino {
-
-static const char *ANONYMOUS_USERNAME_LABEL ATTR_UNUSED = " - anonymous - ";
-static const char *ANONYMOUS_USERNAME ATTR_UNUSED = "justinfan64537";
-
-}  // namespace chatterino

src/providers/twitch/TwitchAccount.cpp

@@ -3,7 +3,7 @@
 #include "common/NetworkRequest.hpp"
 #include "common/UrlFetch.hpp"
 #include "debug/Log.hpp"
-#include "providers/twitch/Const.hpp"
+#include "providers/twitch/TwitchCommon.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {

src/providers/twitch/TwitchAccountManager.cpp

@@ -2,7 +2,7 @@
 
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
-#include "providers/twitch/Const.hpp"
+#include "providers/twitch/TwitchCommon.hpp"
 
 namespace chatterino {
 

src/providers/twitch/TwitchCommon.hpp

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <QByteArray>
+#include <QString>
 
 namespace chatterino {
 
+static const char *ANONYMOUS_USERNAME ATTR_UNUSED = "justinfan64537";
+
 inline QByteArray getDefaultClientID()
 {
     return QByteArray("7ue61iz46fz11y3cugd0l3tawb4taal");

src/widgets/AccountSwitchWidget.cpp

@@ -1,8 +1,9 @@
 #include "AccountSwitchWidget.hpp"
 
 #include "Application.hpp"
+#include "common/Common.hpp"
 #include "controllers/accounts/AccountController.hpp"
-#include "providers/twitch/Const.hpp"
+#include "providers/twitch/TwitchCommon.hpp"
 
 namespace chatterino {
 

src/widgets/settingspages/AccountsPage.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/accounts/AccountModel.hpp"
-#include "providers/twitch/Const.hpp"
+#include "providers/twitch/TwitchCommon.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/dialogs/LoginDialog.hpp"
 #include "widgets/helper/EditableModelView.hpp"