renamed *Manager files

chatterino.pro

@@ -147,20 +147,11 @@ SOURCES += \
     src/providers/twitch/TwitchMessageBuilder.cpp \
     src/providers/twitch/TwitchServer.cpp \
     src/providers/twitch/TwitchUser.cpp \
-    src/singletons/EmoteManager.cpp \
-    src/singletons/FontManager.cpp \
     src/singletons/helper/ChatterinoSetting.cpp \
     src/singletons/helper/GifTimer.cpp \
     src/singletons/helper/LoggingChannel.cpp \
     src/controllers/moderationactions/ModerationAction.cpp \
     src/singletons/IrcManager.cpp \
-    src/singletons/LoggingManager.cpp \
-    src/singletons/NativeMessagingManager.cpp \
-    src/singletons/PathManager.cpp \
-    src/singletons/ResourceManager.cpp \
-    src/singletons/SettingsManager.cpp \
-    src/singletons/ThemeManager.cpp \
-    src/singletons/UpdateManager.cpp \
     src/singletons/WindowManager.cpp \
     src/util/DebugCount.cpp \
     src/util/RapidjsonHelpers.cpp \
@@ -224,7 +215,16 @@ SOURCES += \
     src/widgets/TooltipWidget.cpp \
     src/widgets/Window.cpp \
     src/common/LinkParser.cpp \
-    src/controllers/moderationactions/ModerationActions.cpp
+    src/controllers/moderationactions/ModerationActions.cpp \
+    src/singletons/NativeMessaging.cpp \
+    src/singletons/Emotes.cpp \
+    src/singletons/Fonts.cpp \
+    src/singletons/Logging.cpp \
+    src/singletons/Paths.cpp \
+    src/singletons/Resources.cpp \
+    src/singletons/Settings.cpp \
+    src/singletons/Themes.cpp \
+    src/singletons/Updates.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -301,20 +301,11 @@ HEADERS  += \
     src/providers/twitch/TwitchMessageBuilder.hpp \
     src/providers/twitch/TwitchServer.hpp \
     src/providers/twitch/TwitchUser.hpp \
-    src/singletons/EmoteManager.hpp \
-    src/singletons/FontManager.hpp \
     src/singletons/helper/ChatterinoSetting.hpp \
     src/singletons/helper/GifTimer.hpp \
     src/singletons/helper/LoggingChannel.hpp \
     src/controllers/moderationactions/ModerationAction.hpp \
     src/singletons/IrcManager.hpp \
-    src/singletons/LoggingManager.hpp \
-    src/singletons/NativeMessagingManager.hpp \
-    src/singletons/PathManager.hpp \
-    src/singletons/ResourceManager.hpp \
-    src/singletons/SettingsManager.hpp \
-    src/singletons/ThemeManager.hpp \
-    src/singletons/UpdateManager.hpp \
     src/singletons/WindowManager.hpp \
     src/util/Clamp.hpp \
     src/util/CombinePath.hpp \
@@ -394,7 +385,16 @@ HEADERS  += \
     src/providers/twitch/TwitchCommon.hpp \
     src/util/IsBigEndian.hpp \
     src/common/LinkParser.hpp \
-    src/controllers/moderationactions/ModerationActions.hpp
+    src/controllers/moderationactions/ModerationActions.hpp \
+    src/singletons/Emotes.hpp \
+    src/singletons/Fonts.hpp \
+    src/singletons/Logging.hpp \
+    src/singletons/Paths.hpp \
+    src/singletons/Resources.hpp \
+    src/singletons/Settings.hpp \
+    src/singletons/Themes.hpp \
+    src/singletons/Updates.hpp \
+    src/singletons/NativeMessaging.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \

src/Application.cpp

@@ -8,14 +8,14 @@
 #include "controllers/taggedusers/TaggedUsersController.hpp"
 #include "providers/twitch/Pubsub.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/LoggingManager.hpp"
-#include "singletons/NativeMessagingManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Logging.hpp"
+#include "singletons/NativeMessaging.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IsBigEndian.hpp"
 #include "util/PostToThread.hpp"

src/Application.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "singletons/IrcManager.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 
 #include <QApplication>
 

src/common/Channel.cpp

@@ -3,9 +3,9 @@
 #include "Application.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/LoggingManager.hpp"
+#include "singletons/Logging.hpp"
 #include "singletons/WindowManager.hpp"
 
 #include <QJsonArray>

src/common/CompletionModel.cpp

@@ -4,7 +4,7 @@
 #include "common/Common.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include <QtAlgorithms>
 

src/common/Emotemap.cpp

@@ -1,7 +1,7 @@
 #include "Emotemap.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/common/NetworkRequest.hpp

@@ -4,7 +4,7 @@
 #include "common/NetworkManager.hpp"
 #include "common/NetworkRequester.hpp"
 #include "common/NetworkWorker.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>

src/controllers/commands/CommandController.cpp

@@ -8,8 +8,8 @@
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QApplication>
 #include <QFile>

src/controllers/highlights/HighlightController.hpp

@@ -3,7 +3,7 @@
 #include "common/SignalVector2.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Message.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/controllers/highlights/HighlightModel.cpp

