noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

moved ChatterinoSetting into src/common

Browse source
This commit is contained in:
fourtf 2018-06-28 20:06:09 +02:00
parent 86347dc63e
commit c3c2b934ba
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chatterino.pro
View file

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

2
src/singletons/helper/ChatterinoSetting.cpp → src/common/ChatterinoSetting.cpp
View file

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

0
src/singletons/helper/ChatterinoSetting.hpp → src/common/ChatterinoSetting.hpp
View file

2
src/controllers/moderationactions/ModerationActions.hpp
View file

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

2
src/singletons/Settings.hpp
View file

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