chatterino2
Code Issues

chore: replace usages of obsolete twitch struct with backing field (#3614)

Browse Source 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
This commit is contained in:
James Upjohn
2022-03-20 00:02:29 +13:00
committed by GitHub
parent 4c275cb183
commit 67c10fafc7
23 changed files with 120 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/NativeMessaging.cpp
+3 -4
View File
@@ -240,8 +240,8 @@ void NativeMessagingServer::ReceiverThread::handleMessage(
postToThread([=] {
if (!name.isEmpty())
{
app->twitch.server->watchingChannel.reset(
app->twitch.server->getOrAddChannel(name));
app->twitch->watchingChannel.reset(
app->twitch->getOrAddChannel(name));
}
if (attach || attachFullscreen)
@@ -252,8 +252,7 @@ void NativeMessagingServer::ReceiverThread::handleMessage(
AttachedWindow::get(::GetForegroundWindow(), args);
if (!name.isEmpty())
{
window->setChannel(
app->twitch.server->getOrAddChannel(name));
window->setChannel(app->twitch->getOrAddChannel(name));
}
// }
// window->show();
src/singletons/WindowManager.cpp
+5 -5
View File
@@ -605,23 +605,23 @@ IndirectChannel WindowManager::decodeChannel(const SplitDescriptor &descriptor)
if (descriptor.type_ == "twitch")
{
return app->twitch.server->getOrAddChannel(descriptor.channelName_);
return app->twitch->getOrAddChannel(descriptor.channelName_);
}
else if (descriptor.type_ == "mentions")
{
return app->twitch.server->mentionsChannel;
return app->twitch->mentionsChannel;
}
else if (descriptor.type_ == "watching")
{
return app->twitch.server->watchingChannel;
return app->twitch->watchingChannel;
}
else if (descriptor.type_ == "whispers")
{
return app->twitch.server->whispersChannel;
return app->twitch->whispersChannel;
}
else if (descriptor.type_ == "live")
{
return app->twitch.server->liveChannel;
return app->twitch->liveChannel;
}
else if (descriptor.type_ == "irc")
{