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/windowmanager.cpp
+6 -5
View File
@@ -331,16 +331,17 @@ IndirectChannel WindowManager::decodeChannel(const QJsonObject &obj)
{
util::assertInGuiThread();
auto app = getApp();
QString type = obj.value("type").toString();
if (type == "twitch") {
return providers::twitch::TwitchServer::getInstance().getOrAddChannel(
obj.value("name").toString());
return app->twitch.server->getOrAddChannel(obj.value("name").toString());
} else if (type == "mentions") {
return providers::twitch::TwitchServer::getInstance().mentionsChannel;
return app->twitch.server->mentionsChannel;
} else if (type == "watching") {
return providers::twitch::TwitchServer::getInstance().watchingChannel;
return app->twitch.server->watchingChannel;
} else if (type == "whispers") {
return providers::twitch::TwitchServer::getInstance().whispersChannel;
return app->twitch.server->whispersChannel;
}
return Channel::getEmpty();