jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-24 23:53:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move UserlistProxy to src/server/user and fix capitalization (#5475)

Browse source 
* move file

* fix capitalization
This commit is contained in:
RickyRister 2025-01-15 05:14:16 -08:00 • committed by GitHub
parent 2def02e140
commit 455d68f9ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
}
TabGame::TabGame(TabSupervisor *_tabSupervisor,
UserlistProxy *_userListProxy,
UserListProxy *_userListProxy,
QList<AbstractClient *> &_clients,
const Event_GameJoined &event,
const QMap<int, QString> &_roomGameTypes)

6
cockatrice/src/client/tabs/tab_game.h
View file

@ -11,7 +11,7 @@
#include <QCompleter>
#include <QMap>
class UserlistProxy;
class UserListProxy;
class DeckViewContainer;
class AbstractClient;
class CardDatabase;
@ -67,7 +67,7 @@ class TabGame : public Tab
private:
QTimer *gameTimer;
int secondsElapsed;
UserlistProxy *userListProxy;
UserListProxy *userListProxy;
QList<AbstractClient *> clients;
ServerInfo_Game gameInfo;
QMap<int, QString> roomGameTypes;
@ -212,7 +212,7 @@ private slots:
public:
TabGame(TabSupervisor *_tabSupervisor,
UserlistProxy *_userListProxy,
UserListProxy *_userListProxy,
QList<AbstractClient *> &_clients,
const Event_GameJoined &event,
const QMap<int, QString> &_roomGameTypes);

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

@ -36,7 +36,7 @@
TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
ServerInfo_User *_ownUser,
const UserlistProxy *_userListProxy,
const UserListProxy *_userListProxy,
const ServerInfo_Room &info)
: Tab(_tabSupervisor), client(_client), roomId(info.room_id()), roomName(QString::fromStdString(info.name())),
ownUser(_ownUser), userListProxy(_userListProxy)

6
cockatrice/src/client/tabs/tab_room.h
View file

@ -9,7 +9,7 @@
#include <QKeyEvent>
#include <QMap>
class UserlistProxy;
class UserListProxy;
class UserListManager;
namespace google
{
@ -51,7 +51,7 @@ private:
GameSelector *gameSelector;
UserListWidget *userList;
const UserlistProxy *userListProxy;
const UserListProxy *userListProxy;
ChatView *chatView;
QLabel *sayLabel;
LineEditCompleter *sayEdit;
@ -92,7 +92,7 @@ public:
TabRoom(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
ServerInfo_User *_ownUser,
const UserlistProxy *_userListProxy,
const UserListProxy *_userListProxy,
const ServerInfo_Room &info);
void retranslateUi() override;
void closeRequest(bool forced = false) override;

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

@ -2,7 +2,7 @@
#define TAB_SUPERVISOR_H
#include "../../deck/deck_loader.h"
#include "../../server/chat_view/user_list_proxy.h"
#include "../../server/user/user_list_proxy.h"
#include "visual_deck_storage/tab_deck_storage_visual.h"
#include <QAbstractButton>