Merge branch 'master' of https://github.com/fourtf/chatterino2

src/common/ChatterinoSetting.hpp

@@ -41,7 +41,7 @@ public:
     using pajlada::Settings::Setting<Type>::operator==;
     using pajlada::Settings::Setting<Type>::operator!=;
 
-    using pajlada::Settings::Setting<Type>::operator const Type;
+    using pajlada::Settings::Setting<Type>::operator Type;
 };
 
 using BoolSetting = ChatterinoSetting<bool>;

src/common/UrlFetch.hpp

@@ -1,36 +0,0 @@
-#pragma once
-
-#include "common/NetworkRequest.hpp"
-
-#include <QObject>
-#include <QString>
-
-namespace chatterino {
-
-// Not sure if I like these, but I'm trying them out
-
-static NetworkRequest makeGetChannelRequest(const QString &channelId,
-                                            const QObject *caller = nullptr)
-{
-    QString url("https://api.twitch.tv/kraken/channels/" + channelId);
-
-    auto request = NetworkRequest::twitchRequest(url);
-
-    request.setCaller(caller);
-
-    return request;
-}
-
-static NetworkRequest makeGetStreamRequest(const QString &channelId,
-                                           const QObject *caller = nullptr)
-{
-    QString url("https://api.twitch.tv/kraken/streams/" + channelId);
-
-    auto request = NetworkRequest::twitchRequest(url);
-
-    request.setCaller(caller);
-
-    return request;
-}
-
-}  // namespace chatterino