changed AccountManager to AccountController

src/providers/twitch/pubsub.cpp

@@ -3,7 +3,6 @@
 #include "debug/log.hpp"
 #include "providers/twitch/pubsubactions.hpp"
 #include "providers/twitch/pubsubhelpers.hpp"
-#include "singletons/accountmanager.hpp"
 #include "util/rapidjson-helpers.hpp"
 
 #include <rapidjson/error/en.h>

src/providers/twitch/pubsubhelpers.cpp

@@ -1,7 +1,6 @@
 #include "providers/twitch/pubsubhelpers.hpp"
 
 #include "providers/twitch/pubsubactions.hpp"
-#include "singletons/accountmanager.hpp"
 #include "util/rapidjson-helpers.hpp"
 
 namespace chatterino {

src/providers/twitch/twitchaccountmanager.hpp

@@ -15,10 +15,11 @@
 //
 
 namespace chatterino {
-
-namespace singletons {
-class AccountManager;
-}  // namespace singletons
+namespace controllers {
+namespace accounts {
+class AccountController;
+}
+}  // namespace controllers
 
 namespace providers {
 namespace twitch {
@@ -70,7 +71,7 @@ private:
     std::vector<std::shared_ptr<TwitchAccount>> users;
     mutable std::mutex mutex;
 
-    friend class chatterino::singletons::AccountManager;
+    friend class chatterino::controllers::accounts::AccountController;
 };
 
 }  // namespace twitch

src/providers/twitch/twitchchannel.cpp

@@ -5,7 +5,6 @@
 #include "messages/message.hpp"
 #include "providers/twitch/pubsub.hpp"
 #include "providers/twitch/twitchmessagebuilder.hpp"
-#include "singletons/accountmanager.hpp"
 #include "singletons/emotemanager.hpp"
 #include "singletons/ircmanager.hpp"
 #include "singletons/settingsmanager.hpp"

src/providers/twitch/twitchmessagebuilder.cpp

@@ -1,11 +1,11 @@
 #include "providers/twitch/twitchmessagebuilder.hpp"
 
 #include "application.hpp"
+#include "controllers/accounts/accountcontroller.hpp"
 #include "controllers/highlights/highlightcontroller.hpp"
 #include "controllers/ignores/ignorecontroller.hpp"
 #include "debug/log.hpp"
 #include "providers/twitch/twitchchannel.hpp"
-#include "singletons/accountmanager.hpp"
 #include "singletons/emotemanager.hpp"
 #include "singletons/ircmanager.hpp"
 #include "singletons/resourcemanager.hpp"

src/providers/twitch/twitchserver.cpp

@@ -1,12 +1,12 @@
 #include "twitchserver.hpp"
 
 #include "application.hpp"
+#include "controllers/accounts/accountcontroller.hpp"
 #include "controllers/highlights/highlightcontroller.hpp"
 #include "providers/twitch/ircmessagehandler.hpp"
 #include "providers/twitch/twitchaccount.hpp"
 #include "providers/twitch/twitchhelpers.hpp"
 #include "providers/twitch/twitchmessagebuilder.hpp"
-#include "singletons/accountmanager.hpp"
 #include "util/posttothread.hpp"
 
 #include <cassert>