chatterino2
Code Issues

Finish up singleton refactoring into one giant class

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/resourcemanager.cpp
+3 -6
View File
@@ -289,18 +289,15 @@ ResourceManager::ResourceManager()
, buttonTimeout(lli(":/images/button_timeout.png", 0.25))
{
qDebug() << "init ResourceManager";
}
void ResourceManager::initialize()
{
this->loadDynamicTwitchBadges();
this->loadChatterinoBadges();
}
ResourceManager &ResourceManager::getInstance()
{
static ResourceManager instance;
return instance;
}
ResourceManager::BadgeVersion::BadgeVersion(QJsonObject &&root)
: badgeImage1x(new messages::Image(root.value("image_url_1x").toString()))
, badgeImage2x(new messages::Image(root.value("image_url_2x").toString()))