jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

squash #6158 (#6160)

Browse source 
* move message_log_widget to game

* move files

* update headers

* fix cmakelists

* oracle fixes

* split implementation out to cpp

* fix recursive import

* fix main file

* format
This commit is contained in:
ebbit1q 2025-09-20 14:35:52 +02:00 • committed by GitHub
parent f484c98152
commit 17dcaf9afa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
337 changed files with 728 additions and 721 deletions
Download patch file Download diff file Expand all files Collapse all files

315
cockatrice/CMakeLists.txt
View file

@ -9,149 +9,17 @@ set(cockatrice_SOURCES
# sort by alphabetical order, so that there is no debate about where to add new sources to the list
src/card/card_info.cpp
src/card/exact_card.cpp
src/client/deck_editor_menu.cpp
src/client/get_text_with_max.cpp
src/client/menus/deck_editor/deck_editor_menu.cpp
src/client/network/client_update_checker.cpp
src/client/network/parsers/deck_link_to_api_transformer.cpp
src/client/network/release_channel.cpp
src/client/network/replay_timeline_widget.cpp
src/client/network/sets_model.cpp
src/client/network/spoiler_background_updater.cpp
src/client/network/parsers/deck_link_to_api_transformer.cpp
src/client/replay_manager.cpp
src/client/sound_engine.cpp
src/client/tabs/abstract_tab_deck_editor.cpp
src/client/tabs/api/edhrec/tab_edhrec.cpp
src/client/tabs/api/edhrec/tab_edhrec_main.cpp
src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
src/client/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
src/client/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
src/client/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
src/client/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
src/client/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
src/client/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
src/client/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
src/client/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
src/client/tabs/tab.cpp
src/client/tabs/tab_account.cpp
src/client/tabs/tab_admin.cpp
src/client/tabs/tab_deck_editor.cpp
src/client/tabs/tab_deck_storage.cpp
src/client/tabs/tab_game.cpp
src/client/tabs/tab_home.cpp
src/client/tabs/tab_logs.cpp
src/client/tabs/tab_message.cpp
src/client/tabs/tab_replays.cpp
src/client/tabs/tab_room.cpp
src/client/tabs/tab_server.cpp
src/client/tabs/tab_supervisor.cpp
src/client/tabs/tab_visual_database_display.cpp
src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
src/client/tapped_out_interface.cpp
src/client/translate_counter_name.cpp
src/client/ui/layouts/flow_layout.cpp
src/client/ui/layouts/overlap_layout.cpp
src/client/ui/line_edit_completer.cpp
src/client/ui/phases_toolbar.cpp
src/client/ui/picture_loader/picture_loader.cpp
src/client/ui/picture_loader/picture_loader_local.cpp
src/client/ui/picture_loader/picture_loader_request_status_display_widget.cpp
src/client/ui/picture_loader/picture_loader_status_bar.cpp
src/client/ui/picture_loader/picture_loader_worker.cpp
src/client/ui/picture_loader/picture_loader_worker_work.cpp
src/client/ui/picture_loader/picture_to_load.cpp
src/client/ui/pixel_map_generator.cpp
src/client/ui/theme_manager.cpp
src/client/ui/tip_of_the_day.cpp
src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp
src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp
src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp
src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
src/client/ui/widgets/cards/card_info_display_widget.cpp
src/client/ui/widgets/cards/card_info_frame_widget.cpp
src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp
src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp
src/client/ui/widgets/cards/card_info_picture_widget.cpp
src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
src/client/ui/widgets/cards/card_info_text_widget.cpp
src/client/ui/widgets/cards/card_size_widget.cpp
src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
src/client/ui/widgets/deck_analytics/deck_analytics_widget.cpp
src/client/ui/widgets/deck_analytics/mana_base_widget.cpp
src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp
src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp
src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
src/client/ui/widgets/general/background_sources.cpp
src/client/ui/widgets/general/home_styled_button.cpp
src/client/ui/widgets/general/home_widget.cpp
src/client/ui/widgets/general/display/banner_widget.cpp
src/client/ui/widgets/general/display/bar_widget.cpp
src/client/ui/widgets/general/display/dynamic_font_size_label.cpp
src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp
src/client/ui/widgets/general/display/labeled_input.cpp
src/client/ui/widgets/general/display/percent_bar_widget.cpp
src/client/ui/widgets/general/display/shadow_background_label.cpp
src/client/ui/widgets/general/layout_containers/flow_widget.cpp
src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp
src/client/ui/widgets/general/layout_containers/overlap_widget.cpp
src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
src/client/ui/widgets/printing_selector/card_amount_widget.cpp
src/client/ui/widgets/printing_selector/printing_selector.cpp
src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp
src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp
src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp
src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
src/client/ui/widgets/quick_settings/settings_button_widget.cpp
src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp
src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
src/client/ui/window_main.cpp
src/client/update_downloader.cpp
src/database/card_completer_proxy_model.cpp
src/database/card_database.cpp
@ -168,7 +36,6 @@ set(cockatrice_SOURCES
src/dialogs/dlg_connect.cpp
src/dialogs/dlg_convert_deck_to_cod_format.cpp
src/dialogs/dlg_create_game.cpp
src/dialogs/dlg_create_token.cpp
src/dialogs/dlg_default_tags_editor.cpp
src/dialogs/dlg_edit_avatar.cpp
src/dialogs/dlg_edit_password.cpp
@ -183,15 +50,14 @@ set(cockatrice_SOURCES
src/dialogs/dlg_load_deck_from_website.cpp
src/dialogs/dlg_load_remote_deck.cpp
src/dialogs/dlg_manage_sets.cpp
src/dialogs/dlg_move_top_cards_until.cpp
src/dialogs/dlg_register.cpp
src/dialogs/dlg_roll_dice.cpp
src/dialogs/dlg_select_set_for_cards.cpp
src/dialogs/dlg_settings.cpp
src/dialogs/dlg_startup_card_check.cpp
src/dialogs/dlg_tip_of_the_day.cpp
src/dialogs/dlg_update.cpp
src/dialogs/dlg_view_log.cpp
src/dialogs/tip_of_the_day.cpp
src/filters/deck_filter_string.cpp
src/filters/filter_builder.cpp
src/filters/filter_card.cpp
@ -199,6 +65,7 @@ set(cockatrice_SOURCES
src/filters/filter_tree.cpp
src/filters/filter_tree_model.cpp
src/filters/syntax_help.cpp
src/game/abstract_game.cpp
src/game/board/abstract_card_drag_item.cpp
src/game/board/abstract_card_item.cpp
src/game/board/abstract_counter.cpp
@ -209,30 +76,23 @@ set(cockatrice_SOURCES
src/game/board/card_item.cpp
src/game/board/card_list.cpp
src/game/board/counter_general.cpp
src/game/board/translate_counter_name.cpp
src/game/deckview/deck_view.cpp
src/game/deckview/deck_view_container.cpp
src/game/deckview/tabbed_deck_view_container.cpp
src/game/abstract_game.cpp
src/game/dialogs/dlg_create_token.cpp
src/game/dialogs/dlg_move_top_cards_until.cpp
src/game/dialogs/dlg_roll_dice.cpp
src/game/game.cpp
src/game/game_event_handler.cpp
src/game/game_meta_info.cpp
src/game/game_scene.cpp
src/game/game_selector.cpp
src/game/game_state.cpp
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
src/game/player/player_actions.cpp
src/game/player/player_area.cpp
src/game/player/player_event_handler.cpp
src/game/player/player_graphics_item.cpp
src/game/player/player_info.cpp
src/game/player/player_list_widget.cpp
src/game/player/player_manager.cpp
src/game/player/player_target.cpp
src/game/phases_toolbar.cpp
src/game/player/menu/card_menu.cpp
src/game/player/menu/custom_zone_menu.cpp
src/game/player/menu/grave_menu.cpp
@ -245,29 +105,124 @@ set(cockatrice_SOURCES
src/game/player/menu/say_menu.cpp
src/game/player/menu/sideboard_menu.cpp
src/game/player/menu/utility_menu.cpp
src/game/player/player.cpp
src/game/player/player_actions.cpp
src/game/player/player_area.cpp
src/game/player/player_event_handler.cpp
src/game/player/player_graphics_item.cpp
src/game/player/player_info.cpp
src/game/player/player_list_widget.cpp
src/game/player/player_manager.cpp
src/game/player/player_target.cpp
src/game/replay.cpp
src/game/zones/card_zone.cpp
src/game/zones/hand_zone.cpp
src/game/zones/pile_zone.cpp
src/game/zones/select_zone.cpp
src/game/zones/stack_zone.cpp
src/game/zones/table_zone.cpp
src/game/zones/view_zone.cpp
src/game/zones/view_zone_widget.cpp
src/game/zones/logic/card_zone_logic.cpp
src/game/zones/logic/hand_zone_logic.cpp
src/game/zones/logic/pile_zone_logic.cpp
src/game/zones/logic/stack_zone_logic.cpp
src/game/zones/logic/table_zone_logic.cpp
src/game/zones/logic/view_zone_logic.cpp
src/game/zones/pile_zone.cpp
src/game/zones/select_zone.cpp
src/game/zones/stack_zone.cpp
src/game/zones/table_zone.cpp
src/game/zones/view_zone.cpp
src/game/zones/view_zone_widget.cpp
src/interface/layouts/flow_layout.cpp
src/interface/layouts/overlap_layout.cpp
src/interface/line_edit_completer.cpp
src/interface/pixel_map_generator.cpp
src/interface/theme_manager.cpp
src/interface/widgets/cards/additional_info/color_identity_widget.cpp
src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
src/interface/widgets/cards/card_info_display_widget.cpp
src/interface/widgets/cards/card_info_frame_widget.cpp
src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
src/interface/widgets/cards/card_info_picture_widget.cpp
src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
src/interface/widgets/cards/card_info_text_widget.cpp
src/interface/widgets/cards/card_size_widget.cpp
src/interface/widgets/cards/deck_card_zone_display_widget.cpp
src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
src/interface/widgets/deck_analytics/mana_base_widget.cpp
src/interface/widgets/deck_analytics/mana_curve_widget.cpp
src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
src/interface/widgets/general/background_sources.cpp
src/interface/widgets/general/display/banner_widget.cpp
src/interface/widgets/general/display/bar_widget.cpp
src/interface/widgets/general/display/dynamic_font_size_label.cpp
src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
src/interface/widgets/general/display/labeled_input.cpp
src/interface/widgets/general/display/percent_bar_widget.cpp
src/interface/widgets/general/display/shadow_background_label.cpp
src/interface/widgets/general/home_styled_button.cpp
src/interface/widgets/general/home_widget.cpp
src/interface/widgets/general/layout_containers/flow_widget.cpp
src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
src/interface/widgets/general/layout_containers/overlap_widget.cpp
src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
src/interface/widgets/printing_selector/card_amount_widget.cpp
src/interface/widgets/printing_selector/printing_selector.cpp
src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
src/interface/widgets/quick_settings/settings_button_widget.cpp
src/interface/widgets/quick_settings/settings_popup_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
src/interface/window_main.cpp
src/main.cpp
src/picture_loader/picture_loader.cpp
src/picture_loader/picture_loader_local.cpp
src/picture_loader/picture_loader_request_status_display_widget.cpp
src/picture_loader/picture_loader_status_bar.cpp
src/picture_loader/picture_loader_worker.cpp
src/picture_loader/picture_loader_worker_work.cpp
src/picture_loader/picture_to_load.cpp
src/server/abstract_client.cpp
src/server/chat_view/chat_view.cpp
src/server/game_selector.cpp
src/server/games_model.cpp
src/server/handle_public_servers.cpp
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
@ -291,8 +246,52 @@ set(cockatrice_SOURCES
src/settings/settings_manager.cpp
src/settings/shortcut_treeview.cpp
src/settings/shortcuts_settings.cpp
src/tabs/abstract_tab_deck_editor.cpp
src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
src/tabs/api/edhrec/tab_edhrec.cpp
src/tabs/api/edhrec/tab_edhrec_main.cpp
src/tabs/tab.cpp
src/tabs/tab_account.cpp
src/tabs/tab_admin.cpp
src/tabs/tab_deck_editor.cpp
src/tabs/tab_deck_storage.cpp
src/tabs/tab_game.cpp
src/tabs/tab_home.cpp
src/tabs/tab_logs.cpp
src/tabs/tab_message.cpp
src/tabs/tab_replays.cpp
src/tabs/tab_room.cpp
src/tabs/tab_server.cpp
src/tabs/tab_supervisor.cpp
src/tabs/tab_visual_database_display.cpp
src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
src/utility/card_info_comparator.cpp
src/utility/deck_list_sort_filter_proxy_model.h
src/utility/deck_list_sort_filter_proxy_model.cpp
src/utility/key_signals.cpp
src/utility/levenshtein.cpp
src/utility/logger.cpp

2
cockatrice/src/card/card_info.cpp
View file

@ -1,6 +1,6 @@
#include "card_info.h"
#include "../client/ui/picture_loader/picture_loader.h"
#include "../picture_loader/picture_loader.h"
#include "../settings/cache_settings.h"
#include "game_specific_terms.h"

4
cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp → cockatrice/src/client/deck_editor_menu.cpp
View file

@ -1,7 +1,7 @@
#include "deck_editor_menu.h"
#include "../../../settings/cache_settings.h"
#include "../../../settings/shortcuts_settings.h"
#include "../settings/cache_settings.h"
#include "../settings/shortcuts_settings.h"
DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
{

2
cockatrice/src/client/menus/deck_editor/deck_editor_menu.h → cockatrice/src/client/deck_editor_menu.h
View file

@ -1,7 +1,7 @@
#ifndef DECK_EDITOR_MENU_H
#define DECK_EDITOR_MENU_H
#include "../../tabs/abstract_tab_deck_editor.h"
#include "../tabs/abstract_tab_deck_editor.h"
#include <QMenu>

2
cockatrice/src/client/network/spoiler_background_updater.cpp
View file

@ -2,9 +2,9 @@
#include "../../database/card_database.h"
#include "../../database/card_database_manager.h"
#include "../../interface/window_main.h"
#include "../../main.h"
#include "../../settings/cache_settings.h"
#include "../ui/window_main.h"
#include <QApplication>
#include <QCryptographicHash>

2
cockatrice/src/client/replay_manager.cpp
View file

@ -1,6 +1,6 @@
#include "replay_manager.h"
#include "tabs/tab_game.h"
#include "../tabs/tab_game.h"
#include <QHBoxLayout>
#include <QToolButton>

5
cockatrice/src/client/replay_manager.h
View file

@ -1,11 +1,14 @@
#ifndef REPLAY_MANAGER_H
#define REPLAY_MANAGER_H
#include "network/replay_timeline_widget.h"
#include "pb/game_replay.pb.h"
#include "tabs/tab_game.h"
#include <QToolButton>
#include <QWidget>
class TabGame;
class ReplayManager : public QWidget
{
Q_OBJECT

6
cockatrice/src/database/card_database.cpp
View file

@ -1,10 +1,10 @@
#include "card_database.h"
#include "../client/ui/picture_loader/picture_loader.h"
#include "../picture_loader/picture_loader.h"
#include "../settings/cache_settings.h"
#include "../utility/card_set_comparator.h"
#include "./parser/cockatrice_xml_3.h"
#include "./parser/cockatrice_xml_4.h"
#include "parser/cockatrice_xml_3.h"
#include "parser/cockatrice_xml_4.h"
#include <QCryptographicHash>
#include <QDebug>

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

@ -1,8 +1,8 @@
#include "dlg_create_game.h"
#include "../client/tabs/tab_room.h"
#include "../server/pending_command.h"
#include "../settings/cache_settings.h"
#include "../tabs/tab_room.h"
#include "pb/serverinfo_game.pb.h"
#include "trice_limits.h"

2
cockatrice/src/dialogs/dlg_filter_games.h
View file

@ -1,7 +1,7 @@
#ifndef DLG_FILTER_GAMES_H
#define DLG_FILTER_GAMES_H
#include "../game/games_model.h"
#include "../server/games_model.h"
#include <QCheckBox>
#include <QComboBox>

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

@ -1,10 +1,10 @@
#include "dlg_manage_sets.h"
#include "../client/network/sets_model.h"
#include "../client/ui/picture_loader/picture_loader.h"
#include "../database/card_database_manager.h"
#include "../deck/custom_line_edit.h"
#include "../main.h"
#include "../picture_loader/picture_loader.h"
#include "../settings/cache_settings.h"
#include <QAction>

4
cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
View file

@ -1,9 +1,9 @@
#include "dlg_select_set_for_cards.h"
#include "../client/ui/widgets/cards/card_info_picture_widget.h"
#include "../client/ui/widgets/general/layout_containers/flow_widget.h"
#include "../database/card_database_manager.h"
#include "../deck/deck_loader.h"
#include "../interface/widgets/cards/card_info_picture_widget.h"
#include "../interface/widgets/general/layout_containers/flow_widget.h"
#include "dlg_select_set_for_cards.h"
#include <QCheckBox>

2
cockatrice/src/dialogs/dlg_select_set_for_cards.h
View file

@ -1,8 +1,8 @@
#ifndef DLG_SELECT_SET_FOR_CARDS_H
#define DLG_SELECT_SET_FOR_CARDS_H
#include "../client/ui/widgets/general/layout_containers/flow_widget.h"
#include "../deck/deck_list_model.h"
#include "../interface/widgets/general/layout_containers/flow_widget.h"
#include <QCheckBox>
#include <QDialog>

8
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -4,17 +4,17 @@
#include "../client/network/release_channel.h"
#include "../client/network/spoiler_background_updater.h"
#include "../client/sound_engine.h"
#include "../client/tabs/tab_supervisor.h"
#include "../client/ui/picture_loader/picture_loader.h"
#include "../client/ui/theme_manager.h"
#include "../client/ui/widgets/general/background_sources.h"
#include "../database/card_database.h"
#include "../database/card_database_manager.h"
#include "../deck/custom_line_edit.h"
#include "../interface/theme_manager.h"
#include "../interface/widgets/general/background_sources.h"
#include "../main.h"
#include "../picture_loader/picture_loader.h"
#include "../settings/cache_settings.h"
#include "../settings/card_counter_settings.h"
#include "../settings/shortcut_treeview.h"
#include "../tabs/tab_supervisor.h"
#include "../utility/sequence_edit.h"
#include <QAbstractButton>

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

@ -1,7 +1,7 @@
#include "dlg_tip_of_the_day.h"
#include "../client/ui/tip_of_the_day.h"
#include "../settings/cache_settings.h"
#include "tip_of_the_day.h"
#include <QCheckBox>
#include <QDate>

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

@ -2,7 +2,7 @@
#include "../client/network/client_update_checker.h"
#include "../client/network/release_channel.h"
#include "../client/ui/window_main.h"
#include "../interface/window_main.h"
#include "../settings/cache_settings.h"
#include <QApplication>

0
cockatrice/src/client/ui/tip_of_the_day.cpp → cockatrice/src/dialogs/tip_of_the_day.cpp
View file

0
cockatrice/src/client/ui/tip_of_the_day.h → cockatrice/src/dialogs/tip_of_the_day.h
View file

2
cockatrice/src/filters/deck_filter_string.h
View file

@ -1,7 +1,7 @@
#ifndef DECK_FILTER_STRING_H
#define DECK_FILTER_STRING_H
#include "../client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
#include <QLoggingCategory>
#include <QMap>

2
cockatrice/src/game/board/abstract_card_item.cpp
View file

@ -1,8 +1,8 @@
#include "abstract_card_item.h"
#include "../../client/ui/picture_loader/picture_loader.h"
#include "../../database/card_database.h"
#include "../../database/card_database_manager.h"
#include "../../picture_loader/picture_loader.h"
#include "../../settings/cache_settings.h"
#include "../game_scene.h"

4
cockatrice/src/game/board/abstract_counter.cpp
View file

@ -1,12 +1,12 @@
#include "abstract_counter.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/translate_counter_name.h"
#include "../../settings/cache_settings.h"
#include "../../tabs/tab_game.h"
#include "../player/player.h"
#include "expression.h"
#include "pb/command_inc_counter.pb.h"
#include "pb/command_set_counter.pb.h"
#include "translate_counter_name.h"
#include <QAction>
#include <QApplication>

2
cockatrice/src/game/board/abstract_counter.h
View file

@ -1,7 +1,7 @@
#ifndef COUNTER_H
#define COUNTER_H
#include "../../client/tearoff_menu.h"
#include "../../interface/tearoff_menu.h"
#include <QGraphicsItem>
#include <QInputDialog>

2
cockatrice/src/game/board/card_item.cpp
View file

@ -1,9 +1,9 @@
#include "card_item.h"
#include "../../card/card_info.h"
#include "../../client/tabs/tab_game.h"
#include "../../settings/cache_settings.h"
#include "../../settings/card_counter_settings.h"
#include "../../tabs/tab_game.h"
#include "../game_scene.h"
#include "../player/player.h"
#include "../zones/card_zone.h"

2
cockatrice/src/game/board/counter_general.cpp
View file

@ -1,6 +1,6 @@
#include "counter_general.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../interface/pixel_map_generator.h"
#include "abstract_graphics_item.h"
#include <QPainter>

0
cockatrice/src/client/translate_counter_name.cpp → cockatrice/src/game/board/translate_counter_name.cpp
View file

0
cockatrice/src/client/translate_counter_name.h → cockatrice/src/game/board/translate_counter_name.h
View file

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

@ -1,7 +1,7 @@
#include "deck_view.h"
#include "../../card/card_info.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../settings/cache_settings.h"
#include "deck_list.h"
#include "deck_list_card_node.h"

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

@ -1,7 +1,5 @@
#include "deck_view_container.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/ui/picture_loader/picture_loader.h"
#include "../../database/card_database.h"
#include "../../database/card_database_manager.h"
#include "../../deck/deck_loader.h"
@ -9,8 +7,10 @@
#include "../../dialogs/dlg_load_deck_from_clipboard.h"
#include "../../dialogs/dlg_load_deck_from_website.h"
#include "../../dialogs/dlg_load_remote_deck.h"
#include "../../picture_loader/picture_loader.h"
#include "../../server/pending_command.h"
#include "../../settings/cache_settings.h"
#include "../../tabs/tab_game.h"
#include "../game_scene.h"
#include "deck_view.h"
#include "pb/command_deck_select.pb.h"

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

@ -1,6 +1,6 @@
#include "tabbed_deck_view_container.h"
#include "../../client/tabs/tab_game.h"
#include "../../tabs/tab_game.h"
#include "deck_view.h"
TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)

10
cockatrice/src/dialogs/dlg_create_token.cpp → cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -1,10 +1,10 @@
#include "dlg_create_token.h"
#include "../client/ui/widgets/cards/card_info_picture_widget.h"
#include "../database/card_database_manager.h"
#include "../database/card_database_model.h"
#include "../main.h"
#include "../settings/cache_settings.h"
#include "../../database/card_database_manager.h"
#include "../../database/card_database_model.h"
#include "../../interface/widgets/cards/card_info_picture_widget.h"
#include "../../main.h"
#include "../../settings/cache_settings.h"
#include "deck_list.h"
#include "trice_limits.h"

0
cockatrice/src/dialogs/dlg_create_token.h → cockatrice/src/game/dialogs/dlg_create_token.h
View file

6
cockatrice/src/dialogs/dlg_move_top_cards_until.cpp → cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
View file

@ -1,8 +1,8 @@
#include "dlg_move_top_cards_until.h"
#include "../database/card_database.h"
#include "../database/card_database_manager.h"
#include "../filters/filter_string.h"
#include "../../database/card_database.h"
#include "../../database/card_database_manager.h"
#include "../../filters/filter_string.h"
#include <QDialogButtonBox>
#include <QLabel>

0
cockatrice/src/dialogs/dlg_move_top_cards_until.h → cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
View file

0
cockatrice/src/dialogs/dlg_roll_dice.cpp → cockatrice/src/game/dialogs/dlg_roll_dice.cpp
View file

0
cockatrice/src/dialogs/dlg_roll_dice.h → cockatrice/src/game/dialogs/dlg_roll_dice.h
View file

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

@ -1,6 +1,6 @@
#include "game.h"
#include "../client/tabs/tab_game.h"
#include "../tabs/tab_game.h"
#include "pb/event_game_joined.pb.h"
Game::Game(TabGame *_tab,

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

@ -1,11 +1,11 @@
#include "game_event_handler.h"
#include "../client/tabs/tab_game.h"
#include "../server/abstract_client.h"
#include "../server/message_log_widget.h"
#include "../server/pending_command.h"
#include "../tabs/tab_game.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"

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

@ -1,8 +1,8 @@
#include "game_scene.h"
#include "../client/ui/phases_toolbar.h"
#include "../settings/cache_settings.h"
#include "board/card_item.h"
#include "phases_toolbar.h"
#include "player/player.h"
#include "player/player_graphics_item.h"
#include "zones/view_zone.h"

2
cockatrice/src/game/hand_counter.h
View file

@ -1,7 +1,7 @@
#ifndef HANDCOUNTER_H
#define HANDCOUNTER_H
#include "../game/board/abstract_graphics_item.h"
#include "board/abstract_graphics_item.h"
#include "board/graphics_item_type.h"
#include <QString>

16
cockatrice/src/server/message_log_widget.cpp → cockatrice/src/game/log/message_log_widget.cpp
View file

@ -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 "../../settings/card_counter_settings.h"
#include "../../tabs/tab_game.h"
#include "../board/card_item.h"
#include "../board/translate_counter_name.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"

6
cockatrice/src/server/message_log_widget.h → cockatrice/src/game/log/message_log_widget.h
View file

@ -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;

2
cockatrice/src/client/ui/phases_toolbar.cpp → cockatrice/src/game/phases_toolbar.cpp
View file

@ -1,10 +1,10 @@
#include "phases_toolbar.h"
#include "../interface/pixel_map_generator.h"
#include "pb/command_draw_cards.pb.h"
#include "pb/command_next_turn.pb.h"
#include "pb/command_set_active_phase.pb.h"
#include "pb/command_set_card_attr.pb.h"
#include "pixel_map_generator.h"
#include <QAction>
#include <QDebug>

2
cockatrice/src/client/ui/phases_toolbar.h → cockatrice/src/game/phases_toolbar.h
View file

@ -1,7 +1,7 @@
#ifndef PHASESTOOLBAR_H
#define PHASESTOOLBAR_H
#include "../../game/board/abstract_graphics_item.h"
#include "board/abstract_graphics_item.h"
#include <QFrame>
#include <QGraphicsObject>

2
cockatrice/src/game/player/menu/card_menu.cpp
View file

@ -1,8 +1,8 @@
#include "card_menu.h"
#include "../../../client/tabs/tab_game.h"
#include "../../../database/card_database_manager.h"
#include "../../../settings/card_counter_settings.h"
#include "../../../tabs/tab_game.h"
#include "../../board/card_item.h"
#include "../../zones/logic/view_zone_logic.h"
#include "../card_menu_action_type.h"

2
cockatrice/src/game/player/menu/grave_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_GRAVE_MENU_H
#define COCKATRICE_GRAVE_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/hand_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_HAND_MENU_H
#define COCKATRICE_HAND_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/library_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_LIBRARY_MENU_H
#define COCKATRICE_LIBRARY_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/player_menu.cpp
View file

@ -1,8 +1,8 @@
#include "player_menu.h"
#include "../../../client/tabs/tab_game.h"
#include "../../../common/pb/command_reveal_cards.pb.h"
#include "../../../database/card_database_manager.h"
#include "../../../tabs/tab_game.h"
#include "../../board/card_item.h"
#include "../../zones/hand_zone.h"
#include "../card_menu_action_type.h"

2
cockatrice/src/game/player/menu/player_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_PLAYER_MENU_H
#define COCKATRICE_PLAYER_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include "../player.h"
#include "custom_zone_menu.h"
#include "grave_menu.h"

2
cockatrice/src/game/player/menu/rfg_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_RFG_MENU_H
#define COCKATRICE_RFG_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

4
cockatrice/src/game/player/player.cpp
View file

@ -1,7 +1,7 @@
#include "player.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../tabs/tab_game.h"
#include "../board/arrow_item.h"
#include "../board/card_item.h"
#include "../board/card_list.h"

4
cockatrice/src/game/player/player.h
View file

@ -2,10 +2,10 @@
#define PLAYER_H
#include "../../card/card_info.h"
#include "../../client/tearoff_menu.h"
#include "../../dialogs/dlg_create_token.h"
#include "../../filters/filter_string.h"
#include "../../interface/tearoff_menu.h"
#include "../board/abstract_graphics_item.h"
#include "../dialogs/dlg_create_token.h"
#include "menu/player_menu.h"
#include "pb/card_attributes.pb.h"
#include "pb/game_event.pb.h"

6
cockatrice/src/game/player/player_actions.cpp
View file

@ -2,11 +2,11 @@
#include "../../../common/pb/context_move_card.pb.h"
#include "../../client/get_text_with_max.h"
#include "../../client/tabs/tab_game.h"
#include "../../database/card_database_manager.h"
#include "../../dialogs/dlg_move_top_cards_until.h"
#include "../../dialogs/dlg_roll_dice.h"
#include "../../tabs/tab_game.h"
#include "../board/card_item.h"
#include "../dialogs/dlg_move_top_cards_until.h"
#include "../dialogs/dlg_roll_dice.h"
#include "../zones/logic/view_zone_logic.h"
#include "card_menu_action_type.h"
#include "pb/command_attach_card.pb.h"

2
cockatrice/src/game/player/player_area.cpp
View file

@ -1,6 +1,6 @@
#include "player_area.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include <QPainter>

2
cockatrice/src/game/player/player_event_handler.cpp
View file

@ -1,6 +1,6 @@
#include "player_event_handler.h"
#include "../../client/tabs/tab_game.h"
#include "../../tabs/tab_game.h"
#include "../board/arrow_item.h"
#include "../board/card_item.h"
#include "../board/card_list.h"

2
cockatrice/src/game/player/player_graphics_item.cpp
View file

@ -1,6 +1,6 @@
#include "player_graphics_item.h"
#include "../../client/tabs/tab_game.h"
#include "../../tabs/tab_game.h"
#include "../hand_counter.h"
PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)

8
cockatrice/src/game/player/player_list_widget.cpp
View file

@ -1,13 +1,13 @@
#include "player_list_widget.h"
#include "../../client/tabs/tab_account.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/tabs/tab_supervisor.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../interface/pixel_map_generator.h"
#include "../../server/abstract_client.h"
#include "../../server/user/user_context_menu.h"
#include "../../server/user/user_list_manager.h"
#include "../../server/user/user_list_widget.h"
#include "../../tabs/tab_account.h"
#include "../../tabs/tab_game.h"
#include "../../tabs/tab_supervisor.h"
#include "pb/command_kick_from_game.pb.h"
#include "pb/serverinfo_playerproperties.pb.h"
#include "pb/session_commands.pb.h"

2
cockatrice/src/game/player/player_target.cpp
View file

@ -1,6 +1,6 @@
#include "player_target.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../interface/pixel_map_generator.h"
#include "pb/serverinfo_user.pb.h"
#include "player.h"

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

@ -1,6 +1,6 @@
#include "replay.h"
#include "../client/tabs/tab_game.h"
#include "../tabs/tab_game.h"
Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
{

2
cockatrice/src/game/zones/hand_zone.cpp
View file

@ -1,6 +1,6 @@
#include "hand_zone.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../settings/cache_settings.h"
#include "../board/card_drag_item.h"
#include "../board/card_item.h"

2
cockatrice/src/game/zones/stack_zone.cpp
View file

@ -1,6 +1,6 @@
#include "stack_zone.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../settings/cache_settings.h"
#include "../board/arrow_item.h"
#include "../board/card_drag_item.h"

2
cockatrice/src/game/zones/table_zone.cpp
View file

@ -1,7 +1,7 @@
#include "table_zone.h"
#include "../../card/card_info.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../settings/cache_settings.h"
#include "../board/arrow_item.h"
#include "../board/card_drag_item.h"

2
cockatrice/src/game/zones/view_zone_widget.cpp
View file

@ -1,7 +1,7 @@
#include "view_zone_widget.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../filters/syntax_help.h"
#include "../../interface/pixel_map_generator.h"
#include "../../settings/cache_settings.h"
#include "../board/card_item.h"
#include "../game_scene.h"

0
cockatrice/src/client/ui/layouts/flow_layout.cpp → cockatrice/src/interface/layouts/flow_layout.cpp
View file

0
cockatrice/src/client/ui/layouts/flow_layout.h → cockatrice/src/interface/layouts/flow_layout.h
View file

0
cockatrice/src/client/ui/layouts/overlap_layout.cpp → cockatrice/src/interface/layouts/overlap_layout.cpp
View file

0
cockatrice/src/client/ui/layouts/overlap_layout.h → cockatrice/src/interface/layouts/overlap_layout.h
View file

0
cockatrice/src/client/ui/line_edit_completer.cpp → cockatrice/src/interface/line_edit_completer.cpp
View file

2
cockatrice/src/client/ui/line_edit_completer.h → cockatrice/src/interface/line_edit_completer.h
View file

@ -1,7 +1,7 @@
#ifndef LINEEDITCOMPLETER_H
#define LINEEDITCOMPLETER_H
#include "../../deck/custom_line_edit.h"
#include "../deck/custom_line_edit.h"
#include <QFocusEvent>
#include <QKeyEvent>

0
cockatrice/src/client/ui/pixel_map_generator.cpp → cockatrice/src/interface/pixel_map_generator.cpp
View file

0
cockatrice/src/client/ui/pixel_map_generator.h → cockatrice/src/interface/pixel_map_generator.h
View file

0
cockatrice/src/client/tearoff_menu.h → cockatrice/src/interface/tearoff_menu.h
View file

2
cockatrice/src/client/ui/theme_manager.cpp → cockatrice/src/interface/theme_manager.cpp
View file

@ -1,6 +1,6 @@
#include "theme_manager.h"
#include "../../settings/cache_settings.h"
#include "../settings/cache_settings.h"
#include <QApplication>
#include <QColor>

0
cockatrice/src/client/ui/theme_manager.h → cockatrice/src/interface/theme_manager.h
View file

2
cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp → cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
View file

@ -1,6 +1,6 @@
#include "color_identity_widget.h"
#include "../../../../../settings/cache_settings.h"
#include "../../../../settings/cache_settings.h"
#include "mana_symbol_widget.h"
#include <QHBoxLayout>

2
cockatrice/src/client/ui/widgets/cards/additional_info/color_identity_widget.h → cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
View file

@ -1,7 +1,7 @@
#ifndef COLOR_IDENTITY_WIDGET_H
#define COLOR_IDENTITY_WIDGET_H
#include "../../../../../card/card_info.h"
#include "../../../../card/card_info.h"
#include <QHBoxLayout>
#include <QWidget>

0
cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp → cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
View file

2
cockatrice/src/client/ui/widgets/cards/additional_info/mana_cost_widget.h → cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
View file

@ -1,7 +1,7 @@
#ifndef MANA_COST_WIDGET_H
#define MANA_COST_WIDGET_H
#include "../../../../../card/card_info.h"
#include "../../../../card/card_info.h"
#include <QHBoxLayout>
#include <QWidget>

2
cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp → cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
View file

@ -1,6 +1,6 @@
#include "mana_symbol_widget.h"
#include "../../../../../settings/cache_settings.h"
#include "../../../../settings/cache_settings.h"
#include <QResizeEvent>

0
cockatrice/src/client/ui/widgets/cards/additional_info/mana_symbol_widget.h → cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
View file

8
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp → cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -1,9 +1,9 @@
#include "card_group_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#include "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h"
#include "../../../../../utility/deck_list_sort_filter_proxy_model.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_list_model.h"
#include "../../../../utility/card_info_comparator.h"
#include "../../../../utility/deck_list_sort_filter_proxy_model.h"
#include "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>

4
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h → cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
View file

@ -1,8 +1,8 @@
#ifndef CARD_GROUP_DISPLAY_WIDGET_H
#define CARD_GROUP_DISPLAY_WIDGET_H
#include "../../../../../card/card_info.h"
#include "../../../../../deck/deck_list_model.h"
#include "../../../../card/card_info.h"
#include "../../../../deck/deck_list_model.h"
#include "../../general/display/banner_widget.h"
#include "../card_info_picture_with_text_overlay_widget.h"
#include "../card_size_widget.h"

6
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp → cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -1,8 +1,8 @@
#include "flat_card_group_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#include "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_list_model.h"
#include "../../../../utility/card_info_comparator.h"
#include "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>

0
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h → cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
View file

6
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp → cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
View file

@ -1,8 +1,8 @@
#include "overlapped_card_group_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#include "../../../../../deck/deck_list_model.h"
#include "../../../../../utility/card_info_comparator.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../deck/deck_list_model.h"
#include "../../../../utility/card_info_comparator.h"
#include "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent>

0
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h → cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
View file

6
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
View file

@ -1,8 +1,8 @@
#include "card_info_display_widget.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../game/board/card_item.h"
#include "../../../../main.h"
#include "../../../database/card_database_manager.h"
#include "../../../game/board/card_item.h"
#include "../../../main.h"
#include "card_info_picture_widget.h"
#include "card_info_text_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.h → cockatrice/src/interface/widgets/cards/card_info_display_widget.h
View file

@ -1,7 +1,7 @@
#ifndef CARDINFOWIDGET_H
#define CARDINFOWIDGET_H
#include "../../../../card/exact_card.h"
#include "../../../card/exact_card.h"
#include "card_ref.h"
#include <QComboBox>

6
cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
View file

@ -1,8 +1,8 @@
#include "card_info_frame_widget.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../game/board/card_item.h"
#include "../../../../settings/cache_settings.h"
#include "../../../database/card_database_manager.h"
#include "../../../game/board/card_item.h"
#include "../../../settings/cache_settings.h"
#include "card_info_display_widget.h"
#include "card_info_picture_widget.h"
#include "card_info_text_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.h → cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
View file

@ -1,7 +1,7 @@
#ifndef CARDFRAME_H
#define CARDFRAME_H
#include "../../../../card/exact_card.h"
#include "../../../card/exact_card.h"
#include "card_ref.h"
#include <QPushButton>

2
cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_picture_art_crop_widget.h"
#include "../../picture_loader/picture_loader.h"
#include "../../../picture_loader/picture_loader.h"
CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
: CardInfoPictureWidget(parent, false, false)

0
cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.h → cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
View file

4
cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_picture_enlarged_widget.h"
#include "../../../../settings/cache_settings.h"
#include "../../picture_loader/picture_loader.h"
#include "../../../picture_loader/picture_loader.h"
#include "../../../settings/cache_settings.h"
#include <QPainterPath>
#include <QStylePainter>

2
cockatrice/src/client/ui/widgets/cards/card_info_picture_enlarged_widget.h → cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
View file

@ -1,7 +1,7 @@
#ifndef CARD_PICTURE_ENLARGED_WIDGET_H
#define CARD_PICTURE_ENLARGED_WIDGET_H
#include "../../../../card/exact_card.h"
#include "../../../card/exact_card.h"
#include <QPixmap>
#include <QWidget>

8
cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
View file

@ -1,10 +1,10 @@
#include "card_info_picture_widget.h"
#include "../../../../database/card_database_manager.h"
#include "../../../../game/board/card_item.h"
#include "../../../../settings/cache_settings.h"
#include "../../../database/card_database_manager.h"
#include "../../../game/board/card_item.h"
#include "../../../picture_loader/picture_loader.h"
#include "../../../settings/cache_settings.h"
#include "../../../tabs/tab_supervisor.h"
#include "../../picture_loader/picture_loader.h"
#include "../../window_main.h"
#include <QMenu>

2
cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.h → cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
View file

@ -1,7 +1,7 @@
#ifndef CARD_INFO_PICTURE_H
#define CARD_INFO_PICTURE_H
#include "../../../../card/exact_card.h"
#include "../../../card/exact_card.h"
#include "card_info_picture_enlarged_widget.h"
#include <QPropertyAnimation>

0
cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
View file

0
cockatrice/src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.h → cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
View file

4
cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp → cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_text_widget.h"
#include "../../../../card/game_specific_terms.h"
#include "../../../../game/board/card_item.h"
#include "../../../card/game_specific_terms.h"
#include "../../../game/board/card_item.h"
#include <QGridLayout>
#include <QLabel>

2
cockatrice/src/client/ui/widgets/cards/card_info_text_widget.h → cockatrice/src/interface/widgets/cards/card_info_text_widget.h
View file

@ -1,7 +1,7 @@
#ifndef CARDINFOTEXT_H
#define CARDINFOTEXT_H
#include "../../../../card/card_info.h"
#include "../../../card/card_info.h"
#include <QFrame>
class QLabel;

Some files were not shown because too many files have changed in this diff Show more