jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-16 07:22:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move pending command, adjust CmakeLists.

Browse source 
Took 24 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 13:48:21 +02:00
parent c5bf87dfed
commit eb7c4cae6c
33 changed files with 96 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dialogs/dlg_create_game.cpp
View file

@ -1,6 +1,6 @@
#include "dlg_create_game.h"
#include "../server/pending_command.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../tabs/tab_room.h"
#include <QApplication>

2
cockatrice/src/game/deckview/deck_view_container.cpp
View file

@ -1,12 +1,12 @@
#include "deck_view_container.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../deck/deck_loader.h"
#include "../../dialogs/dlg_load_deck.h"
#include "../../dialogs/dlg_load_deck_from_clipboard.h"
#include "../../dialogs/dlg_load_deck_from_website.h"
#include "../../dialogs/dlg_load_remote_deck.h"
#include "../../interface/card_picture_loader/card_picture_loader.h"
#include "../../server/pending_command.h"
#include "../../tabs/tab_game.h"
#include "../game_scene.h"
#include "deck_view.h"

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

@ -1,7 +1,7 @@
#include "game_event_handler.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../server/pending_command.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../tabs/tab_game.h"
#include "abstract_game.h"
#include "log/message_log_widget.h"

4
cockatrice/src/game/zones/view_zone.cpp
View file

@ -1,6 +1,6 @@
#include "view_zone.h"
#include "../../server/pending_command.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../board/card_drag_item.h"
#include "../board/card_item.h"
#include "../player/player.h"
@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
reorganizeCards();
emit getLogic()->cardCountChanged();
emit getLogic() -> cardCountChanged();
}
// Because of boundingRect(), this function must not be called before the zone was added to a scene.

2
cockatrice/src/server/game_selector.cpp
View file

@ -1,6 +1,7 @@
#include "game_selector.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/get_text_with_max.h"
#include "../dialogs/dlg_create_game.h"
#include "../dialogs/dlg_filter_games.h"
@ -9,7 +10,6 @@
#include "../tabs/tab_room.h"
#include "../tabs/tab_supervisor.h"
#include "games_model.h"
#include "pending_command.h"
#include "user/user_list_manager.h"
#include <QApplication>

31
cockatrice/src/server/pending_command.cpp
View file

@ -1,31 +0,0 @@
#include "pending_command.h"
PendingCommand::PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData)
: commandContainer(_commandContainer), extraData(_extraData), ticks(0)
{
}
CommandContainer &PendingCommand::getCommandContainer()
{
return commandContainer;
}
void PendingCommand::setExtraData(const QVariant &_extraData)
{
extraData = _extraData;
}
QVariant PendingCommand::getExtraData() const
{
return extraData;
}
void PendingCommand::processResponse(const Response &response)
{
emit finished(response, commandContainer, extraData);
}
int PendingCommand::tick()
{
return ++ticks;
}

34
cockatrice/src/server/pending_command.h
View file

@ -1,34 +0,0 @@
/**
* @file pending_command.h
* @ingroup Messages
* @brief TODO: Document this.
*/
#ifndef PENDING_COMMAND_H
#define PENDING_COMMAND_H
#include <QVariant>
#include <libcockatrice/protocol/pb/commands.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
class PendingCommand : public QObject
{
Q_OBJECT
signals:
void finished(const Response &response, const CommandContainer &commandContainer, const QVariant &extraData);
private:
CommandContainer commandContainer;
QVariant extraData;
int ticks;
public:
explicit PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData = QVariant());
CommandContainer &getCommandContainer();
void setExtraData(const QVariant &_extraData);
QVariant getExtraData() const;
void processResponse(const Response &response);
int tick();
};
#endif

2
cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
View file

@ -1,7 +1,7 @@
#include "remote_decklist_tree_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../pending_command.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QFileIconProvider>
#include <QHeaderView>

2
cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
View file

@ -1,7 +1,7 @@
#include "remote_replay_list_tree_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../pending_command.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QFileIconProvider>
#include <QHeaderView>

2
cockatrice/src/server/user/user_context_menu.cpp
View file

@ -1,12 +1,12 @@
#include "user_context_menu.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../tabs/tab_account.h"
#include "../../tabs/tab_game.h"
#include "../../tabs/tab_supervisor.h"
#include "../chat_view/chat_view.h"
#include "../game_selector.h"
#include "../pending_command.h"
#include "user_info_box.h"
#include "user_list_manager.h"
#include "user_list_proxy.h"

2
cockatrice/src/server/user/user_info_box.cpp
View file

