jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: Simplify closeRequest and remove closed signal (#6062)

Browse source 
* Refactor: simplify closeRequest and remove closed signal

* clean up closeRequest usages
This commit is contained in:
RickyRister 2025-08-01 19:45:54 -07:00 • committed by GitHub
parent fd12a1f6be
commit 04be0fe634
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 61 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/client/tabs/tab_supervisor.cpp
View file

@ -364,7 +364,7 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager
// If managed, all close requests should go through the menu action
connect(closeButton, &CloseButton::clicked, this, [manager] { checkAndTrigger(manager, false); });
} else {
connect(closeButton, &CloseButton::clicked, tab, [tab] { tab->closeRequest(); });
connect(closeButton, &CloseButton::clicked, tab, &Tab::closeRequest);
}
tabBar()->setTabButton(tabIndex, closeSide, closeButton);
}
@ -458,16 +458,16 @@ void TabSupervisor::stop()
emit localGameEnded();
} else {
if (tabAccount) {
tabAccount->closeRequest(true);
tabAccount->close();
}
if (tabServer) {
tabServer->closeRequest(true);
tabServer->close();
}
if (tabAdmin) {
tabAdmin->closeRequest(true);
tabAdmin->close();
}
if (tabLog) {
tabLog->closeRequest(true);
tabLog->close();
}
}
@ -486,7 +486,7 @@ void TabSupervisor::stop()
}
for (const auto tab : tabsToDelete) {
tab->closeRequest(true);
tab->close();
}
userListManager->handleDisconnect();
@ -510,7 +510,7 @@ void TabSupervisor::openTabVisualDeckStorage()
{
tabVisualDeckStorage = new TabDeckStorageVisual(this);
myAddTab(tabVisualDeckStorage, aTabVisualDeckStorage);
connect(tabVisualDeckStorage, &Tab::closed, this, [this] {
connect(tabVisualDeckStorage, &QObject::destroyed, this, [this] {
tabVisualDeckStorage = nullptr;
aTabVisualDeckStorage->setChecked(false);
});
@ -533,7 +533,7 @@ void TabSupervisor::openTabServer()
tabServer = new TabServer(this, client);
connect(tabServer, &TabServer::roomJoined, this, &TabSupervisor::addRoomTab);
myAddTab(tabServer, aTabServer);
connect(tabServer, &Tab::closed, this, [this] {
connect(tabServer, &QObject::destroyed, this, [this] {
tabServer = nullptr;
aTabServer->setChecked(false);
});
@ -558,7 +558,7 @@ void TabSupervisor::openTabAccount()
connect(tabAccount, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined);
connect(tabAccount, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft);
myAddTab(tabAccount, aTabAccount);
connect(tabAccount, &Tab::closed, this, [this] {
connect(tabAccount, &QObject::destroyed, this, [this] {
tabAccount = nullptr;
aTabAccount->setChecked(false);
});
@ -581,7 +581,7 @@ void TabSupervisor::openTabDeckStorage()
tabDeckStorage = new TabDeckStorage(this, client, userInfo);
connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::openDeckInNewTab);
myAddTab(tabDeckStorage, aTabDeckStorage);
connect(tabDeckStorage, &Tab::closed, this, [this] {
connect(tabDeckStorage, &QObject::destroyed, this, [this] {
tabDeckStorage = nullptr;
aTabDeckStorage->setChecked(false);
});
@ -604,7 +604,7 @@ void TabSupervisor::openTabReplays()
tabReplays = new TabReplays(this, client, userInfo);
connect(tabReplays, &TabReplays::openReplay, this, &TabSupervisor::openReplay);
myAddTab(tabReplays, aTabReplays);
connect(tabReplays, &Tab::closed, this, [this] {
connect(tabReplays, &QObject::destroyed, this, [this] {
tabReplays = nullptr;
aTabReplays->setChecked(false);
});
@ -627,7 +627,7 @@ void TabSupervisor::openTabAdmin()
tabAdmin = new TabAdmin(this, client, (userInfo->user_level() & ServerInfo_User::IsAdmin));
connect(tabAdmin, &TabAdmin::adminLockChanged, this, &TabSupervisor::adminLockChanged);
myAddTab(tabAdmin, aTabAdmin);
connect(tabAdmin, &Tab::closed, this, [this] {
connect(tabAdmin, &QObject::destroyed, this, [this] {
tabAdmin = nullptr;
aTabAdmin->setChecked(false);
});
@ -649,7 +649,7 @@ void TabSupervisor::openTabLog()
{
tabLog = new TabLog(this, client);
myAddTab(tabLog, aTabLog);
connect(tabLog, &Tab::closed, this, [this] {
connect(tabLog, &QObject::destroyed, this, [this] {
tabLog = nullptr;
aTabAdmin->setChecked(false);
});