From 928cbd5babaef275a2ceff977834054e58b54d9a Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Tue, 14 Jan 2025 22:10:34 -0800
Subject: [PATCH] move file

---
 cockatrice/src/client/tabs/tab_supervisor.h                 | 2 +-
 cockatrice/src/server/chat_view/chat_view.cpp               | 1 +
 cockatrice/src/server/chat_view/chat_view.h                 | 2 +-
 cockatrice/src/server/user/user_context_menu.cpp            | 2 +-
 cockatrice/src/server/user/user_list_manager.h              | 2 +-
 cockatrice/src/server/{chat_view => user}/user_list_proxy.h | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename cockatrice/src/server/{chat_view => user}/user_list_proxy.h (100%)

diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h
index bab5daf22..7e9acbdb6 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.h
+++ b/cockatrice/src/client/tabs/tab_supervisor.h
@@ -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>
diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
index a78ccce10..c0bfeabce 100644
--- a/cockatrice/src/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -5,6 +5,7 @@
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
 #include "../user/user_context_menu.h"
+#include "../user/user_list_proxy.h"
 #include "user_level.h"
 
 #include <QApplication>
diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h
index cf5437dd4..c81d02a45 100644
--- a/cockatrice/src/server/chat_view/chat_view.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -5,7 +5,6 @@
 #include "../user/user_list_widget.h"
 #include "room_message_type.h"
 #include "user_level.h"
-#include "user_list_proxy.h"
 
 #include <QAction>
 #include <QColor>
@@ -16,6 +15,7 @@
 class QTextTable;
 class QMouseEvent;
 class UserContextMenu;
+class UserlistProxy;
 class TabGame;
 
 class UserMessagePosition
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index 4afeb9ed1..cd9403119 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -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>
diff --git a/cockatrice/src/server/user/user_list_manager.h b/cockatrice/src/server/user/user_list_manager.h
index 88be7a258..8cb6dcc32 100644
--- a/cockatrice/src/server/user/user_list_manager.h
+++ b/cockatrice/src/server/user/user_list_manager.h
@@ -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>
diff --git a/cockatrice/src/server/chat_view/user_list_proxy.h b/cockatrice/src/server/user/user_list_proxy.h
similarity index 100%
rename from cockatrice/src/server/chat_view/user_list_proxy.h
rename to cockatrice/src/server/user/user_list_proxy.h