@ -1,12 +1,12 @@
#include "user_info_box.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../client/get_text_with_max.h"
#include "../../dialogs/dlg_edit_avatar.h"
#include "../../dialogs/dlg_edit_password.h"
#include "../../dialogs/dlg_edit_user.h"
#include "../../interface/pixel_map_generator.h"
#include "../pending_command.h"
#include <QDateTime>
#include <QGridLayout>

2
cockatrice/src/server/user/user_list_manager.cpp
View file

@ -1,8 +1,8 @@
#include "user_list_manager.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../client/sound_engine.h"
#include "../pending_command.h"
#include "user_info_box.h"
#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>

2
cockatrice/src/server/user/user_list_widget.cpp
View file

@ -1,11 +1,11 @@
#include "user_list_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../interface/pixel_map_generator.h"
#include "../../tabs/tab_account.h"
#include "../../tabs/tab_supervisor.h"
#include "../game_selector.h"
#include "../pending_command.h"
#include "user_context_menu.h"
#include "user_list_manager.h"

2
cockatrice/src/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,6 +1,7 @@
#include "abstract_tab_deck_editor.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/tapped_out_interface.h"
#include "../deck/deck_stats_interface.h"
#include "../dialogs/dlg_load_deck.h"
@ -9,7 +10,6 @@
#include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/pixel_map_generator.h"
#include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../server/pending_command.h"
#include "tab_supervisor.h"
#include <QAction>

2
cockatrice/src/tabs/tab_account.cpp
View file

@ -1,9 +1,9 @@
#include "tab_account.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h"
#include "../server/pending_command.h"
#include "../server/user/user_info_box.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"

2
cockatrice/src/tabs/tab_admin.cpp
View file

@ -1,7 +1,7 @@
#include "tab_admin.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../server/pending_command.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QDialogButtonBox>
#include <QGridLayout>

2
cockatrice/src/tabs/tab_deck_editor.cpp
View file

@ -1,6 +1,7 @@
#include "tab_deck_editor.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/deck_editor_menu.h"
#include "../client/tapped_out_interface.h"
#include "../dialogs/dlg_load_deck.h"
@ -10,7 +11,6 @@
#include "../interface/pixel_map_generator.h"
#include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
#include "../server/pending_command.h"
#include "tab_supervisor.h"
#include <QAction>

2
cockatrice/src/tabs/tab_deck_storage.cpp
View file

@ -1,8 +1,8 @@
#include "tab_deck_storage.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/get_text_with_max.h"
#include "../deck/deck_loader.h"
#include "../server/pending_command.h"
#include "../server/remote/remote_decklist_tree_widget.h"
#include <QAction>

2
cockatrice/src/tabs/tab_logs.cpp
View file

@ -1,9 +1,9 @@
#include "tab_logs.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../deck/custom_line_edit.h"
#include "../dialogs/dlg_manage_sets.h"
#include "../server/pending_command.h"
#include <QCheckBox>
#include <QDialogButtonBox>

2
cockatrice/src/tabs/tab_message.cpp
View file

@ -1,11 +1,11 @@
#include "tab_message.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h"
#include "../main.h"
#include "../server/chat_view/chat_view.h"
#include "../server/pending_command.h"
#include "../server/user/user_list_manager.h"
#include <QApplication>

2
cockatrice/src/tabs/tab_replays.cpp
View file

@ -1,7 +1,7 @@
#include "tab_replays.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../server/pending_command.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../server/remote/remote_replay_list_tree_widget.h"
#include "tab_game.h"

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

@ -1,11 +1,11 @@
#include "tab_room.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../dialogs/dlg_settings.h"
#include "../main.h"
#include "../server/chat_view/chat_view.h"
#include "../server/game_selector.h"
#include "../server/pending_command.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"
#include "tab_account.h"

2
cockatrice/src/tabs/tab_server.cpp
View file

@ -1,7 +1,7 @@
#include "tab_server.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../server/pending_command.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../server/user/user_list_widget.h"
#include "tab_supervisor.h"

2
cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -1,5 +1,6 @@
#include "tab_deck_editor_visual.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../deck/deck_list_model.h"
#include "../../deck/deck_stats_interface.h"
#include "../../filters/filter_builder.h"
@ -7,7 +8,6 @@
#include "../../interface/widgets/cards/card_info_frame_widget.h"
#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
#include "../../server/pending_command.h"
#include "../tab_deck_editor.h"
#include "../tab_supervisor.h"
#include "tab_deck_editor_visual_tab_widget.h"