moved files into src/common

chatterino.pro

@@ -93,8 +93,11 @@ werr {
 
 SOURCES += \
     src/Application.cpp \
-    src/Channel.cpp \
-    src/Common.cpp \
+    src/common/Channel.cpp \
+    src/common/CompletionModel.cpp \
+    src/common/Emotemap.cpp \
+    src/common/NetworkManager.cpp \
+    src/common/NetworkRequest.cpp \
     src/controllers/accounts/Account.cpp \
     src/controllers/accounts/AccountController.cpp \
     src/controllers/accounts/AccountModel.cpp \
@@ -153,11 +156,7 @@ SOURCES += \
     src/singletons/ThemeManager.cpp \
     src/singletons/UpdateManager.cpp \
     src/singletons/WindowManager.cpp \
-    src/util/CompletionModel.cpp \
     src/util/DebugCount.cpp \
-    src/util/Emotemap.cpp \
-    src/util/NetworkManager.cpp \
-    src/util/NetworkRequest.cpp \
     src/util/RapidjsonHelpers.cpp \
     src/util/StreamLink.cpp \
     src/util/WindowsHelper.cpp \
@@ -222,8 +221,26 @@ SOURCES += \
 
 HEADERS  += \
     src/Application.hpp \
-    src/Channel.hpp \
-    src/Common.hpp \
+    src/common/Channel.hpp \
+    src/common/Common.hpp \
+    src/common/CompletionModel.hpp \
+    src/common/Emotemap.hpp \
+    src/common/FlagsEnum.hpp \
+    src/common/LockedObject.hpp \
+    src/common/MutexValue.hpp \
+    src/common/NetworkManager.hpp \
+    src/common/NetworkRequest.hpp \
+    src/common/NetworkRequester.hpp \
+    src/common/NetworkWorker.hpp \
+    src/common/NullablePtr.hpp \
+    src/common/Property.hpp \
+    src/common/ProviderId.hpp \
+    src/common/SerializeCustom.hpp \
+    src/common/SignalVector.hpp \
+    src/common/SignalVector2.hpp \
+    src/common/SignalVectorModel.hpp \
+    src/common/UrlFetch.hpp \
+    src/common/Version.hpp \
     src/controllers/accounts/Account.hpp \
     src/controllers/accounts/AccountController.hpp \
     src/controllers/accounts/AccountModel.hpp \
@@ -242,7 +259,6 @@ HEADERS  += \
     src/debug/AssertInGuiThread.hpp \
     src/debug/Benchmark.hpp \
     src/debug/Log.hpp \
-    src/LockedObject.hpp \
     src/messages/Image.hpp \
     src/messages/layouts/MessageLayout.hpp \
     src/messages/layouts/MessageLayoutContainer.hpp \
@@ -256,9 +272,7 @@ HEADERS  += \
     src/messages/MessageElement.hpp \
     src/messages/MessageParseArgs.hpp \
     src/messages/Selection.hpp \
-    src/NullablePtr.hpp \
     src/PrecompiledHeader.hpp \
-    src/ProviderId.hpp \
     src/providers/bttv/BttvEmotes.hpp \
     src/providers/emoji/Emojis.hpp \
     src/providers/ffz/FfzEmotes.hpp \
@@ -282,7 +296,6 @@ HEADERS  += \
     src/providers/twitch/TwitchMessageBuilder.hpp \
     src/providers/twitch/TwitchServer.hpp \
     src/providers/twitch/TwitchUser.hpp \
-    src/SignalVector.hpp \
     src/singletons/EmoteManager.hpp \
     src/singletons/FontManager.hpp \
     src/singletons/helper/ChatterinoSetting.hpp \
@@ -300,35 +313,21 @@ HEADERS  += \
     src/singletons/WindowManager.hpp \
     src/util/Clamp.hpp \
     src/util/CombinePath.hpp \
-    src/util/CompletionModel.hpp \
     src/util/ConcurrentMap.hpp \
     src/util/DebugCount.hpp \
     src/util/DistanceBetweenPoints.hpp \
-    src/util/Emotemap.hpp \
-    src/util/FlagsEnum.hpp \
     src/util/Helpers.hpp \
     src/util/IrcHelpers.hpp \
     src/util/LayoutCreator.hpp \
-    src/util/MutexValue.hpp \
     src/util/NativeEventHelper.hpp \
-    src/util/NetworkManager.hpp \
-    src/util/NetworkRequest.hpp \
-    src/util/NetworkRequester.hpp \
-    src/util/NetworkWorker.hpp \
     src/util/PostToThread.hpp \
-    src/util/Property.hpp \
     src/util/QstringHash.hpp \
     src/util/RapidjsonHelpers.hpp \
     src/util/RemoveScrollAreaBackground.hpp \
-    src/util/SerializeCustom.hpp \
     src/util/SharedPtrElementLess.hpp \
-    src/util/SignalVector2.hpp \
-    src/util/SignalVectorModel.hpp \
     src/util/StandardItemHelper.hpp \
     src/util/StreamLink.hpp \
-    src/util/UrlFetch.hpp \
     src/util/WindowsHelper.hpp \
-    src/Version.hpp \
     src/widgets/AccountSwitchPopupWidget.hpp \
     src/widgets/AccountSwitchWidget.hpp \
     src/widgets/AttachedWindow.hpp \
@@ -390,8 +389,8 @@ HEADERS  += \
     src/widgets/TooltipWidget.hpp \
     src/widgets/Window.hpp
 
-RESOURCES += \
-    resources/resources.qrc
+RESOURCES += \ 
+    resources/resources.qrc \
 
 DISTFILES +=
 

files

@@ -0,0 +1,26 @@
+find src/ -type f -exec sed -i 's`Channel.cpp"`common/Channel.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`Channel.hpp"`common/Channel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`Common.hpp"`common/Common.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`LockedObject.hpp"`common/LockedObject.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`NullablePtr.hpp"`common/NullablePtr.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`ProviderId.hpp"`common/ProviderId.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`SignalVector.hpp"`common/SignalVector.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/CompletionModel.cpp"`common/CompletionModel.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/CompletionModel.hpp"`common/CompletionModel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Emotemap.cpp"`common/Emotemap.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Emotemap.hpp"`common/Emotemap.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/FlagsEnum.hpp"`common/FlagsEnum.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/MutexValue.hpp"`common/MutexValue.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkManager.cpp"`common/NetworkManager.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkManager.hpp"`common/NetworkManager.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequest.cpp"`common/NetworkRequest.cpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequest.hpp"`common/NetworkRequest.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkRequester.hpp"`common/NetworkRequester.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/NetworkWorker.hpp"`common/NetworkWorker.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Property.hpp"`common/Property.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SerializeCustom.hpp"`common/SerializeCustom.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SignalVector2.hpp"`common/SignalVector2.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/SignalVectorModel.hpp"`common/SignalVectorModel.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/UrlFetch.hpp"`common/UrlFetch.hpp"`' {} \;
+find src/ -type f -exec sed -i 's`util/Version.hpp"`common/Version.hpp"`' {} \;
+

src/Common.cpp

@@ -1,16 +0,0 @@
-/*-------------------------------------------------------------------- 
-* Precompiled header source file used by Visual Studio.NET to generate
-* the .pch file.
-*
-* Due to issues with the dependencies checker within the IDE, it
-* sometimes fails to recompile the PCH file, if we force the IDE to
-* create the PCH file directly from the header file.
-*
-* This file is auto-generated by qmake since no PRECOMPILED_SOURCE was
-* specified, and is used as the common stdafx.cpp. The file is only
-* generated when creating .vcxproj project files, and is not used for
-* command line compilations by nmake.
-*
-* WARNING: All changes made in this file will be lost.
---------------------------------------------------------------------*/
-#include "Common.hpp"

src/common/Channel.cpp

@@ -1,4 +1,4 @@
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"

src/common/Channel.hpp

@@ -3,7 +3,7 @@
 #include "messages/Image.hpp"
 #include "messages/LimitedQueue.hpp"
 #include "messages/Message.hpp"
-#include "util/CompletionModel.hpp"
+#include "common/CompletionModel.hpp"
 #include "util/ConcurrentMap.hpp"
 
 #include <QString>

src/common/CompletionModel.cpp

@@ -1,7 +1,7 @@
-#include "util/CompletionModel.hpp"
+#include "common/CompletionModel.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
 #include "singletons/EmoteManager.hpp"

src/common/CompletionModel.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 
 #include <QAbstractListModel>
 

src/common/NetworkManager.cpp

@@ -1,4 +1,4 @@
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 
 #include <QNetworkAccessManager>
 

src/common/NetworkManager.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "debug/Log.hpp"
-#include "util/NetworkRequester.hpp"
-#include "util/NetworkWorker.hpp"
+#include "common/NetworkRequester.hpp"
+#include "common/NetworkWorker.hpp"
 
 #include <QJsonDocument>
 #include <QJsonObject>

src/common/NetworkRequest.cpp

@@ -1,4 +1,4 @@
-#include "util/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 
 #include "Application.hpp"
 

src/common/NetworkRequest.hpp

@@ -2,9 +2,9 @@
 
 #include "Application.hpp"
 #include "singletons/PathManager.hpp"
-#include "util/NetworkManager.hpp"
-#include "util/NetworkRequester.hpp"
-#include "util/NetworkWorker.hpp"
+#include "common/NetworkManager.hpp"
+#include "common/NetworkRequester.hpp"
+#include "common/NetworkWorker.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>

src/common/SignalVectorModel.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 #include <QAbstractTableModel>
 #include <QStandardItem>

src/common/UrlFetch.hpp

@@ -3,8 +3,8 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/Credentials.hpp"
 #include "debug/Log.hpp"
-#include "util/NetworkManager.hpp"
-#include "util/NetworkRequest.hpp"
+#include "common/NetworkManager.hpp"
+#include "common/NetworkRequest.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>

src/controllers/accounts/Account.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ProviderId.hpp"
+#include "common/ProviderId.hpp"
 
 #include <QString>
 

src/controllers/accounts/AccountController.hpp

@@ -5,7 +5,7 @@
 #include "controllers/accounts/Account.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
 #include "util/SharedPtrElementLess.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/accounts/AccountModel.hpp

@@ -2,7 +2,7 @@
 
 #include "controllers/accounts/Account.hpp"
 #include "util/QstringHash.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 #include <unordered_map>
 

src/controllers/commands/CommandController.cpp

@@ -1,6 +1,7 @@
 #include "CommandController.hpp"
 
 #include "Application.hpp"
+#include "common/SignalVector2.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandModel.hpp"
@@ -9,7 +10,6 @@
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/PathManager.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
 
 #include <QApplication>
 #include <QFile>

src/controllers/commands/CommandController.hpp

@@ -5,7 +5,7 @@
 #include <mutex>
 
 #include "controllers/commands/Command.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 class Channel;

src/controllers/commands/CommandModel.hpp

@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/commands/Command.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/highlights/HighlightController.hpp

@@ -3,7 +3,7 @@
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Message.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/highlights/HighlightModel.hpp

@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/highlights/HighlightPhrase.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/highlights/HighlightPhrase.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/RapidjsonHelpers.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QRegularExpression>
 #include <QString>

src/controllers/ignores/IgnoreController.hpp

@@ -2,7 +2,7 @@
 
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/ignores/IgnoreModel.hpp

@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/ignores/IgnorePhrase.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/RapidjsonHelpers.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QRegularExpression>
 #include <QString>

src/controllers/taggedusers/TaggedUser.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
+#include "common/ProviderId.hpp"
+
 #include <QString>
-#include <providerid.hpp>
 
 namespace chatterino {
 namespace controllers {

src/controllers/taggedusers/TaggedUsersController.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "controllers/taggedusers/TaggedUser.hpp"
-#include "util/SignalVector2.hpp"
+#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 namespace controllers {

src/controllers/taggedusers/TaggedUsersModel.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "controllers/taggedusers/TaggedUser.hpp"
-#include "util/SignalVectorModel.hpp"
+#include "common/SignalVectorModel.hpp"
 
 namespace chatterino {
 namespace controllers {

src/main.cpp

@@ -3,7 +3,7 @@
 #include "singletons/PathManager.hpp"
 #include "singletons/UpdateManager.hpp"
 #include "util/DebugCount.hpp"
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "widgets/dialogs/LastRunCrashDialog.hpp"
 
 #include <QAbstractNativeEventFilter>

src/messages/Image.cpp

@@ -5,9 +5,9 @@
 #include "singletons/EmoteManager.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "util/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <QBuffer>
 #include <QImageReader>

src/messages/Message.hpp

@@ -2,7 +2,7 @@
 
 #include "messages/MessageElement.hpp"
 #include "providers/twitch/PubsubActions.hpp"
-#include "util/FlagsEnum.hpp"
+#include "common/FlagsEnum.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
 #include <QTime>

src/messages/MessageElement.cpp

@@ -5,7 +5,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "debug/Benchmark.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 namespace chatterino {
 namespace messages {

src/messages/MessageElement.hpp

@@ -4,7 +4,7 @@
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
 #include "singletons/FontManager.hpp"
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QRect>
 #include <QString>

src/messages/layouts/MessageLayout.hpp

@@ -4,7 +4,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "messages/Message.hpp"
 #include "messages/Selection.hpp"
-#include "util/FlagsEnum.hpp"
+#include "common/FlagsEnum.hpp"
 
 #include <QPixmap>
 

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>

src/singletons/IrcManager.cpp

@@ -1,5 +1,5 @@
 //#include "singletons/IrcManager.hpp"
-//#include "Channel.hpp"
+//#include "common/Channel.hpp"
 //#include "debug/Log.hpp"
 //#include "messages/MessageParseArgs.hpp"
 //#include "providers/twitch/TwitchAccount.hpp"
@@ -11,7 +11,7 @@
 //#include "singletons/SettingsManager.hpp"
 //#include "singletons/WindowManager.hpp"
 //#include "util/PostToThread.hpp"
-//#include "util/UrlFetch.hpp"
+//#include "common/UrlFetch.hpp"
 
 //#include <irccommand.h>
 //#include <QJsonArray>

src/singletons/ResourceManager.cpp

@@ -1,5 +1,5 @@
 #include "ResourceManager.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 
 #include <QIcon>
 #include <QPixmap>

src/singletons/ResourceManager.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/Emotemap.hpp"
+#include "common/Emotemap.hpp"
 
 #include <QIcon>
 #include <QRegularExpression>

src/singletons/ThemeManager.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <QBrush>
 #include <QColor>

src/singletons/UpdateManager.cpp

@@ -1,9 +1,9 @@
 #include "UpdateManager.hpp"
 
+#include "common/NetworkRequest.hpp"
+#include "common/Version.hpp"
 #include "util/CombinePath.hpp"
-#include "util/NetworkRequest.hpp"
 #include "util/PostToThread.hpp"
-#include "Version.hpp"
 
 #include <QMessageBox>
 #include <QProcess>

src/util/RapidjsonHelpers.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/SerializeCustom.hpp"
+#include "common/SerializeCustom.hpp"
 
 #include <rapidjson/document.h>
 #include <pajlada/settings/serialize.hpp>

src/widgets/AttachedWindow.hpp

@@ -2,7 +2,7 @@
 
 #include <QWidget>
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/splits/Split.hpp"
 
 namespace chatterino {

src/widgets/StreamView.cpp

@@ -1,6 +1,6 @@
 #include "StreamView.hpp"
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/splits/Split.hpp"

src/widgets/Window.cpp

@@ -1,19 +1,19 @@
 #include "widgets/Window.hpp"
 
 #include "Application.hpp"
+#include "common/Version.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
-#include "Version.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
-#include "widgets/helper/Shortcut.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
-#include "widgets/splits/Split.hpp"
 #include "widgets/dialogs/WelcomeDialog.hpp"
+#include "widgets/helper/Shortcut.hpp"
+#include "widgets/splits/Split.hpp"
 
 #include <QApplication>
 #include <QDesktopServices>

src/widgets/dialogs/EmotePopup.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 #include "widgets/helper/ChannelView.hpp"
 

src/widgets/dialogs/LoginDialog.cpp

@@ -1,6 +1,6 @@
 #include "widgets/dialogs/LoginDialog.hpp"
-#include "Common.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/Common.hpp"
+#include "common/UrlFetch.hpp"
 #ifdef USEWINSDK
 #include <Windows.h>
 #endif

src/widgets/dialogs/NotificationPopup.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/Message.hpp"
 #include "widgets/BaseWindow.hpp"
 

src/widgets/dialogs/SelectChannelDialog.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 #include "widgets/Notebook.hpp"
 

src/widgets/dialogs/UserInfoPopup.cpp

@@ -5,7 +5,7 @@
 #include "singletons/ResourceManager.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/helper/Line.hpp"
 #include "widgets/helper/RippleEffectLabel.hpp"
 #include "widgets/Label.hpp"

src/widgets/dialogs/UserInfoPopup.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <pajlada/signals/signal.hpp>

src/widgets/helper/ChannelView.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/Image.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"

src/widgets/helper/NotebookTab.cpp

@@ -1,7 +1,7 @@
 #include "widgets/helper/NotebookTab.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "debug/Log.hpp"
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"

src/widgets/helper/NotebookTab.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/RippleEffectButton.hpp"
 

src/widgets/helper/ResizingTextEdit.cpp

@@ -1,6 +1,6 @@
 #include "widgets/helper/ResizingTextEdit.hpp"
-#include "Common.hpp"
-#include "util/CompletionModel.hpp"
+#include "common/Common.hpp"
+#include "common/CompletionModel.hpp"
 
 ResizingTextEdit::ResizingTextEdit()
 {

src/widgets/helper/SearchPopup.cpp

@@ -4,7 +4,7 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 namespace chatterino {

src/widgets/splits/Split.cpp

@@ -1,7 +1,7 @@
 #include "widgets/splits/Split.hpp"
 
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "providers/twitch/EmoteValue.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -10,7 +10,7 @@
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StreamLink.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/helper/DebugPopup.hpp"
 #include "widgets/helper/SearchPopup.hpp"
 #include "widgets/helper/Shortcut.hpp"

src/widgets/splits/Split.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Channel.hpp"
+#include "common/Channel.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/MessageElement.hpp"
-#include "NullablePtr.hpp"
-#include "util/SerializeCustom.hpp"
+#include "common/NullablePtr.hpp"
+#include "common/SerializeCustom.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/RippleEffectLabel.hpp"

src/widgets/splits/SplitContainer.cpp

@@ -1,6 +1,6 @@
 #include "widgets/splits/SplitContainer.hpp"
 #include "Application.hpp"
-#include "Common.hpp"
+#include "common/Common.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "debug/AssertInGuiThread.hpp"

src/widgets/splits/SplitHeader.cpp

@@ -6,7 +6,7 @@
 #include "singletons/ResourceManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"

src/widgets/splits/SplitInput.cpp

@@ -8,7 +8,7 @@
 #include "singletons/SettingsManager.hpp"
 #include "singletons/ThemeManager.hpp"
 #include "util/LayoutCreator.hpp"
-#include "util/UrlFetch.hpp"
+#include "common/UrlFetch.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"