moved files into src/common

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"