From 1e4e5a441957f1fcde00a2431487019ccacd5cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 2 Oct 2025 17:41:07 +0200 Subject: [PATCH] Turn Card, Deck_List, Protocol, RNG, Server, Settings and Utility into libraries and remove cockatrice_common. Took 6 hours 3 minutes Took 31 seconds --- CMakeLists.txt | 8 +- cockatrice/CMakeLists.txt | 70 +++----- cockatrice/src/client/deck_editor_menu.cpp | 4 +- cockatrice/src/client/get_text_with_max.h | 3 +- .../client/network/client_update_checker.cpp | 3 +- .../client/network/replay_timeline_widget.cpp | 3 +- cockatrice/src/client/network/sets_model.h | 3 +- .../network/spoiler_background_updater.cpp | 6 +- cockatrice/src/client/replay_manager.h | 2 +- cockatrice/src/client/sound_engine.cpp | 3 +- .../src/client/tapped_out_interface.cpp | 5 +- cockatrice/src/client/tapped_out_interface.h | 5 +- cockatrice/src/deck/custom_line_edit.cpp | 5 +- cockatrice/src/deck/deck_list_model.cpp | 4 +- cockatrice/src/deck/deck_list_model.h | 9 +- cockatrice/src/deck/deck_loader.cpp | 8 +- cockatrice/src/deck/deck_loader.h | 3 +- cockatrice/src/deck/deck_stats_interface.cpp | 5 +- cockatrice/src/deck/deck_stats_interface.h | 5 +- cockatrice/src/dialogs/dlg_connect.cpp | 5 +- cockatrice/src/dialogs/dlg_connect.h | 2 +- cockatrice/src/dialogs/dlg_create_game.cpp | 6 +- cockatrice/src/dialogs/dlg_create_game.h | 3 +- .../src/dialogs/dlg_default_tags_editor.cpp | 3 +- cockatrice/src/dialogs/dlg_edit_avatar.cpp | 3 +- cockatrice/src/dialogs/dlg_edit_password.cpp | 5 +- cockatrice/src/dialogs/dlg_edit_tokens.cpp | 10 +- cockatrice/src/dialogs/dlg_edit_tokens.h | 3 +- cockatrice/src/dialogs/dlg_edit_user.cpp | 5 +- .../dialogs/dlg_forgot_password_challenge.cpp | 5 +- .../dialogs/dlg_forgot_password_request.cpp | 5 +- .../src/dialogs/dlg_forgot_password_reset.cpp | 5 +- cockatrice/src/dialogs/dlg_load_deck.cpp | 3 +- .../dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- cockatrice/src/dialogs/dlg_manage_sets.cpp | 8 +- cockatrice/src/dialogs/dlg_register.cpp | 7 +- .../src/dialogs/dlg_select_set_for_cards.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 16 +- cockatrice/src/dialogs/dlg_settings.h | 3 +- .../src/dialogs/dlg_startup_card_check.cpp | 3 +- cockatrice/src/dialogs/dlg_tip_of_the_day.cpp | 2 +- cockatrice/src/dialogs/dlg_update.cpp | 2 +- cockatrice/src/dialogs/dlg_view_log.cpp | 5 +- cockatrice/src/filters/deck_filter_string.cpp | 5 +- cockatrice/src/filters/filter_string.cpp | 2 +- cockatrice/src/filters/filter_string.h | 2 +- cockatrice/src/filters/filter_tree.h | 2 +- cockatrice/src/game/abstract_game.h | 2 +- .../game/board/abstract_card_drag_item.cpp | 3 +- .../src/game/board/abstract_card_item.cpp | 12 +- .../src/game/board/abstract_card_item.h | 5 +- .../src/game/board/abstract_counter.cpp | 8 +- cockatrice/src/game/board/arrow_item.cpp | 12 +- cockatrice/src/game/board/card_item.cpp | 8 +- cockatrice/src/game/board/card_item.h | 3 +- cockatrice/src/game/board/card_list.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 8 +- cockatrice/src/game/deckview/deck_view.h | 2 +- .../src/game/deckview/deck_view_container.cpp | 22 +-- .../src/game/dialogs/dlg_create_token.cpp | 12 +- .../game/dialogs/dlg_move_top_cards_until.cpp | 4 +- cockatrice/src/game/dialogs/dlg_roll_dice.cpp | 3 +- cockatrice/src/game/game.cpp | 3 +- cockatrice/src/game/game_event_handler.cpp | 47 ++--- cockatrice/src/game/game_event_handler.h | 4 +- cockatrice/src/game/game_meta_info.h | 3 +- cockatrice/src/game/game_scene.cpp | 2 +- cockatrice/src/game/game_state.h | 2 +- cockatrice/src/game/game_view.cpp | 2 +- .../src/game/log/message_log_widget.cpp | 8 +- cockatrice/src/game/log/message_log_widget.h | 3 +- cockatrice/src/game/phases_toolbar.cpp | 8 +- cockatrice/src/game/player/menu/card_menu.cpp | 7 +- cockatrice/src/game/player/menu/hand_menu.cpp | 4 +- .../src/game/player/menu/library_menu.cpp | 4 +- .../src/game/player/menu/player_menu.cpp | 5 +- cockatrice/src/game/player/menu/say_menu.cpp | 3 +- cockatrice/src/game/player/player.cpp | 18 +- cockatrice/src/game/player/player.h | 6 +- cockatrice/src/game/player/player_actions.cpp | 39 ++-- cockatrice/src/game/player/player_actions.h | 3 +- .../src/game/player/player_event_handler.cpp | 45 ++--- .../src/game/player/player_event_handler.h | 4 +- cockatrice/src/game/player/player_info.h | 2 +- .../src/game/player/player_list_widget.cpp | 6 +- cockatrice/src/game/player/player_manager.h | 3 +- cockatrice/src/game/player/player_target.cpp | 2 +- cockatrice/src/game/zones/hand_zone.cpp | 4 +- .../src/game/zones/logic/card_zone_logic.cpp | 6 +- .../src/game/zones/logic/view_zone_logic.cpp | 3 +- cockatrice/src/game/zones/pile_zone.cpp | 2 +- cockatrice/src/game/zones/select_zone.cpp | 2 +- cockatrice/src/game/zones/stack_zone.cpp | 4 +- cockatrice/src/game/zones/table_zone.cpp | 8 +- cockatrice/src/game/zones/view_zone.cpp | 12 +- cockatrice/src/game/zones/view_zone.h | 2 +- .../src/game/zones/view_zone_widget.cpp | 4 +- cockatrice/src/game/zones/view_zone_widget.h | 2 +- .../card_picture_loader.cpp} | 80 +++++---- .../card_picture_loader.h} | 34 ++-- .../card_picture_loader_local.cpp} | 39 ++-- .../card_picture_loader_local.h} | 11 +- ..._loader_request_status_display_widget.cpp} | 10 +- ...re_loader_request_status_display_widget.h} | 14 +- .../card_picture_loader_status_bar.cpp} | 24 +-- .../card_picture_loader_status_bar.h} | 10 +- .../card_picture_loader_worker.cpp} | 56 +++--- .../card_picture_loader_worker.h} | 32 ++-- .../card_picture_loader_worker_work.cpp} | 59 +++--- .../card_picture_loader_worker_work.h} | 18 +- .../card_picture_to_load.cpp} | 29 ++- .../card_picture_to_load.h} | 11 +- .../src/interface/pixel_map_generator.cpp | 3 +- .../src/interface/pixel_map_generator.h | 3 +- cockatrice/src/interface/tearoff_menu.h | 3 +- cockatrice/src/interface/theme_manager.cpp | 3 +- .../deck_list_sort_filter_proxy_model.cpp | 2 +- .../deck_list_sort_filter_proxy_model.h | 3 +- .../{ => interface}/utility/sequence_edit.cpp | 3 +- .../{ => interface}/utility/sequence_edit.h | 0 .../additional_info/color_identity_widget.cpp | 2 +- .../additional_info/color_identity_widget.h | 3 +- .../cards/additional_info/mana_cost_widget.h | 3 +- .../additional_info/mana_symbol_widget.cpp | 3 +- .../card_group_display_widget.cpp | 6 +- .../card_group_display_widget.h | 2 +- .../flat_card_group_display_widget.cpp | 4 +- .../overlapped_card_group_display_widget.cpp | 4 +- .../cards/card_info_display_widget.cpp | 2 +- .../widgets/cards/card_info_display_widget.h | 5 +- .../widgets/cards/card_info_frame_widget.cpp | 6 +- .../widgets/cards/card_info_frame_widget.h | 5 +- .../card_info_picture_art_crop_widget.cpp | 6 +- .../card_info_picture_enlarged_widget.cpp | 8 +- .../cards/card_info_picture_enlarged_widget.h | 3 +- .../cards/card_info_picture_widget.cpp | 14 +- .../widgets/cards/card_info_picture_widget.h | 2 +- .../widgets/cards/card_info_text_widget.cpp | 4 +- .../widgets/cards/card_info_text_widget.h | 3 +- .../widgets/cards/card_size_widget.cpp | 3 +- .../cards/deck_card_zone_display_widget.cpp | 2 +- .../cards/deck_card_zone_display_widget.h | 2 +- .../deck_preview_card_picture_widget.cpp | 3 +- .../deck_analytics/deck_analytics_widget.h | 2 +- .../deck_analytics/mana_base_widget.cpp | 6 +- .../widgets/deck_analytics/mana_base_widget.h | 2 +- .../deck_analytics/mana_curve_widget.cpp | 6 +- .../deck_analytics/mana_devotion_widget.cpp | 6 +- .../deck_analytics/mana_devotion_widget.h | 2 +- .../deck_editor_database_display_widget.cpp | 6 +- .../deck_editor_database_display_widget.h | 6 +- .../deck_editor_deck_dock_widget.cpp | 7 +- .../deck_editor_deck_dock_widget.h | 4 +- .../deck_editor_filter_dock_widget.cpp | 4 +- .../deck_editor_filter_dock_widget.h | 2 +- .../interface/widgets/general/home_widget.cpp | 4 +- .../printing_selector/card_amount_widget.h | 2 +- .../printing_selector/printing_selector.cpp | 4 +- .../printing_selector/printing_selector.h | 2 +- .../printing_selector_card_display_widget.h | 2 +- .../printing_selector_card_overlay_widget.cpp | 6 +- .../printing_selector_card_overlay_widget.h | 3 +- .../printing_selector_card_sorting_widget.cpp | 4 +- ...tabase_display_filter_save_load_widget.cpp | 2 +- ...tabase_display_main_type_filter_widget.cpp | 2 +- ...ual_database_display_set_filter_widget.cpp | 4 +- ...atabase_display_sub_type_filter_widget.cpp | 2 +- .../visual_database_display_widget.cpp | 8 +- .../visual_database_display_widget.h | 6 +- .../visual_database_filter_display_widget.cpp | 3 +- .../visual_deck_editor_sample_hand_widget.cpp | 4 +- .../visual_deck_editor_widget.cpp | 12 +- .../visual_deck_editor_widget.h | 8 +- .../deck_preview_deck_tags_display_widget.cpp | 2 +- .../deck_preview_tag_addition_widget.cpp | 2 +- .../deck_preview/deck_preview_tag_dialog.cpp | 2 +- .../deck_preview/deck_preview_widget.cpp | 4 +- ...ual_deck_storage_folder_display_widget.cpp | 2 +- ...ual_deck_storage_quick_settings_widget.cpp | 2 +- .../visual_deck_storage_search_widget.cpp | 2 +- .../visual_deck_storage_sort_widget.cpp | 2 +- .../visual_deck_storage_widget.cpp | 4 +- cockatrice/src/interface/window_main.cpp | 16 +- cockatrice/src/interface/window_main.h | 2 +- cockatrice/src/main.cpp | 8 +- cockatrice/src/main.h | 3 +- cockatrice/src/server/abstract_client.cpp | 34 ++-- cockatrice/src/server/abstract_client.h | 5 +- cockatrice/src/server/chat_view/chat_view.cpp | 4 +- cockatrice/src/server/chat_view/chat_view.h | 4 +- cockatrice/src/server/game_selector.cpp | 6 +- cockatrice/src/server/game_selector.h | 6 +- cockatrice/src/server/games_model.cpp | 4 +- cockatrice/src/server/games_model.h | 2 +- .../src/server/handle_public_servers.cpp | 3 +- cockatrice/src/server/local_client.cpp | 5 +- cockatrice/src/server/local_server.cpp | 3 +- cockatrice/src/server/local_server.h | 4 +- .../src/server/local_server_interface.h | 2 +- cockatrice/src/server/pending_command.h | 5 +- .../src/server/remote/remote_client.cpp | 22 +-- cockatrice/src/server/remote/remote_client.h | 2 +- .../remote/remote_decklist_tree_widget.cpp | 6 +- .../remote/remote_replay_list_tree_widget.cpp | 6 +- .../remote/remote_replay_list_tree_widget.h | 5 +- .../src/server/user/user_context_menu.cpp | 20 +-- .../src/server/user/user_context_menu.h | 3 +- cockatrice/src/server/user/user_info_box.cpp | 8 +- .../src/server/user/user_info_connection.cpp | 3 +- .../src/server/user/user_list_manager.cpp | 13 +- .../src/server/user/user_list_manager.h | 2 +- .../src/server/user/user_list_widget.cpp | 10 +- cockatrice/src/server/user/user_list_widget.h | 5 +- .../src/tabs/abstract_tab_deck_editor.cpp | 16 +- .../src/tabs/abstract_tab_deck_editor.h | 2 +- ...i_response_card_details_display_widget.cpp | 3 +- ...ponse_commander_details_display_widget.cpp | 3 +- cockatrice/src/tabs/api/edhrec/tab_edhrec.h | 2 +- .../src/tabs/api/edhrec/tab_edhrec_main.cpp | 6 +- .../src/tabs/api/edhrec/tab_edhrec_main.h | 2 +- cockatrice/src/tabs/tab.h | 3 +- cockatrice/src/tabs/tab_account.cpp | 14 +- cockatrice/src/tabs/tab_account.h | 3 +- cockatrice/src/tabs/tab_admin.cpp | 8 +- cockatrice/src/tabs/tab_admin.h | 4 +- cockatrice/src/tabs/tab_deck_editor.cpp | 8 +- cockatrice/src/tabs/tab_deck_editor.h | 5 +- cockatrice/src/tabs/tab_deck_storage.cpp | 20 +-- cockatrice/src/tabs/tab_game.cpp | 20 +-- cockatrice/src/tabs/tab_game.h | 2 +- cockatrice/src/tabs/tab_logs.cpp | 6 +- cockatrice/src/tabs/tab_message.cpp | 10 +- cockatrice/src/tabs/tab_replays.cpp | 22 +-- cockatrice/src/tabs/tab_room.cpp | 20 +-- cockatrice/src/tabs/tab_server.cpp | 8 +- cockatrice/src/tabs/tab_supervisor.cpp | 20 +-- .../tab_deck_editor_visual.cpp | 8 +- .../tab_deck_storage_visual.cpp | 4 +- common/CMakeLists.txt | 50 ------ dbconverter/CMakeLists.txt | 106 ++++++----- dbconverter/src/main.h | 4 +- dbconverter/src/mocks.cpp | 2 +- dbconverter/src/mocks.h | 8 +- libcockatrice_card/CMakeLists.txt | 68 +++++++ .../card/card_database}/card_database.cpp | 5 +- .../card/card_database}/card_database.h | 5 +- .../card_database}/card_database_loader.cpp | 2 +- .../card_database}/card_database_loader.h | 0 .../card_database}/card_database_manager.cpp | 0 .../card_database}/card_database_manager.h | 0 .../card_database}/card_database_querier.cpp | 4 +- .../card_database}/card_database_querier.h | 5 +- .../model/card/card_completer_proxy_model.cpp | 0 .../model/card/card_completer_proxy_model.h | 0 .../model/card/card_search_model.cpp | 3 +- .../model/card/card_search_model.h | 3 +- .../model/card_database_display_model.cpp | 0 .../model/card_database_display_model.h | 2 +- .../model/card_database_model.cpp | 2 + .../model/card_database_model.h | 0 .../model/token/token_display_model.cpp | 0 .../model/token/token_display_model.h | 0 .../model/token/token_edit_model.cpp | 4 +- .../model/token/token_edit_model.h | 0 .../parser/card_database_parser.cpp | 0 .../parser/card_database_parser.h | 3 +- .../parser/cockatrice_xml_3.cpp | 4 +- .../card_database}/parser/cockatrice_xml_3.h | 1 - .../parser/cockatrice_xml_4.cpp | 4 +- .../card_database}/parser/cockatrice_xml_4.h | 1 - .../libcockatrice}/card/card_info.cpp | 8 +- .../libcockatrice}/card/card_info.h | 3 +- .../card}/card_info_comparator.cpp | 0 .../card}/card_info_comparator.h | 2 +- .../card/card_printing}/exact_card.cpp | 3 + .../card/card_printing}/exact_card.h | 2 +- .../card/card_printing}/printing_info.cpp | 2 + .../card/card_printing}/printing_info.h | 2 +- .../card/card_relation}/card_relation.cpp | 1 + .../card/card_relation}/card_relation.h | 0 .../card/card_relation}/card_relation_type.h | 0 .../libcockatrice/card/card_set}/card_set.cpp | 2 +- .../libcockatrice/card/card_set}/card_set.h | 0 .../card/card_set}/card_set_comparator.h | 2 +- .../card/card_set}/card_set_list.cpp | 0 .../card/card_set}/card_set_list.h | 0 .../libcockatrice}/card/game_specific_terms.h | 0 libcockatrice_deck_list/CMakeLists.txt | 30 ++++ .../abstract_deck_list_card_node.cpp | 0 .../deck_list}/abstract_deck_list_card_node.h | 0 .../deck_list}/abstract_deck_list_node.cpp | 0 .../deck_list}/abstract_deck_list_node.h | 0 .../libcockatrice/deck_list}/deck_list.cpp | 0 .../libcockatrice/deck_list}/deck_list.h | 4 +- .../deck_list}/deck_list_card_node.cpp | 0 .../deck_list}/deck_list_card_node.h | 2 +- .../deck_list}/inner_deck_list_node.cpp | 0 .../deck_list}/inner_deck_list_node.h | 0 libcockatrice_protocol/CMakeLists.txt | 13 ++ .../libcockatrice/protocol}/pb/CMakeLists.txt | 18 +- .../protocol}/pb/admin_commands.proto | 0 .../protocol}/pb/card_attributes.proto | 0 .../libcockatrice/protocol}/pb/color.proto | 0 .../protocol}/pb/command_attach_card.proto | 0 .../pb/command_change_zone_properties.proto | 0 .../protocol}/pb/command_concede.proto | 0 .../protocol}/pb/command_create_arrow.proto | 0 .../protocol}/pb/command_create_counter.proto | 0 .../protocol}/pb/command_create_token.proto | 0 .../protocol}/pb/command_deck_del.proto | 0 .../protocol}/pb/command_deck_del_dir.proto | 0 .../protocol}/pb/command_deck_download.proto | 0 .../protocol}/pb/command_deck_list.proto | 0 .../protocol}/pb/command_deck_new_dir.proto | 0 .../protocol}/pb/command_deck_select.proto | 0 .../protocol}/pb/command_deck_upload.proto | 0 .../protocol}/pb/command_del_counter.proto | 0 .../protocol}/pb/command_delete_arrow.proto | 0 .../protocol}/pb/command_draw_cards.proto | 0 .../protocol}/pb/command_dump_zone.proto | 0 .../protocol}/pb/command_flip_card.proto | 0 .../protocol}/pb/command_game_say.proto | 0 .../pb/command_inc_card_counter.proto | 0 .../protocol}/pb/command_inc_counter.proto | 0 .../protocol}/pb/command_kick_from_game.proto | 0 .../protocol}/pb/command_leave_game.proto | 0 .../protocol}/pb/command_move_card.proto | 0 .../protocol}/pb/command_mulligan.proto | 0 .../protocol}/pb/command_next_turn.proto | 0 .../protocol}/pb/command_ready_start.proto | 0 .../pb/command_replay_delete_match.proto | 0 .../pb/command_replay_download.proto | 0 .../pb/command_replay_get_code.proto | 0 .../protocol}/pb/command_replay_list.proto | 0 .../pb/command_replay_modify_match.proto | 0 .../pb/command_replay_submit_code.proto | 0 .../protocol}/pb/command_reveal_cards.proto | 0 .../protocol}/pb/command_reverse_turn.proto | 0 .../protocol}/pb/command_roll_die.proto | 0 .../pb/command_set_active_phase.proto | 0 .../protocol}/pb/command_set_card_attr.proto | 0 .../pb/command_set_card_counter.proto | 0 .../protocol}/pb/command_set_counter.proto | 0 .../pb/command_set_sideboard_lock.proto | 0 .../pb/command_set_sideboard_plan.proto | 0 .../protocol}/pb/command_shuffle.proto | 0 .../protocol}/pb/command_undo_draw.proto | 0 .../libcockatrice/protocol}/pb/commands.proto | 0 .../protocol}/pb/context_concede.proto | 0 .../pb/context_connection_state_changed.proto | 0 .../protocol}/pb/context_deck_select.proto | 0 .../protocol}/pb/context_move_card.proto | 0 .../protocol}/pb/context_mulligan.proto | 0 .../protocol}/pb/context_ping_changed.proto | 0 .../protocol}/pb/context_ready_start.proto | 0 .../pb/context_set_sideboard_lock.proto | 0 .../protocol}/pb/context_undo_draw.proto | 0 .../protocol}/pb/event_add_to_list.proto | 0 .../protocol}/pb/event_attach_card.proto | 0 .../pb/event_change_zone_properties.proto | 0 .../pb/event_connection_closed.proto | 0 .../protocol}/pb/event_create_arrow.proto | 0 .../protocol}/pb/event_create_counter.proto | 0 .../protocol}/pb/event_create_token.proto | 0 .../protocol}/pb/event_del_counter.proto | 0 .../protocol}/pb/event_delete_arrow.proto | 0 .../protocol}/pb/event_destroy_card.proto | 0 .../protocol}/pb/event_draw_cards.proto | 0 .../protocol}/pb/event_dump_zone.proto | 0 .../protocol}/pb/event_flip_card.proto | 0 .../protocol}/pb/event_game_closed.proto | 0 .../pb/event_game_host_changed.proto | 0 .../protocol}/pb/event_game_joined.proto | 0 .../protocol}/pb/event_game_say.proto | 0 .../pb/event_game_state_changed.proto | 0 .../protocol}/pb/event_join.proto | 0 .../protocol}/pb/event_join_room.proto | 0 .../protocol}/pb/event_kicked.proto | 0 .../protocol}/pb/event_leave.proto | 0 .../protocol}/pb/event_leave_room.proto | 0 .../protocol}/pb/event_list_games.proto | 0 .../protocol}/pb/event_list_rooms.proto | 0 .../protocol}/pb/event_move_card.proto | 0 .../protocol}/pb/event_notify_user.proto | 0 .../pb/event_player_properties_changed.proto | 0 .../protocol}/pb/event_remove_from_list.proto | 0 .../protocol}/pb/event_remove_messages.proto | 0 .../protocol}/pb/event_replay_added.proto | 0 .../protocol}/pb/event_reveal_cards.proto | 0 .../protocol}/pb/event_reverse_turn.proto | 0 .../protocol}/pb/event_roll_die.proto | 0 .../protocol}/pb/event_room_say.proto | 0 .../pb/event_server_complete_list.proto | 0 .../pb/event_server_identification.proto | 0 .../protocol}/pb/event_server_message.proto | 0 .../protocol}/pb/event_server_shutdown.proto | 0 .../protocol}/pb/event_set_active_phase.proto | 0 .../pb/event_set_active_player.proto | 0 .../protocol}/pb/event_set_card_attr.proto | 0 .../protocol}/pb/event_set_card_counter.proto | 0 .../protocol}/pb/event_set_counter.proto | 0 .../protocol}/pb/event_shuffle.proto | 0 .../protocol}/pb/event_user_joined.proto | 0 .../protocol}/pb/event_user_left.proto | 0 .../protocol}/pb/event_user_message.proto | 0 .../protocol}/pb/game_commands.proto | 0 .../protocol}/pb/game_event.proto | 0 .../protocol}/pb/game_event_container.proto | 0 .../protocol}/pb/game_event_context.proto | 0 .../protocol}/pb/game_replay.proto | 0 .../protocol}/pb/isl_message.proto | 0 .../protocol}/pb/moderator_commands.proto | 0 .../protocol}/pb/move_card_to_zone.proto | 0 .../libcockatrice/protocol}/pb/response.proto | 0 .../protocol}/pb/response_activate.proto | 0 .../protocol}/pb/response_adjust_mod.proto | 0 .../protocol}/pb/response_ban_history.proto | 0 .../protocol}/pb/response_deck_download.proto | 0 .../protocol}/pb/response_deck_list.proto | 0 .../protocol}/pb/response_deck_upload.proto | 0 .../protocol}/pb/response_dump_zone.proto | 0 .../pb/response_forgotpasswordrequest.proto | 0 .../pb/response_get_admin_notes.proto | 0 .../pb/response_get_games_of_user.proto | 0 .../protocol}/pb/response_get_user_info.proto | 0 .../protocol}/pb/response_join_room.proto | 0 .../protocol}/pb/response_list_users.proto | 0 .../protocol}/pb/response_login.proto | 0 .../protocol}/pb/response_password_salt.proto | 0 .../protocol}/pb/response_register.proto | 0 .../pb/response_replay_download.proto | 0 .../pb/response_replay_get_code.proto | 0 .../protocol}/pb/response_replay_list.proto | 0 .../pb/response_viewlog_history.proto | 0 .../protocol}/pb/response_warn_history.proto | 0 .../protocol}/pb/response_warn_list.proto | 0 .../protocol}/pb/room_commands.proto | 0 .../protocol}/pb/room_event.proto | 0 .../protocol}/pb/server_message.proto | 0 .../protocol}/pb/serverinfo_arrow.proto | 0 .../protocol}/pb/serverinfo_ban.proto | 0 .../protocol}/pb/serverinfo_card.proto | 0 .../protocol}/pb/serverinfo_cardcounter.proto | 0 .../pb/serverinfo_chat_message.proto | 0 .../protocol}/pb/serverinfo_counter.proto | 0 .../protocol}/pb/serverinfo_deckstorage.proto | 0 .../protocol}/pb/serverinfo_game.proto | 0 .../protocol}/pb/serverinfo_gametype.proto | 0 .../protocol}/pb/serverinfo_player.proto | 0 .../protocol}/pb/serverinfo_playerping.proto | 0 .../pb/serverinfo_playerproperties.proto | 0 .../protocol}/pb/serverinfo_replay.proto | 0 .../pb/serverinfo_replay_match.proto | 0 .../protocol}/pb/serverinfo_room.proto | 0 .../protocol}/pb/serverinfo_user.proto | 0 .../protocol}/pb/serverinfo_warning.proto | 0 .../protocol}/pb/serverinfo_zone.proto | 0 .../protocol}/pb/session_commands.proto | 0 .../protocol}/pb/session_event.proto | 0 libcockatrice_rng/CMakeLists.txt | 20 +++ .../libcockatrice/rng}/rng_abstract.cpp | 0 .../libcockatrice/rng}/rng_abstract.h | 0 .../libcockatrice/rng}/rng_sfmt.cpp | 0 .../libcockatrice/rng}/rng_sfmt.h | 0 .../libcockatrice/rng}/sfmt/LICENSE.txt | 0 .../libcockatrice/rng}/sfmt/SFMT-common.h | 0 .../libcockatrice/rng}/sfmt/SFMT-params.h | 0 .../rng}/sfmt/SFMT-params19937.h | 0 .../libcockatrice/rng}/sfmt/SFMT.c | 0 .../libcockatrice/rng}/sfmt/SFMT.h | 0 libcockatrice_server/CMakeLists.txt | 67 +++++++ .../server}/debug_pb_message.cpp | 3 +- .../libcockatrice/server}/debug_pb_message.h | 0 .../game/server_abstract_participant.cpp | 144 +++++++-------- .../server/game/server_abstract_participant.h | 6 +- .../server/game/server_abstract_player.cpp | 81 ++++----- .../server/game/server_abstract_player.h | 2 +- .../server/game/server_arrow.cpp | 3 +- .../libcockatrice}/server/game/server_arrow.h | 2 +- .../server/game/server_arrowtarget.cpp | 0 .../server/game/server_arrowtarget.h | 0 .../server/game/server_card.cpp | 6 +- .../libcockatrice}/server/game/server_card.h | 6 +- .../server/game/server_cardzone.cpp | 4 +- .../server/game/server_cardzone.h | 2 +- .../server/game/server_counter.cpp | 2 +- .../server/game/server_counter.h | 2 +- .../server/game/server_game.cpp | 43 +++-- .../libcockatrice}/server/game/server_game.h | 6 +- .../server/game/server_move_card_struct.h | 0 .../server/game/server_player.cpp | 91 ++++++---- .../server/game/server_player.h | 0 .../server/game/server_spectator.cpp | 0 .../server/game/server_spectator.h | 0 .../server}/get_pb_extension.cpp | 0 .../libcockatrice/server}/get_pb_extension.h | 0 .../libcockatrice/server}/room_message_type.h | 2 +- .../libcockatrice}/server/server.cpp | 16 +- .../libcockatrice}/server/server.h | 10 +- .../server/server_abstractuserinterface.cpp | 4 +- .../server/server_abstractuserinterface.h | 6 +- .../server/server_database_interface.cpp | 0 .../server/server_database_interface.h | 0 .../server/server_player_reference.h | 0 .../server/server_protocolhandler.cpp | 36 ++-- .../server/server_protocolhandler.h | 4 +- .../server/server_remoteuserinterface.cpp | 2 +- .../server/server_remoteuserinterface.h | 0 .../server/server_response_containers.cpp | 0 .../server/server_response_containers.h | 2 +- .../libcockatrice}/server/server_room.cpp | 20 +-- .../libcockatrice}/server/server_room.h | 6 +- .../server}/serverinfo_user_container.cpp | 2 +- .../server}/serverinfo_user_container.h | 0 .../libcockatrice/server}/user_level.h | 2 +- libcockatrice_settings/CMakeLists.txt | 53 ++++++ .../settings/cache_settings.cpp | 2 +- .../libcockatrice}/settings/cache_settings.h | 2 +- .../settings/card_counter_settings.cpp | 0 .../settings/card_counter_settings.h | 0 .../settings/card_database_settings.cpp | 0 .../settings/card_database_settings.h | 0 .../settings/card_override_settings.cpp | 0 .../settings/card_override_settings.h | 2 +- .../settings/debug_settings.cpp | 0 .../libcockatrice}/settings/debug_settings.h | 0 .../settings/download_settings.cpp | 0 .../settings/download_settings.h | 0 .../settings/game_filters_settings.cpp | 0 .../settings/game_filters_settings.h | 0 .../settings/layouts_settings.cpp | 0 .../settings/layouts_settings.h | 0 .../settings/message_settings.cpp | 0 .../settings/message_settings.h | 0 .../settings/recents_settings.cpp | 0 .../settings/recents_settings.h | 0 .../settings/servers_settings.cpp | 0 .../settings/servers_settings.h | 0 .../settings/settings_manager.cpp | 0 .../settings/settings_manager.h | 0 .../settings/shortcut_treeview.cpp | 0 .../settings/shortcut_treeview.h | 0 .../settings/shortcuts_settings.cpp | 0 .../settings/shortcuts_settings.h | 0 libcockatrice_utility/CMakeLists.txt | 33 ++++ .../libcockatrice/utility}/card_ref.h | 0 .../libcockatrice/utility}/color.h | 2 +- .../libcockatrice/utility}/expression.cpp | 2 +- .../libcockatrice/utility}/expression.h | 0 .../libcockatrice/utility}/featureset.cpp | 0 .../libcockatrice/utility}/featureset.h | 0 .../libcockatrice}/utility/key_signals.cpp | 0 .../libcockatrice}/utility/key_signals.h | 0 .../libcockatrice}/utility/levenshtein.cpp | 0 .../libcockatrice}/utility/levenshtein.h | 0 .../libcockatrice}/utility/logger.cpp | 0 .../libcockatrice}/utility/logger.h | 0 .../libcockatrice}/utility/macros.h | 0 .../libcockatrice/utility}/passwordhasher.cpp | 3 +- .../libcockatrice/utility}/passwordhasher.h | 0 .../libcockatrice/utility}/peglib.h | 0 .../libcockatrice/utility}/trice_limits.h | 0 libs/card/CMakeLists.txt | 71 ++++++++ libs/settings/CMakeLists.txt | 55 ++++++ libs/utility/CMakeLists.txt | 18 ++ oracle/CMakeLists.txt | 169 +++++++----------- oracle/src/main.cpp | 2 +- oracle/src/oracleimporter.cpp | 4 +- oracle/src/oracleimporter.h | 2 +- oracle/src/oraclewizard.cpp | 2 +- servatrice/CMakeLists.txt | 9 +- servatrice/src/isl_interface.cpp | 30 ++-- servatrice/src/isl_interface.h | 6 +- servatrice/src/main.cpp | 4 +- servatrice/src/servatrice.cpp | 12 +- servatrice/src/servatrice.h | 3 +- .../src/servatrice_database_interface.cpp | 6 +- .../src/servatrice_database_interface.h | 5 +- servatrice/src/serversocketinterface.cpp | 90 +++++----- servatrice/src/serversocketinterface.h | 5 +- tests/CMakeLists.txt | 6 +- tests/carddatabase/CMakeLists.txt | 89 +++++---- tests/carddatabase/filter_string_test.cpp | 2 +- tests/carddatabase/mocks.cpp | 2 +- tests/carddatabase/mocks.h | 8 +- tests/expression_test.cpp | 3 +- tests/loading_from_clipboard/CMakeLists.txt | 6 +- .../clipboard_testing.cpp | 3 +- .../clipboard_testing.h | 3 +- tests/oracle/CMakeLists.txt | 2 +- tests/password_hash_test.cpp | 7 +- vcpkg | 2 +- .../components/CardDetails/CardDetails.tsx | 6 +- 593 files changed, 1913 insertions(+), 1601 deletions(-) rename cockatrice/src/{picture_loader/picture_loader.cpp => interface/card_picture_loader/card_picture_loader.cpp} (65%) rename cockatrice/src/{picture_loader/picture_loader.h => interface/card_picture_loader/card_picture_loader.h} (53%) rename cockatrice/src/{picture_loader/picture_loader_local.cpp => interface/card_picture_loader/card_picture_loader_local.cpp} (77%) rename cockatrice/src/{picture_loader/picture_loader_local.h => interface/card_picture_loader/card_picture_loader_local.h} (78%) rename cockatrice/src/{picture_loader/picture_loader_request_status_display_widget.cpp => interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp} (74%) rename cockatrice/src/{picture_loader/picture_loader_request_status_display_widget.h => interface/card_picture_loader/card_picture_loader_request_status_display_widget.h} (75%) rename cockatrice/src/{picture_loader/picture_loader_status_bar.cpp => interface/card_picture_loader/card_picture_loader_status_bar.cpp} (54%) rename cockatrice/src/{picture_loader/picture_loader_status_bar.h => interface/card_picture_loader/card_picture_loader_status_bar.h} (68%) rename cockatrice/src/{picture_loader/picture_loader_worker.cpp => interface/card_picture_loader/card_picture_loader_worker.cpp} (78%) rename cockatrice/src/{picture_loader/picture_loader_worker.h => interface/card_picture_loader/card_picture_loader_worker.h} (67%) rename cockatrice/src/{picture_loader/picture_loader_worker_work.cpp => interface/card_picture_loader/card_picture_loader_worker_work.cpp} (75%) rename cockatrice/src/{picture_loader/picture_loader_worker_work.h => interface/card_picture_loader/card_picture_loader_worker_work.h} (74%) rename cockatrice/src/{picture_loader/picture_to_load.cpp => interface/card_picture_loader/card_picture_to_load.cpp} (93%) rename cockatrice/src/{picture_loader/picture_to_load.h => interface/card_picture_loader/card_picture_to_load.h} (76%) rename cockatrice/src/{ => interface}/utility/deck_list_sort_filter_proxy_model.cpp (98%) rename cockatrice/src/{ => interface}/utility/deck_list_sort_filter_proxy_model.h (92%) rename cockatrice/src/{ => interface}/utility/sequence_edit.cpp (99%) rename cockatrice/src/{ => interface}/utility/sequence_edit.h (100%) delete mode 100644 common/CMakeLists.txt create mode 100644 libcockatrice_card/CMakeLists.txt rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database.cpp (97%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database.h (95%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_loader.cpp (98%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_loader.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_manager.cpp (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_manager.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_querier.cpp (98%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/card_database_querier.h (95%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card/card_completer_proxy_model.cpp (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card/card_completer_proxy_model.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card/card_search_model.cpp (95%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card/card_search_model.h (99%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card_database_display_model.cpp (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card_database_display_model.h (98%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card_database_model.cpp (99%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/card_database_model.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/token/token_display_model.cpp (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/token/token_display_model.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/token/token_edit_model.cpp (83%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/model/token/token_edit_model.h (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/card_database_parser.cpp (100%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/card_database_parser.h (97%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/cockatrice_xml_3.cpp (99%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/cockatrice_xml_3.h (96%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/cockatrice_xml_4.cpp (99%) rename {cockatrice/src/database => libcockatrice_card/libcockatrice/card/card_database}/parser/cockatrice_xml_4.h (96%) rename {cockatrice/src => libcockatrice_card/libcockatrice}/card/card_info.cpp (97%) rename {cockatrice/src => libcockatrice_card/libcockatrice}/card/card_info.h (99%) rename {cockatrice/src/utility => libcockatrice_card/libcockatrice/card}/card_info_comparator.cpp (100%) rename {cockatrice/src/utility => libcockatrice_card/libcockatrice/card}/card_info_comparator.h (95%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_printing}/exact_card.cpp (96%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_printing}/exact_card.h (97%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_printing}/printing_info.cpp (88%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_printing}/printing_info.h (97%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_relation}/card_relation.cpp (94%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_relation}/card_relation.h (100%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_relation}/card_relation_type.h (100%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_set}/card_set.cpp (97%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_set}/card_set.h (100%) rename {cockatrice/src/utility => libcockatrice_card/libcockatrice/card/card_set}/card_set_comparator.h (96%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_set}/card_set_list.cpp (100%) rename {cockatrice/src/card => libcockatrice_card/libcockatrice/card/card_set}/card_set_list.h (100%) rename {cockatrice/src => libcockatrice_card/libcockatrice}/card/game_specific_terms.h (100%) create mode 100644 libcockatrice_deck_list/CMakeLists.txt rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/abstract_deck_list_card_node.cpp (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/abstract_deck_list_card_node.h (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/abstract_deck_list_node.cpp (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/abstract_deck_list_node.h (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/deck_list.cpp (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/deck_list.h (98%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/deck_list_card_node.cpp (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/deck_list_card_node.h (99%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/inner_deck_list_node.cpp (100%) rename {common => libcockatrice_deck_list/libcockatrice/deck_list}/inner_deck_list_node.h (100%) create mode 100644 libcockatrice_protocol/CMakeLists.txt rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/CMakeLists.txt (90%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/admin_commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/card_attributes.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/color.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_attach_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_change_zone_properties.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_concede.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_create_arrow.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_create_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_create_token.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_del.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_del_dir.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_download.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_new_dir.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_select.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_deck_upload.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_del_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_delete_arrow.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_draw_cards.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_dump_zone.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_flip_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_game_say.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_inc_card_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_inc_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_kick_from_game.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_leave_game.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_move_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_mulligan.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_next_turn.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_ready_start.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_delete_match.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_download.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_get_code.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_modify_match.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_replay_submit_code.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_reveal_cards.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_reverse_turn.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_roll_die.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_active_phase.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_card_attr.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_card_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_sideboard_lock.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_set_sideboard_plan.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_shuffle.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/command_undo_draw.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_concede.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_connection_state_changed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_deck_select.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_move_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_mulligan.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_ping_changed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_ready_start.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_set_sideboard_lock.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/context_undo_draw.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_add_to_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_attach_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_change_zone_properties.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_connection_closed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_create_arrow.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_create_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_create_token.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_del_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_delete_arrow.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_destroy_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_draw_cards.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_dump_zone.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_flip_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_game_closed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_game_host_changed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_game_joined.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_game_say.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_game_state_changed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_join.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_join_room.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_kicked.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_leave.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_leave_room.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_list_games.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_list_rooms.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_move_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_notify_user.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_player_properties_changed.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_remove_from_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_remove_messages.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_replay_added.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_reveal_cards.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_reverse_turn.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_roll_die.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_room_say.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_server_complete_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_server_identification.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_server_message.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_server_shutdown.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_set_active_phase.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_set_active_player.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_set_card_attr.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_set_card_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_set_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_shuffle.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_user_joined.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_user_left.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/event_user_message.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/game_commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/game_event.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/game_event_container.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/game_event_context.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/game_replay.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/isl_message.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/moderator_commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/move_card_to_zone.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_activate.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_adjust_mod.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_ban_history.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_deck_download.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_deck_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_deck_upload.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_dump_zone.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_forgotpasswordrequest.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_get_admin_notes.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_get_games_of_user.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_get_user_info.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_join_room.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_list_users.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_login.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_password_salt.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_register.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_replay_download.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_replay_get_code.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_replay_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_viewlog_history.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_warn_history.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/response_warn_list.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/room_commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/room_event.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/server_message.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_arrow.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_ban.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_card.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_cardcounter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_chat_message.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_counter.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_deckstorage.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_game.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_gametype.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_player.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_playerping.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_playerproperties.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_replay.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_replay_match.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_room.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_user.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_warning.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/serverinfo_zone.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/session_commands.proto (100%) rename {common => libcockatrice_protocol/libcockatrice/protocol}/pb/session_event.proto (100%) create mode 100644 libcockatrice_rng/CMakeLists.txt rename {common => libcockatrice_rng/libcockatrice/rng}/rng_abstract.cpp (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/rng_abstract.h (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/rng_sfmt.cpp (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/rng_sfmt.h (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/LICENSE.txt (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/SFMT-common.h (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/SFMT-params.h (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/SFMT-params19937.h (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/SFMT.c (100%) rename {common => libcockatrice_rng/libcockatrice/rng}/sfmt/SFMT.h (100%) create mode 100644 libcockatrice_server/CMakeLists.txt rename {common => libcockatrice_server/libcockatrice/server}/debug_pb_message.cpp (98%) rename {common => libcockatrice_server/libcockatrice/server}/debug_pb_message.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_abstract_participant.cpp (83%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_abstract_participant.h (98%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_abstract_player.cpp (96%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_abstract_player.h (99%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_arrow.cpp (94%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_arrow.h (95%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_arrowtarget.cpp (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_arrowtarget.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_card.cpp (96%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_card.h (97%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_cardzone.cpp (99%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_cardzone.h (98%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_counter.cpp (88%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_counter.h (97%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_game.cpp (96%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_game.h (97%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_move_card_struct.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_player.cpp (86%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_player.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_spectator.cpp (100%) rename {common => libcockatrice_server/libcockatrice}/server/game/server_spectator.h (100%) rename {common => libcockatrice_server/libcockatrice/server}/get_pb_extension.cpp (100%) rename {common => libcockatrice_server/libcockatrice/server}/get_pb_extension.h (100%) rename {common => libcockatrice_server/libcockatrice/server}/room_message_type.h (86%) rename {common => libcockatrice_server/libcockatrice}/server/server.cpp (98%) rename {common => libcockatrice_server/libcockatrice}/server/server.h (96%) rename {common => libcockatrice_server/libcockatrice}/server/server_abstractuserinterface.cpp (97%) rename {common => libcockatrice_server/libcockatrice}/server/server_abstractuserinterface.h (92%) rename {common => libcockatrice_server/libcockatrice}/server/server_database_interface.cpp (100%) rename {common => libcockatrice_server/libcockatrice}/server/server_database_interface.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/server_player_reference.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/server_protocolhandler.cpp (97%) rename {common => libcockatrice_server/libcockatrice}/server/server_protocolhandler.h (97%) rename {common => libcockatrice_server/libcockatrice}/server/server_remoteuserinterface.cpp (92%) rename {common => libcockatrice_server/libcockatrice}/server/server_remoteuserinterface.h (100%) rename {common => libcockatrice_server/libcockatrice}/server/server_response_containers.cpp (100%) rename {common => libcockatrice_server/libcockatrice}/server/server_response_containers.h (98%) rename {common => libcockatrice_server/libcockatrice}/server/server_room.cpp (96%) rename {common => libcockatrice_server/libcockatrice}/server/server_room.h (96%) rename {common => libcockatrice_server/libcockatrice/server}/serverinfo_user_container.cpp (96%) rename {common => libcockatrice_server/libcockatrice/server}/serverinfo_user_container.h (100%) rename {common => libcockatrice_server/libcockatrice/server}/user_level.h (85%) create mode 100644 libcockatrice_settings/CMakeLists.txt rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/cache_settings.cpp (99%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/cache_settings.h (99%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_counter_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_counter_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_database_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_database_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_override_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/card_override_settings.h (94%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/debug_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/debug_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/download_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/download_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/game_filters_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/game_filters_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/layouts_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/layouts_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/message_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/message_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/recents_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/recents_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/servers_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/servers_settings.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/settings_manager.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/settings_manager.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/shortcut_treeview.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/shortcut_treeview.h (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/shortcuts_settings.cpp (100%) rename {cockatrice/src => libcockatrice_settings/libcockatrice}/settings/shortcuts_settings.h (100%) create mode 100644 libcockatrice_utility/CMakeLists.txt rename {common => libcockatrice_utility/libcockatrice/utility}/card_ref.h (100%) rename {common => libcockatrice_utility/libcockatrice/utility}/color.h (91%) rename {common => libcockatrice_utility/libcockatrice/utility}/expression.cpp (99%) rename {common => libcockatrice_utility/libcockatrice/utility}/expression.h (100%) rename {common => libcockatrice_utility/libcockatrice/utility}/featureset.cpp (100%) rename {common => libcockatrice_utility/libcockatrice/utility}/featureset.h (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/key_signals.cpp (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/key_signals.h (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/levenshtein.cpp (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/levenshtein.h (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/logger.cpp (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/logger.h (100%) rename {cockatrice/src => libcockatrice_utility/libcockatrice}/utility/macros.h (100%) rename {common => libcockatrice_utility/libcockatrice/utility}/passwordhasher.cpp (96%) rename {common => libcockatrice_utility/libcockatrice/utility}/passwordhasher.h (100%) rename {common/lib => libcockatrice_utility/libcockatrice/utility}/peglib.h (100%) rename {common => libcockatrice_utility/libcockatrice/utility}/trice_limits.h (100%) create mode 100644 libs/card/CMakeLists.txt create mode 100644 libs/settings/CMakeLists.txt create mode 100644 libs/utility/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d2e4b145..d89bcee9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,13 @@ endif() include(CPack) -add_subdirectory(common) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_server ${CMAKE_BINARY_DIR}/libcockatrice_server) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility) if(WITH_SERVER) add_subdirectory(servatrice) set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index d2d76bbe5..3d4717a97 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -7,12 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${ set(cockatrice_SOURCES ${VERSION_STRING_CPP} # 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/card_relation.cpp - src/card/card_set.cpp - src/card/card_set_list.cpp - src/card/exact_card.cpp - src/card/printing_info.cpp src/client/deck_editor_menu.cpp src/client/get_text_with_max.cpp src/client/network/client_update_checker.cpp @@ -25,19 +19,6 @@ set(cockatrice_SOURCES src/client/sound_engine.cpp src/client/tapped_out_interface.cpp src/client/update_downloader.cpp - src/database/card_database.cpp - src/database/card_database_loader.cpp - src/database/card_database_manager.cpp - src/database/card_database_querier.cpp - src/database/model/card_database_model.cpp - src/database/model/card_database_display_model.cpp - src/database/model/card/card_completer_proxy_model.cpp - src/database/model/card/card_search_model.cpp - src/database/model/token/token_display_model.cpp - src/database/model/token/token_edit_model.cpp - src/database/parser/card_database_parser.cpp - src/database/parser/cockatrice_xml_3.cpp - src/database/parser/cockatrice_xml_4.cpp src/deck/custom_line_edit.cpp src/deck/deck_list_model.cpp src/deck/deck_loader.cpp @@ -138,6 +119,13 @@ set(cockatrice_SOURCES src/game/zones/table_zone.cpp src/game/zones/view_zone.cpp src/game/zones/view_zone_widget.cpp + src/interface/card_picture_loader/card_picture_loader.cpp + src/interface/card_picture_loader/card_picture_loader_local.cpp + src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp + src/interface/card_picture_loader/card_picture_loader_status_bar.cpp + src/interface/card_picture_loader/card_picture_loader_worker.cpp + src/interface/card_picture_loader/card_picture_loader_worker_work.cpp + src/interface/card_picture_loader/card_picture_to_load.cpp src/interface/layouts/flow_layout.cpp src/interface/layouts/overlap_layout.cpp src/interface/line_edit_completer.cpp @@ -217,13 +205,6 @@ set(cockatrice_SOURCES 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 @@ -241,20 +222,6 @@ set(cockatrice_SOURCES src/server/user/user_info_connection.cpp src/server/user/user_list_manager.cpp src/server/user/user_list_widget.cpp - src/settings/cache_settings.cpp - src/settings/card_counter_settings.cpp - src/settings/card_database_settings.cpp - src/settings/card_override_settings.cpp - src/settings/debug_settings.cpp - src/settings/download_settings.cpp - src/settings/game_filters_settings.cpp - src/settings/layouts_settings.cpp - src/settings/message_settings.cpp - src/settings/recents_settings.cpp - src/settings/servers_settings.cpp - 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 @@ -299,12 +266,8 @@ set(cockatrice_SOURCES 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.cpp - src/utility/key_signals.cpp - src/utility/levenshtein.cpp - src/utility/logger.cpp - src/utility/sequence_edit.cpp + src/interface/utility/deck_list_sort_filter_proxy_model.cpp + src/interface/utility/sequence_edit.cpp ) add_subdirectory(sounds) @@ -399,9 +362,20 @@ elseif(Qt5_FOUND) endif() if(Qt5_FOUND) - target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries( + cockatrice + libcockatrice_card + libcockatrice_deck_list + libcockatrice_utility + libcockatrice_server + libcockatrice_rng + ${COCKATRICE_QT_MODULES} + ) else() - target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries( + cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_server + libcockatrice_rng ${COCKATRICE_QT_MODULES} + ) endif() if(UNIX) diff --git a/cockatrice/src/client/deck_editor_menu.cpp b/cockatrice/src/client/deck_editor_menu.cpp index b3c46d003..bc6337b56 100644 --- a/cockatrice/src/client/deck_editor_menu.cpp +++ b/cockatrice/src/client/deck_editor_menu.cpp @@ -1,7 +1,7 @@ #include "deck_editor_menu.h" -#include "../settings/cache_settings.h" -#include "../settings/shortcuts_settings.h" +#include +#include DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent) { diff --git a/cockatrice/src/client/get_text_with_max.h b/cockatrice/src/client/get_text_with_max.h index 2e633d494..894eb80f2 100644 --- a/cockatrice/src/client/get_text_with_max.h +++ b/cockatrice/src/client/get_text_with_max.h @@ -7,9 +7,8 @@ #ifndef GETTEXTWITHMAX_H #define GETTEXTWITHMAX_H -#include "trice_limits.h" - #include +#include QString getTextWithMax(QWidget *parent, const QString &title, diff --git a/cockatrice/src/client/network/client_update_checker.cpp b/cockatrice/src/client/network/client_update_checker.cpp index 23c52d08d..f965ff6dc 100644 --- a/cockatrice/src/client/network/client_update_checker.cpp +++ b/cockatrice/src/client/network/client_update_checker.cpp @@ -1,8 +1,9 @@ #include "client_update_checker.h" -#include "../../settings/cache_settings.h" #include "release_channel.h" +#include + ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent) { } diff --git a/cockatrice/src/client/network/replay_timeline_widget.cpp b/cockatrice/src/client/network/replay_timeline_widget.cpp index 1f258bf68..2b9ab72e9 100644 --- a/cockatrice/src/client/network/replay_timeline_widget.cpp +++ b/cockatrice/src/client/network/replay_timeline_widget.cpp @@ -1,11 +1,10 @@ #include "replay_timeline_widget.h" -#include "../../settings/cache_settings.h" - #include #include #include #include +#include ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent) : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0), diff --git a/cockatrice/src/client/network/sets_model.h b/cockatrice/src/client/network/sets_model.h index d341440d7..b024ccd49 100644 --- a/cockatrice/src/client/network/sets_model.h +++ b/cockatrice/src/client/network/sets_model.h @@ -7,12 +7,11 @@ #ifndef SETSMODEL_H #define SETSMODEL_H -#include "../../database/card_database.h" - #include #include #include #include +#include class SetsProxyModel; diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp index 68fdc4c4c..3a35620bb 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/spoiler_background_updater.cpp @@ -1,10 +1,7 @@ #include "spoiler_background_updater.h" -#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 #include @@ -16,6 +13,9 @@ #include #include #include +#include +#include +#include #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled" #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" diff --git a/cockatrice/src/client/replay_manager.h b/cockatrice/src/client/replay_manager.h index 55a64768c..8b9ed4e1f 100644 --- a/cockatrice/src/client/replay_manager.h +++ b/cockatrice/src/client/replay_manager.h @@ -9,10 +9,10 @@ #define REPLAY_MANAGER_H #include "network/replay_timeline_widget.h" -#include "pb/game_replay.pb.h" #include #include +#include class TabGame; diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index fef2df093..05f2d12d8 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -1,9 +1,8 @@ #include "sound_engine.h" -#include "../settings/cache_settings.h" - #include #include +#include #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #include diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index 43ceb6cdd..d18d811b0 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -1,8 +1,5 @@ #include "tapped_out_interface.h" -#include "deck_list.h" -#include "deck_list_card_node.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent) : QObject(parent), cardDatabase(_cardDatabase) diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index 43e5cdea3..449bdc5bb 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,11 +7,10 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H -#include "../database/card_database.h" -#include "deck_list.h" - #include #include +#include +#include inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface"); diff --git a/cockatrice/src/deck/custom_line_edit.cpp b/cockatrice/src/deck/custom_line_edit.cpp index ba521c0fd..532afc114 100644 --- a/cockatrice/src/deck/custom_line_edit.cpp +++ b/cockatrice/src/deck/custom_line_edit.cpp @@ -1,13 +1,12 @@ #include "custom_line_edit.h" -#include "../settings/cache_settings.h" -#include "../settings/shortcuts_settings.h" - #include #include #include #include #include +#include +#include LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent) { diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index 4ff16378c..93179d79c 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/cockatrice/src/deck/deck_list_model.cpp @@ -1,8 +1,6 @@ #include "deck_list_model.h" -#include "../database/card_database_manager.h" #include "../main.h" -#include "../settings/cache_settings.h" #include "deck_loader.h" #include @@ -13,6 +11,8 @@ #include #include #include +#include +#include DeckListModel::DeckListModel(QObject *parent) : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder) diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index 28d95a632..a3e448de4 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,13 +1,12 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "../card/exact_card.h" -#include "abstract_deck_list_card_node.h" -#include "deck_list.h" -#include "deck_list_card_node.h" - #include #include +#include +#include +#include +#include class DeckLoader; class CardDatabase; diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 8e98422a6..ee28ec1a6 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,10 +1,6 @@ #include "deck_loader.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" #include "../main.h" -#include "deck_list.h" -#include "deck_list_card_node.h" #include #include @@ -16,6 +12,10 @@ #include #include #include +#include +#include +#include +#include const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"}; diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index 53c4ef434..f11ded444 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -7,9 +7,8 @@ #ifndef DECK_LOADER_H #define DECK_LOADER_H -#include "deck_list.h" - #include +#include inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader") diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp index 96865d9e7..a5cea5358 100644 --- a/cockatrice/src/deck/deck_stats_interface.cpp +++ b/cockatrice/src/deck/deck_stats_interface.cpp @@ -1,8 +1,5 @@ #include "deck_stats_interface.h" -#include "deck_list.h" -#include "deck_list_card_node.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent) : QObject(parent), cardDatabase(_cardDatabase) diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index 8a76b35fc..890516a58 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -7,10 +7,9 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H -#include "../database/card_database.h" -#include "deck_list.h" - #include +#include +#include class QByteArray; class QNetworkAccessManager; diff --git a/cockatrice/src/dialogs/dlg_connect.cpp b/cockatrice/src/dialogs/dlg_connect.cpp index d8cf11487..3f398218e 100644 --- a/cockatrice/src/dialogs/dlg_connect.cpp +++ b/cockatrice/src/dialogs/dlg_connect.cpp @@ -1,8 +1,5 @@ #include "dlg_connect.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include @@ -15,6 +12,8 @@ #include #include #include +#include +#include DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h index b2afbef4d..fd571fc30 100644 --- a/cockatrice/src/dialogs/dlg_connect.h +++ b/cockatrice/src/dialogs/dlg_connect.h @@ -9,10 +9,10 @@ #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" -#include "../utility/macros.h" #include #include +#include class QCheckBox; class QComboBox; diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index 81b233dcb..73bb4d72c 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,10 +1,7 @@ #include "dlg_create_game.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" #include #include @@ -19,6 +16,9 @@ #include #include #include +#include +#include +#include void DlgCreateGame::sharedCtor() { diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/dialogs/dlg_create_game.h index ac7592b94..71359a758 100644 --- a/cockatrice/src/dialogs/dlg_create_game.h +++ b/cockatrice/src/dialogs/dlg_create_game.h @@ -7,10 +7,9 @@ #ifndef DLG_CREATEGAME_H #define DLG_CREATEGAME_H -#include "../utility/macros.h" - #include #include +#include class QCheckBox; class QDialogButtonBox; diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp index fbd737d4a..39b7333c5 100644 --- a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp +++ b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp @@ -1,9 +1,8 @@ #include "dlg_default_tags_editor.h" -#include "../settings/cache_settings.h" - #include #include +#include DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/dialogs/dlg_edit_avatar.cpp index 98a41bdfa..28be359a3 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.cpp +++ b/cockatrice/src/dialogs/dlg_edit_avatar.cpp @@ -1,7 +1,5 @@ #include "dlg_edit_avatar.h" -#include "trice_limits.h" - #include #include #include @@ -11,6 +9,7 @@ #include #include #include +#include DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image() { diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp index bea94ae08..105783210 100644 --- a/cockatrice/src/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/dialogs/dlg_edit_password.cpp @@ -1,13 +1,12 @@ #include "dlg_edit_password.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include #include #include +#include +#include DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index 56711dda6..5cf502cfd 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -1,12 +1,7 @@ #include "dlg_edit_tokens.h" #include "../client/get_text_with_max.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" -#include "../database/model/card_database_model.h" -#include "../database/model/token/token_edit_model.h" #include "../main.h" -#include "trice_limits.h" #include #include @@ -22,6 +17,11 @@ #include #include #include +#include +#include +#include +#include +#include DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr) { diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h index ce3f6d7d4..f19646756 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.h +++ b/cockatrice/src/dialogs/dlg_edit_tokens.h @@ -7,9 +7,8 @@ #ifndef DLG_EDIT_TOKENS_H #define DLG_EDIT_TOKENS_H -#include "../card/card_info.h" - #include +#include class QModelIndex; class CardDatabaseModel; diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp index 7b2af1445..70e99ca28 100644 --- a/cockatrice/src/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/dialogs/dlg_edit_user.cpp @@ -1,13 +1,12 @@ #include "dlg_edit_user.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include #include #include +#include +#include DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp index 4ff237edf..a8999d1e3 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_challenge.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp index a07bda279..000e7b0f1 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_request.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp index 81ab96b9b..43b6c2fb9 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_reset.h" -#include "../settings/cache_settings.h" -#include "trice_limits.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp index 91252a768..fe9151b54 100644 --- a/cockatrice/src/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck.cpp @@ -1,7 +1,8 @@ #include "dlg_load_deck.h" #include "../deck/deck_loader.h" -#include "../settings/cache_settings.h" + +#include DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) { diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp index 26f92f4e9..3f0275dd7 100644 --- a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp @@ -1,7 +1,6 @@ #include "dlg_load_deck_from_clipboard.h" #include "../deck/deck_loader.h" -#include "../settings/cache_settings.h" #include "dlg_settings.h" #include @@ -13,6 +12,7 @@ #include #include #include +#include /** * Creates the main layout and connects the signals that are common to all versions of this window diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index 890afc075..ea95c1ed6 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -1,11 +1,9 @@ #include "dlg_manage_sets.h" #include "../client/network/sets_model.h" -#include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" +#include "../interface/card_picture_loader/card_picture_loader.h" #include "../main.h" -#include "../picture_loader/picture_loader.h" -#include "../settings/cache_settings.h" #include #include @@ -22,6 +20,8 @@ #include #include #include +#include +#include #define SORT_RESET -1 @@ -251,7 +251,7 @@ void WndSets::actSave() { model->save(CardDatabaseManager::getInstance()); SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards); - PictureLoader::clearPixmapCache(); + CardPictureLoader::clearPixmapCache(); close(); } diff --git a/cockatrice/src/dialogs/dlg_register.cpp b/cockatrice/src/dialogs/dlg_register.cpp index 05c73179e..e71759554 100644 --- a/cockatrice/src/dialogs/dlg_register.cpp +++ b/cockatrice/src/dialogs/dlg_register.cpp @@ -1,9 +1,5 @@ #include "dlg_register.h" -#include "../settings/cache_settings.h" -#include "pb/serverinfo_user.pb.h" -#include "trice_limits.h" - #include #include #include @@ -11,6 +7,9 @@ #include #include #include +#include +#include +#include DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 9f20067b2..b6da8fafe 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -1,6 +1,5 @@ #include "dlg_select_set_for_cards.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" @@ -17,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 6948a8e8b..d772dacd6 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -4,18 +4,13 @@ #include "../client/network/release_channel.h" #include "../client/network/spoiler_background_updater.h" #include "../client/sound_engine.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" #include "../deck/custom_line_edit.h" +#include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/theme_manager.h" +#include "../interface/utility/sequence_edit.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 #include @@ -48,6 +43,11 @@ #include #include #include +#include +#include +#include +#include +#include #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs" #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts" @@ -1086,7 +1086,7 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked() void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked() { - PictureLoader::clearNetworkCache(); + CardPictureLoader::clearNetworkCache(); // These are not used anymore, but we don't delete them automatically, so // we should do it here lest we leave pictures hanging around on users' diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h index bf8dbd2a5..b23e45606 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -7,8 +7,6 @@ #ifndef DLG_SETTINGS_H #define DLG_SETTINGS_H -#include "../utility/macros.h" - #include #include #include @@ -17,6 +15,7 @@ #include #include #include +#include inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings"); diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/dialogs/dlg_startup_card_check.cpp index 5d76bc253..c2a03a55e 100644 --- a/cockatrice/src/dialogs/dlg_startup_card_check.cpp +++ b/cockatrice/src/dialogs/dlg_startup_card_check.cpp @@ -1,8 +1,7 @@ #include "dlg_startup_card_check.h" -#include "../settings/cache_settings.h" - #include +#include DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp index eb8e8dc47..6023ac48c 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp @@ -1,6 +1,5 @@ #include "dlg_tip_of_the_day.h" -#include "../settings/cache_settings.h" #include "tip_of_the_day.h" #include @@ -10,6 +9,7 @@ #include #include #include +#include #define MIN_TIP_IMAGE_HEIGHT 200 #define MIN_TIP_IMAGE_WIDTH 200 diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp index 0edcb1512..ca5100f09 100644 --- a/cockatrice/src/dialogs/dlg_update.cpp +++ b/cockatrice/src/dialogs/dlg_update.cpp @@ -3,7 +3,6 @@ #include "../client/network/client_update_checker.h" #include "../client/network/release_channel.h" #include "../interface/window_main.h" -#include "../settings/cache_settings.h" #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/dialogs/dlg_view_log.cpp b/cockatrice/src/dialogs/dlg_view_log.cpp index b60a9767b..7ad8ec9ab 100644 --- a/cockatrice/src/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/dialogs/dlg_view_log.cpp @@ -1,13 +1,12 @@ #include "dlg_view_log.h" -#include "../settings/cache_settings.h" -#include "../utility/logger.h" - #include #include #include #include #include +#include +#include DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index f107884c3..44ef6c2bd 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,8 +1,9 @@ #include "deck_filter_string.h" -#include "../database/card_database_manager.h" +#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" #include "filter_string.h" -#include "lib/peglib.h" + +#include static peg::parser search(R"( Start <- QueryPartList diff --git a/cockatrice/src/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp index 02fc1e1ec..9a9cc080e 100644 --- a/cockatrice/src/filters/filter_string.cpp +++ b/cockatrice/src/filters/filter_string.cpp @@ -1,6 +1,6 @@ #include "filter_string.h" -#include "../../../common/lib/peglib.h" +#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" #include #include diff --git a/cockatrice/src/filters/filter_string.h b/cockatrice/src/filters/filter_string.h index f2b8ce006..4e6cb38bf 100644 --- a/cockatrice/src/filters/filter_string.h +++ b/cockatrice/src/filters/filter_string.h @@ -7,13 +7,13 @@ #ifndef FILTER_STRING_H #define FILTER_STRING_H -#include "../card/card_info.h" #include "filter_tree.h" #include #include #include #include +#include #include inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string"); diff --git a/cockatrice/src/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h index 40a6ec54c..dc64f79fe 100644 --- a/cockatrice/src/filters/filter_tree.h +++ b/cockatrice/src/filters/filter_tree.h @@ -7,12 +7,12 @@ #ifndef FILTERTREE_H #define FILTERTREE_H -#include "../database/card_database.h" #include "filter_card.h" #include #include #include +#include #include class FilterTreeNode diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h index 08c25772c..cb4dbac2a 100644 --- a/cockatrice/src/game/abstract_game.h +++ b/cockatrice/src/game/abstract_game.h @@ -7,13 +7,13 @@ #ifndef COCKATRICE_ABSTRACT_GAME_H #define COCKATRICE_ABSTRACT_GAME_H -#include "../../../common/pb/game_replay.pb.h" #include "game_event_handler.h" #include "game_meta_info.h" #include "game_state.h" #include "player/player_manager.h" #include +#include class CardItem; class TabGame; diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp index d7b0b7d46..3507a5a27 100644 --- a/cockatrice/src/game/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -1,11 +1,10 @@ #include "abstract_card_drag_item.h" -#include "../../settings/cache_settings.h" - #include #include #include #include +#include static const float CARD_WIDTH_HALF = CARD_WIDTH / 2; static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2; diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index ea23f39c0..f5edf1d62 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -1,9 +1,6 @@ #include "abstract_card_item.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.h" -#include "../../picture_loader/picture_loader.h" -#include "../../settings/cache_settings.h" +#include "../../interface/card_picture_loader/card_picture_loader.h" #include "../game_scene.h" #include @@ -11,6 +8,9 @@ #include #include #include +#include +#include +#include AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id) : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0), @@ -119,11 +119,11 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS if (facedown || cardRef.name.isEmpty()) { // never reveal card color, always paint the card back - PictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize()); + CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize()); } else { // don't even spend time trying to load the picture if our size is too small if (translatedSize.width() > 10) { - PictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize()); + CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize()); if (translatedPixmap.isNull()) paintImage = false; } else { diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h index 7ec843575..8aa5a606b 100644 --- a/cockatrice/src/game/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -7,11 +7,12 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H -#include "../../card/exact_card.h" #include "arrow_target.h" -#include "card_ref.h" #include "graphics_item_type.h" +#include +#include + class Player; const int CARD_WIDTH = 72; diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index c821dc4f8..cfc20341f 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,11 +1,7 @@ #include "abstract_counter.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 @@ -16,6 +12,10 @@ #include #include #include +#include +#include +#include +#include AbstractCounter::AbstractCounter(Player *_player, int _id, diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index 819fb7927..cc4a4e6aa 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -1,22 +1,22 @@ #define _USE_MATH_DEFINES #include "arrow_item.h" -#include "../../card/card_info.h" -#include "../../settings/cache_settings.h" #include "../player/player.h" #include "../player/player_target.h" #include "../zones/card_zone.h" #include "card_item.h" -#include "color.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_delete_arrow.pb.h" #include #include #include #include #include +#include +#include +#include +#include +#include +#include ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color) : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false), diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index da347098f..2bb36725f 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,8 +1,5 @@ #include "card_item.h" -#include "../../card/card_info.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" @@ -12,12 +9,15 @@ #include "../zones/view_zone.h" #include "arrow_item.h" #include "card_drag_item.h" -#include "pb/serverinfo_card.pb.h" #include #include #include #include +#include +#include +#include +#include CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone) : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false), diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h index 5408a5f3a..d8dbe2f44 100644 --- a/cockatrice/src/game/board/card_item.h +++ b/cockatrice/src/game/board/card_item.h @@ -9,7 +9,8 @@ #include "../zones/logic/card_zone_logic.h" #include "abstract_card_item.h" -#include "server/game/server_card.h" + +#include class CardDatabase; class CardDragItem; diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp index 7ad9048c3..c324ca10a 100644 --- a/cockatrice/src/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,10 +1,10 @@ #include "card_list.h" -#include "../../card/card_info.h" #include "card_item.h" #include #include +#include CardList::CardList(bool _contentsKnown) : QList(), contentsKnown(_contentsKnown) { diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index 46b1cc524..da9c97db9 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,16 +1,16 @@ #include "deck_view.h" -#include "../../card/card_info.h" #include "../../interface/theme_manager.h" -#include "../../settings/cache_settings.h" -#include "deck_list.h" -#include "deck_list_card_node.h" #include #include #include #include #include +#include +#include +#include +#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h index 06fb7294a..7d01d5670 100644 --- a/cockatrice/src/game/deckview/deck_view.h +++ b/cockatrice/src/game/deckview/deck_view.h @@ -8,13 +8,13 @@ #define DECKVIEW_H #include "../board/abstract_card_drag_item.h" -#include "pb/move_card_to_zone.pb.h" #include #include #include #include #include +#include class DeckList; class InnerDecklistNode; diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 7dd2da41b..3f2d6d483 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,29 +1,29 @@ #include "deck_view_container.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.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 "../../picture_loader/picture_loader.h" +#include "../../interface/card_picture_loader/card_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" -#include "pb/command_ready_start.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/response_deck_download.pb.h" -#include "trice_limits.h" #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false) { @@ -332,7 +332,7 @@ void DeckViewContainer::deckSelectFinished(const Response &r) { const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext); DeckLoader newDeck(QString::fromStdString(resp.deck())); - PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList())); + CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList())); setDeck(newDeck); switchToDeckLoadedView(); } diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp index 8da2bc722..aeb9be453 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -1,13 +1,7 @@ #include "dlg_create_token.h" -#include "../../database/card_database_manager.h" -#include "../../database/model/card_database_model.h" -#include "../../database/model/token/token_display_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" #include #include @@ -22,6 +16,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent) : QDialog(parent), predefinedTokens(_predefinedTokens) diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp index 53b762fb4..f73968d7a 100644 --- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp @@ -1,7 +1,5 @@ #include "dlg_move_top_cards_until.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.h" #include "../../filters/filter_string.h" #include @@ -12,6 +10,8 @@ #include #include #include +#include +#include DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay) : QDialog(parent) diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp index 7a1a2bb9b..dfb3d0bc5 100644 --- a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp +++ b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp @@ -1,12 +1,11 @@ #include "dlg_roll_dice.h" -#include "trice_limits.h" - #include #include #include #include #include +#include DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index d24d4cb51..a81f838a3 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -1,7 +1,8 @@ #include "game.h" #include "../tabs/tab_game.h" -#include "pb/event_game_joined.pb.h" + +#include Game::Game(TabGame *_tab, QList &_clients, diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index d5848ffdb..f765c35b8 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -4,30 +4,31 @@ #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" -#include "pb/command_leave_game.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_ping_changed.pb.h" -#include "pb/event_game_closed.pb.h" -#include "pb/event_game_host_changed.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_game_state_changed.pb.h" -#include "pb/event_join.pb.h" -#include "pb/event_kicked.pb.h" -#include "pb/event_leave.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_set_active_phase.pb.h" -#include "pb/event_set_active_player.pb.h" -#include "pb/game_event_container.pb.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game) { diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h index 4f44cd83e..2709cdcd5 100644 --- a/cockatrice/src/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -7,12 +7,12 @@ #ifndef COCKATRICE_GAME_EVENT_HANDLER_H #define COCKATRICE_GAME_EVENT_HANDLER_H -#include "pb/event_leave.pb.h" -#include "pb/serverinfo_player.pb.h" #include "player/event_processing_options.h" #include #include +#include +#include class AbstractClient; class Response; diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h index e3c0c22e0..b5f5bfe4f 100644 --- a/cockatrice/src/game/game_meta_info.h +++ b/cockatrice/src/game/game_meta_info.h @@ -7,10 +7,9 @@ #ifndef GAME_META_INFO_H #define GAME_META_INFO_H -#include "pb/serverinfo_game.pb.h" - #include #include +#include // Translation layer class to expose protobuf safely and hook it up to Qt Signals. // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object. diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index 4316e67bf..5af7b2e1d 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,6 +1,5 @@ #include "game_scene.h" -#include "../settings/cache_settings.h" #include "board/card_item.h" #include "phases_toolbar.h" #include "player/player.h" @@ -15,6 +14,7 @@ #include #include #include +#include #include /** diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h index 0ad24633c..19c9cddbc 100644 --- a/cockatrice/src/game/game_state.h +++ b/cockatrice/src/game/game_state.h @@ -8,10 +8,10 @@ #define COCKATRICE_GAME_STATE_H #include "../server/abstract_client.h" -#include "pb/serverinfo_game.pb.h" #include #include +#include class AbstractGame; class ServerInfo_PlayerProperties; diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp index 969e26e14..607f0c85a 100644 --- a/cockatrice/src/game/game_view.cpp +++ b/cockatrice/src/game/game_view.cpp @@ -1,11 +1,11 @@ #include "game_view.h" -#include "../settings/cache_settings.h" #include "game_scene.h" #include #include #include +#include GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0) { diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp index ed8a4e49c..1d76ba31f 100644 --- a/cockatrice/src/game/log/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,17 +1,17 @@ #include "message_log_widget.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" +#include +#include +#include +#include #include static const QString TABLE_ZONE_NAME = "table"; diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h index 128d8ba0e..16be19a3e 100644 --- a/cockatrice/src/game/log/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -10,7 +10,8 @@ #include "../../client/translation.h" #include "../../server/chat_view/chat_view.h" #include "../zones/logic/card_zone_logic.h" -#include "user_level.h" + +#include class AbstractGame; class CardItem; diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp index 2fef5321c..5106e40de 100644 --- a/cockatrice/src/game/phases_toolbar.cpp +++ b/cockatrice/src/game/phases_toolbar.cpp @@ -1,16 +1,16 @@ #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 #include #include #include #include +#include +#include +#include +#include PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable) : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable), diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 22cc86597..86942258c 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,8 +1,5 @@ #include "card_menu.h" -#include "../../../card/card_relation.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" @@ -12,6 +9,10 @@ #include "move_menu.h" #include "pt_menu.h" +#include +#include +#include + CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive) : player(_player), card(_card), shortcutsActive(_shortcutsActive) { diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp index 3f506de00..b8908bc3e 100644 --- a/cockatrice/src/game/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -1,7 +1,5 @@ #include "hand_menu.h" -#include "../../../settings/cache_settings.h" -#include "../../../settings/shortcuts_settings.h" #include "../../abstract_game.h" #include "../../zones/hand_zone.h" #include "../player.h" @@ -9,6 +7,8 @@ #include #include +#include +#include HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player) { diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp index 704e03e9f..53fd58eba 100644 --- a/cockatrice/src/game/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -1,7 +1,5 @@ #include "library_menu.h" -#include "../../../settings/cache_settings.h" -#include "../../../settings/shortcuts_settings.h" #include "../../../tabs/tab_game.h" #include "../../abstract_game.h" #include "../player.h" @@ -9,6 +7,8 @@ #include #include +#include +#include LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) { diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index 7298d3ca9..cc9e284dd 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,7 +1,5 @@ #include "player_menu.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" @@ -10,6 +8,9 @@ #include "card_menu.h" #include "hand_menu.h" +#include +#include + PlayerMenu::PlayerMenu(Player *_player) : player(_player) { playerMenu = new TearOffMenu(); diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp index 3598a1c66..7db8f60be 100644 --- a/cockatrice/src/game/player/menu/say_menu.cpp +++ b/cockatrice/src/game/player/menu/say_menu.cpp @@ -1,9 +1,10 @@ #include "say_menu.h" -#include "../../../settings/cache_settings.h" #include "../player.h" #include "../player_actions.h" +#include + SayMenu::SayMenu(Player *_player) : player(_player) { connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu); diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index b7faa0868..6390bbd84 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -12,15 +12,6 @@ #include "../zones/stack_zone.h" #include "../zones/table_zone.h" #include "../zones/view_zone.h" -#include "color.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/serverinfo_zone.pb.h" #include "player_target.h" #include @@ -28,6 +19,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent) : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)), diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 8047f514e..cd0e3cec7 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -7,14 +7,11 @@ #ifndef PLAYER_H #define PLAYER_H -#include "../../card/card_info.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" #include "player_actions.h" #include "player_area.h" #include "player_event_handler.h" @@ -26,6 +23,9 @@ #include #include #include +#include +#include +#include inline Q_LOGGING_CATEGORY(PlayerLog, "player"); diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index b74db09ce..004053b1e 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,31 +1,32 @@ #include "player_actions.h" -#include "../../../common/pb/context_move_card.pb.h" -#include "../../card/card_relation.h" #include "../../client/get_text_with_max.h" -#include "../../database/card_database_manager.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" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_concede.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "trice_limits.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // milliseconds in between triggers of the move top cards until action static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100; diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h index 02991b60b..ffa02385a 100644 --- a/cockatrice/src/game/player/player_actions.h +++ b/cockatrice/src/game/player/player_actions.h @@ -7,12 +7,13 @@ #ifndef COCKATRICE_PLAYER_ACTIONS_H #define COCKATRICE_PLAYER_ACTIONS_H -#include "../../card/card_relation_type.h" #include "event_processing_options.h" #include "player.h" #include #include +#include +#include namespace google { diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index 969ffd4d2..eacc2dd2b 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -5,30 +5,31 @@ #include "../board/card_item.h" #include "../board/card_list.h" #include "../zones/view_zone.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" #include "player.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player) { } diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h index e7d47b0de..5d1ddd4b4 100644 --- a/cockatrice/src/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -9,8 +9,8 @@ #include "event_processing_options.h" #include -#include -#include +#include +#include class CardItem; class CardZoneLogic; diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h index e649b1584..a8bd63cd0 100644 --- a/cockatrice/src/game/player/player_info.h +++ b/cockatrice/src/game/player/player_info.h @@ -7,7 +7,6 @@ #ifndef COCKATRICE_PLAYER_INFO_H #define COCKATRICE_PLAYER_INFO_H -#include "../../../common/pb/serverinfo_user.pb.h" #include "../../deck/deck_loader.h" #include "../zones/hand_zone.h" #include "../zones/pile_zone.h" @@ -16,6 +15,7 @@ #include "player_target.h" #include +#include class PlayerInfo : public QObject { diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index 9df7e94da..6669a0a37 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -8,14 +8,14 @@ #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" #include #include #include #include +#include +#include +#include PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent) { diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h index 2c257f7b4..20542d466 100644 --- a/cockatrice/src/game/player/player_manager.h +++ b/cockatrice/src/game/player/player_manager.h @@ -7,10 +7,9 @@ #ifndef COCKATRICE_PLAYER_MANAGER_H #define COCKATRICE_PLAYER_MANAGER_H -#include "pb/serverinfo_playerproperties.pb.h" - #include #include +#include class AbstractGame; class Player; diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp index 6ece3e261..a7a5cc5e7 100644 --- a/cockatrice/src/game/player/player_target.cpp +++ b/cockatrice/src/game/player/player_target.cpp @@ -1,13 +1,13 @@ #include "player_target.h" #include "../../interface/pixel_map_generator.h" -#include "pb/serverinfo_user.pb.h" #include "player.h" #include #include #include #include +#include PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent) : AbstractCounter(_player, _id, _name, false, _value, false, parent) diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index 19ea272b2..5d63e8a28 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -1,13 +1,13 @@ #include "hand_zone.h" #include "../../interface/theme_manager.h" -#include "../../settings/cache_settings.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" -#include "pb/command_move_card.pb.h" #include +#include +#include HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index 70cb21b8e..8147a0ddf 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -1,16 +1,16 @@ #include "card_zone_logic.h" -#include "../../../database/card_database_manager.h" #include "../../board/card_item.h" #include "../../player/player.h" #include "../pile_zone.h" #include "../view_zone.h" -#include "pb/command_move_card.pb.h" -#include "pb/serverinfo_user.pb.h" #include "view_zone_logic.h" #include #include +#include +#include +#include /** * @param _player the player that the zone belongs to diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp index 6050cbadf..e61c126e7 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -1,8 +1,9 @@ #include "view_zone_logic.h" -#include "../../../settings/cache_settings.h" #include "../../board/card_item.h" +#include + /** * @param _player the player that the cards are revealed to. * @param _origZone the zone the cards were revealed from. diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp index 5df91a64d..cafb29038 100644 --- a/cockatrice/src/game/zones/pile_zone.cpp +++ b/cockatrice/src/game/zones/pile_zone.cpp @@ -4,12 +4,12 @@ #include "../board/card_item.h" #include "../player/player.h" #include "logic/pile_zone_logic.h" -#include "pb/command_move_card.pb.h" #include "view_zone.h" #include #include #include +#include PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent) { diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp index 863edab48..ec24e4f9f 100644 --- a/cockatrice/src/game/zones/select_zone.cpp +++ b/cockatrice/src/game/zones/select_zone.cpp @@ -1,11 +1,11 @@ #include "select_zone.h" -#include "../../settings/cache_settings.h" #include "../board/card_item.h" #include "../game_scene.h" #include #include +#include qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse) { diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 0eedd5500..4d8c15da8 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -1,16 +1,16 @@ #include "stack_zone.h" #include "../../interface/theme_manager.h" -#include "../../settings/cache_settings.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" #include "logic/stack_zone_logic.h" -#include "pb/command_move_card.pb.h" #include #include +#include +#include StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index 4573cc5c3..b0484f984 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,19 +1,19 @@ #include "table_zone.h" -#include "../../card/card_info.h" #include "../../interface/theme_manager.h" -#include "../../settings/cache_settings.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" #include "logic/table_zone_logic.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_set_card_attr.pb.h" #include #include #include +#include +#include +#include +#include const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100); const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80); diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 1eb99f5c1..29be25640 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,21 +1,21 @@ #include "view_zone.h" -#include "../../card/card_info.h" #include "../../server/pending_command.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" #include "logic/view_zone_logic.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_card.pb.h" #include #include #include #include #include +#include +#include +#include +#include +#include /** * @param parent the parent QGraphicsWidget containing the reveal zone @@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) qobject_cast(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. diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index e452ecedd..06c1e77fb 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -13,7 +13,7 @@ #include #include -#include +#include inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone"); diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index f0615d256..2424feb9b 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -2,11 +2,9 @@ #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" #include "../player/player.h" -#include "pb/command_shuffle.pb.h" #include "view_zone.h" #include @@ -18,6 +16,8 @@ #include #include #include +#include +#include /** * @param _player the player the cards were revealed to. diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h index 862026b21..272ff5560 100644 --- a/cockatrice/src/game/zones/view_zone_widget.h +++ b/cockatrice/src/game/zones/view_zone_widget.h @@ -7,7 +7,6 @@ #ifndef ZONEVIEWWIDGET_H #define ZONEVIEWWIDGET_H -#include "../../utility/macros.h" #include "logic/card_zone_logic.h" #include @@ -15,6 +14,7 @@ #include #include #include +#include class QLabel; class QPushButton; diff --git a/cockatrice/src/picture_loader/picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp similarity index 65% rename from cockatrice/src/picture_loader/picture_loader.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp index 22f81c5dd..56b00e4b8 100644 --- a/cockatrice/src/picture_loader/picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,6 +1,4 @@ -#include "picture_loader.h" - -#include "../settings/cache_settings.h" +#include "card_picture_loader.h" #include #include @@ -17,48 +15,51 @@ #include #include #include +#include #include // never cache more than 300 cards at once for a single deck #define CACHED_CARD_PER_DECK_MAX 300 -PictureLoader::PictureLoader() : QObject(nullptr) +CardPictureLoader::CardPictureLoader() : QObject(nullptr) { - worker = new PictureLoaderWorker; - connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoader::picsPathChanged); - connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this, &PictureLoader::picDownloadChanged); + worker = new CardPictureLoaderWorker; + connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &CardPictureLoader::picsPathChanged); + connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this, + &CardPictureLoader::picDownloadChanged); - connect(worker, &PictureLoaderWorker::imageLoaded, this, &PictureLoader::imageLoaded); + connect(worker, &CardPictureLoaderWorker::imageLoaded, this, &CardPictureLoader::imageLoaded); - statusBar = new PictureLoaderStatusBar(nullptr); + statusBar = new CardPictureLoaderStatusBar(nullptr); QMainWindow *mainWindow = qobject_cast(QApplication::activeWindow()); if (mainWindow) { mainWindow->statusBar()->addPermanentWidget(statusBar); } - connect(worker, &PictureLoaderWorker::imageRequestQueued, statusBar, &PictureLoaderStatusBar::addQueuedImageLoad); - connect(worker, &PictureLoaderWorker::imageRequestSucceeded, statusBar, - &PictureLoaderStatusBar::addSuccessfulImageLoad); + connect(worker, &CardPictureLoaderWorker::imageRequestQueued, statusBar, + &CardPictureLoaderStatusBar::addQueuedImageLoad); + connect(worker, &CardPictureLoaderWorker::imageRequestSucceeded, statusBar, + &CardPictureLoaderStatusBar::addSuccessfulImageLoad); } -PictureLoader::~PictureLoader() +CardPictureLoader::~CardPictureLoader() { worker->deleteLater(); } -void PictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size) +void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size) { QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { - qCDebug(PictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey; + qCDebug(CardPictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey; QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { - qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap."; + qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap."; tmpPixmap = QPixmap(size); tmpPixmap.fill(Qt::gray); // Fallback to a gray pixmap } else { - qCDebug(PictureLoaderLog) << "Successfully loaded 'theme:cardback'."; + qCDebug(CardPictureLoaderLog) << "Successfully loaded 'theme:cardback'."; } pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -66,20 +67,21 @@ void PictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size) } } -void PictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size) +void CardPictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size) { QString backCacheKey = "_trice_card_back_inprogress_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { - qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; + qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { - qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback."; + qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback."; tmpPixmap = QPixmap(size); tmpPixmap.fill(Qt::blue); // Fallback with blue color } else { - qCDebug(PictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for in-progress state."; + qCDebug(CardPictureLoaderCardBackCacheFailLog) + << "Successfully loaded 'theme:cardback' for in-progress state."; } pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -87,20 +89,20 @@ void PictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize si } } -void PictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size) +void CardPictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size) { QString backCacheKey = "_trice_card_back_failed_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { - qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; + qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { - qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback."; + qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback."; tmpPixmap = QPixmap(size); tmpPixmap.fill(Qt::red); // Fallback with red color } else { - qCDebug(PictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for failed state."; + qCDebug(CardPictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for failed state."; } pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -108,10 +110,10 @@ void PictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size) } } -void PictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size) +void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size) { if (!card) { - qCWarning(PictureLoaderLog) << "getPixmap called with null card!"; + qCWarning(CardPictureLoaderLog) << "getPixmap called with null card!"; return; } @@ -126,13 +128,13 @@ void PictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size QPixmap bigPixmap; if (QPixmapCache::find(key, &bigPixmap)) { if (bigPixmap.isNull()) { - qCDebug(PictureLoaderLog) << "Cached pixmap for key" << key << "is NULL!"; + qCDebug(CardPictureLoaderLog) << "Cached pixmap for key" << key << "is NULL!"; return; } QScreen *screen = qApp->primaryScreen(); qreal dpr = screen ? screen->devicePixelRatio() : 1.0; - qCDebug(PictureLoaderLog) << "Scaling cached image for" << card.getName(); + qCDebug(CardPictureLoaderLog) << "Scaling cached image for" << card.getName(); pixmap = bigPixmap.scaled(size * dpr, Qt::KeepAspectRatio, Qt::SmoothTransformation); pixmap.setDevicePixelRatio(dpr); @@ -141,14 +143,14 @@ void PictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size } // add the card to the load queue - qCDebug(PictureLoaderLog) << "Enqueuing " << card.getName() << " for " << card.getPixmapCacheKey(); + qCDebug(CardPictureLoaderLog) << "Enqueuing " << card.getName() << " for " << card.getPixmapCacheKey(); getInstance().worker->enqueueImageLoad(card); } -void PictureLoader::imageLoaded(const ExactCard &card, const QImage &image) +void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) { if (image.isNull()) { - qCDebug(PictureLoaderLog) << "Caching NULL pixmap for" << card.getName(); + qCDebug(CardPictureLoaderLog) << "Caching NULL pixmap for" << card.getName(); QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap()); } else { if (card.getInfo().getUpsideDownArt()) { @@ -164,7 +166,7 @@ void PictureLoader::imageLoaded(const ExactCard &card, const QImage &image) } // imageLoaded should only be reached if the exactCard isn't already in cache. - // (plus there's a deduplication mechanism in PictureLoaderWorker) + // (plus there's a deduplication mechanism in CardPictureLoaderWorker) // It should be safe to connect the CardInfo here without worrying about redundant connections. connect(card.getCardPtr().data(), &QObject::destroyed, this, [cacheKey = card.getPixmapCacheKey()] { QPixmapCache::remove(cacheKey); }); @@ -172,17 +174,17 @@ void PictureLoader::imageLoaded(const ExactCard &card, const QImage &image) card.emitPixmapUpdated(); } -void PictureLoader::clearPixmapCache() +void CardPictureLoader::clearPixmapCache() { QPixmapCache::clear(); } -void PictureLoader::clearNetworkCache() +void CardPictureLoader::clearNetworkCache() { getInstance().worker->clearNetworkCache(); } -void PictureLoader::cacheCardPixmaps(const QList &cards) +void CardPictureLoader::cacheCardPixmaps(const QList &cards) { QPixmap tmp; int max = qMin(cards.size(), CACHED_CARD_PER_DECK_MAX); @@ -201,17 +203,17 @@ void PictureLoader::cacheCardPixmaps(const QList &cards) } } -void PictureLoader::picDownloadChanged() +void CardPictureLoader::picDownloadChanged() { QPixmapCache::clear(); } -void PictureLoader::picsPathChanged() +void CardPictureLoader::picsPathChanged() { QPixmapCache::clear(); } -bool PictureLoader::hasCustomArt() +bool CardPictureLoader::hasCustomArt() { auto picsPath = SettingsCache::instance().getPicsPath(); QDirIterator it(picsPath, QDir::Dirs | QDir::NoDotAndDotDot); diff --git a/cockatrice/src/picture_loader/picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h similarity index 53% rename from cockatrice/src/picture_loader/picture_loader.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader.h index 05a82f708..213231cd9 100644 --- a/cockatrice/src/picture_loader/picture_loader.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h @@ -1,40 +1,40 @@ /** - * @file picture_loader.h + * @file card_picture_loader.h * @ingroup PictureLoader * @brief TODO: Document this. */ -#ifndef PICTURELOADER_H -#define PICTURELOADER_H +#ifndef CARD_PICTURE_LOADER_H +#define CARD_PICTURE_LOADER_H -#include "../card/card_info.h" -#include "picture_loader_status_bar.h" -#include "picture_loader_worker.h" +#include "card_picture_loader_status_bar.h" +#include "card_picture_loader_worker.h" #include +#include -inline Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader"); -inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, "picture_loader.card_back_cache_fail"); +inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader"); +inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail"); -class PictureLoader : public QObject +class CardPictureLoader : public QObject { Q_OBJECT public: - static PictureLoader &getInstance() + static CardPictureLoader &getInstance() { - static PictureLoader instance; + static CardPictureLoader instance; return instance; } private: - explicit PictureLoader(); - ~PictureLoader() override; + explicit CardPictureLoader(); + ~CardPictureLoader() override; // Singleton - Don't implement copy constructor and assign operator - PictureLoader(PictureLoader const &); - void operator=(PictureLoader const &); + CardPictureLoader(CardPictureLoader const &); + void operator=(CardPictureLoader const &); - PictureLoaderWorker *worker; - PictureLoaderStatusBar *statusBar; + CardPictureLoaderWorker *worker; + CardPictureLoaderStatusBar *statusBar; public: static void getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size); diff --git a/cockatrice/src/picture_loader/picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp similarity index 77% rename from cockatrice/src/picture_loader/picture_loader_local.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp index a939f2c66..0f95f03ad 100644 --- a/cockatrice/src/picture_loader/picture_loader_local.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -1,29 +1,30 @@ -#include "picture_loader_local.h" +#include "card_picture_loader_local.h" -#include "../database/card_database_manager.h" -#include "../settings/cache_settings.h" -#include "picture_to_load.h" +#include "card_picture_to_load.h" #include #include +#include +#include static constexpr int REFRESH_INTERVAL_MS = 10 * 1000; -PictureLoaderLocal::PictureLoaderLocal(QObject *parent) +CardPictureLoaderLocal::CardPictureLoaderLocal(QObject *parent) : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()), customPicsPath(SettingsCache::instance().getCustomPicsPath()) { // Hook up signals to settings - connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged); + connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, + &CardPictureLoaderLocal::picsPathChanged); refreshIndex(); refreshTimer = new QTimer(this); - connect(refreshTimer, &QTimer::timeout, this, &PictureLoaderLocal::refreshIndex); + connect(refreshTimer, &QTimer::timeout, this, &CardPictureLoaderLocal::refreshIndex); refreshTimer->start(REFRESH_INTERVAL_MS); } -void PictureLoaderLocal::refreshIndex() +void CardPictureLoaderLocal::refreshIndex() { customFolderIndex.clear(); @@ -42,8 +43,8 @@ void PictureLoaderLocal::refreshIndex() } } - qCDebug(PictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has" - << customFolderIndex.size() << "entries."; + qCDebug(CardPictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has" + << customFolderIndex.size() << "entries."; } /** @@ -52,7 +53,7 @@ void PictureLoaderLocal::refreshIndex() * @param toLoad The card to load * @return The loaded image, or an empty QImage if loading failed. */ -QImage PictureLoaderLocal::tryLoad(const ExactCard &toLoad) const +QImage CardPictureLoaderLocal::tryLoad(const ExactCard &toLoad) const { PrintingInfo setInstance = toLoad.getPrinting(); @@ -67,15 +68,15 @@ QImage PictureLoaderLocal::tryLoad(const ExactCard &toLoad) const providerId = setInstance.getUuid(); } - qCDebug(PictureLoaderLocalLog).nospace() + qCDebug(CardPictureLoaderLocalLog).nospace() << "[card: " << cardName << " set: " << setName << "]: Attempting to load picture from local"; return tryLoadCardImageFromDisk(setName, correctedCardName, collectorNumber, providerId); } -QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, - const QString &correctedCardName, - const QString &collectorNumber, - const QString &providerId) const +QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, + const QString &correctedCardName, + const QString &collectorNumber, + const QString &providerId) const { QImage image; QImageReader imgReader; @@ -134,7 +135,7 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, imgReader.setFileName(fullPath); if (imgReader.read(&image)) { - qCDebug(PictureLoaderLocalLog).nospace() + qCDebug(CardPictureLoaderLocalLog).nospace() << "[card: " << correctedCardName << " set: " << setName << "] Found picture at: " << fullPath; return image; } @@ -142,12 +143,12 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, } } - qCDebug(PictureLoaderLocalLog).nospace() + qCDebug(CardPictureLoaderLocalLog).nospace() << "[card: " << correctedCardName << " set: " << setName << "]: Picture NOT found on disk."; return QImage(); } -void PictureLoaderLocal::picsPathChanged() +void CardPictureLoaderLocal::picsPathChanged() { picsPath = SettingsCache::instance().getPicsPath(); customPicsPath = SettingsCache::instance().getCustomPicsPath(); diff --git a/cockatrice/src/picture_loader/picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h similarity index 78% rename from cockatrice/src/picture_loader/picture_loader_local.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h index 184f43395..1954e1698 100644 --- a/cockatrice/src/picture_loader/picture_loader_local.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h @@ -1,5 +1,5 @@ /** - * @file picture_loader_local.h + * @file card_picture_loader_local.h * @ingroup PictureLoader * @brief TODO: Document this. */ @@ -7,24 +7,23 @@ #ifndef PICTURE_LOADER_LOCAL_H #define PICTURE_LOADER_LOCAL_H -#include "../card/exact_card.h" - #include #include #include +#include -inline Q_LOGGING_CATEGORY(PictureLoaderLocalLog, "picture_loader.local"); +inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local"); /** * Handles searching for and loading card images from the local pics and custom image folders. * This class maintains an index of the CUSTOM folder, to avoid repeatedly searching the entire directory. */ -class PictureLoaderLocal : public QObject +class CardPictureLoaderLocal : public QObject { Q_OBJECT public: - explicit PictureLoaderLocal(QObject *parent); + explicit CardPictureLoaderLocal(QObject *parent); QImage tryLoad(const ExactCard &toLoad) const; diff --git a/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp similarity index 74% rename from cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp index 6403f576c..d1895af06 100644 --- a/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp @@ -1,9 +1,9 @@ -#include "picture_loader_request_status_display_widget.h" +#include "card_picture_loader_request_status_display_widget.h" -PictureLoaderRequestStatusDisplayWidget::PictureLoaderRequestStatusDisplayWidget(QWidget *parent, - const QUrl &_url, - const ExactCard &card, - const QString &setName) +CardPictureLoaderRequestStatusDisplayWidget::CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent, + const QUrl &_url, + const ExactCard &card, + const QString &setName) : QWidget(parent) { layout = new QHBoxLayout(this); diff --git a/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h similarity index 75% rename from cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h index b74412587..be032ae64 100644 --- a/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h @@ -1,25 +1,25 @@ /** - * @file picture_loader_request_status_display_widget.h + * @file card_picture_loader_request_status_display_widget.h * @ingroup PictureLoader * @brief TODO: Document this. */ #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H -#include "picture_loader_worker_work.h" +#include "card_picture_loader_worker_work.h" #include #include #include -class PictureLoaderRequestStatusDisplayWidget : public QWidget +class CardPictureLoaderRequestStatusDisplayWidget : public QWidget { Q_OBJECT public: - PictureLoaderRequestStatusDisplayWidget(QWidget *parent, - const QUrl &url, - const ExactCard &card, - const QString &setName); + CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent, + const QUrl &url, + const ExactCard &card, + const QString &setName); void setFinished() { diff --git a/cockatrice/src/picture_loader/picture_loader_status_bar.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp similarity index 54% rename from cockatrice/src/picture_loader/picture_loader_status_bar.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp index 40104bb23..9e7e645bd 100644 --- a/cockatrice/src/picture_loader/picture_loader_status_bar.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp @@ -1,8 +1,8 @@ -#include "picture_loader_status_bar.h" +#include "card_picture_loader_status_bar.h" -#include "picture_loader_request_status_display_widget.h" +#include "card_picture_loader_request_status_display_widget.h" -PictureLoaderStatusBar::PictureLoaderStatusBar(QWidget *parent) : QWidget(parent) +CardPictureLoaderStatusBar::CardPictureLoaderStatusBar(QWidget *parent) : QWidget(parent) { layout = new QHBoxLayout(this); progressBar = new QProgressBar(this); @@ -15,19 +15,19 @@ PictureLoaderStatusBar::PictureLoaderStatusBar(QWidget *parent) : QWidget(parent cleaner = new QTimer(this); cleaner->setInterval(1000); - connect(cleaner, &QTimer::timeout, this, &PictureLoaderStatusBar::cleanOldEntries); + connect(cleaner, &QTimer::timeout, this, &CardPictureLoaderStatusBar::cleanOldEntries); cleaner->start(); setLayout(layout); } -void PictureLoaderStatusBar::cleanOldEntries() +void CardPictureLoaderStatusBar::cleanOldEntries() { if (!loadLog || !loadLog->popup) { return; } - for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : - loadLog->popup->findChildren()) { + for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : + loadLog->popup->findChildren()) { statusDisplayWidget->queryElapsedSeconds(); if (statusDisplayWidget->getFinished() && QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(QDateTime::currentDateTime()) > 10) { @@ -38,17 +38,17 @@ void PictureLoaderStatusBar::cleanOldEntries() } } -void PictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName) +void CardPictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName) { - loadLog->addSettingsWidget(new PictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName)); + loadLog->addSettingsWidget(new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName)); progressBar->setMaximum(progressBar->maximum() + 1); } -void PictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url) +void CardPictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url) { progressBar->setValue(progressBar->value() + 1); - for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : - loadLog->popup->findChildren()) { + for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : + loadLog->popup->findChildren()) { if (statusDisplayWidget->getUrl() == url.toString()) { statusDisplayWidget->queryElapsedSeconds(); statusDisplayWidget->setFinished(); diff --git a/cockatrice/src/picture_loader/picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h similarity index 68% rename from cockatrice/src/picture_loader/picture_loader_status_bar.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h index 366018d0e..b44d2cc20 100644 --- a/cockatrice/src/picture_loader/picture_loader_status_bar.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h @@ -1,5 +1,5 @@ /** - * @file picture_loader_status_bar.h + * @file card_picture_loader_status_bar.h * @ingroup PictureLoader * @brief TODO: Document this. */ @@ -7,18 +7,18 @@ #ifndef PICTURE_LOADER_STATUS_BAR_H #define PICTURE_LOADER_STATUS_BAR_H -#include "../interface/widgets/quick_settings/settings_button_widget.h" -#include "picture_loader_worker_work.h" +#include "../../interface/widgets/quick_settings/settings_button_widget.h" +#include "card_picture_loader_worker_work.h" #include #include #include -class PictureLoaderStatusBar : public QWidget +class CardPictureLoaderStatusBar : public QWidget { Q_OBJECT public: - explicit PictureLoaderStatusBar(QWidget *parent); + explicit CardPictureLoaderStatusBar(QWidget *parent); public slots: void addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName); diff --git a/cockatrice/src/picture_loader/picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp similarity index 78% rename from cockatrice/src/picture_loader/picture_loader_worker.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index 42429d0e3..301b0d4fb 100644 --- a/cockatrice/src/picture_loader/picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -1,20 +1,20 @@ -#include "picture_loader_worker.h" +#include "card_picture_loader_worker.h" -#include "../database/card_database_manager.h" -#include "../settings/cache_settings.h" -#include "picture_loader_local.h" -#include "picture_loader_worker_work.h" +#include "card_picture_loader_local.h" +#include "card_picture_loader_worker_work.h" #include #include #include #include #include +#include +#include #include static constexpr int MAX_REQUESTS_PER_SEC = 10; -PictureLoaderWorker::PictureLoaderWorker() +CardPictureLoaderWorker::CardPictureLoaderWorker() : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestQuota(MAX_REQUESTS_PER_SEC) { networkManager = new QNetworkAccessManager(this); @@ -41,28 +41,28 @@ PictureLoaderWorker::PictureLoaderWorker() cleanStaleEntries(); connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, - &PictureLoaderWorker::saveRedirectCache); + &CardPictureLoaderWorker::saveRedirectCache); - localLoader = new PictureLoaderLocal(this); + localLoader = new CardPictureLoaderLocal(this); pictureLoaderThread = new QThread; pictureLoaderThread->start(QThread::LowPriority); moveToThread(pictureLoaderThread); - connect(this, &PictureLoaderWorker::imageLoadEnqueued, this, &PictureLoaderWorker::handleImageLoadEnqueued); + connect(this, &CardPictureLoaderWorker::imageLoadEnqueued, this, &CardPictureLoaderWorker::handleImageLoadEnqueued); - connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestQuota); + connect(&requestTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::resetRequestQuota); requestTimer.setInterval(1000); requestTimer.start(); } -PictureLoaderWorker::~PictureLoaderWorker() +CardPictureLoaderWorker::~CardPictureLoaderWorker() { saveRedirectCache(); pictureLoaderThread->deleteLater(); } -void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork *worker) +void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker) { QUrl cachedRedirect = getCachedRedirect(url); if (!cachedRedirect.isEmpty()) { @@ -77,7 +77,7 @@ void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork } } -QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWorkerWork *worker) +QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker) { // Check for cached redirects QUrl cachedRedirect = getCachedRedirect(url); @@ -99,7 +99,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo return reply; } -void PictureLoaderWorker::resetRequestQuota() +void CardPictureLoaderWorker::resetRequestQuota() { requestQuota = MAX_REQUESTS_PER_SEC; processQueuedRequests(); @@ -108,7 +108,7 @@ void PictureLoaderWorker::resetRequestQuota() /** * Keeps processing requests from the queue until it is empty or until the quota runs out. */ -void PictureLoaderWorker::processQueuedRequests() +void CardPictureLoaderWorker::processQueuedRequests() { while (requestQuota > 0 && processSingleRequest()) { --requestQuota; @@ -119,7 +119,7 @@ void PictureLoaderWorker::processQueuedRequests() * Immediately processes a single queued request. No-ops if the load queue is empty * @return If a request was processed */ -bool PictureLoaderWorker::processSingleRequest() +bool CardPictureLoaderWorker::processSingleRequest() { if (!requestLoadQueue.isEmpty()) { auto request = requestLoadQueue.takeFirst(); @@ -129,17 +129,17 @@ bool PictureLoaderWorker::processSingleRequest() return false; } -void PictureLoaderWorker::enqueueImageLoad(const ExactCard &card) +void CardPictureLoaderWorker::enqueueImageLoad(const ExactCard &card) { // Send call through a connection to ensure the handling is run on the pictureLoader thread emit imageLoadEnqueued(card); } -void PictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card) +void CardPictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card) { // deduplicate loads for the same card if (currentlyLoading.contains(card.getPixmapCacheKey())) { - qCDebug(PictureLoaderWorkerLog()) + qCDebug(CardPictureLoaderWorkerLog()) << "Skipping enqueued" << card.getName() << "because it's already being loaded"; return; } @@ -151,31 +151,31 @@ void PictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card) handleImageLoaded(card, image); } else { // queue up to load image from remote only after local loading failed - new PictureLoaderWorkerWork(this, card); + new CardPictureLoaderWorkerWork(this, card); } } /** * Called when image loading is done. Failures are indicated by an empty QImage. */ -void PictureLoaderWorker::handleImageLoaded(const ExactCard &card, const QImage &image) +void CardPictureLoaderWorker::handleImageLoaded(const ExactCard &card, const QImage &image) { currentlyLoading.remove(card.getPixmapCacheKey()); emit imageLoaded(card, image); } -void PictureLoaderWorker::cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl) +void CardPictureLoaderWorker::cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl) { redirectCache[originalUrl] = qMakePair(redirectUrl, QDateTime::currentDateTimeUtc()); // saveRedirectCache(); } -void PictureLoaderWorker::removedCachedUrl(const QUrl &url) +void CardPictureLoaderWorker::removedCachedUrl(const QUrl &url) { networkManager->cache()->remove(url); } -QUrl PictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const +QUrl CardPictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const { if (redirectCache.contains(originalUrl)) { return redirectCache[originalUrl].first; @@ -183,7 +183,7 @@ QUrl PictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const return {}; } -void PictureLoaderWorker::loadRedirectCache() +void CardPictureLoaderWorker::loadRedirectCache() { QSettings settings(cacheFilePath, QSettings::IniFormat); @@ -202,7 +202,7 @@ void PictureLoaderWorker::loadRedirectCache() settings.endArray(); } -void PictureLoaderWorker::saveRedirectCache() const +void CardPictureLoaderWorker::saveRedirectCache() const { QSettings settings(cacheFilePath, QSettings::IniFormat); @@ -217,7 +217,7 @@ void PictureLoaderWorker::saveRedirectCache() const settings.endArray(); } -void PictureLoaderWorker::cleanStaleEntries() +void CardPictureLoaderWorker::cleanStaleEntries() { QDateTime now = QDateTime::currentDateTimeUtc(); @@ -231,7 +231,7 @@ void PictureLoaderWorker::cleanStaleEntries() } } -void PictureLoaderWorker::clearNetworkCache() +void CardPictureLoaderWorker::clearNetworkCache() { networkManager->cache()->clear(); redirectCache.clear(); diff --git a/cockatrice/src/picture_loader/picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h similarity index 67% rename from cockatrice/src/picture_loader/picture_loader_worker.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h index 778ce71a0..028ffbf85 100644 --- a/cockatrice/src/picture_loader/picture_loader_worker.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h @@ -1,5 +1,5 @@ /** - * @file picture_loader_worker.h + * @file card_picture_loader_worker.h * @ingroup PictureLoader * @brief TODO: Document this. */ @@ -7,11 +7,9 @@ #ifndef PICTURE_LOADER_WORKER_H #define PICTURE_LOADER_WORKER_H -#include "../card/card_info.h" -#include "../database/card_database.h" -#include "picture_loader_local.h" -#include "picture_loader_worker_work.h" -#include "picture_to_load.h" +#include "card_picture_loader_local.h" +#include "card_picture_loader_worker_work.h" +#include "card_picture_to_load.h" #include #include @@ -20,6 +18,8 @@ #include #include #include +#include +#include #define REDIRECT_HEADER_NAME "redirects" #define REDIRECT_ORIGINAL_URL "original" @@ -27,22 +27,22 @@ #define REDIRECT_TIMESTAMP "timestamp" #define REDIRECT_CACHE_FILENAME "cache.ini" -inline Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker"); +inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerLog, "card_picture_loader.worker"); -class PictureLoaderWorkerWork; -class PictureLoaderWorker : public QObject +class CardPictureLoaderWorkerWork; +class CardPictureLoaderWorker : public QObject { Q_OBJECT public: - explicit PictureLoaderWorker(); - ~PictureLoaderWorker() override; + explicit CardPictureLoaderWorker(); + ~CardPictureLoaderWorker() override; - void enqueueImageLoad(const ExactCard &card); // Starts a thread for the image to be loaded - void queueRequest(const QUrl &url, PictureLoaderWorkerWork *worker); // Queues network requests for load threads + void enqueueImageLoad(const ExactCard &card); // Starts a thread for the image to be loaded + void queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker); // Queues network requests for load threads void clearNetworkCache(); public slots: - QNetworkReply *makeRequest(const QUrl &url, PictureLoaderWorkerWork *workThread); + QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread); void processQueuedRequests(); bool processSingleRequest(); void handleImageLoaded(const ExactCard &card, const QImage &image); @@ -57,12 +57,12 @@ private: QString cacheFilePath; // Path to persistent storage static constexpr int CacheTTLInDays = 30; // TODO: Make user configurable bool picDownload; - QQueue> requestLoadQueue; + QQueue> requestLoadQueue; int requestQuota; QTimer requestTimer; // Timer for refreshing request quota - PictureLoaderLocal *localLoader; + CardPictureLoaderLocal *localLoader; QSet currentlyLoading; // for deduplication purposes. Contains pixmapCacheKey QUrl getCachedRedirect(const QUrl &originalUrl) const; diff --git a/cockatrice/src/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp similarity index 75% rename from cockatrice/src/picture_loader/picture_loader_worker_work.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp index 4d9fb9354..ba0e6e7e1 100644 --- a/cockatrice/src/picture_loader/picture_loader_worker_work.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp @@ -1,8 +1,6 @@ -#include "picture_loader_worker_work.h" +#include "card_picture_loader_worker_work.h" -#include "../database/card_database_manager.h" -#include "../settings/cache_settings.h" -#include "picture_loader_worker.h" +#include "card_picture_loader_worker.h" #include #include @@ -12,19 +10,24 @@ #include #include #include +#include +#include // Card back returned by gatherer when card is not found static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"}; -PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const ExactCard &toLoad) - : QObject(nullptr), cardToDownload(PictureToLoad(toLoad)), picDownload(SettingsCache::instance().getPicDownload()) +CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad) + : QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)), + picDownload(SettingsCache::instance().getPicDownload()) { // Hook up signals to the orchestrator - connect(this, &PictureLoaderWorkerWork::requestImageDownload, worker, &PictureLoaderWorker::queueRequest); - connect(this, &PictureLoaderWorkerWork::urlRedirected, worker, &PictureLoaderWorker::cacheRedirect); - connect(this, &PictureLoaderWorkerWork::cachedUrlInvalidated, worker, &PictureLoaderWorker::removedCachedUrl); - connect(this, &PictureLoaderWorkerWork::imageLoaded, worker, &PictureLoaderWorker::handleImageLoaded); - connect(this, &PictureLoaderWorkerWork::requestSucceeded, worker, &PictureLoaderWorker::imageRequestSucceeded); + connect(this, &CardPictureLoaderWorkerWork::requestImageDownload, worker, &CardPictureLoaderWorker::queueRequest); + connect(this, &CardPictureLoaderWorkerWork::urlRedirected, worker, &CardPictureLoaderWorker::cacheRedirect); + connect(this, &CardPictureLoaderWorkerWork::cachedUrlInvalidated, worker, + &CardPictureLoaderWorker::removedCachedUrl); + connect(this, &CardPictureLoaderWorkerWork::imageLoaded, worker, &CardPictureLoaderWorker::handleImageLoaded); + connect(this, &CardPictureLoaderWorkerWork::requestSucceeded, worker, + &CardPictureLoaderWorker::imageRequestSucceeded); // Hook up signals to settings connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged())); @@ -32,7 +35,7 @@ PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *work startNextPicDownload(); } -void PictureLoaderWorkerWork::startNextPicDownload() +void CardPictureLoaderWorkerWork::startNextPicDownload() { QString picUrl = cardToDownload.getCurrentUrl(); @@ -40,7 +43,7 @@ void PictureLoaderWorkerWork::startNextPicDownload() picDownloadFailed(); } else { QUrl url(picUrl); - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName() << " set: " << cardToDownload.getSetName() << "]: Trying to fetch picture from url " << url.toDisplayString(); @@ -52,7 +55,7 @@ void PictureLoaderWorkerWork::startNextPicDownload() * Starts another pic download using the next possible url combination for the card. * If all possibilities are exhausted, then concludes the image loading with an empty QImage. */ -void PictureLoaderWorkerWork::picDownloadFailed() +void CardPictureLoaderWorkerWork::picDownloadFailed() { /* Take advantage of short-circuiting here to call the nextUrl until one is not available. Only once nextUrl evaluates to false will this move @@ -61,7 +64,7 @@ void PictureLoaderWorkerWork::picDownloadFailed() if (cardToDownload.nextUrl() || cardToDownload.nextSet()) { startNextPicDownload(); } else { - qCWarning(PictureLoaderWorkerWorkLog).nospace() + qCWarning(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName() << " set: " << cardToDownload.getSetName() << "]: Picture NOT found, " << (picDownload ? "download failed" : "downloads disabled") @@ -74,7 +77,7 @@ void PictureLoaderWorkerWork::picDownloadFailed() * * @param reply The reply. Takes ownership of the object */ -void PictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply) +void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply) { QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); if (redirectTarget.isValid()) { @@ -102,15 +105,15 @@ static bool imageIsBlackListed(const QByteArray &picData) return MD5_BLACKLIST.contains(md5sum); } -void PictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply) +void CardPictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 429) { - qCWarning(PictureLoaderWorkerWorkLog) << "Too many requests."; + qCWarning(CardPictureLoaderWorkerWorkLog) << "Too many requests."; } else { bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(); if (isFromCache) { - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: Removing corrupted cache file for url " << reply->url().toDisplayString() << " and retrying (" << reply->errorString() << ")"; @@ -119,7 +122,7 @@ void PictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply) emit requestImageDownload(reply->url(), this); } else { - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: " << (picDownload ? "Download" : "Cache search") << " failed for url " << reply->url().toDisplayString() << " (" << reply->errorString() << ")"; @@ -129,7 +132,7 @@ void PictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply) } } -void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) +void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) { bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(); @@ -138,7 +141,7 @@ void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) if (statusCode == 301 || statusCode == 302 || statusCode == 303 || statusCode == 305 || statusCode == 307 || statusCode == 308) { QUrl redirectUrl = reply->header(QNetworkRequest::LocationHeader).toUrl(); - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: following " << (isFromCache ? "cached redirect" : "redirect") << " to " << redirectUrl.toDisplayString(); @@ -150,7 +153,7 @@ void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) const QByteArray &picData = reply->peek(reply->size()); if (imageIsBlackListed(picData)) { - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: Picture found, but blacklisted, will consider it as not found"; @@ -161,14 +164,14 @@ void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) QImage image = tryLoadImageFromReply(reply); if (image.isNull()) { - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: Possible " << (isFromCache ? "cached" : "downloaded") << " picture at " << reply->url().toDisplayString() << " could not be loaded: " << reply->errorString(); picDownloadFailed(); } else { - qCDebug(PictureLoaderWorkerWorkLog).nospace() + qCDebug(CardPictureLoaderWorkerWorkLog).nospace() << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName() << "]: Image successfully " << (isFromCache ? "loaded from cached" : "downloaded from") << " url " << reply->url().toDisplayString(); @@ -181,7 +184,7 @@ void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply) * @param reply The reply to load the image from * @return The loaded image, or an empty QImage if loading failed */ -QImage PictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply) +QImage CardPictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply) { static constexpr int riffHeaderSize = 12; // RIFF_HEADER_SIZE from webp/format_constants.h auto replyHeader = reply->peek(riffHeaderSize); @@ -208,13 +211,13 @@ QImage PictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply) * Call this method when the image has finished being loaded. * @param image The image that was loaded. Empty QImage indicates failure. */ -void PictureLoaderWorkerWork::concludeImageLoad(const QImage &image) +void CardPictureLoaderWorkerWork::concludeImageLoad(const QImage &image) { emit imageLoaded(cardToDownload.getCard(), image); deleteLater(); } -void PictureLoaderWorkerWork::picDownloadChanged() +void CardPictureLoaderWorkerWork::picDownloadChanged() { picDownload = SettingsCache::instance().getPicDownload(); } diff --git a/cockatrice/src/picture_loader/picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h similarity index 74% rename from cockatrice/src/picture_loader/picture_loader_worker_work.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h index f40cc61b9..69b18a5fd 100644 --- a/cockatrice/src/picture_loader/picture_loader_worker_work.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h @@ -7,15 +7,15 @@ #ifndef PICTURE_LOADER_WORKER_WORK_H #define PICTURE_LOADER_WORKER_WORK_H -#include "../database/card_database.h" -#include "picture_loader_worker.h" -#include "picture_to_load.h" +#include "card_picture_loader_worker.h" +#include "card_picture_to_load.h" #include #include #include #include #include +#include #define REDIRECT_HEADER_NAME "redirects" #define REDIRECT_ORIGINAL_URL "original" @@ -23,17 +23,17 @@ #define REDIRECT_TIMESTAMP "timestamp" #define REDIRECT_CACHE_FILENAME "cache.ini" -inline Q_LOGGING_CATEGORY(PictureLoaderWorkerWorkLog, "picture_loader.worker"); +inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerWorkLog, "card_picture_loader.worker"); -class PictureLoaderWorker; +class CardPictureLoaderWorker; -class PictureLoaderWorkerWork : public QObject +class CardPictureLoaderWorkerWork : public QObject { Q_OBJECT public: - explicit PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const ExactCard &toLoad); + explicit CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad); - PictureToLoad cardToDownload; + CardPictureToLoad cardToDownload; public slots: void handleNetworkReply(QNetworkReply *reply); @@ -63,7 +63,7 @@ signals: * Emitted when a request did not return a 400 or 500 response */ void requestSucceeded(const QUrl &url); - void requestImageDownload(const QUrl &url, PictureLoaderWorkerWork *instance); + void requestImageDownload(const QUrl &url, CardPictureLoaderWorkerWork *instance); void urlRedirected(const QUrl &originalUrl, const QUrl &redirectUrl); void cachedUrlInvalidated(const QUrl &url); diff --git a/cockatrice/src/picture_loader/picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp similarity index 93% rename from cockatrice/src/picture_loader/picture_to_load.cpp rename to cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp index f70f23d33..1908a6b80 100644 --- a/cockatrice/src/picture_loader/picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -1,15 +1,14 @@ -#include "picture_to_load.h" - -#include "../settings/cache_settings.h" -#include "../utility/card_set_comparator.h" +#include "card_picture_to_load.h" #include #include #include #include #include +#include +#include -PictureToLoad::PictureToLoad(const ExactCard &_card) +CardPictureToLoad::CardPictureToLoad(const ExactCard &_card) : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) { if (card) { @@ -25,7 +24,7 @@ PictureToLoad::PictureToLoad(const ExactCard &_card) * * @return A list of sets. Will not be empty. */ -QList PictureToLoad::extractSetsSorted(const ExactCard &card) +QList CardPictureToLoad::extractSetsSorted(const ExactCard &card) { QList sortedSets; for (const auto &printings : card.getInfo().getSets()) { @@ -80,7 +79,7 @@ static PrintingInfo findPrintingForSet(const ExactCard &card, const QString &set return setsToPrintings[setName][0]; } -void PictureToLoad::populateSetUrls() +void CardPictureToLoad::populateSetUrls() { /* currentSetUrls is a list, populated each time a new set is requested for a particular card and Urls are removed from it as a download is attempted from each one. Custom Urls for @@ -113,7 +112,7 @@ void PictureToLoad::populateSetUrls() * If we are already at the end of the list, then currentSet is set to empty. * @return If we are already at the end of the list */ -bool PictureToLoad::nextSet() +bool CardPictureToLoad::nextSet() { if (!sortedSets.isEmpty()) { currentSet = sortedSets.takeFirst(); @@ -129,7 +128,7 @@ bool PictureToLoad::nextSet() * If we are already at the end of the list, then currentUrl is set to empty. * @return If we are already at the end of the list */ -bool PictureToLoad::nextUrl() +bool CardPictureToLoad::nextUrl() { if (!currentSetUrls.isEmpty()) { currentUrl = currentSetUrls.takeFirst(); @@ -139,7 +138,7 @@ bool PictureToLoad::nextUrl() return false; } -QString PictureToLoad::getSetName() const +QString CardPictureToLoad::getSetName() const { if (currentSet) { return currentSet->getCorrectedShortName(); @@ -185,7 +184,7 @@ static int parse(const QString &urlTemplate, } QString propertyValue = getProperty(cardPropertyName); if (propertyValue.isEmpty()) { - qCDebug(PictureToLoadLog).nospace() + qCDebug(CardPictureToLoadLog).nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType << "property (" << cardPropertyName << ") for Url template (" << urlTemplate << ") is not available"; return 1; @@ -193,7 +192,7 @@ static int parse(const QString &urlTemplate, int propLength = propertyValue.length(); if (subStrLen > 0) { if (subStrPos + subStrLen > propLength) { - qCDebug(PictureToLoadLog).nospace() + qCDebug(CardPictureToLoadLog).nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType << " property (" << cardPropertyName << ") for Url template (" << urlTemplate << ") is smaller than substr specification (" << subStrPos << " + " << subStrLen << " > " @@ -208,7 +207,7 @@ static int parse(const QString &urlTemplate, if (!fillWith.isEmpty()) { int fillLength = fillWith.length(); if (fillLength < propLength) { - qCDebug(PictureToLoadLog).nospace() + qCDebug(CardPictureToLoadLog).nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType << " property (" << cardPropertyName << ") for Url template (" << urlTemplate << ") is longer than fill specification (" << fillWith << ")"; @@ -225,7 +224,7 @@ static int parse(const QString &urlTemplate, return 0; } -QString PictureToLoad::transformUrl(const QString &urlTemplate) const +QString CardPictureToLoad::transformUrl(const QString &urlTemplate) const { /* This function takes Url templates and substitutes actual card details into the url. This is used for making Urls with follow a predictable format @@ -279,7 +278,7 @@ QString PictureToLoad::transformUrl(const QString &urlTemplate) const * populated in this card, so it should return an empty string, * indicating an invalid Url. */ - qCDebug(PictureToLoadLog).nospace() + qCDebug(CardPictureToLoadLog).nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested information (" << prop << ") for Url template (" << urlTemplate << ") is not available"; return QString(); diff --git a/cockatrice/src/picture_loader/picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h similarity index 76% rename from cockatrice/src/picture_loader/picture_to_load.h rename to cockatrice/src/interface/card_picture_loader/card_picture_to_load.h index 57b406587..c91296ab4 100644 --- a/cockatrice/src/picture_loader/picture_to_load.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h @@ -1,5 +1,5 @@ /** - * @file picture_to_load.h + * @file card_picture_to_load.h * @ingroup PictureLoader * @brief TODO: Document this. */ @@ -7,13 +7,12 @@ #ifndef PICTURE_TO_LOAD_H #define PICTURE_TO_LOAD_H -#include "../card/exact_card.h" - #include +#include -inline Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load"); +inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load"); -class PictureToLoad +class CardPictureToLoad { private: ExactCard card; @@ -24,7 +23,7 @@ private: CardSetPtr currentSet; public: - explicit PictureToLoad(const ExactCard &_card); + explicit CardPictureToLoad(const ExactCard &_card); const ExactCard &getCard() const { diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp index 25bd67264..382fff317 100644 --- a/cockatrice/src/interface/pixel_map_generator.cpp +++ b/cockatrice/src/interface/pixel_map_generator.cpp @@ -1,13 +1,12 @@ #include "pixel_map_generator.h" -#include "pb/serverinfo_user.pb.h" - #include #include #include #include #include #include +#include #define DEFAULT_COLOR_UNREGISTERED "#32c8ec"; #define DEFAULT_COLOR_REGISTERED "#5ed900"; diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index dcc4f689f..b38b16a96 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -7,12 +7,11 @@ #ifndef PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H -#include "user_level.h" - #include #include #include #include +#include inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator"); diff --git a/cockatrice/src/interface/tearoff_menu.h b/cockatrice/src/interface/tearoff_menu.h index 30a2542e4..d2b3f3413 100644 --- a/cockatrice/src/interface/tearoff_menu.h +++ b/cockatrice/src/interface/tearoff_menu.h @@ -6,9 +6,8 @@ #pragma once -#include "../settings/cache_settings.h" - #include +#include class TearOffMenu : public QMenu { diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index 58a411c99..4cb66e2b1 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,13 +1,12 @@ #include "theme_manager.h" -#include "../settings/cache_settings.h" - #include #include #include #include #include #include +#include #define NONE_THEME_NAME "Default" #define STYLE_CSS_NAME "style.css" diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp similarity index 98% rename from cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp rename to cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp index a7776cbec..90be2546d 100644 --- a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp +++ b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.cpp @@ -1,6 +1,6 @@ #include "deck_list_sort_filter_proxy_model.h" -#include "../deck/deck_list_model.h" +#include "../../deck/deck_list_model.h" bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { diff --git a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h similarity index 92% rename from cockatrice/src/utility/deck_list_sort_filter_proxy_model.h rename to cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h index af352a56b..0ea6d7495 100644 --- a/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h +++ b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h @@ -7,9 +7,8 @@ #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H -#include "../database/card_database_manager.h" - #include +#include class DeckListSortFilterProxyModel : public QSortFilterProxyModel { diff --git a/cockatrice/src/utility/sequence_edit.cpp b/cockatrice/src/interface/utility/sequence_edit.cpp similarity index 99% rename from cockatrice/src/utility/sequence_edit.cpp rename to cockatrice/src/interface/utility/sequence_edit.cpp index c5f0fd1c1..53776a3b0 100644 --- a/cockatrice/src/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/utility/sequence_edit.cpp @@ -1,10 +1,9 @@ #include "sequence_edit.h" -#include "../settings/cache_settings.h" - #include #include #include +#include #include SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/utility/sequence_edit.h b/cockatrice/src/interface/utility/sequence_edit.h similarity index 100% rename from cockatrice/src/utility/sequence_edit.h rename to cockatrice/src/interface/utility/sequence_edit.h diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp index c00fd7cb2..c134b0aff 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp @@ -1,6 +1,5 @@ #include "color_identity_widget.h" -#include "../../../../settings/cache_settings.h" #include "mana_symbol_widget.h" #include @@ -9,6 +8,7 @@ #include #include #include +#include ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card) { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h index bb6447035..60d69af06 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h @@ -7,10 +7,9 @@ #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H -#include "../../../../card/card_info.h" - #include #include +#include class ColorIdentityWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h index e4aac81c4..26a186c59 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h @@ -7,10 +7,9 @@ #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H -#include "../../../../card/card_info.h" - #include #include +#include class ManaCostWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp index aae22190b..942635871 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -1,8 +1,7 @@ #include "mana_symbol_widget.h" -#include "../../../../settings/cache_settings.h" - #include +#include ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled) : QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled) diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index dcd4cc9aa..36f0e6a4e 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -1,12 +1,12 @@ #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 "../../../utility/deck_list_sort_filter_proxy_model.h" #include "../card_info_picture_with_text_overlay_widget.h" #include +#include +#include CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 0b74d5c3f..4920d97d8 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -7,7 +7,6 @@ #ifndef CARD_GROUP_DISPLAY_WIDGET_H #define CARD_GROUP_DISPLAY_WIDGET_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" @@ -16,6 +15,7 @@ #include #include #include +#include class CardGroupDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 391edb2da..cc46d59eb 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -1,11 +1,11 @@ #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 "../card_info_picture_with_text_overlay_widget.h" #include +#include +#include #include FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index c549ceefe..df02c9e1c 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -1,11 +1,11 @@ #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 "../card_info_picture_with_text_overlay_widget.h" #include +#include +#include OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp index d11590a05..f6533e3ca 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp @@ -1,6 +1,5 @@ #include "card_info_display_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../game/board/card_item.h" #include "../../../main.h" #include "card_info_picture_widget.h" @@ -9,6 +8,7 @@ #include #include #include +#include #include CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags) diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h index ed2e03114..f5b2ea2f2 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -7,12 +7,11 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H -#include "../../../card/exact_card.h" -#include "card_ref.h" - #include #include #include +#include +#include class CardInfoPictureWidget; class CardInfoTextWidget; diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp index ddc1efb48..fe9385a23 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,15 +1,15 @@ #include "card_info_frame_widget.h" -#include "../../../card/card_relation.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" #include #include +#include +#include +#include #include CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent) diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h index 65fd0a514..f534ab956 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -7,11 +7,10 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include "../../../card/exact_card.h" -#include "card_ref.h" - #include #include +#include +#include class AbstractCardItem; class CardInfoPictureWidget; diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp index e7acabce9..451104d17 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp @@ -1,6 +1,6 @@ #include "card_info_picture_art_crop_widget.h" -#include "../../../picture_loader/picture_loader.h" +#include "../../../interface/card_picture_loader/card_picture_loader.h" CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent) : CardInfoPictureWidget(parent, false, false) @@ -13,9 +13,9 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target // Load the full-resolution card image, not a pre-scaled one QPixmap fullResPixmap; if (getCard()) { - PictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size + CardPictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size } else { - PictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040)); + CardPictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040)); } // Fail-safe if loading failed diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp index 02ba37b74..ead669e7c 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp @@ -1,10 +1,10 @@ #include "card_info_picture_enlarged_widget.h" -#include "../../../picture_loader/picture_loader.h" -#include "../../../settings/cache_settings.h" +#include "../../../interface/card_picture_loader/card_picture_loader.h" #include #include +#include #include /** @@ -35,9 +35,9 @@ CardInfoPictureEnlargedWidget::CardInfoPictureEnlargedWidget(QWidget *parent) : void CardInfoPictureEnlargedWidget::loadPixmap(const QSize &size) { if (card) { - PictureLoader::getPixmap(enlargedPixmap, card, size); + CardPictureLoader::getPixmap(enlargedPixmap, card, size); } else { - PictureLoader::getCardBackPixmap(enlargedPixmap, size); + CardPictureLoader::getCardBackPixmap(enlargedPixmap, size); } pixmapDirty = false; } diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h index 07ecd1aab..cc37f2f0b 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h @@ -8,10 +8,9 @@ #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H -#include "../../../card/exact_card.h" - #include #include +#include class CardInfoPictureEnlargedWidget final : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 33f0be946..7e87d6587 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -1,10 +1,7 @@ #include "card_info_picture_widget.h" -#include "../../../card/card_relation.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 "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../tabs/tab_supervisor.h" #include "../../window_main.h" @@ -13,6 +10,9 @@ #include #include #include +#include +#include +#include #include /** @@ -152,11 +152,11 @@ void CardInfoPictureWidget::updatePixmap() */ void CardInfoPictureWidget::loadPixmap() { - PictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size()); + CardPictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size()); if (exactCard) { - PictureLoader::getPixmap(resizedPixmap, exactCard, size()); + CardPictureLoader::getPixmap(resizedPixmap, exactCard, size()); } else { - PictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size()); + CardPictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size()); } pixmapDirty = false; diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h index ce918a33e..3cbdd46db 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -7,12 +7,12 @@ #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H -#include "../../../card/exact_card.h" #include "card_info_picture_enlarged_widget.h" #include #include #include +#include inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget"); diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp index 8a4b26eb6..0a040ff29 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,7 +1,5 @@ #include "card_info_text_widget.h" -#include "../../../card/card_relation.h" -#include "../../../card/game_specific_terms.h" #include "../../../game/board/card_item.h" #include @@ -10,6 +8,8 @@ #include #include #include +#include +#include CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr) { diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h index d3cba8994..8711422b0 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -7,9 +7,8 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include "../../../card/card_info.h" - #include +#include class QLabel; class QScrollArea; class QTextEdit; diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp index 2b81b26d5..c084dac64 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -1,9 +1,10 @@ #include "card_size_widget.h" -#include "../../../settings/cache_settings.h" #include "../printing_selector/printing_selector.h" #include "../visual_deck_storage/visual_deck_storage_widget.h" +#include + /** * @class CardSizeWidget * @brief A widget for adjusting card sizes using a slider. diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 4a8f55cab..892652c02 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -1,11 +1,11 @@ #include "deck_card_zone_display_widget.h" #include "../../../deck/deck_list_model.h" -#include "../../../utility/card_info_comparator.h" #include "card_group_display_widgets/flat_card_group_display_widget.h" #include "card_group_display_widgets/overlapped_card_group_display_widget.h" #include +#include DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 79ddebf6a..12be2debf 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -7,7 +7,6 @@ #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H #define DECK_CARD_ZONE_DISPLAY_WIDGET_H -#include "../../../card/card_info.h" #include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" #include "../general/layout_containers/overlap_widget.h" @@ -18,6 +17,7 @@ #include #include +#include class DeckCardZoneDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp index b284b3f05..dfa7bc025 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -1,7 +1,5 @@ #include "deck_preview_card_picture_widget.h" -#include "../../../settings/cache_settings.h" - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include /** * @brief Constructs a CardPictureWithTextOverlay widget. diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index f2ae805d1..e1c4627fe 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index 11d87be40..4981d0a2d 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -1,14 +1,14 @@ #include "mana_base_widget.h" -#include "../../../database/card_database.h" -#include "../../../database/card_database_manager.h" #include "../../../deck/deck_loader.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" #include #include -#include +#include +#include +#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index c0d970db2..f202eb31e 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index 5a4e14dc9..5b50d953f 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -1,13 +1,13 @@ #include "mana_curve_widget.h" -#include "../../../database/card_database.h" -#include "../../../database/card_database_manager.h" #include "../../../deck/deck_loader.h" #include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include +#include +#include +#include #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index 4960b009a..cfe5684c8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -1,14 +1,14 @@ #include "mana_devotion_widget.h" -#include "../../../database/card_database.h" -#include "../../../database/card_database_manager.h" #include "../../../deck/deck_loader.h" #include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include #include +#include +#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index 003770b51..03cb9aa38 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index b0a9f0814..ab8a5dca2 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -1,9 +1,6 @@ #include "deck_editor_database_display_widget.h" -#include "../../../card/card_relation.h" -#include "../../../database/card_database_manager.h" #include "../../../filters/syntax_help.h" -#include "../../../settings/cache_settings.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/tab_supervisor.h" #include "../../pixel_map_generator.h" @@ -15,6 +12,9 @@ #include #include #include +#include +#include +#include static bool canBeCommander(const CardInfo &cardInfo) { diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index a2f803e2c..8fc9176bd 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -8,14 +8,14 @@ #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H -#include "../../../database/model/card_database_display_model.h" -#include "../../../database/model/card_database_model.h" #include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../utility/key_signals.h" #include #include +#include +#include +#include class AbstractTabDeckEditor; class DeckEditorDatabaseDisplayWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index dc995ff17..270c055c5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -1,15 +1,14 @@ #include "deck_editor_deck_dock_widget.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" - #include #include #include #include #include #include -#include +#include +#include +#include DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 3cb9bf5e9..7c568f6ca 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -8,10 +8,8 @@ #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H -#include "../../../card/card_info.h" #include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../utility/key_signals.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include @@ -19,6 +17,8 @@ #include #include #include +#include +#include class DeckListModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 51d0cdbbe..89e93d376 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -1,13 +1,13 @@ #include "deck_editor_filter_dock_widget.h" -#include "../../../database/model/card_database_model.h" #include "../../../filters/filter_builder.h" #include "../../../filters/filter_tree_model.h" -#include "../../../settings/cache_settings.h" #include #include #include +#include +#include DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h index 7357e489f..740f5c759 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -9,10 +9,10 @@ #define DECK_EDITOR_FILTER_DOCK_WIDGET_H #include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../utility/key_signals.h" #include #include +#include class FilterTreeModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index 50823db4b..35f069763 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -1,8 +1,6 @@ #include "home_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../server/remote/remote_client.h" -#include "../../../settings/cache_settings.h" #include "../../../tabs/tab_supervisor.h" #include "../../window_main.h" #include "background_sources.h" @@ -12,6 +10,8 @@ #include #include #include +#include +#include HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice") diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index 49321ed6e..5e23ccf2a 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -8,7 +8,6 @@ #ifndef CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H -#include "../../../card/card_info.h" #include "../../../deck/deck_list_model.h" #include "../../../deck/deck_loader.h" #include "../../../tabs/abstract_tab_deck_editor.h" @@ -19,6 +18,7 @@ #include #include #include +#include class CardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index e49fd2c9d..f581312f2 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -1,8 +1,7 @@ #include "printing_selector.h" #include "../../../dialogs/dlg_select_set_for_cards.h" -#include "../../../picture_loader/picture_loader.h" -#include "../../../settings/cache_settings.h" +#include "../../../interface/card_picture_loader/card_picture_loader.h" #include "printing_selector_card_display_widget.h" #include "printing_selector_card_search_widget.h" #include "printing_selector_card_selection_widget.h" @@ -10,6 +9,7 @@ #include #include +#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index 1fd27498a..c44057070 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -7,7 +7,6 @@ #ifndef PRINTING_SELECTOR_H #define PRINTING_SELECTOR_H -#include "../../../card/card_info.h" #include "../../../deck/deck_list_model.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" @@ -19,6 +18,7 @@ #include #include #include +#include #define BATCH_SIZE 10 diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index 4bd686cb3..f5b4a1392 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -7,7 +7,6 @@ #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H -#include "../../../card/card_info.h" #include "../../../deck/deck_list_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "printing_selector_card_overlay_widget.h" @@ -15,6 +14,7 @@ #include #include +#include class PrintingSelectorCardDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index f537f566b..ccda1ba34 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,13 +1,13 @@ #include "printing_selector_card_overlay_widget.h" -#include "../../../card/card_relation.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" #include "printing_selector_card_display_widget.h" #include #include #include +#include +#include +#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 84f029f11..25c8f771c 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -7,7 +7,6 @@ #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H -#include "../../../card/card_info.h" #include "../../../deck/deck_list_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../cards/card_info_picture_widget.h" @@ -15,6 +14,8 @@ #include "card_amount_widget.h" #include "set_name_and_collectors_number_display_widget.h" +#include + class PrintingSelectorCardOverlayWidget : public QWidget { Q_OBJECT diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index 2da987762..312bae9a1 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -1,7 +1,7 @@ #include "printing_selector_card_sorting_widget.h" -#include "../../../settings/cache_settings.h" -#include "../../../utility/card_set_comparator.h" +#include +#include const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index 15ef4a590..e8c42a28a 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -1,13 +1,13 @@ #include "visual_database_display_filter_save_load_widget.h" #include "../../../filters/filter_tree.h" -#include "../../../settings/cache_settings.h" #include "visual_database_filter_display_widget.h" #include #include #include #include +#include VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp index 1fddc9724..47c00ac48 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp @@ -1,12 +1,12 @@ #include "visual_database_display_main_type_filter_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" #include #include #include +#include VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp index 6bc27d90f..17c26b544 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp @@ -1,14 +1,14 @@ #include "visual_database_display_set_filter_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" -#include "../../../settings/cache_settings.h" #include #include #include #include +#include +#include VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp index 9c531ba1a..02047723f 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp @@ -1,6 +1,5 @@ #include "visual_database_display_sub_type_filter_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" @@ -8,6 +7,7 @@ #include #include #include +#include VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index 95a463b23..b436c84f5 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -1,12 +1,8 @@ #include "visual_database_display_widget.h" -#include "../../../database/card_database.h" -#include "../../../database/card_database_manager.h" #include "../../../deck/custom_line_edit.h" #include "../../../filters/filter_tree_model.h" #include "../../../filters/syntax_help.h" -#include "../../../settings/cache_settings.h" -#include "../../../utility/card_info_comparator.h" #include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../quick_settings/settings_button_widget.h" @@ -19,6 +15,10 @@ #include #include +#include +#include +#include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 947afeae1..736223dee 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -7,13 +7,10 @@ #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H -#include "../../../database/card_database.h" -#include "../../../database/model/card_database_model.h" #include "../../../deck/custom_line_edit.h" #include "../../../deck/deck_list_model.h" #include "../../../filters/filter_tree_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../utility/key_signals.h" #include "../../layouts/flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" @@ -31,6 +28,9 @@ #include #include #include +#include +#include +#include #include inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display"); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp index 3f6c2d104..093a52d72 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp @@ -1,13 +1,12 @@ #include "visual_database_filter_display_widget.h" -#include "../../../settings/cache_settings.h" - #include #include #include #include #include #include +#include FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel) : QWidget(parent), filterFilename(filename), filterModel(_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index 0f3fc9e49..c73260115 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -1,10 +1,10 @@ #include "visual_deck_editor_sample_hand_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../deck/deck_loader.h" -#include "../../../settings/cache_settings.h" #include "../cards/card_info_picture_widget.h" +#include +#include #include VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 6a23d8215..bf2c7f7e7 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -1,14 +1,8 @@ #include "visual_deck_editor_widget.h" -#include "../../../database/card_database.h" -#include "../../../database/card_database_manager.h" -#include "../../../database/model/card/card_completer_proxy_model.h" -#include "../../../database/model/card/card_search_model.h" -#include "../../../database/model/card_database_model.h" #include "../../../deck/deck_list_model.h" #include "../../../deck/deck_loader.h" #include "../../../main.h" -#include "../../../utility/card_info_comparator.h" #include "../../layouts/overlap_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/deck_card_zone_display_widget.h" @@ -21,6 +15,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index 5453b6e22..06e41f408 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -7,10 +7,6 @@ #ifndef VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H -#include "../../../database/card_database.h" -#include "../../../database/model/card/card_completer_proxy_model.h" -#include "../../../database/model/card_database_display_model.h" -#include "../../../database/model/card_database_model.h" #include "../../../deck/deck_list_model.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" @@ -22,6 +18,10 @@ #include #include #include +#include +#include +#include +#include #include class DeckCardZoneDisplayWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index 6dc579c5b..067318ab5 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -1,7 +1,6 @@ #include "deck_preview_deck_tags_display_widget.h" #include "../../../../dialogs/dlg_convert_deck_to_cod_format.h" -#include "../../../../settings/cache_settings.h" #include "../../../../tabs/tab_deck_editor.h" #include "../../general/layout_containers/flow_widget.h" #include "deck_preview_tag_addition_widget.h" @@ -13,6 +12,7 @@ #include #include #include +#include DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList) : QWidget(_parent), deckList(nullptr) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index df9fa72ae..21e2b0364 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -1,6 +1,5 @@ #include "deck_preview_tag_addition_widget.h" -#include "../../../../settings/cache_settings.h" #include "../../../../tabs/abstract_tab_deck_editor.h" #include "deck_preview_tag_dialog.h" @@ -8,6 +7,7 @@ #include #include #include +#include #include DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp index 601a03394..513c2543b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp @@ -1,7 +1,6 @@ #include "deck_preview_tag_dialog.h" #include "../../../../dialogs/dlg_default_tags_editor.h" -#include "../../../../settings/cache_settings.h" #include "deck_preview_tag_item_widget.h" #include @@ -12,6 +11,7 @@ #include #include #include +#include DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags, const QStringList &_activeTags, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 695918861..6a240020f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -1,7 +1,5 @@ #include "deck_preview_widget.h" -#include "../../../../database/card_database_manager.h" -#include "../../../../settings/cache_settings.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "deck_preview_deck_tags_display_widget.h" @@ -15,6 +13,8 @@ #include #include #include +#include +#include DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, VisualDeckStorageWidget *_visualDeckStorageWidget, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp index 235e62deb..f36b84a1c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp @@ -1,10 +1,10 @@ #include "visual_deck_storage_folder_display_widget.h" -#include "../../../settings/cache_settings.h" #include "deck_preview/deck_preview_widget.h" #include #include +#include VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp index 6e269a9b5..19bf070c9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -1,11 +1,11 @@ #include "visual_deck_storage_quick_settings_widget.h" -#include "../../../settings/cache_settings.h" #include "visual_deck_storage_widget.h" #include #include #include +#include VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 69fb1025a..18430d698 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -2,10 +2,10 @@ #include "../../../filters/deck_filter_string.h" #include "../../../filters/syntax_help.h" -#include "../../../settings/cache_settings.h" #include "../../pixel_map_generator.h" #include +#include /** * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp index c7917ed44..c68dfdc3b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_sort_widget.h" -#include "../../../settings/cache_settings.h" +#include /** * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 36f9c7705..847846c53 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,7 +1,5 @@ #include "visual_deck_storage_widget.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_widget.h" #include "visual_deck_storage_folder_display_widget.h" @@ -14,6 +12,8 @@ #include #include #include +#include +#include VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr) { diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index f1117c369..9225f2990 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -22,8 +22,6 @@ #include "../client/get_text_with_max.h" #include "../client/network/client_update_checker.h" #include "../client/network/release_channel.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" #include "../dialogs/dlg_connect.h" #include "../dialogs/dlg_edit_tokens.h" #include "../dialogs/dlg_forgot_password_challenge.h" @@ -41,14 +39,8 @@ #include "../server/local_server.h" #include "../server/local_server_interface.h" #include "../server/remote/remote_client.h" -#include "../settings/cache_settings.h" #include "../tabs/tab_game.h" #include "../tabs/tab_supervisor.h" -#include "../utility/logger.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_server_shutdown.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/room_commands.pb.h" #include "version_string.h" #include @@ -72,6 +64,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 3b1b25638..a9e11f8de 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -26,7 +26,6 @@ #define WINDOW_H #include "../server/abstract_client.h" -#include "pb/response.pb.h" #include #include @@ -35,6 +34,7 @@ #include #include #include +#include inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main"); inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup"); diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 3a047ef98..ca2a7b8d4 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -24,13 +24,9 @@ #include "client/network/spoiler_background_updater.h" #include "client/sound_engine.h" #include "dialogs/dlg_settings.h" -#include "featureset.h" #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" #include "interface/window_main.h" -#include "rng_sfmt.h" -#include "settings/cache_settings.h" -#include "utility/logger.h" #include "version_string.h" #include @@ -45,6 +41,10 @@ #include #include #include +#include +#include +#include +#include QTranslator *translator, *qtTranslator; RNG_Abstract *rng; diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h index 1cdc4e78d..487abc0ea 100644 --- a/cockatrice/src/main.h +++ b/cockatrice/src/main.h @@ -7,9 +7,8 @@ #ifndef MAIN_H #define MAIN_H -#include "utility/macros.h" - #include +#include inline Q_LOGGING_CATEGORY(MainLog, "main"); inline Q_LOGGING_CATEGORY(QtTranslatorDebug, "qt_translator"); diff --git a/cockatrice/src/server/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp index 4f3098871..03c5fc3ae 100644 --- a/cockatrice/src/server/abstract_client.cpp +++ b/cockatrice/src/server/abstract_client.cpp @@ -1,25 +1,25 @@ #include "abstract_client.h" -#include "featureset.h" -#include "get_pb_extension.h" -#include "pb/commands.pb.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_server_identification.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_server_shutdown.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/server_message.pb.h" #include "pending_command.h" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include AbstractClient::AbstractClient(QObject *parent) : QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false) diff --git a/cockatrice/src/server/abstract_client.h b/cockatrice/src/server/abstract_client.h index e6a812df1..165737e95 100644 --- a/cockatrice/src/server/abstract_client.h +++ b/cockatrice/src/server/abstract_client.h @@ -7,12 +7,11 @@ #ifndef ABSTRACTCLIENT_H #define ABSTRACTCLIENT_H -#include "pb/response.pb.h" -#include "pb/serverinfo_user.pb.h" - #include #include #include +#include +#include class PendingCommand; class CommandContainer; diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index b6a6b3f98..e3ccb1f20 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -2,18 +2,18 @@ #include "../../client/sound_engine.h" #include "../../interface/pixel_map_generator.h" -#include "../../settings/cache_settings.h" #include "../../tabs/tab_account.h" #include "../user/user_context_menu.h" #include "../user/user_list_manager.h" #include "../user/user_list_proxy.h" -#include "user_level.h" #include #include #include #include #include +#include +#include const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47); diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h index 924c2ff42..c3e9ce19a 100644 --- a/cockatrice/src/server/chat_view/chat_view.h +++ b/cockatrice/src/server/chat_view/chat_view.h @@ -10,14 +10,14 @@ #include "../../tabs/tab_supervisor.h" #include "../user/user_list_widget.h" -#include "room_message_type.h" -#include "user_level.h" #include #include #include #include #include +#include +#include class AbstractGame; class QTextTable; diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp index 3cfd3315a..2cf7eff55 100644 --- a/cockatrice/src/server/game_selector.cpp +++ b/cockatrice/src/server/game_selector.cpp @@ -9,9 +9,6 @@ #include "../tabs/tab_supervisor.h" #include "abstract_client.h" #include "games_model.h" -#include "pb/response.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_game.pb.h" #include "pending_command.h" #include "user/user_list_manager.h" @@ -26,6 +23,9 @@ #include #include #include +#include +#include +#include GameSelector::GameSelector(AbstractClient *_client, TabSupervisor *_tabSupervisor, diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/server/game_selector.h index a6cadf141..0ca477fa9 100644 --- a/cockatrice/src/server/game_selector.h +++ b/cockatrice/src/server/game_selector.h @@ -10,9 +10,9 @@ #include "game_type_map.h" #include -#include -#include -#include +#include +#include +#include class QTreeView; class GamesModel; diff --git a/cockatrice/src/server/games_model.cpp b/cockatrice/src/server/games_model.cpp index 5c336738c..3a8c626ea 100644 --- a/cockatrice/src/server/games_model.cpp +++ b/cockatrice/src/server/games_model.cpp @@ -1,9 +1,7 @@ #include "games_model.h" #include "../interface/pixel_map_generator.h" -#include "../settings/cache_settings.h" #include "../tabs/tab_account.h" -#include "pb/serverinfo_game.pb.h" #include "user/user_list_manager.h" #include "user/user_list_widget.h" @@ -13,6 +11,8 @@ #include #include #include +#include +#include enum GameListColumn { diff --git a/cockatrice/src/server/games_model.h b/cockatrice/src/server/games_model.h index 03717bce8..1541b57bf 100644 --- a/cockatrice/src/server/games_model.h +++ b/cockatrice/src/server/games_model.h @@ -8,7 +8,6 @@ #define GAMESMODEL_H #include "game_type_map.h" -#include "pb/serverinfo_game.pb.h" #include #include @@ -16,6 +15,7 @@ #include #include #include +#include class UserListProxy; diff --git a/cockatrice/src/server/handle_public_servers.cpp b/cockatrice/src/server/handle_public_servers.cpp index cc44ba262..2497ecdcc 100644 --- a/cockatrice/src/server/handle_public_servers.cpp +++ b/cockatrice/src/server/handle_public_servers.cpp @@ -1,12 +1,11 @@ #include "handle_public_servers.h" -#include "../settings/cache_settings.h" - #include #include #include #include #include +#include #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json" diff --git a/cockatrice/src/server/local_client.cpp b/cockatrice/src/server/local_client.cpp index 734660af1..f227a2f28 100644 --- a/cockatrice/src/server/local_client.cpp +++ b/cockatrice/src/server/local_client.cpp @@ -1,8 +1,9 @@ #include "local_client.h" -#include "debug_pb_message.h" #include "local_server_interface.h" -#include "pb/session_commands.pb.h" + +#include +#include LocalClient::LocalClient(LocalServerInterface *_lsi, const QString &_playerName, diff --git a/cockatrice/src/server/local_server.cpp b/cockatrice/src/server/local_server.cpp index 74ee8601d..381b30de7 100644 --- a/cockatrice/src/server/local_server.cpp +++ b/cockatrice/src/server/local_server.cpp @@ -1,7 +1,8 @@ #include "local_server.h" #include "local_server_interface.h" -#include "server/server_room.h" + +#include LocalServer::LocalServer(QObject *parent) : Server(parent) { diff --git a/cockatrice/src/server/local_server.h b/cockatrice/src/server/local_server.h index 9546e3f9c..2a1d141a0 100644 --- a/cockatrice/src/server/local_server.h +++ b/cockatrice/src/server/local_server.h @@ -7,8 +7,8 @@ #ifndef LOCALSERVER_H #define LOCALSERVER_H -#include "server/server.h" -#include "server/server_database_interface.h" +#include +#include class LocalServerInterface; diff --git a/cockatrice/src/server/local_server_interface.h b/cockatrice/src/server/local_server_interface.h index 5551b47a5..08dce1feb 100644 --- a/cockatrice/src/server/local_server_interface.h +++ b/cockatrice/src/server/local_server_interface.h @@ -7,7 +7,7 @@ #ifndef LOCALSERVERINTERFACE_H #define LOCALSERVERINTERFACE_H -#include "server/server_protocolhandler.h" +#include class LocalServer; diff --git a/cockatrice/src/server/pending_command.h b/cockatrice/src/server/pending_command.h index df452b10a..1d2d9ff17 100644 --- a/cockatrice/src/server/pending_command.h +++ b/cockatrice/src/server/pending_command.h @@ -7,10 +7,9 @@ #ifndef PENDING_COMMAND_H #define PENDING_COMMAND_H -#include "pb/commands.pb.h" -#include "pb/response.pb.h" - #include +#include +#include class PendingCommand : public QObject { diff --git a/cockatrice/src/server/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp index 1d8579c14..9de8677b0 100644 --- a/cockatrice/src/server/remote/remote_client.cpp +++ b/cockatrice/src/server/remote/remote_client.cpp @@ -1,18 +1,7 @@ #include "remote_client.h" #include "../../main.h" -#include "../../settings/cache_settings.h" #include "../pending_command.h" -#include "debug_pb_message.h" -#include "passwordhasher.h" -#include "pb/event_server_identification.pb.h" -#include "pb/response_activate.pb.h" -#include "pb/response_forgotpasswordrequest.pb.h" -#include "pb/response_login.pb.h" -#include "pb/response_password_salt.pb.h" -#include "pb/response_register.pb.h" -#include "pb/server_message.pb.h" -#include "pb/session_commands.pb.h" #include "version_string.h" #include @@ -23,6 +12,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned int protocolVersion = 14; diff --git a/cockatrice/src/server/remote/remote_client.h b/cockatrice/src/server/remote/remote_client.h index 365b5b520..f6b019af2 100644 --- a/cockatrice/src/server/remote/remote_client.h +++ b/cockatrice/src/server/remote/remote_client.h @@ -8,11 +8,11 @@ #define REMOTECLIENT_H #include "../abstract_client.h" -#include "pb/commands.pb.h" #include #include #include +#include inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client"); diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp index dfed741f9..5606fb707 100644 --- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp @@ -2,13 +2,13 @@ #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/command_deck_list.pb.h" -#include "pb/response_deck_list.pb.h" -#include "pb/serverinfo_deckstorage.pb.h" #include #include #include +#include +#include +#include RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name, RemoteDeckList_TreeModel::DirectoryNode *_parent) diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp index 1fa72b20c..c25391b1a 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp @@ -2,13 +2,13 @@ #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/command_replay_list.pb.h" -#include "pb/response_replay_list.pb.h" -#include "pb/serverinfo_replay.pb.h" #include #include #include +#include +#include +#include const int RemoteReplayList_TreeModel::numberOfColumns = 6; diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h index ccff71c47..d5d70af53 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.h +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h @@ -9,12 +9,11 @@ #ifndef REMOTEREPLAYLIST_TREEWIDGET_H #define REMOTEREPLAYLIST_TREEWIDGET_H -#include "pb/serverinfo_replay.pb.h" -#include "pb/serverinfo_replay_match.pb.h" - #include #include #include +#include +#include class Response; class AbstractClient; diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index c6782ef18..44cad3d9b 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/cockatrice/src/server/user/user_context_menu.cpp @@ -7,16 +7,6 @@ #include "../chat_view/chat_view.h" #include "../game_selector.h" #include "../pending_command.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/commands.pb.h" -#include "pb/moderator_commands.pb.h" -#include "pb/response_ban_history.pb.h" -#include "pb/response_get_admin_notes.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/response_warn_history.pb.h" -#include "pb/response_warn_list.pb.h" -#include "pb/session_commands.pb.h" #include "user_info_box.h" #include "user_list_manager.h" #include "user_list_proxy.h" @@ -28,6 +18,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game) : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor), diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h index d6f48f836..76af4acdc 100644 --- a/cockatrice/src/server/user/user_context_menu.h +++ b/cockatrice/src/server/user/user_context_menu.h @@ -7,9 +7,8 @@ #ifndef USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H -#include "user_level.h" - #include +#include class AbstractGame; class UserListProxy; diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index cec0c38e8..59422203b 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -7,10 +7,6 @@ #include "../../interface/pixel_map_generator.h" #include "../abstract_client.h" #include "../pending_command.h" -#include "passwordhasher.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/session_commands.pb.h" #include #include @@ -18,6 +14,10 @@ #include #include #include +#include +#include +#include +#include UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags), client(_client), editable(_editable) diff --git a/cockatrice/src/server/user/user_info_connection.cpp b/cockatrice/src/server/user/user_info_connection.cpp index 50ac129a8..813a9236c 100644 --- a/cockatrice/src/server/user/user_info_connection.cpp +++ b/cockatrice/src/server/user/user_info_connection.cpp @@ -1,8 +1,7 @@ #include "user_info_connection.h" -#include "../../settings/cache_settings.h" - #include +#include #include UserConnection_Information::UserConnection_Information() = default; diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp index c74706955..47fd86f88 100644 --- a/cockatrice/src/server/user/user_list_manager.cpp +++ b/cockatrice/src/server/user/user_list_manager.cpp @@ -3,14 +3,15 @@ #include "../../client/sound_engine.h" #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/session_commands.pb.h" #include "user_info_box.h" +#include +#include +#include +#include +#include +#include + UserListManager::UserListManager(AbstractClient *_client, QObject *parent) : QObject(parent), client(_client), ownUserInfo(nullptr) { diff --git a/cockatrice/src/server/user/user_list_manager.h b/cockatrice/src/server/user/user_list_manager.h index b02a43808..56f50c0be 100644 --- a/cockatrice/src/server/user/user_list_manager.h +++ b/cockatrice/src/server/user/user_list_manager.h @@ -7,11 +7,11 @@ #ifndef COCKATRICE_USER_LIST_MANAGER_H #define COCKATRICE_USER_LIST_MANAGER_H -#include "pb/serverinfo_user.pb.h" #include "user_list_proxy.h" #include #include +#include class AbstractClient; class Event_AddToList; diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index d4dad5919..0a0cf4dbf 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -6,11 +6,6 @@ #include "../abstract_client.h" #include "../game_selector.h" #include "../pending_command.h" -#include "pb/moderator_commands.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/session_commands.pb.h" -#include "trice_limits.h" #include "user_context_menu.h" #include "user_list_manager.h" @@ -30,6 +25,11 @@ #include #include #include +#include +#include +#include +#include +#include BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h index 8a1674549..2b1a40f95 100644 --- a/cockatrice/src/server/user/user_list_widget.h +++ b/cockatrice/src/server/user/user_list_widget.h @@ -7,15 +7,14 @@ #ifndef USERLIST_H #define USERLIST_H -#include "pb/moderator_commands.pb.h" -#include "user_level.h" - #include #include #include #include #include #include +#include +#include class QTreeWidget; class ServerInfo_User; diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index 3bd29b577..753d89851 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,22 +1,16 @@ #include "abstract_tab_deck_editor.h" #include "../client/tapped_out_interface.h" -#include "../database/card_database_manager.h" -#include "../database/model/card_database_model.h" #include "../deck/deck_stats_interface.h" #include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../dialogs/dlg_load_deck_from_website.h" +#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 "../picture_loader/picture_loader.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "../settings/cache_settings.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/response.pb.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include @@ -39,6 +33,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) { @@ -161,7 +161,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck) void AbstractTabDeckEditor::setDeck(DeckLoader *_deck) { deckDockWidget->setDeck(_deck); - PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList())); + CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList())); setModified(false); // If they load a deck, make the deck list appear diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/tabs/abstract_tab_deck_editor.h index e280d747f..9e4e6c14e 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.h @@ -1,7 +1,6 @@ #ifndef TAB_GENERIC_DECK_EDITOR_H #define TAB_GENERIC_DECK_EDITOR_H -#include "../card/card_info.h" #include "../client/deck_editor_menu.h" #include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h" @@ -24,6 +23,7 @@ class DeckEditorFilterDockWidget; class DeckEditorPrintingSelectorDockWidget; class DeckPreviewDeckTagsDisplayWidget; class Response; +class FilterTree; class FilterTreeModel; class FilterBuilder; diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp index cde18053b..79880b9ee 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp @@ -1,8 +1,9 @@ #include "edhrec_api_response_card_details_display_widget.h" -#include "../../../../../database/card_database_manager.h" #include "../../tab_edhrec_main.h" +#include + EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( QWidget *parent, const EdhrecApiResponseCardDetails &_toDisplay) diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index bf7444b5e..6c05320e0 100644 --- a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -1,10 +1,11 @@ #include "edhrec_api_response_commander_details_display_widget.h" -#include "../../../../../database/card_database_manager.h" #include "../../../../../interface/widgets/cards/card_info_picture_widget.h" #include "../../tab_edhrec_main.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h" +#include + EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget( QWidget *parent, const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails, diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h index ac3d7ea11..0cf48c3e0 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h @@ -7,12 +7,12 @@ #ifndef TAB_EDHREC_H #define TAB_EDHREC_H -#include "../../../card/card_info.h" #include "../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include +#include class TabEdhRec : public Tab { diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp index 36089886a..89f17ba64 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp @@ -1,8 +1,5 @@ #include "tab_edhrec_main.h" -#include "../../../database/card_database_manager.h" -#include "../../../database/model/card/card_completer_proxy_model.h" -#include "../../../database/model/card/card_search_model.h" #include "../../tab_supervisor.h" #include "api_response/average_deck/edhrec_average_deck_api_response.h" #include "api_response/commander/edhrec_commander_api_response.h" @@ -25,6 +22,9 @@ #include #include #include +#include +#include +#include static bool canBeCommander(const CardInfoPtr &cardInfo) { diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h index d9b96ac76..b6f8b5ce6 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h @@ -7,7 +7,6 @@ #ifndef TAB_EDHREC_MAIN_H #define TAB_EDHREC_MAIN_H -#include "../../../database/card_database.h" #include "../../../interface/widgets/cards/card_size_widget.h" #include "../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../../interface/widgets/quick_settings/settings_button_widget.h" @@ -18,6 +17,7 @@ #include #include #include +#include class TabEdhRecMain : public Tab { diff --git a/cockatrice/src/tabs/tab.h b/cockatrice/src/tabs/tab.h index a431aac75..56a9f0b7e 100644 --- a/cockatrice/src/tabs/tab.h +++ b/cockatrice/src/tabs/tab.h @@ -7,9 +7,8 @@ #ifndef TAB_H #define TAB_H -#include "card_ref.h" - #include +#include class QMenu; class TabSupervisor; diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index ba82857fe..34b06f1ee 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -7,17 +7,17 @@ #include "../server/user/user_info_box.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/session_commands.pb.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include +#include +#include +#include +#include +#include +#include +#include TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/tabs/tab_account.h b/cockatrice/src/tabs/tab_account.h index 4e6abb24b..e09c12eb2 100644 --- a/cockatrice/src/tabs/tab_account.h +++ b/cockatrice/src/tabs/tab_account.h @@ -7,9 +7,10 @@ #ifndef TAB_ACCOUNT_H #define TAB_ACCOUNT_H -#include "pb/serverinfo_user.pb.h" #include "tab.h" +#include + class AbstractClient; class Event_AddToList; class Event_ListRooms; diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp index a3d9e34e8..d8a4b52b7 100644 --- a/cockatrice/src/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -2,10 +2,6 @@ #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "pb/admin_commands.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/moderator_commands.pb.h" -#include "trice_limits.h" #include #include @@ -15,6 +11,10 @@ #include #include #include +#include +#include +#include +#include ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/tabs/tab_admin.h b/cockatrice/src/tabs/tab_admin.h index 60722b778..5b44a6569 100644 --- a/cockatrice/src/tabs/tab_admin.h +++ b/cockatrice/src/tabs/tab_admin.h @@ -7,11 +7,11 @@ #ifndef TAB_ADMIN_H #define TAB_ADMIN_H -#include "pb/commands.pb.h" -#include "pb/response.pb.h" #include "tab.h" #include +#include +#include class AbstractClient; diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index 1f56f7b7b..8250a5580 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -2,8 +2,6 @@ #include "../client/deck_editor_menu.h" #include "../client/tapped_out_interface.h" -#include "../database/card_database_manager.h" -#include "../database/model/card_database_model.h" #include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../filters/filter_builder.h" @@ -13,9 +11,7 @@ #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "../settings/cache_settings.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include @@ -38,6 +34,10 @@ #include #include #include +#include +#include +#include +#include TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) { diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h index 078560da1..ec953055c 100644 --- a/cockatrice/src/tabs/tab_deck_editor.h +++ b/cockatrice/src/tabs/tab_deck_editor.h @@ -1,11 +1,12 @@ #ifndef WINDOW_DECKEDITOR_H #define WINDOW_DECKEDITOR_H -#include "../card/card_info.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" -#include "../utility/key_signals.h" #include "abstract_tab_deck_editor.h" +#include +#include + class CardDatabaseModel; class CardDatabaseDisplayModel; class DeckListModel; diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index 898612e6f..181e6b3a4 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -4,16 +4,6 @@ #include "../deck/deck_loader.h" #include "../server/pending_command.h" #include "../server/remote/remote_decklist_tree_widget.h" -#include "../settings/cache_settings.h" -#include "deck_list.h" -#include "pb/command_deck_del.pb.h" -#include "pb/command_deck_del_dir.pb.h" -#include "pb/command_deck_download.pb.h" -#include "pb/command_deck_new_dir.pb.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_deck_upload.pb.h" #include #include @@ -29,6 +19,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index c31f548d6..103cecf8b 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -1,8 +1,6 @@ #include "tab_game.h" #include "../client/network/replay_timeline_widget.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" #include "../dialogs/dlg_create_game.h" #include "../game/board/arrow_item.h" #include "../game/board/card_item.h" @@ -17,20 +15,14 @@ #include "../game/player/player_list_widget.h" #include "../game/replay.h" #include "../game/zones/card_zone.h" +#include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/line_edit_completer.h" #include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/window_main.h" #include "../main.h" -#include "../picture_loader/picture_loader.h" #include "../server/abstract_client.h" #include "../server/user/user_list_manager.h" -#include "../settings/cache_settings.h" -#include "pb/event_game_joined.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include @@ -46,6 +38,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr) @@ -757,7 +757,7 @@ void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerIn TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId); if (playerInfo.has_deck_list()) { DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list())); - PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList())); + CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList())); deckViewContainer->playerDeckView->setDeck(newDeck); localPlayer->setDeck(newDeck); } diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h index eee5769ab..956b72c9b 100644 --- a/cockatrice/src/tabs/tab_game.h +++ b/cockatrice/src/tabs/tab_game.h @@ -15,12 +15,12 @@ #include "../game/player/player.h" #include "../interface/tearoff_menu.h" #include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" -#include "pb/event_leave.pb.h" #include "tab.h" #include #include #include +#include class ServerInfo_PlayerProperties; class TabbedDeckViewContainer; diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index 4a791a27e..c1722df5a 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -4,9 +4,6 @@ #include "../dialogs/dlg_manage_sets.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "pb/moderator_commands.pb.h" -#include "pb/response_viewlog_history.pb.h" -#include "trice_limits.h" #include #include @@ -20,6 +17,9 @@ #include #include #include +#include +#include +#include TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 6b4b7044b..4ca598518 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -7,17 +7,17 @@ #include "../server/chat_view/chat_view.h" #include "../server/pending_command.h" #include "../server/user/user_list_manager.h" -#include "../settings/cache_settings.h" -#include "pb/event_user_message.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/session_commands.pb.h" -#include "trice_limits.h" #include #include #include #include #include +#include +#include +#include +#include +#include TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index 2feb41383..adb75e79e 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -3,17 +3,6 @@ #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "../server/remote/remote_replay_list_tree_widget.h" -#include "../settings/cache_settings.h" -#include "pb/command_replay_delete_match.pb.h" -#include "pb/command_replay_download.pb.h" -#include "pb/command_replay_get_code.pb.h" -#include "pb/command_replay_modify_match.pb.h" -#include "pb/command_replay_submit_code.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/response.pb.h" -#include "pb/response_replay_download.pb.h" -#include "pb/response_replay_get_code.pb.h" #include "tab_game.h" #include @@ -30,6 +19,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index ff6507b29..a691a3b6a 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -8,18 +8,8 @@ #include "../server/pending_command.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "../settings/cache_settings.h" -#include "get_pb_extension.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_room.pb.h" #include "tab_account.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include @@ -32,6 +22,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp index 069f06313..fbfc5b11a 100644 --- a/cockatrice/src/tabs/tab_server.cpp +++ b/cockatrice/src/tabs/tab_server.cpp @@ -3,10 +3,6 @@ #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "../server/user/user_list_widget.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/response_join_room.pb.h" -#include "pb/session_commands.pb.h" #include "tab_supervisor.h" #include @@ -20,6 +16,10 @@ #include #include #include +#include +#include +#include +#include RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client) { diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp index 78fce4516..99b3f71a9 100644 --- a/cockatrice/src/tabs/tab_supervisor.cpp +++ b/cockatrice/src/tabs/tab_supervisor.cpp @@ -5,17 +5,7 @@ #include "../server/abstract_client.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "../settings/cache_settings.h" #include "api/edhrec/tab_edhrec_main.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/game_event_container.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/room_event.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "pb/serverinfo_user.pb.h" #include "tab_account.h" #include "tab_admin.h" #include "tab_deck_editor.h" @@ -36,6 +26,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const { diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index f3ae2e293..596d99a17 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,6 +1,5 @@ #include "tab_deck_editor_visual.h" -#include "../../database/model/card_database_model.h" #include "../../deck/deck_list_model.h" #include "../../deck/deck_stats_interface.h" #include "../../filters/filter_builder.h" @@ -9,12 +8,9 @@ #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 "../../settings/cache_settings.h" #include "../tab_deck_editor.h" #include "../tab_supervisor.h" -#include "pb/command_deck_upload.pb.h" #include "tab_deck_editor_visual_tab_widget.h" -#include "trice_limits.h" #include #include @@ -33,6 +29,10 @@ #include #include #include +#include +#include +#include +#include TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) { diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index ea8822213..f918f61ad 100644 --- a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -1,13 +1,13 @@ #include "tab_deck_storage_visual.h" -#include "../../database/model/card_database_model.h" #include "../../interface/widgets/cards/deck_preview_card_picture_widget.h" #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../tab_supervisor.h" -#include "pb/command_deck_del.pb.h" #include #include +#include +#include TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt deleted file mode 100644 index 19651c948..000000000 --- a/common/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -# CMakeLists for common directory -# -# provides the common library - -add_subdirectory(pb) - -set(common_SOURCES - abstract_deck_list_card_node.cpp - abstract_deck_list_node.cpp - debug_pb_message.cpp - deck_list_card_node.cpp - deck_list.cpp - expression.cpp - featureset.cpp - get_pb_extension.cpp - inner_deck_list_node.cpp - passwordhasher.cpp - rng_abstract.cpp - rng_sfmt.cpp - server/game/server_abstract_participant.cpp - server/game/server_abstract_player.cpp - server/game/server_arrow.cpp - server/game/server_arrowtarget.cpp - server/game/server_card.cpp - server/game/server_cardzone.cpp - server/game/server_counter.cpp - server/game/server_game.cpp - server/game/server_player.cpp - server/game/server_spectator.cpp - server/server.cpp - server/server_abstractuserinterface.cpp - server/server_database_interface.cpp - server/server_protocolhandler.cpp - server/server_remoteuserinterface.cpp - server/server_response_containers.cpp - server/server_room.cpp - serverinfo_user_container.cpp - sfmt/SFMT.c -) - -set(ORACLE_LIBS) - -include_directories(pb) -include_directories(sfmt) -include_directories(${PROTOBUF_INCLUDE_DIR}) -include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS}) -target_link_libraries(cockatrice_common PUBLIC cockatrice_protocol) diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index 4236e1374..44049c13e 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -1,47 +1,46 @@ -# CMakeLists for dbconverter directory - +cmake_minimum_required(VERSION 3.16) project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -set(dbconverter_SOURCES - src/main.cpp - src/mocks.cpp - ../cockatrice/src/card/card_info.cpp - ../cockatrice/src/card/card_relation.cpp - ../cockatrice/src/card/card_set.cpp - ../cockatrice/src/card/card_set_list.cpp - ../cockatrice/src/card/exact_card.cpp - ../cockatrice/src/card/printing_info.cpp - ../cockatrice/src/database/card_database.cpp - ../cockatrice/src/database/card_database_loader.cpp - ../cockatrice/src/database/card_database_querier.cpp - ../cockatrice/src/database/parser/card_database_parser.cpp - ../cockatrice/src/database/parser/cockatrice_xml_3.cpp - ../cockatrice/src/database/parser/cockatrice_xml_4.cpp - ../cockatrice/src/settings/settings_manager.cpp - ${VERSION_STRING_CPP} +# ------------------------ +# Sources +# ------------------------ +set(dbconverter_SOURCES src/main.cpp src/mocks.cpp ${VERSION_STRING_CPP}) + +# ------------------------ +# Qt configuration +# ------------------------ +set(QT_DONT_USE_QTGUI TRUE) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +# ------------------------ +# Build executable +# ------------------------ +add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES}) + +# ------------------------ +# Include directories +# ------------------------ +target_include_directories( + dbconverter + PRIVATE ../common # shared common headers + PRIVATE ../libs/card/include # cardlib public headers ) -set(QT_DONT_USE_QTGUI TRUE) +# ------------------------ +# Link libraries +# ------------------------ +target_link_libraries( + dbconverter + PRIVATE cardlib + PRIVATE settingslib + PRIVATE ${DB_CONVERTER_QT_MODULES} +) -if(Qt6_FOUND) - qt6_wrap_cpp( - dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h - ) -elseif(Qt5_FOUND) - qt5_wrap_cpp( - dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h - ) -endif() - -# Include directories -include_directories(../common) # Required due to card_ref.h - -# Build servatrice binary and link it -add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES}) - -target_link_libraries(dbconverter ${DB_CONVERTER_QT_MODULES}) - -# install rules +# ------------------------ +# Install rules +# ------------------------ if(UNIX) if(APPLE) set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") @@ -53,19 +52,20 @@ if(UNIX) install(TARGETS dbconverter BUNDLE DESTINATION ./) else() - # Assume linux + # Linux install(TARGETS dbconverter RUNTIME DESTINATION bin/) endif() elseif(WIN32) install(TARGETS dbconverter RUNTIME DESTINATION ./) endif() +# ------------------------ +# Qt plugin handling +# ------------------------ if(APPLE) - # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir dbconverter.app/Contents/Plugins) set(qtconf_dest_dir dbconverter.app/Contents/Resources) - # Qt plugins: platforms install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -81,7 +81,7 @@ if(APPLE) file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") - " + " COMPONENT Runtime ) @@ -89,16 +89,15 @@ Translations = Resources/translations\") CODE " file(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") - " + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") + " COMPONENT Runtime ) endif() if(WIN32) - # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir Plugins) set(qtconf_dest_dir .) @@ -109,7 +108,6 @@ if(WIN32) PATTERN "*.dll" ) - # Qt plugins: platforms install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -126,7 +124,7 @@ if(WIN32) file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") - " + " COMPONENT Runtime ) @@ -134,10 +132,10 @@ Translations = Resources/translations\") CODE " file(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") - " + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + " COMPONENT Runtime ) endif() diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h index ccde6b20e..b7b9350b5 100644 --- a/dbconverter/src/main.h +++ b/dbconverter/src/main.h @@ -1,8 +1,8 @@ #ifndef MAIN_H #define MAIN_H -#include "../../cockatrice/src/database/card_database.h" -#include "../../cockatrice/src/database/parser/cockatrice_xml_4.h" +#include +#include class CardDatabaseConverter : public CardDatabase { diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index 213b42f02..6aa108e57 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -448,7 +448,7 @@ void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */) { } -void PictureLoader::clearPixmapCache(CardInfoPtr /* card */) +void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */) { } diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h index 18a50155b..3a8495fb9 100644 --- a/dbconverter/src/mocks.h +++ b/dbconverter/src/mocks.h @@ -10,13 +10,13 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/database/card_database.h" -#include "../../cockatrice/src/settings/cache_settings.h" -#include "../../cockatrice/src/utility/macros.h" +#include +#include +#include extern SettingsCache *settingsCache; -class PictureLoader +class CardPictureLoader { public: static void clearPixmapCache(CardInfoPtr card); diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt new file mode 100644 index 000000000..6acdad8d6 --- /dev/null +++ b/libcockatrice_card/CMakeLists.txt @@ -0,0 +1,68 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/card/card_info.h + libcockatrice/card/card_info_comparator.h + libcockatrice/card/card_database/card_database.h + libcockatrice/card/card_database/card_database_loader.h + libcockatrice/card/card_database/card_database_manager.h + libcockatrice/card/card_database/card_database_querier.h + libcockatrice/card/card_database/model/card_database_model.h + libcockatrice/card/card_database/model/card_database_display_model.h + libcockatrice/card/card_database/model/card/card_completer_proxy_model.h + libcockatrice/card/card_database/model/card/card_search_model.h + libcockatrice/card/card_database/model/token/token_display_model.h + libcockatrice/card/card_database/model/token/token_edit_model.h + libcockatrice/card/card_database/parser/card_database_parser.h + libcockatrice/card/card_database/parser/cockatrice_xml_3.h + libcockatrice/card/card_database/parser/cockatrice_xml_4.h + libcockatrice/card/card_printing/exact_card.h + libcockatrice/card/card_printing/printing_info.h + libcockatrice/card/card_set/card_set.h + libcockatrice/card/card_relation/card_relation.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_card STATIC + ${MOC_SOURCES} + libcockatrice/card/card_database/card_database.cpp + libcockatrice/card/card_database/card_database_loader.cpp + libcockatrice/card/card_database/card_database_manager.cpp + libcockatrice/card/card_database/card_database_querier.cpp + libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp + libcockatrice/card/card_database/model/card/card_search_model.cpp + libcockatrice/card/card_database/model/card_database_display_model.cpp + libcockatrice/card/card_database/model/card_database_model.cpp + libcockatrice/card/card_database/model/token/token_display_model.cpp + libcockatrice/card/card_database/model/token/token_edit_model.cpp + libcockatrice/card/card_database/parser/card_database_parser.cpp + libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp + libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp + libcockatrice/card/card_info.cpp + libcockatrice/card/card_info_comparator.cpp + libcockatrice/card/card_printing/exact_card.cpp + libcockatrice/card/card_printing/printing_info.cpp + libcockatrice/card/card_relation/card_relation.cpp + libcockatrice/card/card_set/card_set.cpp + libcockatrice/card/card_set/card_set_list.cpp +) + +target_include_directories( + libcockatrice_card + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters +) + +target_link_libraries( + libcockatrice_card + PUBLIC libcockatrice_settings + PUBLIC ${COCKATRICE_QT_MODULES} +) diff --git a/cockatrice/src/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp similarity index 97% rename from cockatrice/src/database/card_database.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database.cpp index faa9f5113..212397c17 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp @@ -1,8 +1,6 @@ #include "card_database.h" -#include "../card/card_relation.h" -#include "../picture_loader/picture_loader.h" -#include "../settings/cache_settings.h" +#include "../card_relation/card_relation.h" #include "parser/cockatrice_xml_3.h" #include "parser/cockatrice_xml_4.h" @@ -14,6 +12,7 @@ #include #include #include +#include #include CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded) diff --git a/cockatrice/src/database/card_database.h b/libcockatrice_card/libcockatrice/card/card_database/card_database.h similarity index 95% rename from cockatrice/src/database/card_database.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database.h index 151019143..01d1c61e4 100644 --- a/cockatrice/src/database/card_database.h +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database.h @@ -7,9 +7,7 @@ #ifndef CARDDATABASE_H #define CARDDATABASE_H -#include "../card/card_set_list.h" -#include "../card/exact_card.h" -#include "../common/card_ref.h" +#include "../card_set/card_set_list.h" #include "card_database_loader.h" #include "card_database_querier.h" @@ -20,6 +18,7 @@ #include #include #include +#include #include inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database"); diff --git a/cockatrice/src/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp similarity index 98% rename from cockatrice/src/database/card_database_loader.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp index fbb3e6b67..756464683 100644 --- a/cockatrice/src/database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp @@ -1,9 +1,9 @@ #include "card_database_loader.h" -#include "../settings/cache_settings.h" #include "card_database.h" #include "parser/cockatrice_xml_3.h" #include "parser/cockatrice_xml_4.h" +#include #include #include diff --git a/cockatrice/src/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h similarity index 100% rename from cockatrice/src/database/card_database_loader.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h diff --git a/cockatrice/src/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp similarity index 100% rename from cockatrice/src/database/card_database_manager.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp diff --git a/cockatrice/src/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h similarity index 100% rename from cockatrice/src/database/card_database_manager.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h diff --git a/cockatrice/src/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp similarity index 98% rename from cockatrice/src/database/card_database_querier.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp index 68cc39c9d..2eb6c6e92 100644 --- a/cockatrice/src/database/card_database_querier.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp @@ -1,6 +1,8 @@ #include "card_database_querier.h" -#include "../utility/card_set_comparator.h" +#include "../card_info.h" +#include "../card_printing/exact_card.h" +#include "../card_set/card_set_comparator.h" #include "card_database.h" #include diff --git a/cockatrice/src/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h similarity index 95% rename from cockatrice/src/database/card_database_querier.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h index c30cf49c2..11e485695 100644 --- a/cockatrice/src/database/card_database_querier.h +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h @@ -7,10 +7,11 @@ #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H #define COCKATRICE_CARD_DATABASE_QUERIER_H -#include "../card/exact_card.h" -#include "../common/card_ref.h" +#include "../card_info.h" +#include "../card_printing/exact_card.h" #include +#include class CardDatabase; class CardDatabaseQuerier : public QObject diff --git a/cockatrice/src/database/model/card/card_completer_proxy_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp similarity index 100% rename from cockatrice/src/database/model/card/card_completer_proxy_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp diff --git a/cockatrice/src/database/model/card/card_completer_proxy_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h similarity index 100% rename from cockatrice/src/database/model/card/card_completer_proxy_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h diff --git a/cockatrice/src/database/model/card/card_search_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp similarity index 95% rename from cockatrice/src/database/model/card/card_search_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp index d39a2207d..432d82ef7 100644 --- a/cockatrice/src/database/model/card/card_search_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp @@ -1,7 +1,8 @@ #include "card_search_model.h" -#include "../../../utility/levenshtein.h" +#include "../card_database_display_model.h" #include "../card_database_model.h" +#include #include diff --git a/cockatrice/src/database/model/card/card_search_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h similarity index 99% rename from cockatrice/src/database/model/card/card_search_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h index 98d66cb5e..2b1e3b38d 100644 --- a/cockatrice/src/database/model/card/card_search_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h @@ -7,9 +7,8 @@ #ifndef CARD_SEARCH_MODEL_H #define CARD_SEARCH_MODEL_H -#include "../card_database_display_model.h" - #include +#include "../card_database_display_model.h" class CardSearchModel : public QAbstractListModel { diff --git a/cockatrice/src/database/model/card_database_display_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp similarity index 100% rename from cockatrice/src/database/model/card_database_display_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp diff --git a/cockatrice/src/database/model/card_database_display_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h similarity index 98% rename from cockatrice/src/database/model/card_database_display_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h index a1f9366e2..a1e949eba 100644 --- a/cockatrice/src/database/model/card_database_display_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h @@ -8,7 +8,7 @@ #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H -#include "../../filters/filter_string.h" +#include "filter_string.h" #include #include diff --git a/cockatrice/src/database/model/card_database_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp similarity index 99% rename from cockatrice/src/database/model/card_database_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp index 02175081b..6144121ac 100644 --- a/cockatrice/src/database/model/card_database_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp @@ -1,5 +1,7 @@ #include "card_database_model.h" +#include "../card_database.h" + #include #define CARDDBMODEL_COLUMNS 6 diff --git a/cockatrice/src/database/model/card_database_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h similarity index 100% rename from cockatrice/src/database/model/card_database_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h diff --git a/cockatrice/src/database/model/token/token_display_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp similarity index 100% rename from cockatrice/src/database/model/token/token_display_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp diff --git a/cockatrice/src/database/model/token/token_display_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h similarity index 100% rename from cockatrice/src/database/model/token/token_display_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h diff --git a/cockatrice/src/database/model/token/token_edit_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp similarity index 83% rename from cockatrice/src/database/model/token/token_edit_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp index ad6891d2e..8ce290b03 100644 --- a/cockatrice/src/database/model/token/token_edit_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp @@ -1,5 +1,7 @@ -#include "token_edit_model.h" +#include "../token/token_edit_model.h" +#include "../../../card_info.h" +#include "../card_database_display_model.h" #include "../card_database_model.h" TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent) diff --git a/cockatrice/src/database/model/token/token_edit_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h similarity index 100% rename from cockatrice/src/database/model/token/token_edit_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h diff --git a/cockatrice/src/database/parser/card_database_parser.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp similarity index 100% rename from cockatrice/src/database/parser/card_database_parser.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp diff --git a/cockatrice/src/database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h similarity index 97% rename from cockatrice/src/database/parser/card_database_parser.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h index 15a86fbfa..cce06191e 100644 --- a/cockatrice/src/database/parser/card_database_parser.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h @@ -7,10 +7,9 @@ #ifndef CARDDATABASE_PARSER_H #define CARDDATABASE_PARSER_H -#include "../../card/card_info.h" - #include #include +#include "../../card_info.h" #define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance" diff --git a/cockatrice/src/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp similarity index 99% rename from cockatrice/src/database/parser/cockatrice_xml_3.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp index 7b584bc22..295d307b6 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp @@ -1,7 +1,7 @@ #include "cockatrice_xml_3.h" -#include "../../card/card_relation.h" -#include "../../card/card_relation_type.h" +#include "../../card_relation/card_relation.h" +#include "../../card_relation/card_relation_type.h" #include #include diff --git a/cockatrice/src/database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h similarity index 96% rename from cockatrice/src/database/parser/cockatrice_xml_3.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h index 90130f4d1..50fa9c587 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_3.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h @@ -17,7 +17,6 @@ inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser"); class CockatriceXml3Parser : public ICardDatabaseParser { Q_OBJECT - Q_INTERFACES(ICardDatabaseParser) public: CockatriceXml3Parser() = default; ~CockatriceXml3Parser() override = default; diff --git a/cockatrice/src/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp similarity index 99% rename from cockatrice/src/database/parser/cockatrice_xml_4.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp index 1c68e80c3..d4870f3b3 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp @@ -1,12 +1,12 @@ #include "cockatrice_xml_4.h" -#include "../../card/card_relation.h" -#include "../../settings/cache_settings.h" +#include "../../card_relation/card_relation.h" #include #include #include #include +#include #include #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase" diff --git a/cockatrice/src/database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h similarity index 96% rename from cockatrice/src/database/parser/cockatrice_xml_4.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h index 389e23712..f438f94b2 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_4.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h @@ -17,7 +17,6 @@ inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser"); class CockatriceXml4Parser : public ICardDatabaseParser { Q_OBJECT - Q_INTERFACES(ICardDatabaseParser) public: CockatriceXml4Parser() = default; ~CockatriceXml4Parser() override = default; diff --git a/cockatrice/src/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp similarity index 97% rename from cockatrice/src/card/card_info.cpp rename to libcockatrice_card/libcockatrice/card/card_info.cpp index 47621e65e..0434bcf00 100644 --- a/cockatrice/src/card/card_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info.cpp @@ -1,10 +1,9 @@ #include "card_info.h" -#include "../picture_loader/picture_loader.h" -#include "../settings/cache_settings.h" -#include "card_relation.h" +#include "card_printing/printing_info.h" +#include "card_relation/card_relation.h" +#include "card_set/card_set.h" #include "game_specific_terms.h" -#include "printing_info.h" #include #include @@ -12,6 +11,7 @@ #include #include #include +#include #include class CardRelation; diff --git a/cockatrice/src/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h similarity index 99% rename from cockatrice/src/card/card_info.h rename to libcockatrice_card/libcockatrice/card/card_info.h index b9b5e62c4..f613686be 100644 --- a/cockatrice/src/card/card_info.h +++ b/libcockatrice_card/libcockatrice/card/card_info.h @@ -7,8 +7,6 @@ #ifndef CARD_INFO_H #define CARD_INFO_H -#include "printing_info.h" - #include #include #include @@ -18,6 +16,7 @@ #include #include #include +#include "card_printing/printing_info.h" #include inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info"); diff --git a/cockatrice/src/utility/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp similarity index 100% rename from cockatrice/src/utility/card_info_comparator.cpp rename to libcockatrice_card/libcockatrice/card/card_info_comparator.cpp diff --git a/cockatrice/src/utility/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h similarity index 95% rename from cockatrice/src/utility/card_info_comparator.h rename to libcockatrice_card/libcockatrice/card/card_info_comparator.h index 8b02afaf3..bafc303a5 100644 --- a/cockatrice/src/utility/card_info_comparator.h +++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h @@ -7,7 +7,7 @@ #ifndef CARD_INFO_COMPARATOR_H #define CARD_INFO_COMPARATOR_H -#include "../card/card_info.h" +#include "card_info.h" #include #include diff --git a/cockatrice/src/card/exact_card.cpp b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp similarity index 96% rename from cockatrice/src/card/exact_card.cpp rename to libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp index fbd60071e..993b5b96e 100644 --- a/cockatrice/src/card/exact_card.cpp +++ b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp @@ -1,5 +1,8 @@ #include "exact_card.h" +#include "../card_info.h" +#include "printing_info.h" + /** * Default constructor. * This will set the CardInfoPtr to null. diff --git a/cockatrice/src/card/exact_card.h b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.h similarity index 97% rename from cockatrice/src/card/exact_card.h rename to libcockatrice_card/libcockatrice/card/card_printing/exact_card.h index f0ba25c02..e3d5d828a 100644 --- a/cockatrice/src/card/exact_card.h +++ b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.h @@ -1,7 +1,7 @@ #ifndef EXACT_CARD_H #define EXACT_CARD_H -#include "card_info.h" +#include "../card_info.h" /** * @class ExactCard diff --git a/cockatrice/src/card/printing_info.cpp b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp similarity index 88% rename from cockatrice/src/card/printing_info.cpp rename to libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp index 3e7735e6b..17a0d6317 100644 --- a/cockatrice/src/card/printing_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp @@ -1,5 +1,7 @@ #include "printing_info.h" +#include "../card_set/card_set.h" + PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set) { } diff --git a/cockatrice/src/card/printing_info.h b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h similarity index 97% rename from cockatrice/src/card/printing_info.h rename to libcockatrice_card/libcockatrice/card/card_printing/printing_info.h index cf262b6bb..0b5a14a0a 100644 --- a/cockatrice/src/card/printing_info.h +++ b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_PRINTING_INFO_H #define COCKATRICE_PRINTING_INFO_H -#include "card_set.h" +#include "../card_set/card_set.h" #include #include diff --git a/cockatrice/src/card/card_relation.cpp b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp similarity index 94% rename from cockatrice/src/card/card_relation.cpp rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp index 41fbb5617..a88729b5f 100644 --- a/cockatrice/src/card/card_relation.cpp +++ b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp @@ -1,4 +1,5 @@ #include "card_relation.h" +#include "card_relation_type.h" CardRelation::CardRelation(const QString &_name, CardRelationType _attachType, diff --git a/cockatrice/src/card/card_relation.h b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.h similarity index 100% rename from cockatrice/src/card/card_relation.h rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation.h diff --git a/cockatrice/src/card/card_relation_type.h b/libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h similarity index 100% rename from cockatrice/src/card/card_relation_type.h rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h diff --git a/cockatrice/src/card/card_set.cpp b/libcockatrice_card/libcockatrice/card/card_set/card_set.cpp similarity index 97% rename from cockatrice/src/card/card_set.cpp rename to libcockatrice_card/libcockatrice/card/card_set/card_set.cpp index 89bc0f6e5..6b4a8f764 100644 --- a/cockatrice/src/card/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/card_set/card_set.cpp @@ -1,6 +1,6 @@ #include "card_set.h" -#include "../settings/cache_settings.h" +#include const char *CardSet::TOKENS_SETNAME = "TK"; diff --git a/cockatrice/src/card/card_set.h b/libcockatrice_card/libcockatrice/card/card_set/card_set.h similarity index 100% rename from cockatrice/src/card/card_set.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set.h diff --git a/cockatrice/src/utility/card_set_comparator.h b/libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h similarity index 96% rename from cockatrice/src/utility/card_set_comparator.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h index 4089cf42b..53e2cb97d 100644 --- a/cockatrice/src/utility/card_set_comparator.h +++ b/libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h @@ -7,7 +7,7 @@ #ifndef SET_PRIORITY_COMPARATOR_H #define SET_PRIORITY_COMPARATOR_H -#include "../card/card_info.h" +#include "../card_info.h" class SetPriorityComparator { diff --git a/cockatrice/src/card/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp similarity index 100% rename from cockatrice/src/card/card_set_list.cpp rename to libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp diff --git a/cockatrice/src/card/card_set_list.h b/libcockatrice_card/libcockatrice/card/card_set/card_set_list.h similarity index 100% rename from cockatrice/src/card/card_set_list.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set_list.h diff --git a/cockatrice/src/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h similarity index 100% rename from cockatrice/src/card/game_specific_terms.h rename to libcockatrice_card/libcockatrice/card/game_specific_terms.h diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt new file mode 100644 index 000000000..5ba0b32c9 --- /dev/null +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -0,0 +1,30 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/deck_list/abstract_deck_list_card_node.h libcockatrice/deck_list/abstract_deck_list_node.h + libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/deck_list_card_node.h + libcockatrice/deck_list/inner_deck_list_node.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_deck_list STATIC + ${MOC_SOURCES} libcockatrice/deck_list/abstract_deck_list_card_node.cpp + libcockatrice/deck_list/abstract_deck_list_node.cpp libcockatrice/deck_list/deck_list.cpp + libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_node.cpp +) + +add_dependencies(libcockatrice_deck_list libcockatrice_protocol_wrapper) + +target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries( + libcockatrice_deck_list PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility ${COCKATRICE_QT_MODULES} +) diff --git a/common/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.cpp similarity index 100% rename from common/abstract_deck_list_card_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.cpp diff --git a/common/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.h similarity index 100% rename from common/abstract_deck_list_card_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.h diff --git a/common/abstract_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.cpp similarity index 100% rename from common/abstract_deck_list_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.cpp diff --git a/common/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.h similarity index 100% rename from common/abstract_deck_list_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.h diff --git a/common/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp similarity index 100% rename from common/deck_list.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp diff --git a/common/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h similarity index 98% rename from common/deck_list.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index 2a70ea4b1..f7e5cafa7 100644 --- a/common/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -10,14 +10,14 @@ #ifndef DECKLIST_H #define DECKLIST_H -#include "card_ref.h" #include "inner_deck_list_node.h" +#include +#include #include #include #include #include -#include class AbstractDecklistNode; class DecklistCardNode; diff --git a/common/deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.cpp similarity index 100% rename from common/deck_list_card_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.cpp diff --git a/common/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h similarity index 99% rename from common/deck_list_card_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h index 84a396daf..fb1e553a8 100644 --- a/common/deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h @@ -13,7 +13,7 @@ #define COCKATRICE_DECK_LIST_CARD_NODE_H #include "abstract_deck_list_card_node.h" -#include "card_ref.h" +#include /** * @class DecklistCardNode diff --git a/common/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp similarity index 100% rename from common/inner_deck_list_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp diff --git a/common/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.h similarity index 100% rename from common/inner_deck_list_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.h diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt new file mode 100644 index 000000000..42c2af503 --- /dev/null +++ b/libcockatrice_protocol/CMakeLists.txt @@ -0,0 +1,13 @@ +# Top-level wrapper for the protobuf library + +add_subdirectory(libcockatrice/protocol/pb) + +add_library(libcockatrice_protocol_wrapper STATIC) + +# Link the actual generated protobuf library +target_link_libraries(libcockatrice_protocol_wrapper PUBLIC libcockatrice_protocol) + +# Expose the pb/ folder so consumers can do #include +target_include_directories( + libcockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers +) diff --git a/common/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt similarity index 90% rename from common/pb/CMakeLists.txt rename to libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index dc48823fd..2d3051863 100644 --- a/common/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -171,12 +171,12 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") include_directories(${CMAKE_CURRENT_BINARY_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) - add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) - set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) + add_library(libcockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) + set(libcockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) if(UNIX) - set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lpthread) + set(libcockatrice_protocol_LIBS ${libcockatrice_protocol_LIBS} -lpthread) endif(UNIX) - target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS}) + target_link_libraries(libcockatrice_protocol ${libcockatrice_protocol_LIBS}) # ubuntu uses an outdated package for protobuf, 3.1.0 is required if(${Protobuf_VERSION} VERSION_LESS "3.1.0") @@ -188,12 +188,10 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") ) endif() else() - add_library(cockatrice_protocol ${PROTO_FILES}) - target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf) + add_library(libcockatrice_protocol ${PROTO_FILES}) + target_link_libraries(libcockatrice_protocol PUBLIC protobuf::libprotobuf) set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") - target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") + target_include_directories(libcockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") - protobuf_generate( - TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}" - ) + protobuf_generate(TARGET libcockatrice_protocol IMPORT_DIRS "." PROTOC_OUT_DIR "${PROTO_BINARY_DIR}") endif() diff --git a/common/pb/admin_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto similarity index 100% rename from common/pb/admin_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto diff --git a/common/pb/card_attributes.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto similarity index 100% rename from common/pb/card_attributes.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto diff --git a/common/pb/color.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/color.proto similarity index 100% rename from common/pb/color.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/color.proto diff --git a/common/pb/command_attach_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto similarity index 100% rename from common/pb/command_attach_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto diff --git a/common/pb/command_change_zone_properties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto similarity index 100% rename from common/pb/command_change_zone_properties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto diff --git a/common/pb/command_concede.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto similarity index 100% rename from common/pb/command_concede.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto diff --git a/common/pb/command_create_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto similarity index 100% rename from common/pb/command_create_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto diff --git a/common/pb/command_create_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto similarity index 100% rename from common/pb/command_create_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto diff --git a/common/pb/command_create_token.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto similarity index 100% rename from common/pb/command_create_token.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto diff --git a/common/pb/command_deck_del.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto similarity index 100% rename from common/pb/command_deck_del.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto diff --git a/common/pb/command_deck_del_dir.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto similarity index 100% rename from common/pb/command_deck_del_dir.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto diff --git a/common/pb/command_deck_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto similarity index 100% rename from common/pb/command_deck_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto diff --git a/common/pb/command_deck_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto similarity index 100% rename from common/pb/command_deck_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto diff --git a/common/pb/command_deck_new_dir.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto similarity index 100% rename from common/pb/command_deck_new_dir.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto diff --git a/common/pb/command_deck_select.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto similarity index 100% rename from common/pb/command_deck_select.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto diff --git a/common/pb/command_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto similarity index 100% rename from common/pb/command_deck_upload.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto diff --git a/common/pb/command_del_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto similarity index 100% rename from common/pb/command_del_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto diff --git a/common/pb/command_delete_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto similarity index 100% rename from common/pb/command_delete_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto diff --git a/common/pb/command_draw_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto similarity index 100% rename from common/pb/command_draw_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto diff --git a/common/pb/command_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto similarity index 100% rename from common/pb/command_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto diff --git a/common/pb/command_flip_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto similarity index 100% rename from common/pb/command_flip_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto diff --git a/common/pb/command_game_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto similarity index 100% rename from common/pb/command_game_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto diff --git a/common/pb/command_inc_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto similarity index 100% rename from common/pb/command_inc_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto diff --git a/common/pb/command_inc_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto similarity index 100% rename from common/pb/command_inc_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto diff --git a/common/pb/command_kick_from_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto similarity index 100% rename from common/pb/command_kick_from_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto diff --git a/common/pb/command_leave_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto similarity index 100% rename from common/pb/command_leave_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto diff --git a/common/pb/command_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto similarity index 100% rename from common/pb/command_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto diff --git a/common/pb/command_mulligan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto similarity index 100% rename from common/pb/command_mulligan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto diff --git a/common/pb/command_next_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto similarity index 100% rename from common/pb/command_next_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto diff --git a/common/pb/command_ready_start.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto similarity index 100% rename from common/pb/command_ready_start.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto diff --git a/common/pb/command_replay_delete_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto similarity index 100% rename from common/pb/command_replay_delete_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto diff --git a/common/pb/command_replay_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto similarity index 100% rename from common/pb/command_replay_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto diff --git a/common/pb/command_replay_get_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto similarity index 100% rename from common/pb/command_replay_get_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto diff --git a/common/pb/command_replay_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto similarity index 100% rename from common/pb/command_replay_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto diff --git a/common/pb/command_replay_modify_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto similarity index 100% rename from common/pb/command_replay_modify_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto diff --git a/common/pb/command_replay_submit_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto similarity index 100% rename from common/pb/command_replay_submit_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto diff --git a/common/pb/command_reveal_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto similarity index 100% rename from common/pb/command_reveal_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto diff --git a/common/pb/command_reverse_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto similarity index 100% rename from common/pb/command_reverse_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto diff --git a/common/pb/command_roll_die.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto similarity index 100% rename from common/pb/command_roll_die.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto diff --git a/common/pb/command_set_active_phase.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto similarity index 100% rename from common/pb/command_set_active_phase.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto diff --git a/common/pb/command_set_card_attr.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto similarity index 100% rename from common/pb/command_set_card_attr.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto diff --git a/common/pb/command_set_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto similarity index 100% rename from common/pb/command_set_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto diff --git a/common/pb/command_set_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto similarity index 100% rename from common/pb/command_set_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto diff --git a/common/pb/command_set_sideboard_lock.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto similarity index 100% rename from common/pb/command_set_sideboard_lock.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto diff --git a/common/pb/command_set_sideboard_plan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto similarity index 100% rename from common/pb/command_set_sideboard_plan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto diff --git a/common/pb/command_shuffle.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto similarity index 100% rename from common/pb/command_shuffle.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto diff --git a/common/pb/command_undo_draw.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto similarity index 100% rename from common/pb/command_undo_draw.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto diff --git a/common/pb/commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto similarity index 100% rename from common/pb/commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto diff --git a/common/pb/context_concede.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto similarity index 100% rename from common/pb/context_concede.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto diff --git a/common/pb/context_connection_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto similarity index 100% rename from common/pb/context_connection_state_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto diff --git a/common/pb/context_deck_select.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto similarity index 100% rename from common/pb/context_deck_select.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto diff --git a/common/pb/context_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto similarity index 100% rename from common/pb/context_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto diff --git a/common/pb/context_mulligan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto similarity index 100% rename from common/pb/context_mulligan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto diff --git a/common/pb/context_ping_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto similarity index 100% rename from common/pb/context_ping_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto diff --git a/common/pb/context_ready_start.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto similarity index 100% rename from common/pb/context_ready_start.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto diff --git a/common/pb/context_set_sideboard_lock.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto similarity index 100% rename from common/pb/context_set_sideboard_lock.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto diff --git a/common/pb/context_undo_draw.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto similarity index 100% rename from common/pb/context_undo_draw.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto diff --git a/common/pb/event_add_to_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto similarity index 100% rename from common/pb/event_add_to_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto diff --git a/common/pb/event_attach_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto similarity index 100% rename from common/pb/event_attach_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto diff --git a/common/pb/event_change_zone_properties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto similarity index 100% rename from common/pb/event_change_zone_properties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto diff --git a/common/pb/event_connection_closed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto similarity index 100% rename from common/pb/event_connection_closed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto diff --git a/common/pb/event_create_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto similarity index 100% rename from common/pb/event_create_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto diff --git a/common/pb/event_create_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto similarity index 100% rename from common/pb/event_create_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto diff --git a/common/pb/event_create_token.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto similarity index 100% rename from common/pb/event_create_token.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto diff --git a/common/pb/event_del_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto similarity index 100% rename from common/pb/event_del_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto diff --git a/common/pb/event_delete_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto similarity index 100% rename from common/pb/event_delete_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto diff --git a/common/pb/event_destroy_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto similarity index 100% rename from common/pb/event_destroy_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto diff --git a/common/pb/event_draw_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto similarity index 100% rename from common/pb/event_draw_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto diff --git a/common/pb/event_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto similarity index 100% rename from common/pb/event_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto diff --git a/common/pb/event_flip_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto similarity index 100% rename from common/pb/event_flip_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto diff --git a/common/pb/event_game_closed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto similarity index 100% rename from common/pb/event_game_closed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto diff --git a/common/pb/event_game_host_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto similarity index 100% rename from common/pb/event_game_host_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto diff --git a/common/pb/event_game_joined.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto similarity index 100% rename from common/pb/event_game_joined.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto diff --git a/common/pb/event_game_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto similarity index 100% rename from common/pb/event_game_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto diff --git a/common/pb/event_game_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto similarity index 100% rename from common/pb/event_game_state_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto diff --git a/common/pb/event_join.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto similarity index 100% rename from common/pb/event_join.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto diff --git a/common/pb/event_join_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto similarity index 100% rename from common/pb/event_join_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto diff --git a/common/pb/event_kicked.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto similarity index 100% rename from common/pb/event_kicked.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto diff --git a/common/pb/event_leave.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto similarity index 100% rename from common/pb/event_leave.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto diff --git a/common/pb/event_leave_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto similarity index 100% rename from common/pb/event_leave_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto diff --git a/common/pb/event_list_games.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto similarity index 100% rename from common/pb/event_list_games.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto diff --git a/common/pb/event_list_rooms.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto similarity index 100% rename from common/pb/event_list_rooms.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto diff --git a/common/pb/event_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto similarity index 100% rename from common/pb/event_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto diff --git a/common/pb/event_notify_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto similarity index 100% rename from common/pb/event_notify_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto diff --git a/common/pb/event_player_properties_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto similarity index 100% rename from common/pb/event_player_properties_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto diff --git a/common/pb/event_remove_from_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto similarity index 100% rename from common/pb/event_remove_from_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto diff --git a/common/pb/event_remove_messages.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto similarity index 100% rename from common/pb/event_remove_messages.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto diff --git a/common/pb/event_replay_added.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto similarity index 100% rename from common/pb/event_replay_added.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto diff --git a/common/pb/event_reveal_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto similarity index 100% rename from common/pb/event_reveal_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto diff --git a/common/pb/event_reverse_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto similarity index 100% rename from common/pb/event_reverse_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto diff --git a/common/pb/event_roll_die.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto similarity index 100% rename from common/pb/event_roll_die.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto diff --git a/common/pb/event_room_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto similarity index 100% rename from common/pb/event_room_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto diff --git a/common/pb/event_server_complete_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto similarity index 100% rename from common/pb/event_server_complete_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto diff --git a/common/pb/event_server_identification.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto similarity index 100% rename from common/pb/event_server_identification.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto diff --git a/common/pb/event_server_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto similarity index 100% rename from common/pb/event_server_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto diff --git a/common/pb/event_server_shutdown.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto similarity index 100% rename from common/pb/event_server_shutdown.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto diff --git a/common/pb/event_set_active_phase.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto similarity index 100% rename from common/pb/event_set_active_phase.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto diff --git a/common/pb/event_set_active_player.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto similarity index 100% rename from common/pb/event_set_active_player.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto diff --git a/common/pb/event_set_card_attr.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto similarity index 100% rename from common/pb/event_set_card_attr.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto diff --git a/common/pb/event_set_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto similarity index 100% rename from common/pb/event_set_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto diff --git a/common/pb/event_set_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto similarity index 100% rename from common/pb/event_set_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto diff --git a/common/pb/event_shuffle.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto similarity index 100% rename from common/pb/event_shuffle.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto diff --git a/common/pb/event_user_joined.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto similarity index 100% rename from common/pb/event_user_joined.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto diff --git a/common/pb/event_user_left.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto similarity index 100% rename from common/pb/event_user_left.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto diff --git a/common/pb/event_user_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto similarity index 100% rename from common/pb/event_user_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto diff --git a/common/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto similarity index 100% rename from common/pb/game_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto diff --git a/common/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto similarity index 100% rename from common/pb/game_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto diff --git a/common/pb/game_event_container.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto similarity index 100% rename from common/pb/game_event_container.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto diff --git a/common/pb/game_event_context.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto similarity index 100% rename from common/pb/game_event_context.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto diff --git a/common/pb/game_replay.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto similarity index 100% rename from common/pb/game_replay.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto diff --git a/common/pb/isl_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto similarity index 100% rename from common/pb/isl_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto diff --git a/common/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto similarity index 100% rename from common/pb/moderator_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto diff --git a/common/pb/move_card_to_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto similarity index 100% rename from common/pb/move_card_to_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto diff --git a/common/pb/response.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto similarity index 100% rename from common/pb/response.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response.proto diff --git a/common/pb/response_activate.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto similarity index 100% rename from common/pb/response_activate.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto diff --git a/common/pb/response_adjust_mod.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto similarity index 100% rename from common/pb/response_adjust_mod.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto diff --git a/common/pb/response_ban_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto similarity index 100% rename from common/pb/response_ban_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto diff --git a/common/pb/response_deck_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto similarity index 100% rename from common/pb/response_deck_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto diff --git a/common/pb/response_deck_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto similarity index 100% rename from common/pb/response_deck_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto diff --git a/common/pb/response_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto similarity index 100% rename from common/pb/response_deck_upload.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto diff --git a/common/pb/response_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto similarity index 100% rename from common/pb/response_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto diff --git a/common/pb/response_forgotpasswordrequest.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto similarity index 100% rename from common/pb/response_forgotpasswordrequest.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto diff --git a/common/pb/response_get_admin_notes.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto similarity index 100% rename from common/pb/response_get_admin_notes.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto diff --git a/common/pb/response_get_games_of_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto similarity index 100% rename from common/pb/response_get_games_of_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto diff --git a/common/pb/response_get_user_info.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto similarity index 100% rename from common/pb/response_get_user_info.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto diff --git a/common/pb/response_join_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto similarity index 100% rename from common/pb/response_join_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto diff --git a/common/pb/response_list_users.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto similarity index 100% rename from common/pb/response_list_users.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto diff --git a/common/pb/response_login.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto similarity index 100% rename from common/pb/response_login.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto diff --git a/common/pb/response_password_salt.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto similarity index 100% rename from common/pb/response_password_salt.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto diff --git a/common/pb/response_register.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto similarity index 100% rename from common/pb/response_register.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto diff --git a/common/pb/response_replay_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto similarity index 100% rename from common/pb/response_replay_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto diff --git a/common/pb/response_replay_get_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto similarity index 100% rename from common/pb/response_replay_get_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto diff --git a/common/pb/response_replay_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto similarity index 100% rename from common/pb/response_replay_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto diff --git a/common/pb/response_viewlog_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto similarity index 100% rename from common/pb/response_viewlog_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto diff --git a/common/pb/response_warn_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto similarity index 100% rename from common/pb/response_warn_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto diff --git a/common/pb/response_warn_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto similarity index 100% rename from common/pb/response_warn_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto diff --git a/common/pb/room_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto similarity index 100% rename from common/pb/room_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto diff --git a/common/pb/room_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto similarity index 100% rename from common/pb/room_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto diff --git a/common/pb/server_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto similarity index 100% rename from common/pb/server_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto diff --git a/common/pb/serverinfo_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto similarity index 100% rename from common/pb/serverinfo_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto diff --git a/common/pb/serverinfo_ban.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto similarity index 100% rename from common/pb/serverinfo_ban.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto diff --git a/common/pb/serverinfo_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto similarity index 100% rename from common/pb/serverinfo_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto diff --git a/common/pb/serverinfo_cardcounter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto similarity index 100% rename from common/pb/serverinfo_cardcounter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto diff --git a/common/pb/serverinfo_chat_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto similarity index 100% rename from common/pb/serverinfo_chat_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto diff --git a/common/pb/serverinfo_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto similarity index 100% rename from common/pb/serverinfo_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto diff --git a/common/pb/serverinfo_deckstorage.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto similarity index 100% rename from common/pb/serverinfo_deckstorage.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto diff --git a/common/pb/serverinfo_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto similarity index 100% rename from common/pb/serverinfo_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto diff --git a/common/pb/serverinfo_gametype.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto similarity index 100% rename from common/pb/serverinfo_gametype.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto diff --git a/common/pb/serverinfo_player.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto similarity index 100% rename from common/pb/serverinfo_player.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto diff --git a/common/pb/serverinfo_playerping.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto similarity index 100% rename from common/pb/serverinfo_playerping.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto diff --git a/common/pb/serverinfo_playerproperties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto similarity index 100% rename from common/pb/serverinfo_playerproperties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto diff --git a/common/pb/serverinfo_replay.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto similarity index 100% rename from common/pb/serverinfo_replay.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto diff --git a/common/pb/serverinfo_replay_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto similarity index 100% rename from common/pb/serverinfo_replay_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto diff --git a/common/pb/serverinfo_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto similarity index 100% rename from common/pb/serverinfo_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto diff --git a/common/pb/serverinfo_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto similarity index 100% rename from common/pb/serverinfo_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto diff --git a/common/pb/serverinfo_warning.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto similarity index 100% rename from common/pb/serverinfo_warning.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto diff --git a/common/pb/serverinfo_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto similarity index 100% rename from common/pb/serverinfo_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto diff --git a/common/pb/session_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto similarity index 100% rename from common/pb/session_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto diff --git a/common/pb/session_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto similarity index 100% rename from common/pb/session_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt new file mode 100644 index 000000000..0e29e96f2 --- /dev/null +++ b/libcockatrice_rng/CMakeLists.txt @@ -0,0 +1,20 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp + libcockatrice/rng/sfmt/SFMT.c +) + +target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(libcockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}) diff --git a/common/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp similarity index 100% rename from common/rng_abstract.cpp rename to libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp diff --git a/common/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h similarity index 100% rename from common/rng_abstract.h rename to libcockatrice_rng/libcockatrice/rng/rng_abstract.h diff --git a/common/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp similarity index 100% rename from common/rng_sfmt.cpp rename to libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp diff --git a/common/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h similarity index 100% rename from common/rng_sfmt.h rename to libcockatrice_rng/libcockatrice/rng/rng_sfmt.h diff --git a/common/sfmt/LICENSE.txt b/libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt similarity index 100% rename from common/sfmt/LICENSE.txt rename to libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt diff --git a/common/sfmt/SFMT-common.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h similarity index 100% rename from common/sfmt/SFMT-common.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h diff --git a/common/sfmt/SFMT-params.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h similarity index 100% rename from common/sfmt/SFMT-params.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h diff --git a/common/sfmt/SFMT-params19937.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h similarity index 100% rename from common/sfmt/SFMT-params19937.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h diff --git a/common/sfmt/SFMT.c b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c similarity index 100% rename from common/sfmt/SFMT.c rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c diff --git a/common/sfmt/SFMT.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h similarity index 100% rename from common/sfmt/SFMT.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h diff --git a/libcockatrice_server/CMakeLists.txt b/libcockatrice_server/CMakeLists.txt new file mode 100644 index 000000000..6d78625c6 --- /dev/null +++ b/libcockatrice_server/CMakeLists.txt @@ -0,0 +1,67 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/server/game/server_abstract_participant.h + libcockatrice/server/game/server_abstract_player.h + libcockatrice/server/game/server_arrow.h + libcockatrice/server/game/server_arrowtarget.h + libcockatrice/server/game/server_card.h + libcockatrice/server/game/server_cardzone.h + libcockatrice/server/game/server_counter.h + libcockatrice/server/game/server_game.h + libcockatrice/server/game/server_player.h + libcockatrice/server/game/server_spectator.h + libcockatrice/server/debug_pb_message.h + libcockatrice/server/get_pb_extension.h + libcockatrice/server/server.h + libcockatrice/server/server_abstractuserinterface.h + libcockatrice/server/server_database_interface.h + libcockatrice/server/server_protocolhandler.h + libcockatrice/server/server_remoteuserinterface.h + libcockatrice/server/server_response_containers.h + libcockatrice/server/server_room.h + libcockatrice/server/serverinfo_user_container.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_server STATIC + ${MOC_SOURCES} + libcockatrice/server/debug_pb_message.cpp + libcockatrice/server/game/server_abstract_participant.cpp + libcockatrice/server/game/server_abstract_player.cpp + libcockatrice/server/game/server_arrow.cpp + libcockatrice/server/game/server_arrowtarget.cpp + libcockatrice/server/game/server_card.cpp + libcockatrice/server/game/server_cardzone.cpp + libcockatrice/server/game/server_counter.cpp + libcockatrice/server/game/server_game.cpp + libcockatrice/server/game/server_player.cpp + libcockatrice/server/game/server_spectator.cpp + libcockatrice/server/get_pb_extension.cpp + libcockatrice/server/server.cpp + libcockatrice/server/server_abstractuserinterface.cpp + libcockatrice/server/server_database_interface.cpp + libcockatrice/server/server_protocolhandler.cpp + libcockatrice/server/server_remoteuserinterface.cpp + libcockatrice/server/server_response_containers.cpp + libcockatrice/server/server_room.cpp + libcockatrice/server/serverinfo_user_container.cpp +) + +add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) + +target_include_directories(libcockatrice_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +# Make cockatrice_server depend on cockatrice_protocol +target_link_libraries( + libcockatrice_server PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility libcockatrice_rng + libcockatrice_deck_list ${COCKATRICE_QT_MODULES} +) diff --git a/common/debug_pb_message.cpp b/libcockatrice_server/libcockatrice/server/debug_pb_message.cpp similarity index 98% rename from common/debug_pb_message.cpp rename to libcockatrice_server/libcockatrice/server/debug_pb_message.cpp index dda672689..f0c3448b5 100644 --- a/common/debug_pb_message.cpp +++ b/libcockatrice_server/libcockatrice/server/debug_pb_message.cpp @@ -1,12 +1,11 @@ #include "debug_pb_message.h" -#include "trice_limits.h" - #include #include #include #include #include +#include // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it #if GOOGLE_PROTOBUF_VERSION > 3004000 diff --git a/common/debug_pb_message.h b/libcockatrice_server/libcockatrice/server/debug_pb_message.h similarity index 100% rename from common/debug_pb_message.h rename to libcockatrice_server/libcockatrice/server/debug_pb_message.h diff --git a/common/server/game/server_abstract_participant.cpp b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp similarity index 83% rename from common/server/game/server_abstract_participant.cpp rename to libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp index cdbf29d47..629036c73 100644 --- a/common/server/game/server_abstract_participant.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp @@ -1,81 +1,10 @@ #include "server_abstract_participant.h" -#include "../../color.h" -#include "../../deck_list.h" -#include "../../deck_list_card_node.h" -#include "../../get_pb_extension.h" -#include "../../rng_abstract.h" -#include "../../trice_limits.h" +#include "../get_pb_extension.h" #include "../server.h" #include "../server_abstractuserinterface.h" #include "../server_database_interface.h" #include "../server_room.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_concede.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_create_counter.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_deck_select.pb.h" -#include "pb/command_del_counter.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_inc_card_counter.pb.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/command_leave_game.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_ready_start.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/command_set_counter.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "pb/context_concede.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/context_ready_start.pb.h" -#include "pb/context_set_sideboard_lock.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" #include "server_arrow.h" #include "server_card.h" #include "server_cardzone.h" @@ -86,6 +15,77 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game, int _playerId, diff --git a/common/server/game/server_abstract_participant.h b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h similarity index 98% rename from common/server/game/server_abstract_participant.h rename to libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h index dcae09741..10fbb3349 100644 --- a/common/server/game/server_abstract_participant.h +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h @@ -1,12 +1,12 @@ #ifndef ABSTRACT_PARTICIPANT_H #define ABSTRACT_PARTICIPANT_H -#include "../../serverinfo_user_container.h" -#include "pb/card_attributes.pb.h" -#include "pb/response.pb.h" +#include "../serverinfo_user_container.h" #include "server_arrowtarget.h" #include +#include +#include class Server_Game; class Server_AbstractUserInterface; diff --git a/common/server/game/server_abstract_player.cpp b/libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp similarity index 96% rename from common/server/game/server_abstract_player.cpp rename to libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp index c94e54f10..5ac0a26ad 100644 --- a/common/server/game/server_abstract_player.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp @@ -1,47 +1,5 @@ #include "server_abstract_player.h" -#include "../../deck_list.h" -#include "../../rng_abstract.h" -#include "../../trice_limits.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_inc_card_counter.pb.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_ready_start.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/context_concede.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_ready_start.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/response.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" #include "server_arrow.h" #include "server_card.h" #include "server_cardzone.h" @@ -51,6 +9,45 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game, int _playerId, diff --git a/common/server/game/server_abstract_player.h b/libcockatrice_server/libcockatrice/server/game/server_abstract_player.h similarity index 99% rename from common/server/game/server_abstract_player.h rename to libcockatrice_server/libcockatrice/server/game/server_abstract_player.h index 51828adf7..4a32b6fef 100644 --- a/common/server/game/server_abstract_player.h +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_player.h @@ -1,7 +1,7 @@ #ifndef ABSTRACT_PLAYER_H #define ABSTRACT_PLAYER_H -#include "../../serverinfo_user_container.h" +#include "../serverinfo_user_container.h" #include "server_abstract_participant.h" #include diff --git a/common/server/game/server_arrow.cpp b/libcockatrice_server/libcockatrice/server/game/server_arrow.cpp similarity index 94% rename from common/server/game/server_arrow.cpp rename to libcockatrice_server/libcockatrice/server/game/server_arrow.cpp index fe02995d3..e077416bc 100644 --- a/common/server/game/server_arrow.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_arrow.cpp @@ -1,10 +1,11 @@ #include "server_arrow.h" -#include "pb/serverinfo_arrow.pb.h" #include "server_card.h" #include "server_cardzone.h" #include "server_player.h" +#include + Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor) : id(_id), startCard(_startCard), targetItem(_targetItem), arrowColor(_arrowColor) { diff --git a/common/server/game/server_arrow.h b/libcockatrice_server/libcockatrice/server/game/server_arrow.h similarity index 95% rename from common/server/game/server_arrow.h rename to libcockatrice_server/libcockatrice/server/game/server_arrow.h index 13a6ea2d8..0b3e63550 100644 --- a/common/server/game/server_arrow.h +++ b/libcockatrice_server/libcockatrice/server/game/server_arrow.h @@ -1,7 +1,7 @@ #ifndef SERVER_ARROW_H #define SERVER_ARROW_H -#include "pb/color.pb.h" +#include class Server_Card; class Server_ArrowTarget; diff --git a/common/server/game/server_arrowtarget.cpp b/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp similarity index 100% rename from common/server/game/server_arrowtarget.cpp rename to libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp diff --git a/common/server/game/server_arrowtarget.h b/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h similarity index 100% rename from common/server/game/server_arrowtarget.h rename to libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h diff --git a/common/server/game/server_card.cpp b/libcockatrice_server/libcockatrice/server/game/server_card.cpp similarity index 96% rename from common/server/game/server_card.cpp rename to libcockatrice_server/libcockatrice/server/game/server_card.cpp index 323b4d827..3f6aaf272 100644 --- a/common/server/game/server_card.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_card.cpp @@ -19,11 +19,11 @@ ***************************************************************************/ #include "server_card.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/serverinfo_card.pb.h" #include "server_cardzone.h" #include "server_player.h" +#include +#include +#include #include diff --git a/common/server/game/server_card.h b/libcockatrice_server/libcockatrice/server/game/server_card.h similarity index 97% rename from common/server/game/server_card.h rename to libcockatrice_server/libcockatrice/server/game/server_card.h index a24be2046..bc326bbc4 100644 --- a/common/server/game/server_card.h +++ b/libcockatrice_server/libcockatrice/server/game/server_card.h @@ -20,13 +20,13 @@ #ifndef SERVER_CARD_H #define SERVER_CARD_H -#include "../../card_ref.h" -#include "pb/card_attributes.pb.h" -#include "pb/serverinfo_card.pb.h" #include "server_arrowtarget.h" #include #include +#include +#include +#include class Server_CardZone; class Event_SetCardCounter; diff --git a/common/server/game/server_cardzone.cpp b/libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp similarity index 99% rename from common/server/game/server_cardzone.cpp rename to libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp index 8f019f746..09d286d5b 100644 --- a/common/server/game/server_cardzone.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "server_cardzone.h" -#include "../rng_abstract.h" -#include "pb/command_move_card.pb.h" #include "server_abstract_player.h" #include "server_card.h" #include #include +#include +#include Server_CardZone::Server_CardZone(Server_AbstractPlayer *_player, const QString &_name, diff --git a/common/server/game/server_cardzone.h b/libcockatrice_server/libcockatrice/server/game/server_cardzone.h similarity index 98% rename from common/server/game/server_cardzone.h rename to libcockatrice_server/libcockatrice/server/game/server_cardzone.h index 3f83be9d4..3cd056647 100644 --- a/common/server/game/server_cardzone.h +++ b/libcockatrice_server/libcockatrice/server/game/server_cardzone.h @@ -20,7 +20,7 @@ #ifndef SERVER_CARDZONE_H #define SERVER_CARDZONE_H -#include "pb/serverinfo_zone.pb.h" +#include #include #include diff --git a/common/server/game/server_counter.cpp b/libcockatrice_server/libcockatrice/server/game/server_counter.cpp similarity index 88% rename from common/server/game/server_counter.cpp rename to libcockatrice_server/libcockatrice/server/game/server_counter.cpp index 3dc5c6d66..b18e11c2b 100644 --- a/common/server/game/server_counter.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_counter.cpp @@ -1,6 +1,6 @@ #include "server_counter.h" -#include "pb/serverinfo_counter.pb.h" +#include Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count) : id(_id), name(_name), counterColor(_counterColor), radius(_radius), count(_count) diff --git a/common/server/game/server_counter.h b/libcockatrice_server/libcockatrice/server/game/server_counter.h similarity index 97% rename from common/server/game/server_counter.h rename to libcockatrice_server/libcockatrice/server/game/server_counter.h index 3a5f837ae..3ed4165ed 100644 --- a/common/server/game/server_counter.h +++ b/libcockatrice_server/libcockatrice/server/game/server_counter.h @@ -20,7 +20,7 @@ #ifndef SERVER_COUNTER_H #define SERVER_COUNTER_H -#include "pb/color.pb.h" +#include #include diff --git a/common/server/game/server_game.cpp b/libcockatrice_server/libcockatrice/server/game/server_game.cpp similarity index 96% rename from common/server/game/server_game.cpp rename to libcockatrice_server/libcockatrice/server/game/server_game.cpp index 278fcfdc1..6cf346a0b 100644 --- a/common/server/game/server_game.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_game.cpp @@ -19,34 +19,31 @@ ***************************************************************************/ #include "server_game.h" -#include "../../deck_list.h" -#include "../server.h" -#include "../server_database_interface.h" -#include "../server_protocolhandler.h" -#include "../server_room.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_ping_changed.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_game_closed.pb.h" -#include "pb/event_game_host_changed.pb.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_game_state_changed.pb.h" -#include "pb/event_join.pb.h" -#include "pb/event_kicked.pb.h" -#include "pb/event_leave.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_set_active_phase.pb.h" -#include "pb/event_set_active_player.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/serverinfo_playerping.pb.h" -#include "server_abstract_player.h" #include "server_arrow.h" #include "server_card.h" #include "server_cardzone.h" #include "server_player.h" #include "server_spectator.h" +#include "../server.h" +#include "../server_database_interface.h" +#include "../server_protocolhandler.h" +#include "../server_room.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/common/server/game/server_game.h b/libcockatrice_server/libcockatrice/server/game/server_game.h similarity index 97% rename from common/server/game/server_game.h rename to libcockatrice_server/libcockatrice/server/game/server_game.h index b3a56be3e..fc5fb66c4 100644 --- a/common/server/game/server_game.h +++ b/libcockatrice_server/libcockatrice/server/game/server_game.h @@ -21,9 +21,9 @@ #define SERVERGAME_H #include "../server_response_containers.h" -#include "pb/event_leave.pb.h" -#include "pb/response.pb.h" -#include "pb/serverinfo_game.pb.h" +#include +#include +#include #include #include diff --git a/common/server/game/server_move_card_struct.h b/libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h similarity index 100% rename from common/server/game/server_move_card_struct.h rename to libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h diff --git a/common/server/game/server_player.cpp b/libcockatrice_server/libcockatrice/server/game/server_player.cpp similarity index 86% rename from common/server/game/server_player.cpp rename to libcockatrice_server/libcockatrice/server/game/server_player.cpp index d5598e138..d32552791 100644 --- a/common/server/game/server_player.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_player.cpp @@ -1,45 +1,70 @@ #include "server_player.h" -#include "../../color.h" -#include "../../deck_list.h" -#include "../../deck_list_card_node.h" -#include "../../trice_limits.h" #include "../server.h" +#include "../server_abstractuserinterface.h" #include "../server_database_interface.h" #include "../server_room.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_create_counter.pb.h" -#include "pb/command_deck_select.pb.h" -#include "pb/command_del_counter.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/command_set_counter.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/context_set_sideboard_lock.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/serverinfo_player.pb.h" #include "server_card.h" #include "server_cardzone.h" #include "server_counter.h" #include "server_game.h" -#include "server_move_card_struct.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct MoveCardStruct +{ + Server_Card *card; + int position; + const CardToMove *cardToMove; + int xCoord, yCoord; + MoveCardStruct(Server_Card *_card, int _position, const CardToMove *_cardToMove) + : card(_card), position(_position), cardToMove(_cardToMove), xCoord(_card->getX()), yCoord(_card->getY()) + + { + } + bool operator<(const MoveCardStruct &other) const + { + return (yCoord == other.yCoord && + ((xCoord == other.xCoord && position < other.position) || xCoord < other.xCoord)) || + yCoord < other.yCoord; + } +}; Server_Player::Server_Player(Server_Game *_game, int _playerId, diff --git a/common/server/game/server_player.h b/libcockatrice_server/libcockatrice/server/game/server_player.h similarity index 100% rename from common/server/game/server_player.h rename to libcockatrice_server/libcockatrice/server/game/server_player.h diff --git a/common/server/game/server_spectator.cpp b/libcockatrice_server/libcockatrice/server/game/server_spectator.cpp similarity index 100% rename from common/server/game/server_spectator.cpp rename to libcockatrice_server/libcockatrice/server/game/server_spectator.cpp diff --git a/common/server/game/server_spectator.h b/libcockatrice_server/libcockatrice/server/game/server_spectator.h similarity index 100% rename from common/server/game/server_spectator.h rename to libcockatrice_server/libcockatrice/server/game/server_spectator.h diff --git a/common/get_pb_extension.cpp b/libcockatrice_server/libcockatrice/server/get_pb_extension.cpp similarity index 100% rename from common/get_pb_extension.cpp rename to libcockatrice_server/libcockatrice/server/get_pb_extension.cpp diff --git a/common/get_pb_extension.h b/libcockatrice_server/libcockatrice/server/get_pb_extension.h similarity index 100% rename from common/get_pb_extension.h rename to libcockatrice_server/libcockatrice/server/get_pb_extension.h diff --git a/common/room_message_type.h b/libcockatrice_server/libcockatrice/server/room_message_type.h similarity index 86% rename from common/room_message_type.h rename to libcockatrice_server/libcockatrice/server/room_message_type.h index 7b7ad9aca..59ee34933 100644 --- a/common/room_message_type.h +++ b/libcockatrice_server/libcockatrice/server/room_message_type.h @@ -6,7 +6,7 @@ // https://github.com/protocolbuffers/protobuf/issues/119 #undef TYPE_BOOL #endif -#include "pb/event_room_say.pb.h" +#include #include diff --git a/common/server/server.cpp b/libcockatrice_server/libcockatrice/server/server.cpp similarity index 98% rename from common/server/server.cpp rename to libcockatrice_server/libcockatrice/server/server.cpp index a80c9ee8f..babcc3554 100644 --- a/common/server/server.cpp +++ b/libcockatrice_server/libcockatrice/server/server.cpp @@ -19,20 +19,20 @@ ***************************************************************************/ #include "server.h" -#include "../debug_pb_message.h" -#include "../featureset.h" +#include "debug_pb_message.h" #include "game/server_game.h" #include "game/server_player.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/isl_message.pb.h" -#include "pb/session_event.pb.h" #include "server_database_interface.h" #include "server_protocolhandler.h" #include "server_remoteuserinterface.h" #include "server_room.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/common/server/server.h b/libcockatrice_server/libcockatrice/server/server.h similarity index 96% rename from common/server/server.h rename to libcockatrice_server/libcockatrice/server/server.h index 293aeb5b2..462014f49 100644 --- a/common/server/server.h +++ b/libcockatrice_server/libcockatrice/server/server.h @@ -1,11 +1,11 @@ #ifndef SERVER_H #define SERVER_H -#include "pb/commands.pb.h" -#include "pb/serverinfo_ban.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/serverinfo_warning.pb.h" +#include +#include +#include +#include +#include #include "server_player_reference.h" #include diff --git a/common/server/server_abstractuserinterface.cpp b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp similarity index 97% rename from common/server/server_abstractuserinterface.cpp rename to libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp index 5016a8867..ceec4fb8c 100644 --- a/common/server/server_abstractuserinterface.cpp +++ b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp @@ -2,12 +2,12 @@ #include "game/server_game.h" #include "game/server_player.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_game_state_changed.pb.h" #include "server.h" #include "server_player_reference.h" #include "server_response_containers.h" #include "server_room.h" +#include +#include #include #include diff --git a/common/server/server_abstractuserinterface.h b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h similarity index 92% rename from common/server/server_abstractuserinterface.h rename to libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h index c65d8a5c4..ca67b3eea 100644 --- a/common/server/server_abstractuserinterface.h +++ b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h @@ -1,9 +1,9 @@ #ifndef SERVER_ABSTRACTUSERINTERFACE #define SERVER_ABSTRACTUSERINTERFACE -#include "../serverinfo_user_container.h" -#include "pb/response.pb.h" -#include "pb/server_message.pb.h" +#include "serverinfo_user_container.h" +#include +#include #include #include diff --git a/common/server/server_database_interface.cpp b/libcockatrice_server/libcockatrice/server/server_database_interface.cpp similarity index 100% rename from common/server/server_database_interface.cpp rename to libcockatrice_server/libcockatrice/server/server_database_interface.cpp diff --git a/common/server/server_database_interface.h b/libcockatrice_server/libcockatrice/server/server_database_interface.h similarity index 100% rename from common/server/server_database_interface.h rename to libcockatrice_server/libcockatrice/server/server_database_interface.h diff --git a/common/server/server_player_reference.h b/libcockatrice_server/libcockatrice/server/server_player_reference.h similarity index 100% rename from common/server/server_player_reference.h rename to libcockatrice_server/libcockatrice/server/server_player_reference.h diff --git a/common/server/server_protocolhandler.cpp b/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp similarity index 97% rename from common/server/server_protocolhandler.cpp rename to libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp index c06ee7624..c37e5a315 100644 --- a/common/server/server_protocolhandler.cpp +++ b/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp @@ -1,27 +1,27 @@ #include "server_protocolhandler.h" -#include "../debug_pb_message.h" -#include "../featureset.h" -#include "../get_pb_extension.h" -#include "../trice_limits.h" +#include "debug_pb_message.h" #include "game/server_game.h" #include "game/server_player.h" -#include "pb/commands.pb.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/response.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/response_join_room.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/response_login.pb.h" -#include "pb/serverinfo_user.pb.h" +#include "get_pb_extension.h" #include "server_database_interface.h" #include "server_room.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/common/server/server_protocolhandler.h b/libcockatrice_server/libcockatrice/server/server_protocolhandler.h similarity index 97% rename from common/server/server_protocolhandler.h rename to libcockatrice_server/libcockatrice/server/server_protocolhandler.h index b80e08c7e..9f09dff91 100644 --- a/common/server/server_protocolhandler.h +++ b/libcockatrice_server/libcockatrice/server/server_protocolhandler.h @@ -1,8 +1,8 @@ #ifndef SERVER_PROTOCOLHANDLER_H #define SERVER_PROTOCOLHANDLER_H -#include "pb/response.pb.h" -#include "pb/server_message.pb.h" +#include +#include #include "server.h" #include "server_abstractuserinterface.h" diff --git a/common/server/server_remoteuserinterface.cpp b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp similarity index 92% rename from common/server/server_remoteuserinterface.cpp rename to libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp index ec9b5d88a..474ceae2b 100644 --- a/common/server/server_remoteuserinterface.cpp +++ b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp @@ -1,7 +1,7 @@ #include "server_remoteuserinterface.h" -#include "pb/serverinfo_user.pb.h" #include "server.h" +#include void Server_RemoteUserInterface::sendProtocolItem(const Response &item) { diff --git a/common/server/server_remoteuserinterface.h b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h similarity index 100% rename from common/server/server_remoteuserinterface.h rename to libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h diff --git a/common/server/server_response_containers.cpp b/libcockatrice_server/libcockatrice/server/server_response_containers.cpp similarity index 100% rename from common/server/server_response_containers.cpp rename to libcockatrice_server/libcockatrice/server/server_response_containers.cpp diff --git a/common/server/server_response_containers.h b/libcockatrice_server/libcockatrice/server/server_response_containers.h similarity index 98% rename from common/server/server_response_containers.h rename to libcockatrice_server/libcockatrice/server/server_response_containers.h index 31e00c54e..446fc6e8f 100644 --- a/common/server/server_response_containers.h +++ b/libcockatrice_server/libcockatrice/server/server_response_containers.h @@ -1,7 +1,7 @@ #ifndef SERVER_RESPONSE_CONTAINERS_H #define SERVER_RESPONSE_CONTAINERS_H -#include "pb/server_message.pb.h" +#include #include #include diff --git a/common/server/server_room.cpp b/libcockatrice_server/libcockatrice/server/server_room.cpp similarity index 96% rename from common/server/server_room.cpp rename to libcockatrice_server/libcockatrice/server/server_room.cpp index badb37642..e94b255bd 100644 --- a/common/server/server_room.cpp +++ b/libcockatrice_server/libcockatrice/server/server_room.cpp @@ -1,21 +1,21 @@ #include "server_room.h" -#include "../trice_limits.h" #include "game/server_game.h" -#include "pb/commands.pb.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_room.pb.h" #include "server_protocolhandler.h" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Server_Room::Server_Room(int _id, int _chatHistorySize, diff --git a/common/server/server_room.h b/libcockatrice_server/libcockatrice/server/server_room.h similarity index 96% rename from common/server/server_room.h rename to libcockatrice_server/libcockatrice/server/server_room.h index 7e256dc15..34b9063e9 100644 --- a/common/server/server_room.h +++ b/libcockatrice_server/libcockatrice/server/server_room.h @@ -1,9 +1,7 @@ #ifndef SERVER_ROOM_H #define SERVER_ROOM_H -#include "../serverinfo_user_container.h" -#include "pb/response.pb.h" -#include "pb/serverinfo_chat_message.pb.h" +#include "serverinfo_user_container.h" #include #include @@ -11,6 +9,8 @@ #include #include #include +#include +#include class Server_DatabaseInterface; class Server_ProtocolHandler; diff --git a/common/serverinfo_user_container.cpp b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp similarity index 96% rename from common/serverinfo_user_container.cpp rename to libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp index 597ebd01a..77ff38906 100644 --- a/common/serverinfo_user_container.cpp +++ b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp @@ -1,6 +1,6 @@ #include "serverinfo_user_container.h" -#include "pb/serverinfo_user.pb.h" +#include ServerInfo_User_Container::ServerInfo_User_Container(ServerInfo_User *_userInfo) : userInfo(_userInfo) { diff --git a/common/serverinfo_user_container.h b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.h similarity index 100% rename from common/serverinfo_user_container.h rename to libcockatrice_server/libcockatrice/server/serverinfo_user_container.h diff --git a/common/user_level.h b/libcockatrice_server/libcockatrice/server/user_level.h similarity index 85% rename from common/user_level.h rename to libcockatrice_server/libcockatrice/server/user_level.h index 5d720c0aa..adc07f7e7 100644 --- a/common/user_level.h +++ b/libcockatrice_server/libcockatrice/server/user_level.h @@ -6,7 +6,7 @@ // https://github.com/protocolbuffers/protobuf/issues/119 #undef TYPE_BOOL #endif -#include "pb/serverinfo_user.pb.h" +#include #include diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt new file mode 100644 index 000000000..bacb397bf --- /dev/null +++ b/libcockatrice_settings/CMakeLists.txt @@ -0,0 +1,53 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/settings/cache_settings.h + libcockatrice/settings/card_counter_settings.h + libcockatrice/settings/card_database_settings.h + libcockatrice/settings/card_override_settings.h + libcockatrice/settings/debug_settings.h + libcockatrice/settings/download_settings.h + libcockatrice/settings/game_filters_settings.h + libcockatrice/settings/layouts_settings.h + libcockatrice/settings/message_settings.h + libcockatrice/settings/recents_settings.h + libcockatrice/settings/servers_settings.h + libcockatrice/settings/settings_manager.h + libcockatrice/settings/shortcut_treeview.h + libcockatrice/settings/shortcuts_settings.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_settings STATIC + ${MOC_SOURCES} + libcockatrice/settings/cache_settings.cpp + libcockatrice/settings/card_counter_settings.cpp + libcockatrice/settings/card_database_settings.cpp + libcockatrice/settings/card_override_settings.cpp + libcockatrice/settings/debug_settings.cpp + libcockatrice/settings/download_settings.cpp + libcockatrice/settings/game_filters_settings.cpp + libcockatrice/settings/layouts_settings.cpp + libcockatrice/settings/message_settings.cpp + libcockatrice/settings/recents_settings.cpp + libcockatrice/settings/servers_settings.cpp + libcockatrice/settings/settings_manager.cpp + libcockatrice/settings/shortcut_treeview.cpp + libcockatrice/settings/shortcuts_settings.cpp +) + +target_include_directories( + libcockatrice_settings + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network +) + +target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_utility ${COCKATRICE_QT_MODULES}) diff --git a/cockatrice/src/settings/cache_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp similarity index 99% rename from cockatrice/src/settings/cache_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/cache_settings.cpp index 942881958..65b410daf 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp @@ -1,8 +1,8 @@ #include "cache_settings.h" -#include "../client/network/release_channel.h" #include "card_counter_settings.h" #include "card_override_settings.h" +#include "release_channel.h" #include #include diff --git a/cockatrice/src/settings/cache_settings.h b/libcockatrice_settings/libcockatrice/settings/cache_settings.h similarity index 99% rename from cockatrice/src/settings/cache_settings.h rename to libcockatrice_settings/libcockatrice/settings/cache_settings.h index 93cd5a837..90eba0cb1 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/cache_settings.h @@ -7,7 +7,6 @@ #ifndef SETTINGSCACHE_H #define SETTINGSCACHE_H -#include "../utility/macros.h" #include "card_database_settings.h" #include "card_override_settings.h" #include "debug_settings.h" @@ -24,6 +23,7 @@ #include #include #include +#include inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache"); diff --git a/cockatrice/src/settings/card_counter_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp similarity index 100% rename from cockatrice/src/settings/card_counter_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp diff --git a/cockatrice/src/settings/card_counter_settings.h b/libcockatrice_settings/libcockatrice/settings/card_counter_settings.h similarity index 100% rename from cockatrice/src/settings/card_counter_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_counter_settings.h diff --git a/cockatrice/src/settings/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp similarity index 100% rename from cockatrice/src/settings/card_database_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp diff --git a/cockatrice/src/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h similarity index 100% rename from cockatrice/src/settings/card_database_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_database_settings.h diff --git a/cockatrice/src/settings/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp similarity index 100% rename from cockatrice/src/settings/card_override_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp diff --git a/cockatrice/src/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h similarity index 94% rename from cockatrice/src/settings/card_override_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_override_settings.h index 90a1a1681..d5ee0287b 100644 --- a/cockatrice/src/settings/card_override_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h @@ -7,10 +7,10 @@ #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H -#include "../common/card_ref.h" #include "settings_manager.h" #include +#include class CardOverrideSettings : public SettingsManager { diff --git a/cockatrice/src/settings/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp similarity index 100% rename from cockatrice/src/settings/debug_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/debug_settings.cpp diff --git a/cockatrice/src/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h similarity index 100% rename from cockatrice/src/settings/debug_settings.h rename to libcockatrice_settings/libcockatrice/settings/debug_settings.h diff --git a/cockatrice/src/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp similarity index 100% rename from cockatrice/src/settings/download_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/download_settings.cpp diff --git a/cockatrice/src/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h similarity index 100% rename from cockatrice/src/settings/download_settings.h rename to libcockatrice_settings/libcockatrice/settings/download_settings.h diff --git a/cockatrice/src/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp similarity index 100% rename from cockatrice/src/settings/game_filters_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp diff --git a/cockatrice/src/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h similarity index 100% rename from cockatrice/src/settings/game_filters_settings.h rename to libcockatrice_settings/libcockatrice/settings/game_filters_settings.h diff --git a/cockatrice/src/settings/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp similarity index 100% rename from cockatrice/src/settings/layouts_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp diff --git a/cockatrice/src/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h similarity index 100% rename from cockatrice/src/settings/layouts_settings.h rename to libcockatrice_settings/libcockatrice/settings/layouts_settings.h diff --git a/cockatrice/src/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp similarity index 100% rename from cockatrice/src/settings/message_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/message_settings.cpp diff --git a/cockatrice/src/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h similarity index 100% rename from cockatrice/src/settings/message_settings.h rename to libcockatrice_settings/libcockatrice/settings/message_settings.h diff --git a/cockatrice/src/settings/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp similarity index 100% rename from cockatrice/src/settings/recents_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/recents_settings.cpp diff --git a/cockatrice/src/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h similarity index 100% rename from cockatrice/src/settings/recents_settings.h rename to libcockatrice_settings/libcockatrice/settings/recents_settings.h diff --git a/cockatrice/src/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp similarity index 100% rename from cockatrice/src/settings/servers_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/servers_settings.cpp diff --git a/cockatrice/src/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h similarity index 100% rename from cockatrice/src/settings/servers_settings.h rename to libcockatrice_settings/libcockatrice/settings/servers_settings.h diff --git a/cockatrice/src/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp similarity index 100% rename from cockatrice/src/settings/settings_manager.cpp rename to libcockatrice_settings/libcockatrice/settings/settings_manager.cpp diff --git a/cockatrice/src/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h similarity index 100% rename from cockatrice/src/settings/settings_manager.h rename to libcockatrice_settings/libcockatrice/settings/settings_manager.h diff --git a/cockatrice/src/settings/shortcut_treeview.cpp b/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp similarity index 100% rename from cockatrice/src/settings/shortcut_treeview.cpp rename to libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp diff --git a/cockatrice/src/settings/shortcut_treeview.h b/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h similarity index 100% rename from cockatrice/src/settings/shortcut_treeview.h rename to libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h diff --git a/cockatrice/src/settings/shortcuts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp similarity index 100% rename from cockatrice/src/settings/shortcuts_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp diff --git a/cockatrice/src/settings/shortcuts_settings.h b/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h similarity index 100% rename from cockatrice/src/settings/shortcuts_settings.h rename to libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt new file mode 100644 index 000000000..e531b7983 --- /dev/null +++ b/libcockatrice_utility/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.16) +project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(UTILITY_SOURCES + libcockatrice/utility/expression.cpp libcockatrice/utility/featureset.cpp libcockatrice/utility/key_signals.cpp + libcockatrice/utility/levenshtein.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp +) + +set(UTILITY_HEADERS + libcockatrice/utility/color.h + libcockatrice/utility/expression.h + libcockatrice/utility/featureset.h + libcockatrice/utility/key_signals.h + libcockatrice/utility/levenshtein.h + libcockatrice/utility/logger.h + libcockatrice/utility/macros.h + libcockatrice/utility/passwordhasher.h + libcockatrice/utility/trice_limits.h +) + +add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) + +target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${COCKATRICE_QT_MODULES}) + +set(ORACLE_LIBS) + +include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) diff --git a/common/card_ref.h b/libcockatrice_utility/libcockatrice/utility/card_ref.h similarity index 100% rename from common/card_ref.h rename to libcockatrice_utility/libcockatrice/utility/card_ref.h diff --git a/common/color.h b/libcockatrice_utility/libcockatrice/utility/color.h similarity index 91% rename from common/color.h rename to libcockatrice_utility/libcockatrice/utility/color.h index 1ea3e33df..164c6ffd7 100644 --- a/common/color.h +++ b/libcockatrice_utility/libcockatrice/utility/color.h @@ -5,7 +5,7 @@ #include #endif -#include "pb/color.pb.h" +#include #ifdef QT_GUI_LIB inline QColor convertColorToQColor(const color &c) diff --git a/common/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp similarity index 99% rename from common/expression.cpp rename to libcockatrice_utility/libcockatrice/utility/expression.cpp index 9cb40ea3c..3b2e815d1 100644 --- a/common/expression.cpp +++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp @@ -1,6 +1,6 @@ #include "expression.h" -#include "./lib/peglib.h" +#include "peglib.h" #include #include diff --git a/common/expression.h b/libcockatrice_utility/libcockatrice/utility/expression.h similarity index 100% rename from common/expression.h rename to libcockatrice_utility/libcockatrice/utility/expression.h diff --git a/common/featureset.cpp b/libcockatrice_utility/libcockatrice/utility/featureset.cpp similarity index 100% rename from common/featureset.cpp rename to libcockatrice_utility/libcockatrice/utility/featureset.cpp diff --git a/common/featureset.h b/libcockatrice_utility/libcockatrice/utility/featureset.h similarity index 100% rename from common/featureset.h rename to libcockatrice_utility/libcockatrice/utility/featureset.h diff --git a/cockatrice/src/utility/key_signals.cpp b/libcockatrice_utility/libcockatrice/utility/key_signals.cpp similarity index 100% rename from cockatrice/src/utility/key_signals.cpp rename to libcockatrice_utility/libcockatrice/utility/key_signals.cpp diff --git a/cockatrice/src/utility/key_signals.h b/libcockatrice_utility/libcockatrice/utility/key_signals.h similarity index 100% rename from cockatrice/src/utility/key_signals.h rename to libcockatrice_utility/libcockatrice/utility/key_signals.h diff --git a/cockatrice/src/utility/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp similarity index 100% rename from cockatrice/src/utility/levenshtein.cpp rename to libcockatrice_utility/libcockatrice/utility/levenshtein.cpp diff --git a/cockatrice/src/utility/levenshtein.h b/libcockatrice_utility/libcockatrice/utility/levenshtein.h similarity index 100% rename from cockatrice/src/utility/levenshtein.h rename to libcockatrice_utility/libcockatrice/utility/levenshtein.h diff --git a/cockatrice/src/utility/logger.cpp b/libcockatrice_utility/libcockatrice/utility/logger.cpp similarity index 100% rename from cockatrice/src/utility/logger.cpp rename to libcockatrice_utility/libcockatrice/utility/logger.cpp diff --git a/cockatrice/src/utility/logger.h b/libcockatrice_utility/libcockatrice/utility/logger.h similarity index 100% rename from cockatrice/src/utility/logger.h rename to libcockatrice_utility/libcockatrice/utility/logger.h diff --git a/cockatrice/src/utility/macros.h b/libcockatrice_utility/libcockatrice/utility/macros.h similarity index 100% rename from cockatrice/src/utility/macros.h rename to libcockatrice_utility/libcockatrice/utility/macros.h diff --git a/common/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp similarity index 96% rename from common/passwordhasher.cpp rename to libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp index bc5f072e8..c40c5f94f 100644 --- a/common/passwordhasher.cpp +++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp @@ -1,8 +1,7 @@ #include "passwordhasher.h" -#include "rng_sfmt.h" - #include +#include QString PasswordHasher::computeHash(const QString &password, const QString &salt) { diff --git a/common/passwordhasher.h b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h similarity index 100% rename from common/passwordhasher.h rename to libcockatrice_utility/libcockatrice/utility/passwordhasher.h diff --git a/common/lib/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h similarity index 100% rename from common/lib/peglib.h rename to libcockatrice_utility/libcockatrice/utility/peglib.h diff --git a/common/trice_limits.h b/libcockatrice_utility/libcockatrice/utility/trice_limits.h similarity index 100% rename from common/trice_limits.h rename to libcockatrice_utility/libcockatrice/utility/trice_limits.h diff --git a/libs/card/CMakeLists.txt b/libs/card/CMakeLists.txt new file mode 100644 index 000000000..1da35b75b --- /dev/null +++ b/libs/card/CMakeLists.txt @@ -0,0 +1,71 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + include/card/card_info.h + include/card/card_info_comparator.h + include/card/card_database/card_database.h + include/card/card_database/card_database_loader.h + include/card/card_database/card_database_manager.h + include/card/card_database/card_database_querier.h + include/card/card_database/model/card_database_model.h + include/card/card_database/model/card_database_display_model.h + include/card/card_database/model/card/card_completer_proxy_model.h + include/card/card_database/model/card/card_search_model.h + include/card/card_database/model/token/token_display_model.h + include/card/card_database/model/token/token_edit_model.h + include/card/card_database/parser/card_database_parser.h + include/card/card_database/parser/cockatrice_xml_3.h + include/card/card_database/parser/cockatrice_xml_4.h + include/card/card_printing/exact_card.h + include/card/card_printing/printing_info.h + include/card/card_set/card_set.h + include/card/card_relation/card_relation.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +qt_add_library( + cardlib + STATIC + src/card_info.cpp + src/card_info_comparator.cpp + src/card_database/card_database.cpp + src/card_database/card_database_loader.cpp + src/card_database/card_database_manager.cpp + src/card_database/card_database_querier.cpp + src/card_database/model/card_database_model.cpp + src/card_database/model/card_database_display_model.cpp + src/card_database/model/card/card_completer_proxy_model.cpp + src/card_database/model/card/card_search_model.cpp + src/card_database/model/token/token_display_model.cpp + src/card_database/model/token/token_edit_model.cpp + src/card_database/parser/card_database_parser.cpp + src/card_database/parser/cockatrice_xml_3.cpp + src/card_database/parser/cockatrice_xml_4.cpp + src/card_printing/exact_card.cpp + src/card_printing/printing_info.cpp + src/card_set/card_set.cpp + src/card_set/card_set_list.cpp + src/card_relation/card_relation.cpp + ${MOC_SOURCES} +) + +target_include_directories( + cardlib + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + PUBLIC ${CMAKE_SOURCE_DIR}/common + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/settings/include + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters +) + +target_link_libraries( + cardlib + PUBLIC settingslib + PUBLIC ${COCKATRICE_QT_MODULES} +) diff --git a/libs/settings/CMakeLists.txt b/libs/settings/CMakeLists.txt new file mode 100644 index 000000000..2b26a0cde --- /dev/null +++ b/libs/settings/CMakeLists.txt @@ -0,0 +1,55 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + include/settings/cache_settings.h + include/settings/card_counter_settings.h + include/settings/card_database_settings.h + include/settings/card_override_settings.h + include/settings/debug_settings.h + include/settings/download_settings.h + include/settings/game_filters_settings.h + include/settings/layouts_settings.h + include/settings/message_settings.h + include/settings/recents_settings.h + include/settings/servers_settings.h + include/settings/settings_manager.h + include/settings/shortcut_treeview.h + include/settings/shortcuts_settings.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + settingslib STATIC + ${MOC_SOURCES} + src/cache_settings.cpp + src/card_counter_settings.cpp + src/card_database_settings.cpp + src/card_override_settings.cpp + src/debug_settings.cpp + src/download_settings.cpp + src/game_filters_settings.cpp + src/layouts_settings.cpp + src/message_settings.cpp + src/recents_settings.cpp + src/servers_settings.cpp + src/settings_manager.cpp + src/shortcut_treeview.cpp + src/shortcuts_settings.cpp +) + +target_include_directories( + settingslib + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + PUBLIC ${CMAKE_SOURCE_DIR}/common + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/utility/include + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network +) + +target_link_libraries(settingslib PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}) diff --git a/libs/utility/CMakeLists.txt b/libs/utility/CMakeLists.txt new file mode 100644 index 000000000..a6583f9ff --- /dev/null +++ b/libs/utility/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.16) +project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(UTILITY_SOURCES src/key_signals.cpp src/levenshtein.cpp src/logger.cpp) + +set(UTILITY_HEADERS include/utility/key_signals.h include/utility/levenshtein.h include/utility/logger.h + include/utility/macros.h +) + +qt_add_library(utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) + +target_include_directories(utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) + +target_link_libraries(utility PUBLIC ${COCKATRICE_QT_MODULES}) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 63b1974e4..f35013c46 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -1,15 +1,21 @@ -# CMakeLists for oracle directory -# -# provides the oracle binary - +cmake_minimum_required(VERSION 3.16) project(Oracle VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -# paths +# ------------------------ +# Paths and directories +# ------------------------ set(DESKTOPDIR share/applications CACHE STRING "path to .desktop files" ) +set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations") +set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations") +set(ORACLE_WIN32_QM_INSTALL_DIR "translations") + +# ------------------------ +# Sources +# ------------------------ set(oracle_SOURCES src/main.cpp src/oraclewizard.cpp @@ -17,92 +23,56 @@ set(oracle_SOURCES src/pagetemplates.cpp src/parsehelpers.cpp src/qt-json/json.cpp - ../cockatrice/src/card/card_info.cpp - ../cockatrice/src/card/card_relation.cpp - ../cockatrice/src/card/card_set.cpp - ../cockatrice/src/card/printing_info.cpp ../cockatrice/src/client/network/release_channel.cpp - ../cockatrice/src/database/parser/card_database_parser.cpp - ../cockatrice/src/database/parser/cockatrice_xml_3.cpp - ../cockatrice/src/database/parser/cockatrice_xml_4.cpp ../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp - ../cockatrice/src/settings/cache_settings.cpp - ../cockatrice/src/settings/card_counter_settings.cpp - ../cockatrice/src/settings/card_database_settings.cpp - ../cockatrice/src/settings/card_override_settings.cpp - ../cockatrice/src/settings/debug_settings.cpp - ../cockatrice/src/settings/download_settings.cpp - ../cockatrice/src/settings/game_filters_settings.cpp - ../cockatrice/src/settings/layouts_settings.cpp - ../cockatrice/src/settings/message_settings.cpp - ../cockatrice/src/settings/recents_settings.cpp - ../cockatrice/src/settings/servers_settings.cpp - ../cockatrice/src/settings/settings_manager.cpp - ../cockatrice/src/settings/shortcuts_settings.cpp ${VERSION_STRING_CPP} ) set(oracle_RESOURCES oracle.qrc) -if(UPDATE_TRANSLATIONS) - file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) - set(translate_SRCS ${translate_oracle_SRCS}) - set(oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts") -else() - file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") -endif(UPDATE_TRANSLATIONS) - -if(WIN32) - set(oracle_SOURCES ${oracle_SOURCES} oracle.rc) -endif(WIN32) - -if(APPLE) - set(MACOSX_BUNDLE_ICON_FILE appicon.icns) - set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources - ) - set(oracle_SOURCES ${oracle_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) -endif(APPLE) - +# ------------------------ +# Qt resources +# ------------------------ if(Qt6_FOUND) qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES}) elseif(Qt5_FOUND) qt5_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES}) endif() -include_directories(../cockatrice/src) -include_directories(../common) +# ------------------------ +# Include directories +# ------------------------ +include_directories(../cockatrice/libs/card/include ../cockatrice/libs/settings/include ../cockatrice/src ../common) -# Libz is required to support zipped files +# ------------------------ +# Optional libraries +# ------------------------ +# ZLIB find_package(ZLIB) if(ZLIB_FOUND) include_directories(${ZLIB_INCLUDE_DIRS}) add_definitions("-DHAS_ZLIB") - - set(oracle_SOURCES ${oracle_SOURCES} src/zip/unzip.cpp src/zip/zipglobal.cpp) + list(APPEND oracle_SOURCES src/zip/unzip.cpp src/zip/zipglobal.cpp) else() message(STATUS "Oracle: zlib not found; ZIP support disabled") endif() -# LibLZMA is required to support xz files +# LZMA find_package(LibLZMA) if(LIBLZMA_FOUND) include_directories(${LIBLZMA_INCLUDE_DIRS}) add_definitions("-DHAS_LZMA") - - set(oracle_SOURCES ${oracle_SOURCES} src/lzma/decompress.cpp) + list(APPEND oracle_SOURCES src/lzma/decompress.cpp) else() message(STATUS "Oracle: LibLZMA not found; xz support disabled") endif() -set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations") -set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations") -set(ORACLE_WIN32_QM_INSTALL_DIR "translations") - +# ------------------------ +# Build executable +# ------------------------ if(Qt6_FOUND) - # Qt6 Translations are linked after the executable is created in manual mode qt6_add_executable( oracle WIN32 @@ -113,49 +83,44 @@ if(Qt6_FOUND) MANUAL_FINALIZATION ) elseif(Qt5_FOUND) - # Qt5 Translations need to be linked at executable creation time if(Qt5LinguistTools_FOUND) if(UPDATE_TRANSLATIONS) - qt5_create_translation(oracle_QM ${translate_SRCS} ${oracle_TS}) + file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) + qt5_create_translation(oracle_QM ${translate_oracle_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts) else() + file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") qt5_add_translation(oracle_QM ${oracle_TS}) endif() endif() add_executable(oracle WIN32 MACOSX_BUNDLE ${oracle_MOC_SRCS} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_SOURCES}) - if(UNIX) - if(APPLE) - install(FILES ${oracle_QM} DESTINATION ${ORACLE_MAC_QM_INSTALL_DIR}) - else() - install(FILES ${oracle_QM} DESTINATION ${ORACLE_UNIX_QM_INSTALL_DIR}) - endif() - elseif(WIN32) - install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR}) - endif() endif() -target_link_libraries(oracle PUBLIC ${ORACLE_QT_MODULES}) +# ------------------------ +# Link libraries +# ------------------------ +target_link_libraries( + oracle + PRIVATE cardlib + PRIVATE settingslib + PRIVATE ${ORACLE_QT_MODULES} +) if(ZLIB_FOUND) - target_link_libraries(oracle PUBLIC ${ZLIB_LIBRARIES}) + target_link_libraries(oracle PRIVATE ${ZLIB_LIBRARIES}) endif() if(LIBLZMA_FOUND) - target_link_libraries(oracle PUBLIC ${LIBLZMA_LIBRARIES}) + target_link_libraries(oracle PRIVATE ${LIBLZMA_LIBRARIES}) endif() +# ------------------------ +# Install rules +# ------------------------ if(UNIX) if(APPLE) - set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.cockatrice.${PROJECT_NAME}") - set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME}-${PROJECT_VERSION}") - set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) - set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}) - set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) set_target_properties(oracle PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) - install(TARGETS oracle BUNDLE DESTINATION ./) else() - # Assume linux install(TARGETS oracle RUNTIME DESTINATION bin/) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.png DESTINATION ${ICONDIR}/hicolor/48x48/apps) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps) @@ -166,14 +131,15 @@ endif() if(NOT WIN32 AND NOT APPLE) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) -endif(NOT WIN32 AND NOT APPLE) +endif() +# ------------------------ +# Qt plugin handling +# ------------------------ if(APPLE) - # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir oracle.app/Contents/Plugins) set(qtconf_dest_dir oracle.app/Contents/Resources) - # Qt plugins: iconengines, platforms, styles, tls (Qt6) install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -189,7 +155,7 @@ if(APPLE) install( CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " @@ -198,18 +164,17 @@ Translations = Resources/translations\") install( CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") - " + file(GLOB_RECURSE QTPLUGINS + \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + " COMPONENT Runtime ) endif() if(WIN32) - # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir Plugins) set(qtconf_dest_dir .) list(APPEND libSearchDirs ${QT_LIBRARY_DIR}) @@ -221,7 +186,6 @@ if(WIN32) PATTERN "*.dll" ) - # Qt plugins: iconengines, platforms, styles, tls (Qt6) install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -243,7 +207,7 @@ if(WIN32) install( CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " @@ -252,25 +216,28 @@ Translations = Resources/translations\") install( CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") - " + file(GLOB_RECURSE QTPLUGINS + \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") + " COMPONENT Runtime ) endif() +# ------------------------ +# Qt translations +# ------------------------ if(Qt6_FOUND AND Qt6LinguistTools_FOUND) - #Qt6 Translations happen after the executable is built up if(UPDATE_TRANSLATIONS) + file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) qt6_add_translations( oracle TS_FILES ${oracle_TS} SOURCES - ${translate_SRCS} + ${translate_oracle_SRCS} QM_FILES_OUTPUT_VARIABLE oracle_QM ) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index f2930f975..3215f1d44 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -2,7 +2,6 @@ #include "interface/theme_manager.h" #include "oraclewizard.h" -#include "settings/cache_settings.h" #include #include @@ -10,6 +9,7 @@ #include #include #include +#include QTranslator *translator, *qtTranslator; ThemeManager *themeManager; diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 0c53c4ad9..6669238ae 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,14 +1,14 @@ #include "oracleimporter.h" -#include "database/parser/cockatrice_xml_4.h" #include "parsehelpers.h" #include "qt-json/json.h" #include #include #include -#include #include +#include +#include SplitCardPart::SplitCardPart(const QString &_name, const QString &_text, diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 5f40af9ba..3ec6da6e1 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include // many users prefer not to see these sets with non english arts diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 0fdd4b8f1..eeadfb8be 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -2,7 +2,6 @@ #include "main.h" #include "oracleimporter.h" -#include "settings/cache_settings.h" #include "version_string.h" #include @@ -25,6 +24,7 @@ #include #include #include +#include #ifdef HAS_LZMA #include "lzma/decompress.h" diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 2b345362a..02a2e1afd 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -106,9 +106,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES}) if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") - target_link_libraries(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY}) + target_link_libraries( + servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} + ${LIBEXECINFO_LIBRARY} + ) else() - target_link_libraries(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES}) + target_link_libraries( + servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} + ) endif() # install rules diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index 0c13bcd0f..514df9f87 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -1,25 +1,25 @@ #include "isl_interface.h" -#include "debug_pb_message.h" -#include "get_pb_extension.h" #include "main.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/event_server_complete_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/isl_message.pb.h" -#include "server/server_protocolhandler.h" -#include "server/server_room.h" #include "server_logger.h" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey) { diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h index 19310e07b..27e5b8293 100644 --- a/servatrice/src/isl_interface.h +++ b/servatrice/src/isl_interface.h @@ -1,13 +1,13 @@ #ifndef ISL_INTERFACE_H #define ISL_INTERFACE_H -#include "pb/serverinfo_game.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "pb/serverinfo_user.pb.h" #include "servatrice.h" #include #include +#include +#include +#include class Servatrice; class QSslSocket; diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index c8950d973..b1294a04c 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -18,8 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "passwordhasher.h" -#include "rng_sfmt.h" #include "servatrice.h" #include "server_logger.h" #include "settingscache.h" @@ -34,6 +32,8 @@ #include #include #include +#include +#include RNG_Abstract *rng; ServerLogger *logger; diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index e1288a627..65beb0646 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -19,17 +19,11 @@ ***************************************************************************/ #include "servatrice.h" -#include "deck_list.h" #include "email_parser.h" -#include "featureset.h" #include "isl_interface.h" #include "main.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_server_shutdown.pb.h" #include "servatrice_connection_pool.h" #include "servatrice_database_interface.h" -#include "server/server_room.h" #include "server_logger.h" #include "serversocketinterface.h" #include "settingscache.h" @@ -45,6 +39,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, int _numberPools, diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h index c68327c60..4bd2500cf 100644 --- a/servatrice/src/servatrice.h +++ b/servatrice/src/servatrice.h @@ -20,8 +20,6 @@ #ifndef SERVATRICE_H #define SERVATRICE_H -#include "server/server.h" - #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include Q_DECLARE_METATYPE(QSqlDatabase) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 289059846..bad16bec3 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,8 +1,5 @@ #include "servatrice_database_interface.h" -#include "deck_list.h" -#include "passwordhasher.h" -#include "pb/game_replay.pb.h" #include "servatrice.h" #include "serversocketinterface.h" #include "settingscache.h" @@ -12,6 +9,9 @@ #include #include #include +#include +#include +#include Servatrice_DatabaseInterface::Servatrice_DatabaseInterface(int _instanceId, Servatrice *_server) : instanceId(_instanceId), sqlDatabase(QSqlDatabase()), server(_server) diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 9eb492953..dc1c8505b 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -1,13 +1,12 @@ #ifndef SERVATRICE_DATABASE_INTERFACE_H #define SERVATRICE_DATABASE_INTERFACE_H -#include "server/server.h" -#include "server/server_database_interface.h" - #include #include #include #include +#include +#include #define DATABASE_SCHEMA_VERSION 34 diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 9b08ee330..ea3940a71 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -20,57 +20,12 @@ #include "serversocketinterface.h" -#include "deck_list.h" #include "email_parser.h" #include "main.h" -#include "pb/command_deck_del.pb.h" -#include "pb/command_deck_del_dir.pb.h" -#include "pb/command_deck_download.pb.h" -#include "pb/command_deck_list.pb.h" -#include "pb/command_deck_new_dir.pb.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/command_replay_delete_match.pb.h" -#include "pb/command_replay_download.pb.h" -#include "pb/command_replay_get_code.pb.h" -#include "pb/command_replay_list.pb.h" -#include "pb/command_replay_modify_match.pb.h" -#include "pb/command_replay_submit_code.pb.h" -#include "pb/commands.pb.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_server_identification.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/response_ban_history.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_deck_list.pb.h" -#include "pb/response_deck_upload.pb.h" -#include "pb/response_forgotpasswordrequest.pb.h" -#include "pb/response_get_admin_notes.pb.h" -#include "pb/response_password_salt.pb.h" -#include "pb/response_register.pb.h" -#include "pb/response_replay_download.pb.h" -#include "pb/response_replay_get_code.pb.h" -#include "pb/response_replay_list.pb.h" -#include "pb/response_viewlog_history.pb.h" -#include "pb/response_warn_history.pb.h" -#include "pb/response_warn_list.pb.h" -#include "pb/serverinfo_ban.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_deckstorage.pb.h" -#include "pb/serverinfo_replay.pb.h" -#include "pb/serverinfo_user.pb.h" #include "servatrice.h" #include "servatrice_database_interface.h" -#include "server/game/server_player.h" -#include "server/server_response_containers.h" -#include "server/server_room.h" #include "server_logger.h" #include "settingscache.h" -#include "trice_limits.h" #include "version_string.h" #include @@ -81,6 +36,51 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static const int protocolVersion = 14; diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h index 9f15e62b8..ab1f2ca0a 100644 --- a/servatrice/src/serversocketinterface.h +++ b/servatrice/src/serversocketinterface.h @@ -20,12 +20,11 @@ #ifndef SERVERSOCKETINTERFACE_H #define SERVERSOCKETINTERFACE_H -#include "server/server_protocolhandler.h" - #include #include #include #include +#include class Servatrice; class Servatrice_DatabaseInterface; @@ -147,7 +146,7 @@ public: AbstractServerSocketInterface(Servatrice *_server, Servatrice_DatabaseInterface *_databaseInterface, QObject *parent = 0); - ~AbstractServerSocketInterface(){}; + ~AbstractServerSocketInterface() {}; bool initSession(); virtual QHostAddress getPeerAddress() const = 0; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f6b2d12d2..6a5eacf54 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,9 +45,11 @@ endif() include_directories(${GTEST_INCLUDE_DIRS}) target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES}) -target_link_libraries(expression_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) target_link_libraries(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) -target_link_libraries(password_hash_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries( + password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} +) add_subdirectory(carddatabase) add_subdirectory(loading_from_clipboard) diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 913c1cc06..372f97e08 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -1,70 +1,65 @@ +cmake_minimum_required(VERSION 3.16) +project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + +# ------------------------ +# Definitions +# ------------------------ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") +# ------------------------ +# Qt modules +# ------------------------ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg ) -if(Qt6_FOUND) - qt6_wrap_cpp( - MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h - ) -elseif(Qt5_FOUND) - qt5_wrap_cpp( - MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h - ) -endif() +# ------------------------ +# Card Database Test +# ------------------------ +add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp) -add_executable( +target_link_libraries( carddatabase_test - ${MOCKS_SOURCES} - ${VERSION_STRING_CPP} - ../../cockatrice/src/card/card_info.cpp - ../../cockatrice/src/card/card_relation.cpp - ../../cockatrice/src/card/card_set.cpp - ../../cockatrice/src/card/card_set_list.cpp - ../../cockatrice/src/card/exact_card.cpp - ../../cockatrice/src/card/printing_info.cpp - ../../cockatrice/src/database/card_database.cpp - ../../cockatrice/src/database/card_database_loader.cpp - ../../cockatrice/src/database/card_database_querier.cpp - ../../cockatrice/src/database/parser/card_database_parser.cpp - ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp - ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp - ../../cockatrice/src/settings/settings_manager.cpp - carddatabase_test.cpp - mocks.cpp + PRIVATE cardlib + PRIVATE settingslib + PRIVATE cockatrice_common + PRIVATE Threads::Threads + PRIVATE ${GTEST_BOTH_LIBRARIES} + PRIVATE ${TEST_QT_MODULES} ) + +add_test(NAME carddatabase_test COMMAND carddatabase_test) + +# ------------------------ +# Filter String Test +# ------------------------ add_executable( filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} - ../../cockatrice/src/card/card_info.cpp - ../../cockatrice/src/card/card_relation.cpp - ../../cockatrice/src/card/card_set.cpp - ../../cockatrice/src/card/card_set_list.cpp - ../../cockatrice/src/card/exact_card.cpp - ../../cockatrice/src/card/printing_info.cpp - ../../cockatrice/src/database/card_database.cpp - ../../cockatrice/src/database/card_database_loader.cpp - ../../cockatrice/src/database/card_database_querier.cpp - ../../cockatrice/src/database/card_database_manager.cpp - ../../cockatrice/src/database/parser/card_database_parser.cpp - ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp - ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp ../../cockatrice/src/filters/filter_card.cpp ../../cockatrice/src/filters/filter_string.cpp ../../cockatrice/src/filters/filter_tree.cpp - ../../cockatrice/src/settings/settings_manager.cpp filter_string_test.cpp mocks.cpp ) + +target_link_libraries( + filter_string_test + PRIVATE cardlib + PRIVATE settingslib + PRIVATE cockatrice_common + PRIVATE Threads::Threads + PRIVATE ${GTEST_BOTH_LIBRARIES} + PRIVATE ${TEST_QT_MODULES} +) + +add_test(NAME filter_string_test COMMAND filter_string_test) + +# ------------------------ +# Dependencies on gtest +# ------------------------ if(NOT GTEST_FOUND) add_dependencies(carddatabase_test gtest) add_dependencies(filter_string_test gtest) endif() - -target_link_libraries(carddatabase_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) -target_link_libraries(filter_string_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) - -add_test(NAME carddatabase_test COMMAND carddatabase_test) -add_test(NAME filter_string_test COMMAND filter_string_test) diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 3055bb76a..f18e96d0e 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -1,8 +1,8 @@ -#include "../../cockatrice/src/database/card_database_manager.h" #include "../../cockatrice/src/filters/filter_string.h" #include "mocks.h" #include "gtest/gtest.h" +#include #define QUERY(name, card, query, match) \ TEST_F(CardQuery, name) \ diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index 08d82d765..7d46a68c2 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -452,7 +452,7 @@ void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */) { } -void PictureLoader::clearPixmapCache(CardInfoPtr /* card */) +void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */) { } diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index 18a50155b..3a8495fb9 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,13 +10,13 @@ #define PICTURELOADER_H -#include "../../cockatrice/src/database/card_database.h" -#include "../../cockatrice/src/settings/cache_settings.h" -#include "../../cockatrice/src/utility/macros.h" +#include +#include +#include extern SettingsCache *settingsCache; -class PictureLoader +class CardPictureLoader { public: static void clearPixmapCache(CardInfoPtr card); diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp index 51c4039a4..4fbe98cb9 100644 --- a/tests/expression_test.cpp +++ b/tests/expression_test.cpp @@ -1,7 +1,6 @@ -#include "../common/expression.h" - #include "gtest/gtest.h" #include +#include #define TEST_EXPR(name, a, b) \ TEST(ExpressionTest, name) \ diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt index be8ac6374..40e85c66e 100644 --- a/tests/loading_from_clipboard/CMakeLists.txt +++ b/tests/loading_from_clipboard/CMakeLists.txt @@ -1,7 +1,5 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") -add_executable( - loading_from_clipboard_test ../../common/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp -) +add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp) if(NOT GTEST_FOUND) add_dependencies(loading_from_clipboard_test gtest) @@ -12,6 +10,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE ) target_link_libraries( - loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} + loading_from_clipboard_test libcockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test) diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp index 943c6a05d..df2806585 100644 --- a/tests/loading_from_clipboard/clipboard_testing.cpp +++ b/tests/loading_from_clipboard/clipboard_testing.cpp @@ -1,8 +1,7 @@ #include "clipboard_testing.h" -#include "../../common/deck_list_card_node.h" - #include +#include void testEmpty(const QString &clipboard) { diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h index 8f1b215b8..5e9cff915 100644 --- a/tests/loading_from_clipboard/clipboard_testing.h +++ b/tests/loading_from_clipboard/clipboard_testing.h @@ -1,9 +1,8 @@ #ifndef CLIPBOARD_TESTING_H #define CLIPBOARD_TESTING_H -#include "../../common/deck_list.h" - #include "gtest/gtest.h" +#include // using std types because qt types aren't understood by gtest (without this you'll get less nice errors) using CardRows = QVector>; diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt index 0c11eb751..b89663d6f 100644 --- a/tests/oracle/CMakeLists.txt +++ b/tests/oracle/CMakeLists.txt @@ -6,6 +6,6 @@ endif() set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Widgets) -target_link_libraries(parse_cipt_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) add_test(NAME parse_cipt_test COMMAND parse_cipt_test) diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp index 84e7c8eb1..38d9b6315 100644 --- a/tests/password_hash_test.cpp +++ b/tests/password_hash_test.cpp @@ -1,8 +1,7 @@ -#include "../common/passwordhasher.h" -#include "../common/rng_abstract.h" -#include "../common/rng_sfmt.h" - #include "gtest/gtest.h" +#include +#include +#include RNG_Abstract *rng; diff --git a/vcpkg b/vcpkg index 29ff5b813..bb1ca2757 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 29ff5b8131d0c6c8fcb8fbaef35992f0d507cd7c +Subproject commit bb1ca2757bca8f8e372a4deb35943828e3b0d155 diff --git a/webclient/src/components/CardDetails/CardDetails.tsx b/webclient/src/components/CardDetails/CardDetails.tsx index 84196fda6..90197533d 100644 --- a/webclient/src/components/CardDetails/CardDetails.tsx +++ b/webclient/src/components/CardDetails/CardDetails.tsx @@ -1,9 +1,9 @@ // eslint-disable-next-line -import React, { useMemo, useState } from 'react'; +import React from 'react'; -import { CardDTO } from 'services'; +import {CardDTO} from 'services'; -import Card from '../Card/Card'; +import Card from 'card/Card'; import './CardDetails.css';