moved files into src/common

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 {