From 5d4dfff9da825b42a5de40fa04ee072423288e03 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Fri, 19 Sep 2025 13:21:56 +0200 Subject: [PATCH] move message_log_widget to game --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/client/tabs/tab_game.cpp | 2 +- cockatrice/src/client/tabs/tab_game.h | 2 +- cockatrice/src/game/game_event_handler.cpp | 4 ++-- .../{server => game/log}/message_log_widget.cpp | 16 ++++++++-------- .../{server => game/log}/message_log_widget.h | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) rename cockatrice/src/{server => game/log}/message_log_widget.cpp (99%) rename cockatrice/src/{server => game/log}/message_log_widget.h (97%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index e02934128..730e5c2db 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -222,6 +222,7 @@ set(cockatrice_SOURCES src/game/game_view.cpp src/game/games_model.cpp src/game/hand_counter.cpp + src/game/log/message_log_widget.cpp src/game/phase.cpp src/game/player/event_processing_options.h src/game/player/player.cpp @@ -267,7 +268,6 @@ set(cockatrice_SOURCES src/server/local_client.cpp src/server/local_server.cpp src/server/local_server_interface.cpp - src/server/message_log_widget.cpp src/server/pending_command.cpp src/server/remote/remote_client.cpp src/server/remote/remote_decklist_tree_widget.cpp diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index 6ffb6668d..a36c9a5c7 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -11,13 +11,13 @@ #include "../../game/game.h" #include "../../game/game_scene.h" #include "../../game/game_view.h" +#include "../../game/log/message_log_widget.h" #include "../../game/player/player.h" #include "../../game/player/player_list_widget.h" #include "../../game/replay.h" #include "../../game/zones/card_zone.h" #include "../../main.h" #include "../../server/abstract_client.h" -#include "../../server/message_log_widget.h" #include "../../server/user/user_list_manager.h" #include "../../settings/cache_settings.h" #include "../network/replay_timeline_widget.h" diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 1ebbef9d2..c25b04f8b 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -3,8 +3,8 @@ #include "../../client/tearoff_menu.h" #include "../../game/abstract_game.h" +#include "../../game/log/message_log_widget.h" #include "../../game/player/player.h" -#include "../../server/message_log_widget.h" #include "../replay_manager.h" #include "../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "pb/event_leave.pb.h" diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index d2dd97a2c..859672972 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -2,10 +2,10 @@ #include "../client/tabs/tab_game.h" #include "../server/abstract_client.h" -#include "../server/message_log_widget.h" #include "../server/pending_command.h" #include "abstract_game.h" #include "get_pb_extension.h" +#include "log/message_log_widget.h" #include "pb/command_concede.pb.h" #include "pb/command_delete_arrow.pb.h" #include "pb/command_game_say.pb.h" @@ -501,4 +501,4 @@ void GameEventHandler::eventSetActivePhase(const Event_SetActivePhase &event, } game->getGameState()->setCurrentPhase(phase); emitUserEvent(); -} \ No newline at end of file +} diff --git a/cockatrice/src/server/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp similarity index 99% rename from cockatrice/src/server/message_log_widget.cpp rename to cockatrice/src/game/log/message_log_widget.cpp index 7cf8522d9..dd5151fa7 100644 --- a/cockatrice/src/server/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,13 +1,13 @@ #include "message_log_widget.h" -#include "../client/sound_engine.h" -#include "../client/tabs/tab_game.h" -#include "../client/translate_counter_name.h" -#include "../game/board/card_item.h" -#include "../game/phase.h" -#include "../game/player/player.h" -#include "../game/zones/card_zone.h" -#include "../settings/card_counter_settings.h" +#include "../../client/sound_engine.h" +#include "../../client/tabs/tab_game.h" +#include "../../client/translate_counter_name.h" +#include "../../settings/card_counter_settings.h" +#include "../board/card_item.h" +#include "../phase.h" +#include "../player/player.h" +#include "../zones/card_zone.h" #include "pb/context_move_card.pb.h" #include "pb/context_mulligan.pb.h" #include "pb/serverinfo_user.pb.h" diff --git a/cockatrice/src/server/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h similarity index 97% rename from cockatrice/src/server/message_log_widget.h rename to cockatrice/src/game/log/message_log_widget.h index e496bb4e9..b7b1c7902 100644 --- a/cockatrice/src/server/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -1,9 +1,9 @@ #ifndef MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H -#include "../client/translation.h" -#include "../game/zones/logic/card_zone_logic.h" -#include "chat_view/chat_view.h" +#include "../../client/translation.h" +#include "../../server/chat_view/chat_view.h" +#include "../zones/logic/card_zone_logic.h" #include "user_level.h" class AbstractGame;