Finish up singleton refactoring into one giant class

This commit is contained in:
Rasmus Karlsson
2018-04-28 15:20:18 +02:00
parent 9426a9d633
commit 2f195891cd
34 changed files with 221 additions and 184 deletions
+19
View File
@@ -7,6 +7,14 @@
namespace chatterino {
namespace providers {
namespace twitch {
class TwitchServer;
} // namespace twitch
} // namespace providers
namespace singletons {
class ThemeManager;
@@ -19,6 +27,8 @@ class EmoteManager;
class PubSubManager;
class NativeMessagingManager;
class SettingManager;
class FontManager;
class ResourceManager;
} // namespace singletons
@@ -37,6 +47,8 @@ public:
int run(QApplication &qtApp);
friend void test();
singletons::PathManager *paths = nullptr;
singletons::ThemeManager *themes = nullptr;
singletons::WindowManager *windows = nullptr;
@@ -47,6 +59,13 @@ public:
singletons::PubSubManager *pubsub = nullptr;
singletons::NativeMessagingManager *nativeMessaging = nullptr;
singletons::SettingManager *settings = nullptr;
singletons::FontManager *fonts = nullptr;
singletons::ResourceManager *resources = nullptr;
/// Provider-specific
struct {
providers::twitch::TwitchServer *server;
} twitch;
void save();