push for now

This commit is contained in:
apa420
2018-08-19 19:02:49 +02:00
parent 21c4880ace
commit 8d5b93fe82
10 changed files with 170 additions and 90 deletions
+2 -3
View File
@@ -12,7 +12,6 @@
#include "providers/ffz/FfzEmotes.hpp"
#include "providers/twitch/PubsubClient.hpp"
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/DownloadManager.hpp"
#include "singletons/Fonts.hpp"
#include "singletons/Logging.hpp"
#include "singletons/NativeMessaging.hpp"
@@ -46,8 +45,8 @@ Application::Application(Settings &_settings, Paths &_paths)
, fonts(&this->emplace<Fonts>())
, emotes(&this->emplace<Emotes>())
, windows(&this->emplace<WindowManager>())
, toasts(&this->emplace<Toasts>())
, accounts(&this->emplace<AccountController>())
, commands(&this->emplace<CommandController>())
, highlights(&this->emplace<HighlightController>())
@@ -57,7 +56,7 @@ Application::Application(Settings &_settings, Paths &_paths)
, moderationActions(&this->emplace<ModerationActions>())
, twitch2(&this->emplace<TwitchServer>())
, logging(&this->emplace<Logging>())
, downloads(&this->emplace<DownloadManager>())
{
this->instance = this;