From c3c2b934bab2f2b3acc98101a5422d536b5cb19e Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 28 Jun 2018 20:06:09 +0200
Subject: [PATCH] moved ChatterinoSetting into src/common

---
 chatterino.pro                                          | 4 ++--
 src/{singletons/helper => common}/ChatterinoSetting.cpp | 2 +-
 src/{singletons/helper => common}/ChatterinoSetting.hpp | 0
 src/controllers/moderationactions/ModerationActions.hpp | 2 +-
 src/singletons/Settings.hpp                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{singletons/helper => common}/ChatterinoSetting.cpp (80%)
 rename src/{singletons/helper => common}/ChatterinoSetting.hpp (100%)

diff --git a/chatterino.pro b/chatterino.pro
index 924c4b6b6..d30b3e07b 100644
--- a/chatterino.pro
+++ b/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 \
diff --git a/src/singletons/helper/ChatterinoSetting.cpp b/src/common/ChatterinoSetting.cpp
similarity index 80%
rename from src/singletons/helper/ChatterinoSetting.cpp
rename to src/common/ChatterinoSetting.cpp
index 664eff0da..8c9a882fa 100644
--- a/src/singletons/helper/ChatterinoSetting.cpp
+++ b/src/common/ChatterinoSetting.cpp
@@ -1,4 +1,4 @@
-#include "singletons/helper/ChatterinoSetting.hpp"
+#include "common/ChatterinoSetting.hpp"
 
 #include "singletons/Settings.hpp"
 
diff --git a/src/singletons/helper/ChatterinoSetting.hpp b/src/common/ChatterinoSetting.hpp
similarity index 100%
rename from src/singletons/helper/ChatterinoSetting.hpp
rename to src/common/ChatterinoSetting.hpp
diff --git a/src/controllers/moderationactions/ModerationActions.hpp b/src/controllers/moderationactions/ModerationActions.hpp
index 948f98e2d..6f58ae137 100644
--- a/src/controllers/moderationactions/ModerationActions.hpp
+++ b/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 {
 
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 03a0ec146..c1f769340 100644
--- a/src/singletons/Settings.hpp
+++ b/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>