mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-17 07:52:16 -07:00
Move UserlistProxy to src/server/user and fix capitalization (#5475)
* move file * fix capitalization
This commit is contained in:
parent
2def02e140
commit
455d68f9ea
15 changed files with 34 additions and 33 deletions
|
|
@ -5,7 +5,6 @@
|
|||
#include "../../client/tabs/tab_game.h"
|
||||
#include "../../client/tabs/tab_supervisor.h"
|
||||
#include "../../game/game_selector.h"
|
||||
#include "../../server/chat_view/user_list_proxy.h"
|
||||
#include "../chat_view/chat_view.h"
|
||||
#include "../pending_command.h"
|
||||
#include "pb/command_kick_from_game.pb.h"
|
||||
|
|
@ -19,6 +18,7 @@
|
|||
#include "pb/response_warn_list.pb.h"
|
||||
#include "pb/session_commands.pb.h"
|
||||
#include "user_info_box.h"
|
||||
#include "user_list_proxy.h"
|
||||
#include "user_list_widget.h"
|
||||
|
||||
#include <QAction>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
#include <QtWidgets>
|
||||
|
||||
UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor,
|
||||
const UserlistProxy *_userListProxy,
|
||||
const UserListProxy *_userListProxy,
|
||||
QWidget *parent,
|
||||
TabGame *_game)
|
||||
: QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include <QObject>
|
||||
|
||||
class UserlistProxy;
|
||||
class UserListProxy;
|
||||
class AbstractClient;
|
||||
class ChatView;
|
||||
class CommandContainer;
|
||||
|
|
@ -23,7 +23,7 @@ class UserContextMenu : public QObject
|
|||
private:
|
||||
AbstractClient *client;
|
||||
TabSupervisor *tabSupervisor;
|
||||
const UserlistProxy *userListProxy;
|
||||
const UserListProxy *userListProxy;
|
||||
TabGame *game;
|
||||
|
||||
QAction *aUserName;
|
||||
|
|
@ -55,7 +55,7 @@ private slots:
|
|||
|
||||
public:
|
||||
UserContextMenu(TabSupervisor *_tabSupervisor,
|
||||
const UserlistProxy *_userListProxy,
|
||||
const UserListProxy *_userListProxy,
|
||||
QWidget *_parent,
|
||||
TabGame *_game = 0);
|
||||
void retranslateUi();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef COCKATRICE_USER_LIST_MANAGER_H
|
||||
#define COCKATRICE_USER_LIST_MANAGER_H
|
||||
|
||||
#include "../chat_view/user_list_proxy.h"
|
||||
#include "pb/serverinfo_user.pb.h"
|
||||
#include "user_list_proxy.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QWidget>
|
||||
|
|
@ -17,7 +17,7 @@ class Response;
|
|||
class ServerInfo_User;
|
||||
class TabSupervisor;
|
||||
|
||||
class UserListManager : public QWidget, public UserlistProxy
|
||||
class UserListManager : public QWidget, public UserListProxy
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
21
cockatrice/src/server/user/user_list_proxy.h
Normal file
21
cockatrice/src/server/user/user_list_proxy.h
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#ifndef COCKATRICE_USERLISTPROXY_H
|
||||
#define COCKATRICE_USERLISTPROXY_H
|
||||
|
||||
class QString;
|
||||
class ServerInfo_User;
|
||||
|
||||
/**
|
||||
* Responsible for providing a bare-bones minimal interface into userlist information,
|
||||
* including your current connection to the server as well as buddy/ignore/alluser lists.
|
||||
*/
|
||||
class UserListProxy
|
||||
{
|
||||
public:
|
||||
virtual bool isOwnUserRegistered() const = 0;
|
||||
virtual QString getOwnUsername() const = 0;
|
||||
virtual bool isUserBuddy(const QString &userName) const = 0;
|
||||
virtual bool isUserIgnored(const QString &userName) const = 0;
|
||||
virtual const ServerInfo_User *getOnlineUser(const QString &userName) const = 0; // Can return nullptr
|
||||
};
|
||||
|
||||
#endif // COCKATRICE_USERLISTPROXY_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue