refactor: turn Emotes into EmoteController (#6516)
* refactor: turn `Emotes` into `EmoteController` * changelog * why does clang-format do this??? * nit: remove unused include from EmoteController.hpp --------- Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
+4
-3
@@ -24,6 +24,7 @@
|
||||
#ifdef CHATTERINO_HAVE_PLUGINS
|
||||
# include "controllers/plugins/PluginController.hpp"
|
||||
#endif
|
||||
#include "controllers/emotes/EmoteController.hpp"
|
||||
#include "controllers/sound/MiniaudioBackend.hpp"
|
||||
#include "controllers/sound/NullBackend.hpp"
|
||||
#include "controllers/twitch/LiveController.hpp"
|
||||
@@ -43,7 +44,6 @@
|
||||
#include "providers/twitch/TwitchIrcServer.hpp"
|
||||
#include "providers/twitch/TwitchUsers.hpp"
|
||||
#include "singletons/CrashHandler.hpp"
|
||||
#include "singletons/Emotes.hpp"
|
||||
#include "singletons/Fonts.hpp"
|
||||
#include "singletons/helper/LoggingChannel.hpp"
|
||||
#include "singletons/Logging.hpp"
|
||||
@@ -163,7 +163,7 @@ Application::Application(Settings &_settings, const Paths &paths,
|
||||
, themes(new Theme(paths))
|
||||
, fonts(new Fonts(_settings))
|
||||
, logging(new Logging(_settings))
|
||||
, emotes(new Emotes)
|
||||
, emotes(new EmoteController)
|
||||
, accounts(new AccountController)
|
||||
, eventSub(makeEventSubController(_settings))
|
||||
, hotkeys(new HotkeyController)
|
||||
@@ -233,6 +233,7 @@ void Application::initialize(Settings &settings, const Paths &paths)
|
||||
{
|
||||
getSettings()->currentVersion.setValue(CHATTERINO_VERSION);
|
||||
}
|
||||
this->emotes->initialize();
|
||||
|
||||
this->accounts->load();
|
||||
|
||||
@@ -343,7 +344,7 @@ Fonts *Application::getFonts()
|
||||
return this->fonts.get();
|
||||
}
|
||||
|
||||
IEmotes *Application::getEmotes()
|
||||
EmoteController *Application::getEmotes()
|
||||
{
|
||||
assertInGuiThread();
|
||||
assert(this->emotes);
|
||||
|
||||
Reference in New Issue
Block a user