renamed resources to ResourceManager

This commit is contained in:
2017-12-31 02:21:33 +01:00
parent bfa2f1637e
commit ad001431f2
9 changed files with 44 additions and 44 deletions
+3 -3
View File
@@ -3,10 +3,10 @@
#include "channel.hpp"
#include "debug/log.hpp"
#include "messages/messageparseargs.hpp"
#include "resources.hpp"
#include "singletons/accountmanager.hpp"
#include "singletons/channelmanager.hpp"
#include "singletons/emotemanager.hpp"
#include "singletons/resourcemanager.hpp"
#include "singletons/settingsmanager.hpp"
#include "singletons/windowmanager.hpp"
#include "twitch/twitchmessagebuilder.hpp"
@@ -27,7 +27,7 @@ using namespace chatterino::messages;
namespace chatterino {
IrcManager::IrcManager(ChannelManager &_channelManager, Resources &_resources,
IrcManager::IrcManager(ChannelManager &_channelManager, ResourceManager &_resources,
AccountManager &_accountManager)
: channelManager(_channelManager)
, resources(_resources)
@@ -70,7 +70,7 @@ IrcManager::IrcManager(ChannelManager &_channelManager, Resources &_resources,
IrcManager &IrcManager::getInstance()
{
static IrcManager instance(ChannelManager::getInstance(), Resources::getInstance(),
static IrcManager instance(ChannelManager::getInstance(), ResourceManager::getInstance(),
AccountManager::getInstance());
return instance;
}