Remove UrlFetch file

src/widgets/dialogs/LoginDialog.cpp

@@ -1,7 +1,7 @@
 #include "widgets/dialogs/LoginDialog.hpp"
 
 #include "common/Common.hpp"
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/PartialTwitchUser.hpp"
 

src/widgets/dialogs/UserInfoPopup.cpp

@@ -1,7 +1,7 @@
 #include "UserInfoPopup.hpp"
 
 #include "Application.hpp"
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/PartialTwitchUser.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
@@ -250,7 +250,10 @@ void UserInfoPopup::updateUserData()
 
         this->userId_ = id;
 
-        auto request = makeGetChannelRequest(id, this);
+        QString url("https://api.twitch.tv/kraken/channels/" + id);
+
+        auto request = NetworkRequest::twitchRequest(url);
+        request.setCaller(this);
 
         request.onSuccess([this](auto result) {
             auto obj = result.parseJson();

src/widgets/splits/Split.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Common.hpp"
-#include "common/UrlFetch.hpp"
+#include "common/NetworkRequest.hpp"
 #include "providers/twitch/EmoteValue.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -27,6 +27,7 @@
 #include <QDesktopServices>
 #include <QDockWidget>
 #include <QDrag>
+#include <QJsonArray>
 #include <QListWidget>
 #include <QMimeData>
 #include <QPainter>

src/widgets/splits/SplitHeader.cpp

@@ -1,7 +1,6 @@
 #include "widgets/splits/SplitHeader.hpp"
 
 #include "Application.hpp"
-#include "common/UrlFetch.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
@@ -80,9 +79,7 @@ SplitHeader::SplitHeader(Split *_split)
         //        dropdown->setScaleIndependantSize(23, 23);
         this->addDropdownItems(dropdown.getElement());
         QObject::connect(dropdown.getElement(), &RippleEffectButton::leftMousePress, this, [this] {
-            QTimer::singleShot(80, [&, this] {
-                this->dropdownMenu_.popup(QCursor::pos());
-            });
+            QTimer::singleShot(80, [&, this] { this->dropdownMenu_.popup(QCursor::pos()); });
         });
     }
 

src/widgets/splits/SplitInput.cpp

@@ -1,7 +1,6 @@
 #include "widgets/splits/SplitInput.hpp"
 
 #include "Application.hpp"
-#include "common/UrlFetch.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"