@@ -1,7 +1,7 @@
 #include "HighlightModel.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

src/controllers/ignores/IgnoreController.hpp

@@ -2,7 +2,7 @@
 
 #include "common/SignalVector2.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/controllers/ignores/IgnoreModel.cpp

@@ -1,7 +1,7 @@
 #include "IgnoreModel.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

src/controllers/moderationactions/ModerationAction.cpp

@@ -1,7 +1,7 @@
 #include "ModerationAction.hpp"
 
 #include "Application.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 
 namespace chatterino {
 

src/controllers/moderationactions/ModerationActions.cpp

@@ -1,7 +1,7 @@
 #include "ModerationActions.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QRegularExpression>
 

src/main.cpp

@@ -1,8 +1,8 @@
 #include "Application.hpp"
 #include "common/NetworkManager.hpp"
-#include "singletons/NativeMessagingManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/UpdateManager.hpp"
+#include "singletons/NativeMessaging.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Updates.hpp"
 #include "util/DebugCount.hpp"
 #include "widgets/dialogs/LastRunCrashDialog.hpp"
 

src/messages/Image.cpp

@@ -4,7 +4,7 @@
 #include "common/NetworkManager.hpp"
 #include "common/UrlFetch.hpp"
 #include "debug/Log.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/PostToThread.hpp"

src/messages/MessageBuilder.cpp

@@ -1,9 +1,9 @@
 #include "MessageBuilder.hpp"
 
 #include "common/LinkParser.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDateTime>
 

src/messages/MessageColor.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QColor>
 

src/messages/MessageElement.cpp

@@ -6,7 +6,7 @@
 #include "debug/Benchmark.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/messages/MessageElement.hpp

@@ -4,7 +4,7 @@
 #include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 #include <QRect>
 #include <QString>

src/messages/layouts/MessageLayout.cpp

@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Benchmark.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 
 #include <QApplication>

src/messages/layouts/MessageLayoutContainer.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "MessageLayoutElement.hpp"
 #include "messages/Selection.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDebug>
 #include <QPainter>

src/messages/layouts/MessageLayoutElement.hpp

@@ -9,7 +9,7 @@
 
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 class QPainter;
 

src/providers/emoji/Emojis.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QFile>
 

src/providers/twitch/IrcMessageHandler.cpp

@@ -9,7 +9,7 @@
 #include "providers/twitch/TwitchHelpers.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 

src/providers/twitch/TwitchChannel.cpp

@@ -6,9 +6,9 @@
 #include "messages/Message.hpp"
 #include "providers/twitch/Pubsub.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/PostToThread.hpp"
 
 #include <IrcConnection>

src/providers/twitch/TwitchChannel.hpp

@@ -5,7 +5,7 @@
 #include "common/Channel.hpp"
 #include "common/Common.hpp"
 #include "common/MutexValue.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
 #include "util/ConcurrentMap.hpp"
 

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -6,11 +6,11 @@
 #include "controllers/ignores/IgnoreController.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 

src/providers/twitch/TwitchMessageBuilder.hpp

@@ -2,7 +2,7 @@
 
 #include "messages/MessageBuilder.hpp"
 #include "messages/MessageParseArgs.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include <IrcMessage>
 

src/singletons/Emotes.cpp

@@ -1,4 +1,4 @@
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"

src/singletons/Fonts.cpp

@@ -1,4 +1,4 @@
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 #include <QDebug>
 #include <QtGlobal>

src/singletons/Logging.cpp

@@ -1,9 +1,9 @@
-#include "singletons/LoggingManager.hpp"
+#include "singletons/Logging.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDir>
 #include <QStandardPaths>

src/singletons/NativeMessaging.cpp

@@ -1,8 +1,8 @@
-#include "NativeMessagingManager.hpp"
+#include "NativeMessaging.hpp"
 
 #include "Application.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 #include "util/PostToThread.hpp"
 
 #include <QCoreApplication>

src/singletons/Paths.cpp

@@ -1,4 +1,4 @@
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 
 #include <QCoreApplication>
 #include <QCryptographicHash>

src/singletons/Resources.cpp

@@ -1,4 +1,4 @@
-#include "ResourceManager.hpp"
+#include "Resources.hpp"
 #include "common/UrlFetch.hpp"
 
 #include <QIcon>

src/singletons/Settings.cpp

@@ -1,9 +1,9 @@
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Resources.hpp"
 #include "singletons/WindowManager.hpp"
 
 namespace chatterino {

src/singletons/Themes.cpp

@@ -1,6 +1,6 @@
 #define LOOKUP_COLOR_COUNT 360
 
-#include "ThemeManager.hpp"
+#include "Themes.hpp"
 
 #include <QColor>
 

src/singletons/Updates.cpp

@@ -1,4 +1,4 @@
-#include "UpdateManager.hpp"
+#include "Updates.hpp"
 
 #include "common/NetworkRequest.hpp"
 #include "common/Version.hpp"

src/singletons/WindowManager.cpp

@@ -4,9 +4,9 @@
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Themes.hpp"
 #include "util/Clamp.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"

src/singletons/helper/ChatterinoSetting.cpp

@@ -1,6 +1,6 @@
 #include "singletons/helper/ChatterinoSetting.hpp"
 
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/singletons/helper/GifTimer.cpp

@@ -1,7 +1,7 @@
 #include "singletons/helper/GifTimer.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 
 namespace chatterino {

src/singletons/helper/LoggingChannel.cpp

@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDir>
 

src/util/StreamLink.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "Helpers.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "widgets/dialogs/QualityPopup.hpp"
 
 #include <QErrorMessage>

src/widgets/BaseWidget.cpp

@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <QChildEvent>

src/widgets/BaseWindow.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "boost/algorithm/algorithm.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/PostToThread.hpp"
 #include "util/WindowsHelper.hpp"

src/widgets/Label.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 #include "widgets/BaseWidget.hpp"
 
 #include <pajlada/signals/signalholder.hpp>

src/widgets/Notebook.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "widgets/Window.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"

src/widgets/Scrollbar.cpp

@@ -1,7 +1,7 @@
 #include "widgets/Scrollbar.hpp"
 
 #include "Application.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 #include <QDebug>

src/widgets/Scrollbar.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "messages/LimitedQueue.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 

src/widgets/TooltipWidget.cpp

@@ -1,8 +1,8 @@
 #include "TooltipWidget.hpp"
 
 #include "Application.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDebug>
 #include <QDesktopWidget>

src/widgets/Window.cpp

@@ -5,8 +5,8 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/Notebook.hpp"

src/widgets/dialogs/LastRunCrashDialog.cpp

@@ -5,7 +5,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "singletons/UpdateManager.hpp"
+#include "singletons/Updates.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
 

src/widgets/dialogs/UserInfoPopup.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "common/UrlFetch.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
 #include "widgets/Label.hpp"

src/widgets/helper/ChannelView.cpp

@@ -7,8 +7,8 @@
 #include "messages/Message.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/DistanceBetweenPoints.hpp"
 #include "widgets/TooltipWidget.hpp"

src/widgets/helper/DropPreview.cpp

@@ -1,6 +1,6 @@
 #include "widgets/helper/DropPreview.hpp"
 #include "Application.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDebug>
 #include <QPainter>

src/widgets/helper/NotebookButton.cpp

@@ -1,5 +1,5 @@
 #include "widgets/helper/NotebookButton.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/helper/RippleEffectButton.hpp"
 #include "widgets/splits/SplitContainer.hpp"

src/widgets/helper/NotebookTab.cpp

@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "util/Clamp.hpp"
 #include "util/Helpers.hpp"
 #include "widgets/Notebook.hpp"

src/widgets/helper/RippleEffectButton.cpp

@@ -3,7 +3,7 @@
 #include <QDebug>
 #include <QPainter>
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 namespace chatterino {
 

src/widgets/helper/RippleEffectLabel.cpp

@@ -1,5 +1,5 @@
 #include "widgets/helper/RippleEffectLabel.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/splits/SplitHeader.hpp"
 
 #include <QBrush>

src/widgets/helper/ScrollbarHighlight.cpp

@@ -1,5 +1,5 @@
 #include "widgets/helper/ScrollbarHighlight.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/Scrollbar.hpp"
 
 namespace chatterino {

src/widgets/helper/TitlebarButton.cpp

@@ -1,6 +1,6 @@
 #include "TitlebarButton.hpp"
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 namespace chatterino {
 

src/widgets/settingspages/HighlightingPage.cpp

@@ -4,7 +4,7 @@
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/highlights/HighlightModel.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/StandardItemHelper.hpp"
 #include "widgets/helper/EditableModelView.hpp"

src/widgets/settingspages/IgnoreusersPage.cpp

@@ -4,7 +4,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnoreModel.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 

src/widgets/settingspages/ModerationPage.cpp

@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "controllers/taggedusers/TaggedUsersController.hpp"
 #include "controllers/taggedusers/TaggedUsersModel.hpp"
-#include "singletons/LoggingManager.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Logging.hpp"
+#include "singletons/Paths.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 

src/widgets/settingspages/SettingsPage.hpp

@@ -6,7 +6,7 @@
 #include <QSpinBox>
 #include <pajlada/signals/signal.hpp>
 
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 

src/widgets/settingspages/SpecialChannelsPage.cpp

@@ -1,7 +1,7 @@
 #include "SpecialChannelsPage.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 
 #include <QGroupBox>

src/widgets/splits/Split.cpp

@@ -7,8 +7,8 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StreamLink.hpp"
 #include "widgets/Window.hpp"

src/widgets/splits/SplitContainer.cpp

@@ -2,7 +2,7 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "debug/AssertInGuiThread.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"

src/widgets/splits/SplitHeader.cpp

@@ -4,8 +4,8 @@
 #include "common/UrlFetch.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Themes.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"

src/widgets/splits/SplitInput.cpp

@@ -6,8 +6,8 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"

src/widgets/splits/SplitOverlay.cpp

@@ -9,7 +9,7 @@
 #include <QPushButton>
 
 #include "Application.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"