jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename variables

Browse source
This commit is contained in:
RickyRister 2025-01-13 23:30:26 -08:00
parent a1f40aa3ba
commit 72a7dd5ea6
4 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/tab_room.cpp
View file

@ -282,7 +282,7 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
QString senderName = QString::fromStdString(event.name()); QString senderName = QString::fromStdString(event.name());
QString message = QString::fromStdString(event.message()); QString message = QString::fromStdString(event.message());
if (tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains(senderName)) if (tabSupervisor->getTabAccount()->getIgnoreList()->getUsers().contains(senderName))
return; return;
UserListTWI *twi = userList->getUsers().value(senderName); UserListTWI *twi = userList->getUsers().value(senderName);

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

@ -102,7 +102,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent) TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent)
: QTabWidget(parent), userInfo(0), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), tabServer(0), : 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); setElideMode(Qt::ElideRight);
setMovable(true); setMovable(true);
@ -137,9 +137,9 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
aTabServer->setCheckable(true); aTabServer->setCheckable(true);
connect(aTabServer, &QAction::toggled, this, &TabSupervisor::actTabServer); connect(aTabServer, &QAction::toggled, this, &TabSupervisor::actTabServer);
aTabUserLists = new QAction(this); aTabAccount = new QAction(this);
aTabUserLists->setCheckable(true); aTabAccount->setCheckable(true);
connect(aTabUserLists, &QAction::toggled, this, &TabSupervisor::actTabUserLists); connect(aTabAccount, &QAction::toggled, this, &TabSupervisor::actTabAccount);
aTabDeckStorage = new QAction(this); aTabDeckStorage = new QAction(this);
aTabDeckStorage->setCheckable(true); aTabDeckStorage->setCheckable(true);
@ -182,7 +182,7 @@ void TabSupervisor::retranslateUi()
aTabDeckEditor->setText(tr("Deck Editor")); aTabDeckEditor->setText(tr("Deck Editor"));
aTabVisualDeckStorage->setText(tr("&Visual Deck storage")); aTabVisualDeckStorage->setText(tr("&Visual Deck storage"));
aTabServer->setText(tr("Server")); aTabServer->setText(tr("Server"));
aTabUserLists->setText(tr("Account")); aTabAccount->setText(tr("Account"));
aTabDeckStorage->setText(tr("Deck storage")); aTabDeckStorage->setText(tr("Deck storage"));
aTabReplays->setText(tr("Game replays")); aTabReplays->setText(tr("Game replays"));
aTabAdmin->setText(tr("Administration")); aTabAdmin->setText(tr("Administration"));
@ -194,7 +194,7 @@ void TabSupervisor::retranslateUi()
tabs.append(tabReplays); tabs.append(tabReplays);
tabs.append(tabDeckStorage); tabs.append(tabDeckStorage);
tabs.append(tabAdmin); tabs.append(tabAdmin);
tabs.append(tabUserLists); tabs.append(tabAccount);
tabs.append(tabLog); tabs.append(tabLog);
QMapIterator<int, TabRoom *> roomIterator(roomTabs); QMapIterator<int, TabRoom *> roomIterator(roomTabs);
while (roomIterator.hasNext()) while (roomIterator.hasNext())
@ -295,10 +295,10 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
tabsMenu->addSeparator(); tabsMenu->addSeparator();
tabsMenu->addAction(aTabServer); tabsMenu->addAction(aTabServer);
tabsMenu->addAction(aTabUserLists); tabsMenu->addAction(aTabAccount);
aTabServer->setChecked(true); aTabServer->setChecked(true);
aTabUserLists->setChecked(true); aTabAccount->setChecked(true);
updatePingTime(0, -1); updatePingTime(0, -1);
@ -326,7 +326,7 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
{ {
resetTabsMenu(); resetTabsMenu();
tabUserLists = 0; tabAccount = 0;
tabDeckStorage = 0; tabDeckStorage = 0;
tabReplays = 0; tabReplays = 0;
tabAdmin = 0; tabAdmin = 0;
@ -357,8 +357,8 @@ void TabSupervisor::stop()
emit localGameEnded(); emit localGameEnded();
} else { } else {
if (tabUserLists) { if (tabAccount) {
tabUserLists->closeRequest(true); tabAccount->closeRequest(true);
} }
if (tabServer) { if (tabServer) {
tabServer->closeRequest(true); 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) { if (checked && !tabAccount) {
tabUserLists = new TabAccount(this, client, *userInfo); tabAccount = new TabAccount(this, client, *userInfo);
connect(tabUserLists, &TabAccount::openMessageDialog, this, &TabSupervisor::addMessageTab); connect(tabAccount, &TabAccount::openMessageDialog, this, &TabSupervisor::addMessageTab);
connect(tabUserLists, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined); connect(tabAccount, &TabAccount::userJoined, this, &TabSupervisor::processUserJoined);
connect(tabUserLists, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft); connect(tabAccount, &TabAccount::userLeft, this, &TabSupervisor::processUserLeft);
myAddTab(tabUserLists); myAddTab(tabAccount);
connect(tabUserLists, &Tab::closed, this, [this] { connect(tabAccount, &Tab::closed, this, [this] {
tabUserLists = nullptr; tabAccount = nullptr;
aTabUserLists->setChecked(false); aTabAccount->setChecked(false);
}); });
} else if (!checked && tabUserLists) { } else if (!checked && tabAccount) {
tabUserLists->closeRequest(); tabAccount->closeRequest();
} }
} }
@ -616,7 +616,7 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
return nullptr; return nullptr;
ServerInfo_User otherUser; ServerInfo_User otherUser;
UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName); UserListTWI *twi = tabAccount->getAllUsersList()->getUsers().value(receiverName);
if (twi) if (twi)
otherUser = twi->getUserInfo(); otherUser = twi->getUserInfo();
else else
@ -717,7 +717,7 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
if (!tab) if (!tab)
tab = messageTabs.value(QString::fromStdString(event.receiver_name())); tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
if (!tab) { if (!tab) {
UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName); UserListTWI *twi = tabAccount->getAllUsersList()->getUsers().value(senderName);
if (twi) { if (twi) {
UserLevelFlags userLevel = UserLevelFlags(twi->getUserInfo().user_level()); UserLevelFlags userLevel = UserLevelFlags(twi->getUserInfo().user_level());
if (SettingsCache::instance().getIgnoreUnregisteredUserMessages() && if (SettingsCache::instance().getIgnoreUnregisteredUserMessages() &&
@ -754,7 +754,7 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
{ {
QString userName = QString::fromStdString(userInfoJoined.name()); QString userName = QString::fromStdString(userInfoJoined.name());
if (isUserBuddy(userName)) { if (isUserBuddy(userName)) {
Tab *tab = static_cast<Tab *>(getUserListsTab()); Tab *tab = static_cast<Tab *>(getTabAccount());
if (tab != currentWidget()) { if (tab != currentWidget()) {
tab->setContentsChanged(true); tab->setContentsChanged(true);
@ -861,33 +861,33 @@ QString TabSupervisor::getOwnUsername() const
bool TabSupervisor::isUserBuddy(const QString &userName) const bool TabSupervisor::isUserBuddy(const QString &userName) const
{ {
if (!getUserListsTab()) if (!getTabAccount())
return false; return false;
if (!getUserListsTab()->getBuddyList()) if (!getTabAccount()->getBuddyList())
return false; return false;
QMap<QString, UserListTWI *> buddyList = getUserListsTab()->getBuddyList()->getUsers(); QMap<QString, UserListTWI *> buddyList = getTabAccount()->getBuddyList()->getUsers();
bool senderIsBuddy = buddyList.contains(userName); bool senderIsBuddy = buddyList.contains(userName);
return senderIsBuddy; return senderIsBuddy;
} }
bool TabSupervisor::isUserIgnored(const QString &userName) const bool TabSupervisor::isUserIgnored(const QString &userName) const
{ {
if (!getUserListsTab()) if (!getTabAccount())
return false; return false;
if (!getUserListsTab()->getIgnoreList()) if (!getTabAccount()->getIgnoreList())
return false; return false;
QMap<QString, UserListTWI *> buddyList = getUserListsTab()->getIgnoreList()->getUsers(); QMap<QString, UserListTWI *> buddyList = getTabAccount()->getIgnoreList()->getUsers();
bool senderIsBuddy = buddyList.contains(userName); bool senderIsBuddy = buddyList.contains(userName);
return senderIsBuddy; return senderIsBuddy;
} }
const ServerInfo_User *TabSupervisor::getOnlineUser(const QString &userName) const const ServerInfo_User *TabSupervisor::getOnlineUser(const QString &userName) const
{ {
if (!getUserListsTab()) if (!getTabAccount())
return nullptr; return nullptr;
if (!getUserListsTab()->getAllUsersList()) if (!getTabAccount()->getAllUsersList())
return nullptr; return nullptr;
QMap<QString, UserListTWI *> userList = getUserListsTab()->getAllUsersList()->getUsers(); QMap<QString, UserListTWI *> userList = getTabAccount()->getAllUsersList()->getUsers();
const QString &userNameToMatchLower = userName.toLower(); const QString &userNameToMatchLower = userName.toLower();
QMap<QString, UserListTWI *>::iterator i; QMap<QString, UserListTWI *>::iterator i;

10
cockatrice/src/client/tabs/tab_supervisor.h
View file

@ -72,7 +72,7 @@ private:
QMenu *tabsMenu; QMenu *tabsMenu;
TabDeckStorageVisual *tabVisualDeckStorage; TabDeckStorageVisual *tabVisualDeckStorage;
TabServer *tabServer; TabServer *tabServer;
TabAccount *tabUserLists; TabAccount *tabAccount;
TabDeckStorage *tabDeckStorage; TabDeckStorage *tabDeckStorage;
TabReplays *tabReplays; TabReplays *tabReplays;
TabAdmin *tabAdmin; TabAdmin *tabAdmin;
@ -84,7 +84,7 @@ private:
QList<TabDeckEditor *> deckEditorTabs; QList<TabDeckEditor *> deckEditorTabs;
bool isLocalGame; bool isLocalGame;
QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabUserLists, *aTabDeckStorage, *aTabReplays, QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays,
*aTabAdmin, *aTabLog; *aTabAdmin, *aTabLog;
int myAddTab(Tab *tab); int myAddTab(Tab *tab);
@ -108,9 +108,9 @@ public:
{ {
return gameTabs.size(); return gameTabs.size();
} }
TabAccount *getUserListsTab() const TabAccount *getTabAccount() const
{ {
return tabUserLists; return tabAccount;
} }
ServerInfo_User *getUserInfo() const ServerInfo_User *getUserInfo() const
{ {
@ -145,7 +145,7 @@ private slots:
void actTabVisualDeckStorage(bool checked); void actTabVisualDeckStorage(bool checked);
void actTabServer(bool checked); void actTabServer(bool checked);
void actTabUserLists(bool checked); void actTabAccount(bool checked);
void actTabDeckStorage(bool checked); void actTabDeckStorage(bool checked);
void actTabReplays(bool checked); void actTabReplays(bool checked);
void actTabAdmin(bool checked); void actTabAdmin(bool checked);

2
cockatrice/src/game/games_model.cpp
View file

@ -508,7 +508,7 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
if (!showBuddiesOnlyGames && game.only_buddies()) { if (!showBuddiesOnlyGames && game.only_buddies()) {
return false; return false;
} }
if (hideIgnoredUserGames && tabSupervisor->getUserListsTab()->getIgnoreList()->getUsers().contains( if (hideIgnoredUserGames && tabSupervisor->getTabAccount()->getIgnoreList()->getUsers().contains(
QString::fromStdString(game.creator_info().name()))) { QString::fromStdString(game.creator_info().name()))) {
return false; return false;
} }