moved files into src/common

src/providers/bttv/BttvEmotes.cpp

@@ -2,7 +2,7 @@
 
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/bttv/BttvEmotes.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 

src/providers/emoji/Emojis.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QMap>
 #include <QRegularExpression>

src/providers/ffz/FfzEmotes.cpp

@@ -2,7 +2,7 @@
 
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 namespace chatterino {
 namespace providers {

src/providers/ffz/FfzEmotes.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SignalVector.hpp"
+#include "common/SignalVector.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 

src/providers/irc/AbstractIrcServer.cpp

@@ -1,6 +1,6 @@
 #include "AbstractIrcServer.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
 

src/providers/irc/AbstractIrcServer.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "providers/irc/IrcConnection2.hpp"
 
 #include <IrcMessage>

src/providers/twitch/IrcMessageHandler.cpp

@@ -327,22 +327,12 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
 void IrcMessageHandler::handleWriteConnectionNoticeMessage(Communi::IrcNoticeMessage *message)
 {
     static std::unordered_set<std::string> readConnectionOnlyIDs{
-        "host_on",
-        "host_off",
-        "host_target_went_offline",
-        "emote_only_on",
-        "emote_only_off",
-        "slow_on",
-        "slow_off",
-        "subs_on",
-        "subs_off",
-        "r9k_on",
-        "r9k_off",
+        "host_on", "host_off", "host_target_went_offline", "emote_only_on", "emote_only_off",
+        "slow_on", "slow_off", "subs_on", "subs_off", "r9k_on", "r9k_off",
 
         // Display for user who times someone out. This implies you're a moderator, at which point
         // you will be connected to PubSub and receive a better message from there
-        "timeout_success",
-        "ban_success",
+        "timeout_success", "ban_success",
     };
 
     QVariant v = message->tag("msg-id");

src/providers/twitch/TwitchAccount.cpp

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

src/providers/twitch/TwitchAccountManager.cpp

@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchAccountManager.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "providers/twitch/Const.hpp"
 #include "debug/Log.hpp"
 

src/providers/twitch/TwitchAccountManager.hpp

@@ -2,7 +2,7 @@
 
 #include "providers/twitch/TwitchAccount.hpp"
 #include "util/SharedPtrElementLess.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 #include <pajlada/settings/setting.hpp>
 

src/providers/twitch/TwitchChannel.cpp

@@ -1,6 +1,6 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
 #include "providers/twitch/Pubsub.hpp"
@@ -9,7 +9,7 @@
 #include "singletons/IrcManager.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <IrcConnection>
 #include <QThread>

src/providers/twitch/TwitchChannel.hpp

@@ -2,12 +2,12 @@
 
 #include <IrcConnection>
 
-#include "Channel.hpp"
-#include "Common.hpp"
+#include "common/Channel.hpp"
+#include "common/Common.hpp"
 #include "singletons/EmoteManager.hpp"
 #include "singletons/IrcManager.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/MutexValue.hpp"
+#include "common/MutexValue.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
 

src/providers/twitch/TwitchEmotes.cpp

@@ -4,7 +4,7 @@
 #include "messages/Image.hpp"
 #include "debug/Benchmark.hpp"
 #include "util/RapidjsonHelpers.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #define TWITCH_EMOTE_TEMPLATE "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 

src/providers/twitch/TwitchEmotes.hpp

@@ -4,7 +4,7 @@
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 #include "util/ConcurrentMap.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <map>
 

src/providers/twitch/TwitchServer.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/MutexValue.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "util/MutexValue.hpp"
 
 #include <chrono>
 #include <memory>