From 72a7dd5ea61c14c9f0853c49e8427b1be2fe7208 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 13 Jan 2025 23:30:26 -0800 Subject: [PATCH] rename variables --- cockatrice/src/client/tabs/tab_room.cpp | 2 +- cockatrice/src/client/tabs/tab_supervisor.cpp | 70 +++++++++---------- cockatrice/src/client/tabs/tab_supervisor.h | 10 +-- cockatrice/src/game/games_model.cpp | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp index 363724103..a8c7140b9 100644 --- a/cockatrice/src/client/tabs/tab_room.cpp +++ b/cockatrice/src/client/tabs/tab_room.cpp @@ -282,7 +282,7 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event) QString senderName = QString::fromStdString(event.name()); QString message = QString::fromStdString(event.message()); - if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(senderName)) + if (tabSupervisor->getTabAccount()->getIgnoreList()->getUsers().contains(senderName)) return; UserListTWI *twi = userList->getUsers().value(senderName); diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index 677aa5c41..d3704661b 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/client/tabs/tab_supervisor.cpp @@ -102,7 +102,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/) TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent) : QTabWidget(parent), userInfo(0), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), tabServer(0), - tabUserLists(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0), tabLog(0) + tabAccount(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0), tabLog(0) { setElideMode(Qt::ElideRight); setMovable(true); @@ -137,9 +137,9 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget * aTabServer->setCheckable(true); connect(aTabServer, &QAction::toggled, this, &TabSupervisor::actTabServer); - aTabUserLists = new QAction(this); - aTabUserLists->setCheckable(true); - connect(aTabUserLists, &QAction::toggled, this, &TabSupervisor::actTabUserLists); + aTabAccount = new QAction(this); + aTabAccount->setCheckable(true); + connect(aTabAccount, &QAction::toggled, this, &TabSupervisor::actTabAccount); aTabDeckStorage = new QAction(this); aTabDeckStorage->setCheckable(true); @@ -182,7 +182,7 @@ void TabSupervisor::retranslateUi() aTabDeckEditor->setText(tr("Deck Editor")); aTabVisualDeckStorage->setText(tr("&Visual Deck storage")); aTabServer->setText(tr("Server")); - aTabUserLists->setText(tr("Account")); + aTabAccount->setText(tr("Account")); aTabDeckStorage->setText(tr("Deck storage")); aTabReplays->setText(tr("Game replays")); aTabAdmin->setText(tr("Administration")); @@ -194,7 +194,7 @@ void TabSupervisor::retranslateUi() tabs.append(tabReplays); tabs.append(tabDeckStorage); tabs.append(tabAdmin); - tabs.append(tabUserLists); + tabs.append(tabAccount); tabs.append(tabLog); QMapIterator roomIterator(roomTabs); while (roomIterator.hasNext()) @@ -295,10 +295,10 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) tabsMenu->addSeparator(); tabsMenu->addAction(aTabServer); - tabsMenu->addAction(aTabUserLists); + tabsMenu->addAction(aTabAccount); aTabServer->setChecked(true); - aTabUserLists->setChecked(true); + aTabAccount->setChecked(true); updatePingTime(0, -1); @@ -326,7 +326,7 @@ void TabSupervisor::startLocal(const QList &_clients) { resetTabsMenu(); - tabUserLists = 0; + tabAccount = 0; tabDeckStorage = 0; tabReplays = 0; tabAdmin = 0; @@ -357,8 +357,8 @@ void TabSupervisor::stop() emit localGameEnded(); } else { - if (tabUserLists) { - tabUserLists->closeRequest(true); + if (tabAccount) { + tabAccount->closeRequest(true); } if (tabServer) { tabServer->closeRequest(true); @@ -429,20 +429,20 @@ void TabSupervisor::actTabServer(bool checked) } } -void TabSupervisor::actTabUserLists(bool checked) +void TabSupervisor::actTabAccount(bool checked) { - if (checked && !tabUserLists) { - tabUserLists = new TabAccount(this, client, *userInfo); - connect(tabUserLists, &TabAccount::openMessageDialog, this, &TabSupervisor::addMessageTab); - connect(tabUserLists, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined); - connect(tabUserLists, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft); - myAddTab(tabUserLists); - connect(tabUserLists, &Tab::closed, this, [this] { - tabUserLists = nullptr; - aTabUserLists->setChecked(false); + if (checked && !tabAccount) { + tabAccount = new TabAccount(this, client, *userInfo); + connect(tabAccount, &TabAccount::openMessageDialog, this, &TabSupervisor::addMessageTab); + connect(tabAccount, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined); + connect(tabAccount, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft); + myAddTab(tabAccount); + connect(tabAccount, &Tab::closed, this, [this] { + tabAccount = nullptr; + aTabAccount->setChecked(false); }); - } else if (!checked && tabUserLists) { - tabUserLists->closeRequest(); + } else if (!checked && tabAccount) { + tabAccount->closeRequest(); } } @@ -616,7 +616,7 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus return nullptr; ServerInfo_User otherUser; - UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName); + UserListTWI *twi = tabAccount->getAllUsersList()->getUsers().value(receiverName); if (twi) otherUser = twi->getUserInfo(); else @@ -717,7 +717,7 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) if (!tab) tab = messageTabs.value(QString::fromStdString(event.receiver_name())); if (!tab) { - UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName); + UserListTWI *twi = tabAccount->getAllUsersList()->getUsers().value(senderName); if (twi) { UserLevelFlags userLevel = UserLevelFlags(twi->getUserInfo().user_level()); if (SettingsCache::instance().getIgnoreUnregisteredUserMessages() && @@ -754,7 +754,7 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined) { QString userName = QString::fromStdString(userInfoJoined.name()); if (isUserBuddy(userName)) { - Tab *tab = static_cast(getUserListsTab()); + Tab *tab = static_cast(getTabAccount()); if (tab != currentWidget()) { tab->setContentsChanged(true); @@ -861,33 +861,33 @@ QString TabSupervisor::getOwnUsername() const bool TabSupervisor::isUserBuddy(const QString &userName) const { - if (!getUserListsTab()) + if (!getTabAccount()) return false; - if (!getUserListsTab()->getBuddyList()) + if (!getTabAccount()->getBuddyList()) return false; - QMap buddyList = getUserListsTab()->getBuddyList()->getUsers(); + QMap buddyList = getTabAccount()->getBuddyList()->getUsers(); bool senderIsBuddy = buddyList.contains(userName); return senderIsBuddy; } bool TabSupervisor::isUserIgnored(const QString &userName) const { - if (!getUserListsTab()) + if (!getTabAccount()) return false; - if (!getUserListsTab()->getIgnoreList()) + if (!getTabAccount()->getIgnoreList()) return false; - QMap buddyList = getUserListsTab()->getIgnoreList()->getUsers(); + QMap buddyList = getTabAccount()->getIgnoreList()->getUsers(); bool senderIsBuddy = buddyList.contains(userName); return senderIsBuddy; } const ServerInfo_User *TabSupervisor::getOnlineUser(const QString &userName) const { - if (!getUserListsTab()) + if (!getTabAccount()) return nullptr; - if (!getUserListsTab()->getAllUsersList()) + if (!getTabAccount()->getAllUsersList()) return nullptr; - QMap userList = getUserListsTab()->getAllUsersList()->getUsers(); + QMap userList = getTabAccount()->getAllUsersList()->getUsers(); const QString &userNameToMatchLower = userName.toLower(); QMap::iterator i; diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index d2fe6fe4e..d193b285c 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -72,7 +72,7 @@ private: QMenu *tabsMenu; TabDeckStorageVisual *tabVisualDeckStorage; TabServer *tabServer; - TabAccount *tabUserLists; + TabAccount *tabAccount; TabDeckStorage *tabDeckStorage; TabReplays *tabReplays; TabAdmin *tabAdmin; @@ -84,7 +84,7 @@ private: QList deckEditorTabs; bool isLocalGame; - QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabUserLists, *aTabDeckStorage, *aTabReplays, + QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog; int myAddTab(Tab *tab); @@ -108,9 +108,9 @@ public: { return gameTabs.size(); } - TabAccount *getUserListsTab() const + TabAccount *getTabAccount() const { - return tabUserLists; + return tabAccount; } ServerInfo_User *getUserInfo() const { @@ -145,7 +145,7 @@ private slots: void actTabVisualDeckStorage(bool checked); void actTabServer(bool checked); - void actTabUserLists(bool checked); + void actTabAccount(bool checked); void actTabDeckStorage(bool checked); void actTabReplays(bool checked); void actTabAdmin(bool checked); diff --git a/cockatrice/src/game/games_model.cpp b/cockatrice/src/game/games_model.cpp index dd3332e84..4d3104a19 100644 --- a/cockatrice/src/game/games_model.cpp +++ b/cockatrice/src/game/games_model.cpp @@ -508,7 +508,7 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const if (!showBuddiesOnlyGames && game.only_buddies()) { return false; } - if (hideIgnoredUserGames && tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains( + if (hideIgnoredUserGames && tabSupervisor->getTabAccount()->getIgnoreList()->getUsers().contains( QString::fromStdString(game.creator_info().name()))) { return false; }