Store default client id in credentials.hpp

src/credentials.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace chatterino {
+
+inline QByteArray getDefaultClientID()
+{
+    return QByteArray("7ue61iz46fz11y3cugd0l3tawb4taal");
+}
+
+}  // namespace chatterino

src/ircmanager.cpp

@@ -25,8 +25,6 @@ using namespace chatterino::messages;
 
 namespace chatterino {
 
-const QString IrcManager::defaultClientId("7ue61iz46fz11y3cugd0l3tawb4taal");
-
 IrcManager::IrcManager(ChannelManager &_channelManager, Resources &_resources,
                        EmoteManager &_emoteManager, WindowManager &_windowManager)
     : channelManager(_channelManager)

src/ircmanager.hpp

@@ -30,8 +30,6 @@ public:
     IrcManager(ChannelManager &_channelManager, Resources &_resources, EmoteManager &_emoteManager,
                WindowManager &_windowManager);
 
-    static const QString defaultClientId;
-
     void connect();
     void disconnect();
 

src/widgets/accountpopup.cpp

@@ -1,5 +1,6 @@
 #include "widgets/accountpopup.hpp"
 #include "channel.hpp"
+#include "credentials.hpp"
 #include "ui_accountpopupform.h"
 
 #include <QDebug>
@@ -42,7 +43,7 @@ void AccountPopupWidget::getUserId()
 
     QNetworkRequest req(nameUrl);
     req.setRawHeader(QByteArray("Accept"), QByteArray("application/vnd.twitchtv.v5+json"));
-    req.setRawHeader(QByteArray("Client-ID"), QByteArray("7ue61iz46fz11y3cugd0l3tawb4taal"));
+    req.setRawHeader(QByteArray("Client-ID"), getDefaultClientID());
 
     static auto manager = new QNetworkAccessManager();
     auto *reply = manager->get(req);
@@ -66,7 +67,7 @@ void AccountPopupWidget::getUserData()
 
     QNetworkRequest req(idUrl);
     req.setRawHeader(QByteArray("Accept"), QByteArray("application/vnd.twitchtv.v5+json"));
-    req.setRawHeader(QByteArray("Client-ID"), QByteArray("7ue61iz46fz11y3cugd0l3tawb4taal"));
+    req.setRawHeader(QByteArray("Client-ID"), getDefaultClientID());
 
     static auto manager = new QNetworkAccessManager();
     auto *reply = manager->get(req);