moved ChatterinoSetting into src/common

chatterino.pro

@@ -147,7 +147,7 @@ SOURCES += \
     src/providers/twitch/TwitchMessageBuilder.cpp \
     src/providers/twitch/TwitchServer.cpp \
     src/providers/twitch/TwitchUser.cpp \
-    src/singletons/helper/ChatterinoSetting.cpp \
+    src/common/ChatterinoSetting.cpp \
     src/singletons/helper/GifTimer.cpp \
     src/singletons/helper/LoggingChannel.cpp \
     src/controllers/moderationactions/ModerationAction.cpp \
@@ -300,7 +300,7 @@ HEADERS  += \
     src/providers/twitch/TwitchMessageBuilder.hpp \
     src/providers/twitch/TwitchServer.hpp \
     src/providers/twitch/TwitchUser.hpp \
-    src/singletons/helper/ChatterinoSetting.hpp \
+    src/common/ChatterinoSetting.hpp \
     src/singletons/helper/GifTimer.hpp \
     src/singletons/helper/LoggingChannel.hpp \
     src/controllers/moderationactions/ModerationAction.hpp \

src/common/ChatterinoSetting.cpp

@@ -1,4 +1,4 @@
-#include "singletons/helper/ChatterinoSetting.hpp"
+#include "common/ChatterinoSetting.hpp"
 
 #include "singletons/Settings.hpp"
 

src/controllers/moderationactions/ModerationActions.hpp

@@ -2,7 +2,7 @@
 
 #include "common/SignalVector2.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
-#include "singletons/helper/ChatterinoSetting.hpp"
+#include "common/ChatterinoSetting.hpp"
 
 namespace chatterino {
 

src/singletons/Settings.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/ChatterinoSetting.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
 #include "messages/MessageElement.hpp"
-#include "singletons/helper/ChatterinoSetting.hpp"
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/settings/settinglistener.hpp>