From 53d80efab83d2aa725d96fbbb4002253ab808238 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, Settings and Utility into libraries. Took 4 hours 3 minutes Took 2 minutes Took 38 seconds Took 5 minutes Took 5 minutes Took 9 minutes Took 15 minutes --- cockatrice/CMakeLists.txt | 62 +--- cockatrice/libs/card/CMakeLists.txt | 67 +++++ .../card/card_database}/card_database.h | 7 +- .../card_database}/card_database_loader.h | 0 .../card_database}/card_database_manager.h | 0 .../card_database}/card_database_querier.h | 5 +- .../model/card/card_completer_proxy_model.h | 0 .../model/card/card_search_model.h | 2 +- .../model/card_database_display_model.h | 2 +- .../model/card_database_model.h | 2 +- .../model/token/token_display_model.h | 2 +- .../model/token/token_edit_model.h | 2 +- .../parser/card_database_parser.h | 2 +- .../card_database}/parser/cockatrice_xml_3.h | 3 +- .../card_database}/parser/cockatrice_xml_4.h | 3 +- .../card/include}/card/card_info.h | 2 +- .../card/include/card}/card_info_comparator.h | 2 +- .../include/card/card_printing}/exact_card.h | 2 +- .../card/card_printing}/printing_info.h | 2 +- .../card/card_relation}/card_relation.h | 2 +- .../card/card_relation}/card_relation_type.h | 0 .../card/include/card/card_set}/card_set.h | 0 .../card/card_set}/card_set_comparator.h | 2 +- .../include/card/card_set}/card_set_list.h | 0 .../card/include}/card/game_specific_terms.h | 0 .../card/src/card_database}/card_database.cpp | 11 +- .../card_database}/card_database_loader.cpp | 10 +- .../card_database}/card_database_manager.cpp | 2 +- .../card_database}/card_database_querier.cpp | 8 +- .../model/card/card_completer_proxy_model.cpp | 2 +- .../model/card/card_search_model.cpp | 7 +- .../model/card_database_display_model.cpp | 4 +- .../model/card_database_model.cpp | 4 +- .../model/token/token_display_model.cpp | 4 +- .../model/token/token_edit_model.cpp | 6 +- .../parser/card_database_parser.cpp | 2 +- .../parser/cockatrice_xml_3.cpp | 6 +- .../parser/cockatrice_xml_4.cpp | 6 +- .../{src/card => libs/card/src}/card_info.cpp | 12 +- .../card/src}/card_info_comparator.cpp | 2 +- .../card/src/card_printing}/exact_card.cpp | 5 +- .../card/src/card_printing}/printing_info.cpp | 4 +- .../card/src/card_relation}/card_relation.cpp | 4 +- .../card/src/card_set}/card_set.cpp | 4 +- .../card/src/card_set}/card_set_list.cpp | 2 +- cockatrice/libs/settings/CMakeLists.txt | 55 ++++ .../include}/settings/cache_settings.h | 2 +- .../include}/settings/card_counter_settings.h | 0 .../settings/card_database_settings.h | 0 .../settings/card_override_settings.h | 0 .../include}/settings/debug_settings.h | 0 .../include}/settings/download_settings.h | 0 .../include}/settings/game_filters_settings.h | 0 .../include}/settings/layouts_settings.h | 0 .../include}/settings/message_settings.h | 0 .../include}/settings/recents_settings.h | 0 .../include}/settings/servers_settings.h | 0 .../include}/settings/settings_manager.h | 0 .../include}/settings/shortcut_treeview.h | 0 .../include}/settings/shortcuts_settings.h | 0 .../settings/src}/cache_settings.cpp | 8 +- .../settings/src}/card_counter_settings.cpp | 2 +- .../settings/src}/card_database_settings.cpp | 2 +- .../settings/src}/card_override_settings.cpp | 2 +- .../settings/src}/debug_settings.cpp | 2 +- .../settings/src}/download_settings.cpp | 4 +- .../settings/src}/game_filters_settings.cpp | 2 +- .../settings/src}/layouts_settings.cpp | 2 +- .../settings/src}/message_settings.cpp | 2 +- .../settings/src}/recents_settings.cpp | 2 +- .../settings/src}/servers_settings.cpp | 2 +- .../settings/src}/settings_manager.cpp | 2 +- .../settings/src}/shortcut_treeview.cpp | 6 +- .../settings/src}/shortcuts_settings.cpp | 2 +- cockatrice/libs/utility/CMakeLists.txt | 32 ++ .../utility/include}/utility/key_signals.h | 0 .../utility/include}/utility/levenshtein.h | 0 .../utility/include}/utility/logger.h | 0 .../utility/include}/utility/macros.h | 0 .../utility/src}/key_signals.cpp | 2 +- .../utility/src}/levenshtein.cpp | 2 +- .../utility => libs/utility/src}/logger.cpp | 2 +- cockatrice/src/client/deck_editor_menu.cpp | 4 +- .../client/network/client_update_checker.cpp | 2 +- .../client/network/replay_timeline_widget.cpp | 2 +- cockatrice/src/client/network/sets_model.h | 2 +- .../network/spoiler_background_updater.cpp | 6 +- cockatrice/src/client/sound_engine.cpp | 2 +- cockatrice/src/client/tapped_out_interface.h | 2 +- cockatrice/src/deck/custom_line_edit.cpp | 4 +- cockatrice/src/deck/deck_list_model.cpp | 4 +- cockatrice/src/deck/deck_list_model.h | 2 +- cockatrice/src/deck/deck_loader.cpp | 4 +- cockatrice/src/deck/deck_stats_interface.h | 2 +- cockatrice/src/dialogs/dlg_connect.cpp | 2 +- cockatrice/src/dialogs/dlg_connect.h | 2 +- cockatrice/src/dialogs/dlg_create_game.cpp | 2 +- cockatrice/src/dialogs/dlg_create_game.h | 2 +- .../src/dialogs/dlg_default_tags_editor.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_password.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_tokens.cpp | 8 +- cockatrice/src/dialogs/dlg_edit_tokens.h | 2 +- cockatrice/src/dialogs/dlg_edit_user.cpp | 2 +- .../dialogs/dlg_forgot_password_challenge.cpp | 2 +- .../dialogs/dlg_forgot_password_request.cpp | 2 +- .../src/dialogs/dlg_forgot_password_reset.cpp | 2 +- cockatrice/src/dialogs/dlg_load_deck.cpp | 2 +- .../dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- cockatrice/src/dialogs/dlg_manage_sets.cpp | 8 +- cockatrice/src/dialogs/dlg_register.cpp | 2 +- .../src/dialogs/dlg_select_set_for_cards.cpp | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 16 +- cockatrice/src/dialogs/dlg_settings.h | 2 +- .../src/dialogs/dlg_startup_card_check.cpp | 2 +- cockatrice/src/dialogs/dlg_tip_of_the_day.cpp | 2 +- cockatrice/src/dialogs/dlg_update.cpp | 2 +- cockatrice/src/dialogs/dlg_view_log.cpp | 4 +- cockatrice/src/filters/deck_filter_string.cpp | 2 +- cockatrice/src/filters/filter_string.h | 2 +- cockatrice/src/filters/filter_tree.h | 2 +- .../game/board/abstract_card_drag_item.cpp | 2 +- .../src/game/board/abstract_card_item.cpp | 12 +- .../src/game/board/abstract_card_item.h | 2 +- .../src/game/board/abstract_counter.cpp | 2 +- cockatrice/src/game/board/arrow_item.cpp | 4 +- cockatrice/src/game/board/card_item.cpp | 6 +- cockatrice/src/game/board/card_list.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 4 +- .../src/game/deckview/deck_view_container.cpp | 10 +- .../src/game/dialogs/dlg_create_token.cpp | 8 +- .../game/dialogs/dlg_move_top_cards_until.cpp | 4 +- cockatrice/src/game/game_scene.cpp | 2 +- cockatrice/src/game/game_view.cpp | 2 +- .../src/game/log/message_log_widget.cpp | 2 +- cockatrice/src/game/player/menu/card_menu.cpp | 6 +- .../src/game/player/menu/player_menu.cpp | 2 +- cockatrice/src/game/player/menu/say_menu.cpp | 2 +- cockatrice/src/game/player/player.h | 2 +- cockatrice/src/game/player/player_actions.cpp | 4 +- cockatrice/src/game/player/player_actions.h | 2 +- cockatrice/src/game/zones/hand_zone.cpp | 2 +- .../src/game/zones/logic/card_zone_logic.cpp | 2 +- .../src/game/zones/logic/view_zone_logic.cpp | 2 +- cockatrice/src/game/zones/select_zone.cpp | 2 +- cockatrice/src/game/zones/stack_zone.cpp | 2 +- cockatrice/src/game/zones/table_zone.cpp | 4 +- cockatrice/src/game/zones/view_zone.cpp | 4 +- .../src/game/zones/view_zone_widget.cpp | 2 +- cockatrice/src/game/zones/view_zone_widget.h | 2 +- .../card_picture_loader.cpp} | 79 ++--- .../card_picture_loader.h} | 34 +-- .../card_picture_loader_local.cpp} | 39 +-- .../card_picture_loader_local.h} | 10 +- ..._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} | 28 +- .../card_picture_to_load.h} | 10 +- cockatrice/src/interface/tearoff_menu.h | 2 +- cockatrice/src/interface/theme_manager.cpp | 2 +- .../deck_list_sort_filter_proxy_model.cpp | 2 +- .../deck_list_sort_filter_proxy_model.h | 2 +- .../{ => interface}/utility/sequence_edit.cpp | 2 +- .../{ => interface}/utility/sequence_edit.h | 0 .../additional_info/color_identity_widget.cpp | 2 +- .../additional_info/color_identity_widget.h | 2 +- .../cards/additional_info/mana_cost_widget.h | 2 +- .../additional_info/mana_symbol_widget.cpp | 2 +- .../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 | 2 +- .../widgets/cards/card_info_frame_widget.cpp | 6 +- .../widgets/cards/card_info_frame_widget.h | 2 +- .../card_info_picture_art_crop_widget.cpp | 6 +- .../card_info_picture_enlarged_widget.cpp | 8 +- .../cards/card_info_picture_enlarged_widget.h | 2 +- .../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 | 2 +- .../widgets/cards/card_size_widget.cpp | 2 +- .../cards/deck_card_zone_display_widget.cpp | 2 +- .../cards/deck_card_zone_display_widget.h | 2 +- .../deck_preview_card_picture_widget.cpp | 2 +- .../deck_analytics/mana_base_widget.cpp | 4 +- .../deck_analytics/mana_curve_widget.cpp | 4 +- .../deck_analytics/mana_devotion_widget.cpp | 4 +- .../deck_editor_database_display_widget.cpp | 6 +- .../deck_editor_database_display_widget.h | 6 +- .../deck_editor_deck_dock_widget.cpp | 4 +- .../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 | 2 +- .../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 | 2 +- .../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 | 8 +- cockatrice/src/server/chat_view/chat_view.cpp | 2 +- cockatrice/src/server/games_model.cpp | 2 +- .../src/server/handle_public_servers.cpp | 2 +- .../src/server/remote/remote_client.cpp | 2 +- .../src/server/user/user_info_connection.cpp | 2 +- .../src/tabs/abstract_tab_deck_editor.cpp | 10 +- .../src/tabs/abstract_tab_deck_editor.h | 3 +- ...i_response_card_details_display_widget.cpp | 2 +- ...ponse_commander_details_display_widget.cpp | 2 +- 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_deck_editor.cpp | 6 +- cockatrice/src/tabs/tab_deck_editor.h | 4 +- cockatrice/src/tabs/tab_deck_storage.cpp | 2 +- cockatrice/src/tabs/tab_game.cpp | 10 +- cockatrice/src/tabs/tab_message.cpp | 2 +- cockatrice/src/tabs/tab_replays.cpp | 2 +- cockatrice/src/tabs/tab_room.cpp | 2 +- cockatrice/src/tabs/tab_supervisor.cpp | 2 +- .../tab_deck_editor_visual.cpp | 4 +- .../tab_deck_storage_visual.cpp | 2 +- dbconverter/CMakeLists.txt | 150 +++++----- dbconverter/src/main.h | 4 +- dbconverter/src/mocks.cpp | 2 +- dbconverter/src/mocks.h | 8 +- oracle/CMakeLists.txt | 278 ++++++++---------- oracle/src/oracleimporter.cpp | 4 +- tests/carddatabase/CMakeLists.txt | 118 ++++---- tests/carddatabase/filter_string_test.cpp | 2 +- tests/carddatabase/mocks.cpp | 2 +- tests/carddatabase/mocks.h | 8 +- .../components/CardDetails/CardDetails.tsx | 6 +- 262 files changed, 1025 insertions(+), 918 deletions(-) create mode 100644 cockatrice/libs/card/CMakeLists.txt rename cockatrice/{src/database => libs/card/include/card/card_database}/card_database.h (94%) rename cockatrice/{src/database => libs/card/include/card/card_database}/card_database_loader.h (100%) rename cockatrice/{src/database => libs/card/include/card/card_database}/card_database_manager.h (100%) rename cockatrice/{src/database => libs/card/include/card/card_database}/card_database_querier.h (95%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/card/card_completer_proxy_model.h (100%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/card/card_search_model.h (92%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/card_database_display_model.h (98%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/card_database_model.h (97%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/token/token_display_model.h (89%) rename cockatrice/{src/database => libs/card/include/card/card_database}/model/token/token_edit_model.h (88%) rename cockatrice/{src/database => libs/card/include/card/card_database}/parser/card_database_parser.h (97%) rename cockatrice/{src/database => libs/card/include/card/card_database}/parser/cockatrice_xml_3.h (93%) rename cockatrice/{src/database => libs/card/include/card/card_database}/parser/cockatrice_xml_4.h (93%) rename cockatrice/{src => libs/card/include}/card/card_info.h (99%) rename cockatrice/{src/utility => libs/card/include/card}/card_info_comparator.h (95%) rename cockatrice/{src/card => libs/card/include/card/card_printing}/exact_card.h (97%) rename cockatrice/{src/card => libs/card/include/card/card_printing}/printing_info.h (96%) rename cockatrice/{src/card => libs/card/include/card/card_relation}/card_relation.h (96%) rename cockatrice/{src/card => libs/card/include/card/card_relation}/card_relation_type.h (100%) rename cockatrice/{src/card => libs/card/include/card/card_set}/card_set.h (100%) rename cockatrice/{src/utility => libs/card/include/card/card_set}/card_set_comparator.h (96%) rename cockatrice/{src/card => libs/card/include/card/card_set}/card_set_list.h (100%) rename cockatrice/{src => libs/card/include}/card/game_specific_terms.h (100%) rename cockatrice/{src/database => libs/card/src/card_database}/card_database.cpp (95%) rename cockatrice/{src/database => libs/card/src/card_database}/card_database_loader.cpp (95%) rename cockatrice/{src/database => libs/card/src/card_database}/card_database_manager.cpp (81%) rename cockatrice/{src/database => libs/card/src/card_database}/card_database_querier.cpp (97%) rename cockatrice/{src/database => libs/card/src/card_database}/model/card/card_completer_proxy_model.cpp (88%) rename cockatrice/{src/database => libs/card/src/card_database}/model/card/card_search_model.cpp (90%) rename cockatrice/{src/database => libs/card/src/card_database}/model/card_database_display_model.cpp (98%) rename cockatrice/{src/database => libs/card/src/card_database}/model/card_database_model.cpp (97%) rename cockatrice/{src/database => libs/card/src/card_database}/model/token/token_display_model.cpp (80%) rename cockatrice/{src/database => libs/card/src/card_database}/model/token/token_edit_model.cpp (72%) rename cockatrice/{src/database => libs/card/src/card_database}/parser/card_database_parser.cpp (93%) rename cockatrice/{src/database => libs/card/src/card_database}/parser/cockatrice_xml_3.cpp (99%) rename cockatrice/{src/database => libs/card/src/card_database}/parser/cockatrice_xml_4.cpp (99%) rename cockatrice/{src/card => libs/card/src}/card_info.cpp (96%) rename cockatrice/{src/utility => libs/card/src}/card_info_comparator.cpp (98%) rename cockatrice/{src/card => libs/card/src/card_printing}/exact_card.cpp (93%) rename cockatrice/{src/card => libs/card/src/card_printing}/printing_info.cpp (75%) rename cockatrice/{src/card => libs/card/src/card_relation}/card_relation.cpp (83%) rename cockatrice/{src/card => libs/card/src/card_set}/card_set.cpp (97%) rename cockatrice/{src/card => libs/card/src/card_set}/card_set_list.cpp (98%) create mode 100644 cockatrice/libs/settings/CMakeLists.txt rename cockatrice/{src => libs/settings/include}/settings/cache_settings.h (99%) rename cockatrice/{src => libs/settings/include}/settings/card_counter_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/card_database_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/card_override_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/debug_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/download_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/game_filters_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/layouts_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/message_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/recents_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/servers_settings.h (100%) rename cockatrice/{src => libs/settings/include}/settings/settings_manager.h (100%) rename cockatrice/{src => libs/settings/include}/settings/shortcut_treeview.h (100%) rename cockatrice/{src => libs/settings/include}/settings/shortcuts_settings.h (100%) rename cockatrice/{src/settings => libs/settings/src}/cache_settings.cpp (99%) rename cockatrice/{src/settings => libs/settings/src}/card_counter_settings.cpp (96%) rename cockatrice/{src/settings => libs/settings/src}/card_database_settings.cpp (94%) rename cockatrice/{src/settings => libs/settings/src}/card_override_settings.cpp (90%) rename cockatrice/{src/settings => libs/settings/src}/debug_settings.cpp (94%) rename cockatrice/{src/settings => libs/settings/src}/download_settings.cpp (90%) rename cockatrice/{src/settings => libs/settings/src}/game_filters_settings.cpp (99%) rename cockatrice/{src/settings => libs/settings/src}/layouts_settings.cpp (99%) rename cockatrice/{src/settings => libs/settings/src}/message_settings.cpp (92%) rename cockatrice/{src/settings => libs/settings/src}/recents_settings.cpp (95%) rename cockatrice/{src/settings => libs/settings/src}/servers_settings.cpp (99%) rename cockatrice/{src/settings => libs/settings/src}/settings_manager.cpp (97%) rename cockatrice/{src/settings => libs/settings/src}/shortcut_treeview.cpp (97%) rename cockatrice/{src/settings => libs/settings/src}/shortcuts_settings.cpp (99%) create mode 100644 cockatrice/libs/utility/CMakeLists.txt rename cockatrice/{src => libs/utility/include}/utility/key_signals.h (100%) rename cockatrice/{src => libs/utility/include}/utility/levenshtein.h (100%) rename cockatrice/{src => libs/utility/include}/utility/logger.h (100%) rename cockatrice/{src => libs/utility/include}/utility/macros.h (100%) rename cockatrice/{src/utility => libs/utility/src}/key_signals.cpp (98%) rename cockatrice/{src/utility => libs/utility/src}/levenshtein.cpp (93%) rename cockatrice/{src/utility => libs/utility/src}/logger.cpp (99%) 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} (54%) rename cockatrice/src/{picture_loader/picture_loader_local.cpp => interface/card_picture_loader/card_picture_loader_local.cpp} (78%) rename cockatrice/src/{picture_loader/picture_loader_local.h => interface/card_picture_loader/card_picture_loader_local.h} (79%) 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} (68%) 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} (75%) 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} (77%) 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 (93%) rename cockatrice/src/{ => interface}/utility/sequence_edit.cpp (99%) rename cockatrice/src/{ => interface}/utility/sequence_edit.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index d2d76bbe5..ec5fcb248 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,14 +266,13 @@ 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(libs/settings) +add_subdirectory(libs/card) +add_subdirectory(libs/utility) add_subdirectory(sounds) add_subdirectory(themes) configure_file( @@ -399,9 +365,9 @@ elseif(Qt5_FOUND) endif() if(Qt5_FOUND) - target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries(cockatrice cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES}) else() - target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries(cockatrice PUBLIC cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES}) endif() if(UNIX) diff --git a/cockatrice/libs/card/CMakeLists.txt b/cockatrice/libs/card/CMakeLists.txt new file mode 100644 index 000000000..d66b72964 --- /dev/null +++ b/cockatrice/libs/card/CMakeLists.txt @@ -0,0 +1,67 @@ +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/cockatrice/src/database/card_database.h b/cockatrice/libs/card/include/card/card_database/card_database.h similarity index 94% rename from cockatrice/src/database/card_database.h rename to cockatrice/libs/card/include/card/card_database/card_database.h index 151019143..15e8e69a1 100644 --- a/cockatrice/src/database/card_database.h +++ b/cockatrice/libs/card/include/card/card_database/card_database.h @@ -7,10 +7,9 @@ #ifndef CARDDATABASE_H #define CARDDATABASE_H -#include "../card/card_set_list.h" -#include "../card/exact_card.h" -#include "../common/card_ref.h" -#include "card_database_loader.h" +#include "../../common/card_ref.h" +#include "card/card_database/card_database_loader.h" +#include "card/card_set/card_set_list.h" #include "card_database_querier.h" #include diff --git a/cockatrice/src/database/card_database_loader.h b/cockatrice/libs/card/include/card/card_database/card_database_loader.h similarity index 100% rename from cockatrice/src/database/card_database_loader.h rename to cockatrice/libs/card/include/card/card_database/card_database_loader.h diff --git a/cockatrice/src/database/card_database_manager.h b/cockatrice/libs/card/include/card/card_database/card_database_manager.h similarity index 100% rename from cockatrice/src/database/card_database_manager.h rename to cockatrice/libs/card/include/card/card_database/card_database_manager.h diff --git a/cockatrice/src/database/card_database_querier.h b/cockatrice/libs/card/include/card/card_database/card_database_querier.h similarity index 95% rename from cockatrice/src/database/card_database_querier.h rename to cockatrice/libs/card/include/card/card_database/card_database_querier.h index c30cf49c2..983484745 100644 --- a/cockatrice/src/database/card_database_querier.h +++ b/cockatrice/libs/card/include/card/card_database/card_database_querier.h @@ -7,8 +7,9 @@ #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H #define COCKATRICE_CARD_DATABASE_QUERIER_H -#include "../card/exact_card.h" -#include "../common/card_ref.h" +#include "../../common/card_ref.h" +#include "card/card_info.h" +#include "card/card_printing/exact_card.h" #include diff --git a/cockatrice/src/database/model/card/card_completer_proxy_model.h b/cockatrice/libs/card/include/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 cockatrice/libs/card/include/card/card_database/model/card/card_completer_proxy_model.h diff --git a/cockatrice/src/database/model/card/card_search_model.h b/cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h similarity index 92% rename from cockatrice/src/database/model/card/card_search_model.h rename to cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h index 98d66cb5e..0cceedb96 100644 --- a/cockatrice/src/database/model/card/card_search_model.h +++ b/cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h @@ -7,7 +7,7 @@ #ifndef CARD_SEARCH_MODEL_H #define CARD_SEARCH_MODEL_H -#include "../card_database_display_model.h" +#include "card/card_database/model/card_database_display_model.h" #include diff --git a/cockatrice/src/database/model/card_database_display_model.h b/cockatrice/libs/card/include/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 cockatrice/libs/card/include/card/card_database/model/card_database_display_model.h index a1f9366e2..a1e949eba 100644 --- a/cockatrice/src/database/model/card_database_display_model.h +++ b/cockatrice/libs/card/include/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.h b/cockatrice/libs/card/include/card/card_database/model/card_database_model.h similarity index 97% rename from cockatrice/src/database/model/card_database_model.h rename to cockatrice/libs/card/include/card/card_database/model/card_database_model.h index fc89e0572..92bb8f79c 100644 --- a/cockatrice/src/database/model/card_database_model.h +++ b/cockatrice/libs/card/include/card/card_database/model/card_database_model.h @@ -7,7 +7,7 @@ #ifndef CARDDATABASEMODEL_H #define CARDDATABASEMODEL_H -#include "../card_database.h" +#include "card/card_database/card_database.h" #include #include diff --git a/cockatrice/src/database/model/token/token_display_model.h b/cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h similarity index 89% rename from cockatrice/src/database/model/token/token_display_model.h rename to cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h index 5d3b63a36..fe0792a93 100644 --- a/cockatrice/src/database/model/token/token_display_model.h +++ b/cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H #define COCKATRICE_TOKEN_DISPLAY_MODEL_H -#include "../card_database_display_model.h" +#include "card/card_database/model/card_database_display_model.h" class TokenDisplayModel : public CardDatabaseDisplayModel { diff --git a/cockatrice/src/database/model/token/token_edit_model.h b/cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h similarity index 88% rename from cockatrice/src/database/model/token/token_edit_model.h rename to cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h index 50c7eb642..907439976 100644 --- a/cockatrice/src/database/model/token/token_edit_model.h +++ b/cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H #define COCKATRICE_TOKEN_EDIT_MODEL_H -#include "../card_database_display_model.h" +#include "card/card_database/model/card_database_display_model.h" class TokenEditModel : public CardDatabaseDisplayModel { diff --git a/cockatrice/src/database/parser/card_database_parser.h b/cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h similarity index 97% rename from cockatrice/src/database/parser/card_database_parser.h rename to cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h index 15a86fbfa..822d392bf 100644 --- a/cockatrice/src/database/parser/card_database_parser.h +++ b/cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h @@ -7,7 +7,7 @@ #ifndef CARDDATABASE_PARSER_H #define CARDDATABASE_PARSER_H -#include "../../card/card_info.h" +#include "card/card_info.h" #include #include diff --git a/cockatrice/src/database/parser/cockatrice_xml_3.h b/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h similarity index 93% rename from cockatrice/src/database/parser/cockatrice_xml_3.h rename to cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h index 90130f4d1..e487091e2 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_3.h +++ b/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_XML3_H #define COCKATRICE_XML3_H -#include "card_database_parser.h" +#include "card/card_database/parser/card_database_parser.h" #include #include @@ -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.h b/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h similarity index 93% rename from cockatrice/src/database/parser/cockatrice_xml_4.h rename to cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h index 389e23712..c75858755 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_4.h +++ b/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_XML4_H #define COCKATRICE_XML4_H -#include "card_database_parser.h" +#include "card/card_database/parser/card_database_parser.h" #include #include @@ -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.h b/cockatrice/libs/card/include/card/card_info.h similarity index 99% rename from cockatrice/src/card/card_info.h rename to cockatrice/libs/card/include/card/card_info.h index b9b5e62c4..771f07464 100644 --- a/cockatrice/src/card/card_info.h +++ b/cockatrice/libs/card/include/card/card_info.h @@ -7,7 +7,7 @@ #ifndef CARD_INFO_H #define CARD_INFO_H -#include "printing_info.h" +#include "card_printing/printing_info.h" #include #include diff --git a/cockatrice/src/utility/card_info_comparator.h b/cockatrice/libs/card/include/card/card_info_comparator.h similarity index 95% rename from cockatrice/src/utility/card_info_comparator.h rename to cockatrice/libs/card/include/card/card_info_comparator.h index 8b02afaf3..bafc303a5 100644 --- a/cockatrice/src/utility/card_info_comparator.h +++ b/cockatrice/libs/card/include/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.h b/cockatrice/libs/card/include/card/card_printing/exact_card.h similarity index 97% rename from cockatrice/src/card/exact_card.h rename to cockatrice/libs/card/include/card/card_printing/exact_card.h index f0ba25c02..97b42df6f 100644 --- a/cockatrice/src/card/exact_card.h +++ b/cockatrice/libs/card/include/card/card_printing/exact_card.h @@ -1,7 +1,7 @@ #ifndef EXACT_CARD_H #define EXACT_CARD_H -#include "card_info.h" +#include "card/card_info.h" /** * @class ExactCard diff --git a/cockatrice/src/card/printing_info.h b/cockatrice/libs/card/include/card/card_printing/printing_info.h similarity index 96% rename from cockatrice/src/card/printing_info.h rename to cockatrice/libs/card/include/card/card_printing/printing_info.h index cf262b6bb..583bcd234 100644 --- a/cockatrice/src/card/printing_info.h +++ b/cockatrice/libs/card/include/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/card_set/card_set.h" #include #include diff --git a/cockatrice/src/card/card_relation.h b/cockatrice/libs/card/include/card/card_relation/card_relation.h similarity index 96% rename from cockatrice/src/card/card_relation.h rename to cockatrice/libs/card/include/card/card_relation/card_relation.h index 34f88e651..50645fcea 100644 --- a/cockatrice/src/card/card_relation.h +++ b/cockatrice/libs/card/include/card/card_relation/card_relation.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_CARD_RELATION_H #define COCKATRICE_CARD_RELATION_H -#include "card_relation_type.h" +#include "card/card_relation/card_relation_type.h" #include #include diff --git a/cockatrice/src/card/card_relation_type.h b/cockatrice/libs/card/include/card/card_relation/card_relation_type.h similarity index 100% rename from cockatrice/src/card/card_relation_type.h rename to cockatrice/libs/card/include/card/card_relation/card_relation_type.h diff --git a/cockatrice/src/card/card_set.h b/cockatrice/libs/card/include/card/card_set/card_set.h similarity index 100% rename from cockatrice/src/card/card_set.h rename to cockatrice/libs/card/include/card/card_set/card_set.h diff --git a/cockatrice/src/utility/card_set_comparator.h b/cockatrice/libs/card/include/card/card_set/card_set_comparator.h similarity index 96% rename from cockatrice/src/utility/card_set_comparator.h rename to cockatrice/libs/card/include/card/card_set/card_set_comparator.h index 4089cf42b..9f8be6676 100644 --- a/cockatrice/src/utility/card_set_comparator.h +++ b/cockatrice/libs/card/include/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/card_info.h" class SetPriorityComparator { diff --git a/cockatrice/src/card/card_set_list.h b/cockatrice/libs/card/include/card/card_set/card_set_list.h similarity index 100% rename from cockatrice/src/card/card_set_list.h rename to cockatrice/libs/card/include/card/card_set/card_set_list.h diff --git a/cockatrice/src/card/game_specific_terms.h b/cockatrice/libs/card/include/card/game_specific_terms.h similarity index 100% rename from cockatrice/src/card/game_specific_terms.h rename to cockatrice/libs/card/include/card/game_specific_terms.h diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/libs/card/src/card_database/card_database.cpp similarity index 95% rename from cockatrice/src/database/card_database.cpp rename to cockatrice/libs/card/src/card_database/card_database.cpp index faa9f5113..7830b947f 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/cockatrice/libs/card/src/card_database/card_database.cpp @@ -1,10 +1,9 @@ -#include "card_database.h" +#include "card/card_database/card_database.h" -#include "../card/card_relation.h" -#include "../picture_loader/picture_loader.h" -#include "../settings/cache_settings.h" -#include "parser/cockatrice_xml_3.h" -#include "parser/cockatrice_xml_4.h" +#include "card/card_database/parser/cockatrice_xml_3.h" +#include "card/card_database/parser/cockatrice_xml_4.h" +#include "card/card_relation/card_relation.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/database/card_database_loader.cpp b/cockatrice/libs/card/src/card_database/card_database_loader.cpp similarity index 95% rename from cockatrice/src/database/card_database_loader.cpp rename to cockatrice/libs/card/src/card_database/card_database_loader.cpp index fbb3e6b67..31e54528d 100644 --- a/cockatrice/src/database/card_database_loader.cpp +++ b/cockatrice/libs/card/src/card_database/card_database_loader.cpp @@ -1,9 +1,9 @@ -#include "card_database_loader.h" +#include "card/card_database/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 "card/card_database/card_database.h" +#include "card/card_database/parser/cockatrice_xml_3.h" +#include "card/card_database/parser/cockatrice_xml_4.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/database/card_database_manager.cpp b/cockatrice/libs/card/src/card_database/card_database_manager.cpp similarity index 81% rename from cockatrice/src/database/card_database_manager.cpp rename to cockatrice/libs/card/src/card_database/card_database_manager.cpp index 4ffe0cc70..df7872d1a 100644 --- a/cockatrice/src/database/card_database_manager.cpp +++ b/cockatrice/libs/card/src/card_database/card_database_manager.cpp @@ -1,4 +1,4 @@ -#include "card_database_manager.h" +#include "card/card_database/card_database_manager.h" CardDatabase *CardDatabaseManager::getInstance() { diff --git a/cockatrice/src/database/card_database_querier.cpp b/cockatrice/libs/card/src/card_database/card_database_querier.cpp similarity index 97% rename from cockatrice/src/database/card_database_querier.cpp rename to cockatrice/libs/card/src/card_database/card_database_querier.cpp index 68cc39c9d..b428a4462 100644 --- a/cockatrice/src/database/card_database_querier.cpp +++ b/cockatrice/libs/card/src/card_database/card_database_querier.cpp @@ -1,7 +1,9 @@ -#include "card_database_querier.h" +#include "card/card_database/card_database_querier.h" -#include "../utility/card_set_comparator.h" -#include "card_database.h" +#include "card/card_database/card_database.h" +#include "card/card_info.h" +#include "card/card_printing/exact_card.h" +#include "card/card_set/card_set_comparator.h" #include diff --git a/cockatrice/src/database/model/card/card_completer_proxy_model.cpp b/cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp similarity index 88% rename from cockatrice/src/database/model/card/card_completer_proxy_model.cpp rename to cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp index 387eb454f..fcc224f2e 100644 --- a/cockatrice/src/database/model/card/card_completer_proxy_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp @@ -1,4 +1,4 @@ -#include "card_completer_proxy_model.h" +#include "card/card_database/model/card/card_completer_proxy_model.h" CardCompleterProxyModel::CardCompleterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) { diff --git a/cockatrice/src/database/model/card/card_search_model.cpp b/cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp similarity index 90% rename from cockatrice/src/database/model/card/card_search_model.cpp rename to cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp index d39a2207d..b648554b3 100644 --- a/cockatrice/src/database/model/card/card_search_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp @@ -1,7 +1,8 @@ -#include "card_search_model.h" +#include "card/card_database/model/card/card_search_model.h" -#include "../../../utility/levenshtein.h" -#include "../card_database_model.h" +#include "card/card_database/model/card_database_display_model.h" +#include "card/card_database/model/card_database_model.h" +#include "utility/levenshtein.h" #include diff --git a/cockatrice/src/database/model/card_database_display_model.cpp b/cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp similarity index 98% rename from cockatrice/src/database/model/card_database_display_model.cpp rename to cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp index fc1b20cf6..4fed0e7f8 100644 --- a/cockatrice/src/database/model/card_database_display_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp @@ -1,6 +1,6 @@ -#include "card_database_display_model.h" +#include "card/card_database/model/card_database_display_model.h" -#include "card_database_model.h" +#include "card/card_database/model/card_database_model.h" CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent) : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr) diff --git a/cockatrice/src/database/model/card_database_model.cpp b/cockatrice/libs/card/src/card_database/model/card_database_model.cpp similarity index 97% rename from cockatrice/src/database/model/card_database_model.cpp rename to cockatrice/libs/card/src/card_database/model/card_database_model.cpp index 02175081b..35e3dfb2c 100644 --- a/cockatrice/src/database/model/card_database_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/card_database_model.cpp @@ -1,4 +1,6 @@ -#include "card_database_model.h" +#include "card/card_database/model/card_database_model.h" + +#include "card/card_database/card_database.h" #include diff --git a/cockatrice/src/database/model/token/token_display_model.cpp b/cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp similarity index 80% rename from cockatrice/src/database/model/token/token_display_model.cpp rename to cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp index 4282c6dc8..d8df25550 100644 --- a/cockatrice/src/database/model/token/token_display_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp @@ -1,6 +1,6 @@ -#include "token_display_model.h" +#include "card/card_database/model/token/token_display_model.h" -#include "../card_database_model.h" +#include "card/card_database/model/card_database_model.h" TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent) { diff --git a/cockatrice/src/database/model/token/token_edit_model.cpp b/cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp similarity index 72% rename from cockatrice/src/database/model/token/token_edit_model.cpp rename to cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp index ad6891d2e..6fa71161d 100644 --- a/cockatrice/src/database/model/token/token_edit_model.cpp +++ b/cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp @@ -1,6 +1,8 @@ -#include "token_edit_model.h" +#include "card/card_database/model/token/token_edit_model.h" -#include "../card_database_model.h" +#include "card/card_database/model/card_database_display_model.h" +#include "card/card_database/model/card_database_model.h" +#include "card/card_info.h" TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent) { diff --git a/cockatrice/src/database/parser/card_database_parser.cpp b/cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp similarity index 93% rename from cockatrice/src/database/parser/card_database_parser.cpp rename to cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp index ac1372f7f..76c071507 100644 --- a/cockatrice/src/database/parser/card_database_parser.cpp +++ b/cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp @@ -1,4 +1,4 @@ -#include "card_database_parser.h" +#include "card/card_database/parser/card_database_parser.h" SetNameMap ICardDatabaseParser::sets; diff --git a/cockatrice/src/database/parser/cockatrice_xml_3.cpp b/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp similarity index 99% rename from cockatrice/src/database/parser/cockatrice_xml_3.cpp rename to cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp index 7b584bc22..211e35710 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_3.cpp +++ b/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp @@ -1,7 +1,7 @@ -#include "cockatrice_xml_3.h" +#include "card/card_database/parser/cockatrice_xml_3.h" -#include "../../card/card_relation.h" -#include "../../card/card_relation_type.h" +#include "card/card_relation/card_relation.h" +#include "card/card_relation/card_relation_type.h" #include #include diff --git a/cockatrice/src/database/parser/cockatrice_xml_4.cpp b/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp similarity index 99% rename from cockatrice/src/database/parser/cockatrice_xml_4.cpp rename to cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp index 1c68e80c3..aff52ea65 100644 --- a/cockatrice/src/database/parser/cockatrice_xml_4.cpp +++ b/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp @@ -1,7 +1,7 @@ -#include "cockatrice_xml_4.h" +#include "card/card_database/parser/cockatrice_xml_4.h" -#include "../../card/card_relation.h" -#include "../../settings/cache_settings.h" +#include "card/card_relation/card_relation.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/card/card_info.cpp b/cockatrice/libs/card/src/card_info.cpp similarity index 96% rename from cockatrice/src/card/card_info.cpp rename to cockatrice/libs/card/src/card_info.cpp index 47621e65e..69dd41b98 100644 --- a/cockatrice/src/card/card_info.cpp +++ b/cockatrice/libs/card/src/card_info.cpp @@ -1,10 +1,10 @@ -#include "card_info.h" +#include "card/card_info.h" -#include "../picture_loader/picture_loader.h" -#include "../settings/cache_settings.h" -#include "card_relation.h" -#include "game_specific_terms.h" -#include "printing_info.h" +#include "card/card_printing/printing_info.h" +#include "card/card_relation/card_relation.h" +#include "card/card_set/card_set.h" +#include "card/game_specific_terms.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/utility/card_info_comparator.cpp b/cockatrice/libs/card/src/card_info_comparator.cpp similarity index 98% rename from cockatrice/src/utility/card_info_comparator.cpp rename to cockatrice/libs/card/src/card_info_comparator.cpp index 821cc8675..7e002d312 100644 --- a/cockatrice/src/utility/card_info_comparator.cpp +++ b/cockatrice/libs/card/src/card_info_comparator.cpp @@ -1,4 +1,4 @@ -#include "card_info_comparator.h" +#include "card/card_info_comparator.h" CardInfoComparator::CardInfoComparator(const QStringList &properties, Qt::SortOrder order) : m_properties(properties), m_order(order) diff --git a/cockatrice/src/card/exact_card.cpp b/cockatrice/libs/card/src/card_printing/exact_card.cpp similarity index 93% rename from cockatrice/src/card/exact_card.cpp rename to cockatrice/libs/card/src/card_printing/exact_card.cpp index fbd60071e..cc79a5c83 100644 --- a/cockatrice/src/card/exact_card.cpp +++ b/cockatrice/libs/card/src/card_printing/exact_card.cpp @@ -1,4 +1,7 @@ -#include "exact_card.h" +#include "card/card_printing/exact_card.h" + +#include "card/card_info.h" +#include "card/card_printing/printing_info.h" /** * Default constructor. diff --git a/cockatrice/src/card/printing_info.cpp b/cockatrice/libs/card/src/card_printing/printing_info.cpp similarity index 75% rename from cockatrice/src/card/printing_info.cpp rename to cockatrice/libs/card/src/card_printing/printing_info.cpp index 3e7735e6b..3b8ce3ed1 100644 --- a/cockatrice/src/card/printing_info.cpp +++ b/cockatrice/libs/card/src/card_printing/printing_info.cpp @@ -1,4 +1,6 @@ -#include "printing_info.h" +#include "card/card_printing/printing_info.h" + +#include "card/card_set/card_set.h" PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set) { diff --git a/cockatrice/src/card/card_relation.cpp b/cockatrice/libs/card/src/card_relation/card_relation.cpp similarity index 83% rename from cockatrice/src/card/card_relation.cpp rename to cockatrice/libs/card/src/card_relation/card_relation.cpp index 41fbb5617..0b59545c6 100644 --- a/cockatrice/src/card/card_relation.cpp +++ b/cockatrice/libs/card/src/card_relation/card_relation.cpp @@ -1,4 +1,6 @@ -#include "card_relation.h" +#include "card/card_relation/card_relation.h" + +#include "card/card_relation/card_relation_type.h" CardRelation::CardRelation(const QString &_name, CardRelationType _attachType, diff --git a/cockatrice/src/card/card_set.cpp b/cockatrice/libs/card/src/card_set/card_set.cpp similarity index 97% rename from cockatrice/src/card/card_set.cpp rename to cockatrice/libs/card/src/card_set/card_set.cpp index 89bc0f6e5..99acfc85e 100644 --- a/cockatrice/src/card/card_set.cpp +++ b/cockatrice/libs/card/src/card_set/card_set.cpp @@ -1,6 +1,6 @@ -#include "card_set.h" +#include "card/card_set/card_set.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" const char *CardSet::TOKENS_SETNAME = "TK"; diff --git a/cockatrice/src/card/card_set_list.cpp b/cockatrice/libs/card/src/card_set/card_set_list.cpp similarity index 98% rename from cockatrice/src/card/card_set_list.cpp rename to cockatrice/libs/card/src/card_set/card_set_list.cpp index 8d6aa7365..1324f94dd 100644 --- a/cockatrice/src/card/card_set_list.cpp +++ b/cockatrice/libs/card/src/card_set/card_set_list.cpp @@ -1,4 +1,4 @@ -#include "card_set_list.h" +#include "card/card_set/card_set_list.h" class CardSetList::KeyCompareFunctor { diff --git a/cockatrice/libs/settings/CMakeLists.txt b/cockatrice/libs/settings/CMakeLists.txt new file mode 100644 index 000000000..b37d20213 --- /dev/null +++ b/cockatrice/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 + 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 + ${MOC_SOURCES} +) + +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/cockatrice/src/settings/cache_settings.h b/cockatrice/libs/settings/include/settings/cache_settings.h similarity index 99% rename from cockatrice/src/settings/cache_settings.h rename to cockatrice/libs/settings/include/settings/cache_settings.h index 93cd5a837..3c27dbd92 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/libs/settings/include/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.h b/cockatrice/libs/settings/include/settings/card_counter_settings.h similarity index 100% rename from cockatrice/src/settings/card_counter_settings.h rename to cockatrice/libs/settings/include/settings/card_counter_settings.h diff --git a/cockatrice/src/settings/card_database_settings.h b/cockatrice/libs/settings/include/settings/card_database_settings.h similarity index 100% rename from cockatrice/src/settings/card_database_settings.h rename to cockatrice/libs/settings/include/settings/card_database_settings.h diff --git a/cockatrice/src/settings/card_override_settings.h b/cockatrice/libs/settings/include/settings/card_override_settings.h similarity index 100% rename from cockatrice/src/settings/card_override_settings.h rename to cockatrice/libs/settings/include/settings/card_override_settings.h diff --git a/cockatrice/src/settings/debug_settings.h b/cockatrice/libs/settings/include/settings/debug_settings.h similarity index 100% rename from cockatrice/src/settings/debug_settings.h rename to cockatrice/libs/settings/include/settings/debug_settings.h diff --git a/cockatrice/src/settings/download_settings.h b/cockatrice/libs/settings/include/settings/download_settings.h similarity index 100% rename from cockatrice/src/settings/download_settings.h rename to cockatrice/libs/settings/include/settings/download_settings.h diff --git a/cockatrice/src/settings/game_filters_settings.h b/cockatrice/libs/settings/include/settings/game_filters_settings.h similarity index 100% rename from cockatrice/src/settings/game_filters_settings.h rename to cockatrice/libs/settings/include/settings/game_filters_settings.h diff --git a/cockatrice/src/settings/layouts_settings.h b/cockatrice/libs/settings/include/settings/layouts_settings.h similarity index 100% rename from cockatrice/src/settings/layouts_settings.h rename to cockatrice/libs/settings/include/settings/layouts_settings.h diff --git a/cockatrice/src/settings/message_settings.h b/cockatrice/libs/settings/include/settings/message_settings.h similarity index 100% rename from cockatrice/src/settings/message_settings.h rename to cockatrice/libs/settings/include/settings/message_settings.h diff --git a/cockatrice/src/settings/recents_settings.h b/cockatrice/libs/settings/include/settings/recents_settings.h similarity index 100% rename from cockatrice/src/settings/recents_settings.h rename to cockatrice/libs/settings/include/settings/recents_settings.h diff --git a/cockatrice/src/settings/servers_settings.h b/cockatrice/libs/settings/include/settings/servers_settings.h similarity index 100% rename from cockatrice/src/settings/servers_settings.h rename to cockatrice/libs/settings/include/settings/servers_settings.h diff --git a/cockatrice/src/settings/settings_manager.h b/cockatrice/libs/settings/include/settings/settings_manager.h similarity index 100% rename from cockatrice/src/settings/settings_manager.h rename to cockatrice/libs/settings/include/settings/settings_manager.h diff --git a/cockatrice/src/settings/shortcut_treeview.h b/cockatrice/libs/settings/include/settings/shortcut_treeview.h similarity index 100% rename from cockatrice/src/settings/shortcut_treeview.h rename to cockatrice/libs/settings/include/settings/shortcut_treeview.h diff --git a/cockatrice/src/settings/shortcuts_settings.h b/cockatrice/libs/settings/include/settings/shortcuts_settings.h similarity index 100% rename from cockatrice/src/settings/shortcuts_settings.h rename to cockatrice/libs/settings/include/settings/shortcuts_settings.h diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/libs/settings/src/cache_settings.cpp similarity index 99% rename from cockatrice/src/settings/cache_settings.cpp rename to cockatrice/libs/settings/src/cache_settings.cpp index 942881958..c3e15c530 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/libs/settings/src/cache_settings.cpp @@ -1,8 +1,8 @@ -#include "cache_settings.h" +#include "../include/settings/cache_settings.h" -#include "../client/network/release_channel.h" -#include "card_counter_settings.h" -#include "card_override_settings.h" +#include "../include/settings/card_counter_settings.h" +#include "../include/settings/card_override_settings.h" +#include "release_channel.h" #include #include diff --git a/cockatrice/src/settings/card_counter_settings.cpp b/cockatrice/libs/settings/src/card_counter_settings.cpp similarity index 96% rename from cockatrice/src/settings/card_counter_settings.cpp rename to cockatrice/libs/settings/src/card_counter_settings.cpp index d22eb239f..ae17a605e 100644 --- a/cockatrice/src/settings/card_counter_settings.cpp +++ b/cockatrice/libs/settings/src/card_counter_settings.cpp @@ -1,4 +1,4 @@ -#include "card_counter_settings.h" +#include "../include/settings/card_counter_settings.h" #include #include diff --git a/cockatrice/src/settings/card_database_settings.cpp b/cockatrice/libs/settings/src/card_database_settings.cpp similarity index 94% rename from cockatrice/src/settings/card_database_settings.cpp rename to cockatrice/libs/settings/src/card_database_settings.cpp index f0b8d58b1..eac8ae11c 100644 --- a/cockatrice/src/settings/card_database_settings.cpp +++ b/cockatrice/libs/settings/src/card_database_settings.cpp @@ -1,4 +1,4 @@ -#include "card_database_settings.h" +#include "../include/settings/card_database_settings.h" CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardDatabase.ini", parent) diff --git a/cockatrice/src/settings/card_override_settings.cpp b/cockatrice/libs/settings/src/card_override_settings.cpp similarity index 90% rename from cockatrice/src/settings/card_override_settings.cpp rename to cockatrice/libs/settings/src/card_override_settings.cpp index 2e2c7607d..a23ab75c5 100644 --- a/cockatrice/src/settings/card_override_settings.cpp +++ b/cockatrice/libs/settings/src/card_override_settings.cpp @@ -1,4 +1,4 @@ -#include "card_override_settings.h" +#include "../include/settings/card_override_settings.h" CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent) diff --git a/cockatrice/src/settings/debug_settings.cpp b/cockatrice/libs/settings/src/debug_settings.cpp similarity index 94% rename from cockatrice/src/settings/debug_settings.cpp rename to cockatrice/libs/settings/src/debug_settings.cpp index f6f12f60e..cb20f3299 100644 --- a/cockatrice/src/settings/debug_settings.cpp +++ b/cockatrice/libs/settings/src/debug_settings.cpp @@ -1,4 +1,4 @@ -#include "debug_settings.h" +#include "../include/settings/debug_settings.h" #include diff --git a/cockatrice/src/settings/download_settings.cpp b/cockatrice/libs/settings/src/download_settings.cpp similarity index 90% rename from cockatrice/src/settings/download_settings.cpp rename to cockatrice/libs/settings/src/download_settings.cpp index adbe26363..02dcfca00 100644 --- a/cockatrice/src/settings/download_settings.cpp +++ b/cockatrice/libs/settings/src/download_settings.cpp @@ -1,6 +1,6 @@ -#include "download_settings.h" +#include "../include/settings/download_settings.h" -#include "settings_manager.h" +#include "../include/settings/settings_manager.h" const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = { "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!", diff --git a/cockatrice/src/settings/game_filters_settings.cpp b/cockatrice/libs/settings/src/game_filters_settings.cpp similarity index 99% rename from cockatrice/src/settings/game_filters_settings.cpp rename to cockatrice/libs/settings/src/game_filters_settings.cpp index e82b18a47..8131cfda1 100644 --- a/cockatrice/src/settings/game_filters_settings.cpp +++ b/cockatrice/libs/settings/src/game_filters_settings.cpp @@ -1,4 +1,4 @@ -#include "game_filters_settings.h" +#include "../include/settings/game_filters_settings.h" #include #include diff --git a/cockatrice/src/settings/layouts_settings.cpp b/cockatrice/libs/settings/src/layouts_settings.cpp similarity index 99% rename from cockatrice/src/settings/layouts_settings.cpp rename to cockatrice/libs/settings/src/layouts_settings.cpp index 5791cbfe9..15f6fcab1 100644 --- a/cockatrice/src/settings/layouts_settings.cpp +++ b/cockatrice/libs/settings/src/layouts_settings.cpp @@ -1,4 +1,4 @@ -#include "layouts_settings.h" +#include "../include/settings/layouts_settings.h" LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "layouts.ini", parent) diff --git a/cockatrice/src/settings/message_settings.cpp b/cockatrice/libs/settings/src/message_settings.cpp similarity index 92% rename from cockatrice/src/settings/message_settings.cpp rename to cockatrice/libs/settings/src/message_settings.cpp index 786ea9cd1..c9e211ac8 100644 --- a/cockatrice/src/settings/message_settings.cpp +++ b/cockatrice/libs/settings/src/message_settings.cpp @@ -1,4 +1,4 @@ -#include "message_settings.h" +#include "../include/settings/message_settings.h" MessageSettings::MessageSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "messages.ini", parent) diff --git a/cockatrice/src/settings/recents_settings.cpp b/cockatrice/libs/settings/src/recents_settings.cpp similarity index 95% rename from cockatrice/src/settings/recents_settings.cpp rename to cockatrice/libs/settings/src/recents_settings.cpp index 5bbec3c8c..f51d77589 100644 --- a/cockatrice/src/settings/recents_settings.cpp +++ b/cockatrice/libs/settings/src/recents_settings.cpp @@ -1,4 +1,4 @@ -#include "recents_settings.h" +#include "../include/settings/recents_settings.h" #define MAX_RECENT_DECK_COUNT 10 diff --git a/cockatrice/src/settings/servers_settings.cpp b/cockatrice/libs/settings/src/servers_settings.cpp similarity index 99% rename from cockatrice/src/settings/servers_settings.cpp rename to cockatrice/libs/settings/src/servers_settings.cpp index 01a6c795b..a1b0e739c 100644 --- a/cockatrice/src/settings/servers_settings.cpp +++ b/cockatrice/libs/settings/src/servers_settings.cpp @@ -1,4 +1,4 @@ -#include "servers_settings.h" +#include "../include/settings/servers_settings.h" #include #include diff --git a/cockatrice/src/settings/settings_manager.cpp b/cockatrice/libs/settings/src/settings_manager.cpp similarity index 97% rename from cockatrice/src/settings/settings_manager.cpp rename to cockatrice/libs/settings/src/settings_manager.cpp index dc2da741e..a76da4ffb 100644 --- a/cockatrice/src/settings/settings_manager.cpp +++ b/cockatrice/libs/settings/src/settings_manager.cpp @@ -1,4 +1,4 @@ -#include "settings_manager.h" +#include "../include/settings/settings_manager.h" SettingsManager::SettingsManager(const QString &settingPath, QObject *parent) : QObject(parent), settings(settingPath, QSettings::IniFormat) diff --git a/cockatrice/src/settings/shortcut_treeview.cpp b/cockatrice/libs/settings/src/shortcut_treeview.cpp similarity index 97% rename from cockatrice/src/settings/shortcut_treeview.cpp rename to cockatrice/libs/settings/src/shortcut_treeview.cpp index 6b329b23d..4fa64151f 100644 --- a/cockatrice/src/settings/shortcut_treeview.cpp +++ b/cockatrice/libs/settings/src/shortcut_treeview.cpp @@ -1,7 +1,7 @@ -#include "shortcut_treeview.h" +#include "../include/settings/shortcut_treeview.h" -#include "cache_settings.h" -#include "shortcuts_settings.h" +#include "../include/settings/cache_settings.h" +#include "../include/settings/shortcuts_settings.h" #include diff --git a/cockatrice/src/settings/shortcuts_settings.cpp b/cockatrice/libs/settings/src/shortcuts_settings.cpp similarity index 99% rename from cockatrice/src/settings/shortcuts_settings.cpp rename to cockatrice/libs/settings/src/shortcuts_settings.cpp index 53c6f6a23..07542d303 100644 --- a/cockatrice/src/settings/shortcuts_settings.cpp +++ b/cockatrice/libs/settings/src/shortcuts_settings.cpp @@ -1,4 +1,4 @@ -#include "shortcuts_settings.h" +#include "../include/settings/shortcuts_settings.h" #include #include diff --git a/cockatrice/libs/utility/CMakeLists.txt b/cockatrice/libs/utility/CMakeLists.txt new file mode 100644 index 000000000..e896e9a82 --- /dev/null +++ b/cockatrice/libs/utility/CMakeLists.txt @@ -0,0 +1,32 @@ +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} +) \ No newline at end of file diff --git a/cockatrice/src/utility/key_signals.h b/cockatrice/libs/utility/include/utility/key_signals.h similarity index 100% rename from cockatrice/src/utility/key_signals.h rename to cockatrice/libs/utility/include/utility/key_signals.h diff --git a/cockatrice/src/utility/levenshtein.h b/cockatrice/libs/utility/include/utility/levenshtein.h similarity index 100% rename from cockatrice/src/utility/levenshtein.h rename to cockatrice/libs/utility/include/utility/levenshtein.h diff --git a/cockatrice/src/utility/logger.h b/cockatrice/libs/utility/include/utility/logger.h similarity index 100% rename from cockatrice/src/utility/logger.h rename to cockatrice/libs/utility/include/utility/logger.h diff --git a/cockatrice/src/utility/macros.h b/cockatrice/libs/utility/include/utility/macros.h similarity index 100% rename from cockatrice/src/utility/macros.h rename to cockatrice/libs/utility/include/utility/macros.h diff --git a/cockatrice/src/utility/key_signals.cpp b/cockatrice/libs/utility/src/key_signals.cpp similarity index 98% rename from cockatrice/src/utility/key_signals.cpp rename to cockatrice/libs/utility/src/key_signals.cpp index b4a38fad5..d9af6dd68 100644 --- a/cockatrice/src/utility/key_signals.cpp +++ b/cockatrice/libs/utility/src/key_signals.cpp @@ -1,4 +1,4 @@ -#include "key_signals.h" +#include "../include/utility/key_signals.h" #include diff --git a/cockatrice/src/utility/levenshtein.cpp b/cockatrice/libs/utility/src/levenshtein.cpp similarity index 93% rename from cockatrice/src/utility/levenshtein.cpp rename to cockatrice/libs/utility/src/levenshtein.cpp index cfb972f91..a68b1da61 100644 --- a/cockatrice/src/utility/levenshtein.cpp +++ b/cockatrice/libs/utility/src/levenshtein.cpp @@ -1,4 +1,4 @@ -#include "levenshtein.h" +#include "../include/utility/levenshtein.h" #include #include diff --git a/cockatrice/src/utility/logger.cpp b/cockatrice/libs/utility/src/logger.cpp similarity index 99% rename from cockatrice/src/utility/logger.cpp rename to cockatrice/libs/utility/src/logger.cpp index 0184146ae..55c6d4d2b 100644 --- a/cockatrice/src/utility/logger.cpp +++ b/cockatrice/libs/utility/src/logger.cpp @@ -1,4 +1,4 @@ -#include "logger.h" +#include "../include/utility/logger.h" #include "version_string.h" diff --git a/cockatrice/src/client/deck_editor_menu.cpp b/cockatrice/src/client/deck_editor_menu.cpp index b3c46d003..c012f9761 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 "settings/cache_settings.h" +#include "settings/shortcuts_settings.h" DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent) { diff --git a/cockatrice/src/client/network/client_update_checker.cpp b/cockatrice/src/client/network/client_update_checker.cpp index 23c52d08d..ccb6d2034 100644 --- a/cockatrice/src/client/network/client_update_checker.cpp +++ b/cockatrice/src/client/network/client_update_checker.cpp @@ -1,7 +1,7 @@ #include "client_update_checker.h" -#include "../../settings/cache_settings.h" #include "release_channel.h" +#include "settings/cache_settings.h" 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..26176d04d 100644 --- a/cockatrice/src/client/network/replay_timeline_widget.cpp +++ b/cockatrice/src/client/network/replay_timeline_widget.cpp @@ -1,6 +1,6 @@ #include "replay_timeline_widget.h" -#include "../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/network/sets_model.h b/cockatrice/src/client/network/sets_model.h index d341440d7..1c973b055 100644 --- a/cockatrice/src/client/network/sets_model.h +++ b/cockatrice/src/client/network/sets_model.h @@ -7,7 +7,7 @@ #ifndef SETSMODEL_H #define SETSMODEL_H -#include "../../database/card_database.h" +#include "card/card_database/card_database.h" #include #include diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp index 68fdc4c4c..9772bebc2 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/spoiler_background_updater.cpp @@ -1,10 +1,10 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index fef2df093..31cb2a35e 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -1,6 +1,6 @@ #include "sound_engine.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index 43e5cdea3..bc5988b4a 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,7 +7,7 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H -#include "../database/card_database.h" +#include "card/card_database/card_database.h" #include "deck_list.h" #include diff --git a/cockatrice/src/deck/custom_line_edit.cpp b/cockatrice/src/deck/custom_line_edit.cpp index ba521c0fd..58561f019 100644 --- a/cockatrice/src/deck/custom_line_edit.cpp +++ b/cockatrice/src/deck/custom_line_edit.cpp @@ -1,7 +1,7 @@ #include "custom_line_edit.h" -#include "../settings/cache_settings.h" -#include "../settings/shortcuts_settings.h" +#include "settings/cache_settings.h" +#include "settings/shortcuts_settings.h" #include #include diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index 4ff16378c..a6bc1d402 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/cockatrice/src/deck/deck_list_model.cpp @@ -1,9 +1,9 @@ #include "deck_list_model.h" -#include "../database/card_database_manager.h" #include "../main.h" -#include "../settings/cache_settings.h" +#include "card/card_database/card_database_manager.h" #include "deck_loader.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index 28d95a632..4d706a136 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,8 +1,8 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "../card/exact_card.h" #include "abstract_deck_list_card_node.h" +#include "card/card_printing/exact_card.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 8e98422a6..cc3d8f122 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,8 +1,8 @@ #include "deck_loader.h" -#include "../database/card_database.h" -#include "../database/card_database_manager.h" #include "../main.h" +#include "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" #include "deck_list.h" #include "deck_list_card_node.h" diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index 8a76b35fc..af8b9a879 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -7,7 +7,7 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H -#include "../database/card_database.h" +#include "card/card_database/card_database.h" #include "deck_list.h" #include diff --git a/cockatrice/src/dialogs/dlg_connect.cpp b/cockatrice/src/dialogs/dlg_connect.cpp index d8cf11487..168bd9aa3 100644 --- a/cockatrice/src/dialogs/dlg_connect.cpp +++ b/cockatrice/src/dialogs/dlg_connect.cpp @@ -1,6 +1,6 @@ #include "dlg_connect.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h index b2afbef4d..406410b89 100644 --- a/cockatrice/src/dialogs/dlg_connect.h +++ b/cockatrice/src/dialogs/dlg_connect.h @@ -9,7 +9,7 @@ #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" -#include "../utility/macros.h" +#include "utility/macros.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index 81b233dcb..e0a3eaecb 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,9 +1,9 @@ #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 "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/dialogs/dlg_create_game.h index ac7592b94..f9420ca1c 100644 --- a/cockatrice/src/dialogs/dlg_create_game.h +++ b/cockatrice/src/dialogs/dlg_create_game.h @@ -7,7 +7,7 @@ #ifndef DLG_CREATEGAME_H #define DLG_CREATEGAME_H -#include "../utility/macros.h" +#include "utility/macros.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp index fbd737d4a..c5ec95a98 100644 --- a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp +++ b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp @@ -1,6 +1,6 @@ #include "dlg_default_tags_editor.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp index bea94ae08..0015b9175 100644 --- a/cockatrice/src/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/dialogs/dlg_edit_password.cpp @@ -1,6 +1,6 @@ #include "dlg_edit_password.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index 56711dda6..e9ab4f7b1 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -1,11 +1,11 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" +#include "card/card_database/model/card_database_model.h" +#include "card/card_database/model/token/token_edit_model.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h index ce3f6d7d4..93f089bfe 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.h +++ b/cockatrice/src/dialogs/dlg_edit_tokens.h @@ -7,7 +7,7 @@ #ifndef DLG_EDIT_TOKENS_H #define DLG_EDIT_TOKENS_H -#include "../card/card_info.h" +#include "card/card_info.h" #include diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp index 7b2af1445..6df7b4b5d 100644 --- a/cockatrice/src/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/dialogs/dlg_edit_user.cpp @@ -1,6 +1,6 @@ #include "dlg_edit_user.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp index 4ff237edf..d21087e2b 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp @@ -1,6 +1,6 @@ #include "dlg_forgot_password_challenge.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp index a07bda279..9ac665a44 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp @@ -1,6 +1,6 @@ #include "dlg_forgot_password_request.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp index 81ab96b9b..ad40cc5fc 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp @@ -1,6 +1,6 @@ #include "dlg_forgot_password_reset.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp index 91252a768..3a77fc216 100644 --- a/cockatrice/src/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck.cpp @@ -1,7 +1,7 @@ #include "dlg_load_deck.h" #include "../deck/deck_loader.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" 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..f2b514fa4 100644 --- a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp @@ -1,8 +1,8 @@ #include "dlg_load_deck_from_clipboard.h" #include "../deck/deck_loader.h" -#include "../settings/cache_settings.h" #include "dlg_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index 890afc075..41a21a67f 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -1,11 +1,11 @@ #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 "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include #include @@ -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..874c1d0b5 100644 --- a/cockatrice/src/dialogs/dlg_register.cpp +++ b/cockatrice/src/dialogs/dlg_register.cpp @@ -1,7 +1,7 @@ #include "dlg_register.h" -#include "../settings/cache_settings.h" #include "pb/serverinfo_user.pb.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 9f20067b2..c142ec3a2 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -1,9 +1,9 @@ #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" +#include "card/card_database/card_database_manager.h" #include "dlg_select_set_for_cards.h" #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 6948a8e8b..37e106fc4 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -4,18 +4,18 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" +#include "settings/card_counter_settings.h" +#include "settings/shortcut_treeview.h" #include #include @@ -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..5519493a9 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -7,7 +7,7 @@ #ifndef DLG_SETTINGS_H #define DLG_SETTINGS_H -#include "../utility/macros.h" +#include "utility/macros.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/dialogs/dlg_startup_card_check.cpp index 5d76bc253..7c2b73042 100644 --- a/cockatrice/src/dialogs/dlg_startup_card_check.cpp +++ b/cockatrice/src/dialogs/dlg_startup_card_check.cpp @@ -1,6 +1,6 @@ #include "dlg_startup_card_check.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp index eb8e8dc47..10240d6bc 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp @@ -1,6 +1,6 @@ #include "dlg_tip_of_the_day.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "tip_of_the_day.h" #include diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp index 0edcb1512..eb8913525 100644 --- a/cockatrice/src/dialogs/dlg_update.cpp +++ b/cockatrice/src/dialogs/dlg_update.cpp @@ -3,7 +3,7 @@ #include "../client/network/client_update_checker.h" #include "../client/network/release_channel.h" #include "../interface/window_main.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_view_log.cpp b/cockatrice/src/dialogs/dlg_view_log.cpp index b60a9767b..1ec25d139 100644 --- a/cockatrice/src/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/dialogs/dlg_view_log.cpp @@ -1,7 +1,7 @@ #include "dlg_view_log.h" -#include "../settings/cache_settings.h" -#include "../utility/logger.h" +#include "settings/cache_settings.h" +#include "utility/logger.h" #include #include diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index f107884c3..c9d919043 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,6 +1,6 @@ #include "deck_filter_string.h" -#include "../database/card_database_manager.h" +#include "card/card_database/card_database_manager.h" #include "filter_string.h" #include "lib/peglib.h" diff --git a/cockatrice/src/filters/filter_string.h b/cockatrice/src/filters/filter_string.h index f2b8ce006..3502c6ea9 100644 --- a/cockatrice/src/filters/filter_string.h +++ b/cockatrice/src/filters/filter_string.h @@ -7,7 +7,7 @@ #ifndef FILTER_STRING_H #define FILTER_STRING_H -#include "../card/card_info.h" +#include "card/card_info.h" #include "filter_tree.h" #include diff --git a/cockatrice/src/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h index 40a6ec54c..3f3855a4d 100644 --- a/cockatrice/src/filters/filter_tree.h +++ b/cockatrice/src/filters/filter_tree.h @@ -7,7 +7,7 @@ #ifndef FILTERTREE_H #define FILTERTREE_H -#include "../database/card_database.h" +#include "card/card_database/card_database.h" #include "filter_card.h" #include diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp index d7b0b7d46..d773b34a9 100644 --- a/cockatrice/src/game/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -1,6 +1,6 @@ #include "abstract_card_drag_item.h" -#include "../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index ea23f39c0..c673b1fc6 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -1,10 +1,10 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include #include @@ -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..2e95d366a 100644 --- a/cockatrice/src/game/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -7,8 +7,8 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H -#include "../../card/exact_card.h" #include "arrow_target.h" +#include "card/card_printing/exact_card.h" #include "card_ref.h" #include "graphics_item_type.h" diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index c821dc4f8..5ad983b05 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,11 +1,11 @@ #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 "settings/cache_settings.h" #include "translate_counter_name.h" #include diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index 819fb7927..b32ce6569 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -1,16 +1,16 @@ #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/card_info.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 "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index da347098f..93a635576 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" @@ -11,8 +8,11 @@ #include "../zones/table_zone.h" #include "../zones/view_zone.h" #include "arrow_item.h" +#include "card/card_info.h" #include "card_drag_item.h" #include "pb/serverinfo_card.pb.h" +#include "settings/cache_settings.h" +#include "settings/card_counter_settings.h" #include #include diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp index 7ad9048c3..391a96ad3 100644 --- a/cockatrice/src/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,6 +1,6 @@ #include "card_list.h" -#include "../../card/card_info.h" +#include "card/card_info.h" #include "card_item.h" #include diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index 46b1cc524..1a6a4689d 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,10 +1,10 @@ #include "deck_view.h" -#include "../../card/card_info.h" #include "../../interface/theme_manager.h" -#include "../../settings/cache_settings.h" +#include "card/card_info.h" #include "deck_list.h" #include "deck_list_card_node.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 7dd2da41b..b1740e59d 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,23 +1,23 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.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 "settings/cache_settings.h" #include "trice_limits.h" #include @@ -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..92a7889bb 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -1,12 +1,12 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_database/model/card_database_model.h" +#include "card/card_database/model/token/token_display_model.h" #include "deck_list.h" +#include "settings/cache_settings.h" #include "trice_limits.h" #include 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..cf00eeb95 100644 --- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp @@ -1,8 +1,8 @@ #include "dlg_move_top_cards_until.h" -#include "../../database/card_database.h" -#include "../../database/card_database_manager.h" #include "../../filters/filter_string.h" +#include "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" #include #include diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index 4316e67bf..7e0d37f3f 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,10 +1,10 @@ #include "game_scene.h" -#include "../settings/cache_settings.h" #include "board/card_item.h" #include "phases_toolbar.h" #include "player/player.h" #include "player/player_graphics_item.h" +#include "settings/cache_settings.h" #include "zones/view_zone.h" #include "zones/view_zone_widget.h" diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp index 969e26e14..a7f8ccd41 100644 --- a/cockatrice/src/game/game_view.cpp +++ b/cockatrice/src/game/game_view.cpp @@ -1,7 +1,7 @@ #include "game_view.h" -#include "../settings/cache_settings.h" #include "game_scene.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp index ed8a4e49c..2614c175a 100644 --- a/cockatrice/src/game/log/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -1,7 +1,6 @@ #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" @@ -11,6 +10,7 @@ #include "pb/context_move_card.pb.h" #include "pb/context_mulligan.pb.h" #include "pb/serverinfo_user.pb.h" +#include "settings/card_counter_settings.h" #include diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 22cc86597..84ad32886 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -1,16 +1,16 @@ #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" #include "../card_menu_action_type.h" #include "../player.h" #include "../player_actions.h" +#include "card/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" #include "move_menu.h" #include "pt_menu.h" +#include "settings/card_counter_settings.h" CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive) : player(_player), card(_card), shortcutsActive(_shortcutsActive) diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index 7298d3ca9..873379683 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,12 +1,12 @@ #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" #include "../card_menu_action_type.h" #include "../player_actions.h" +#include "card/card_database/card_database_manager.h" #include "card_menu.h" #include "hand_menu.h" diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp index 3598a1c66..d24a82565 100644 --- a/cockatrice/src/game/player/menu/say_menu.cpp +++ b/cockatrice/src/game/player/menu/say_menu.cpp @@ -1,8 +1,8 @@ #include "say_menu.h" -#include "../../../settings/cache_settings.h" #include "../player.h" #include "../player_actions.h" +#include "settings/cache_settings.h" SayMenu::SayMenu(Player *_player) : player(_player) { diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 8047f514e..94c910580 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -7,11 +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 "card/card_info.h" #include "menu/player_menu.h" #include "pb/card_attributes.pb.h" #include "pb/game_event.pb.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index b74db09ce..a910cf72a 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,14 +1,14 @@ #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/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" #include "card_menu_action_type.h" #include "pb/command_attach_card.pb.h" #include "pb/command_change_zone_properties.pb.h" diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h index 02991b60b..fcac5d1c4 100644 --- a/cockatrice/src/game/player/player_actions.h +++ b/cockatrice/src/game/player/player_actions.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_PLAYER_ACTIONS_H #define COCKATRICE_PLAYER_ACTIONS_H -#include "../../card/card_relation_type.h" +#include "card/card_relation/card_relation_type.h" #include "event_processing_options.h" #include "player.h" diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index 19ea272b2..d00214774 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -1,11 +1,11 @@ #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 "settings/cache_settings.h" #include diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index 70cb21b8e..c1fca132a 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -1,10 +1,10 @@ #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 "card/card_database/card_database_manager.h" #include "pb/command_move_card.pb.h" #include "pb/serverinfo_user.pb.h" #include "view_zone_logic.h" diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp index 6050cbadf..fab157b0b 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -1,7 +1,7 @@ #include "view_zone_logic.h" -#include "../../../settings/cache_settings.h" #include "../../board/card_item.h" +#include "settings/cache_settings.h" /** * @param _player the player that the cards are revealed to. diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp index 863edab48..e71c572cf 100644 --- a/cockatrice/src/game/zones/select_zone.cpp +++ b/cockatrice/src/game/zones/select_zone.cpp @@ -1,8 +1,8 @@ #include "select_zone.h" -#include "../../settings/cache_settings.h" #include "../board/card_item.h" #include "../game_scene.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 0eedd5500..3cf1fff9b 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -1,13 +1,13 @@ #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 "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index 4573cc5c3..2c7287e35 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,15 +1,15 @@ #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 "card/card_info.h" #include "logic/table_zone_logic.h" #include "pb/command_move_card.pb.h" #include "pb/command_set_card_attr.pb.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 1eb99f5c1..7fdc5a1fe 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -1,10 +1,10 @@ #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 "card/card_info.h" #include "logic/view_zone_logic.h" #include "pb/command_dump_zone.pb.h" #include "pb/command_move_card.pb.h" @@ -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_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index f0615d256..1b8ca1f02 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -2,11 +2,11 @@ #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 "settings/cache_settings.h" #include "view_zone.h" #include diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h index 862026b21..97ebc97f9 100644 --- a/cockatrice/src/game/zones/view_zone_widget.h +++ b/cockatrice/src/game/zones/view_zone_widget.h @@ -7,8 +7,8 @@ #ifndef ZONEVIEWWIDGET_H #define ZONEVIEWWIDGET_H -#include "../../utility/macros.h" #include "logic/card_zone_logic.h" +#include "utility/macros.h" #include #include 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..c86768f3a 100644 --- a/cockatrice/src/picture_loader/picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,6 +1,6 @@ -#include "picture_loader.h" +#include "card_picture_loader.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include @@ -22,43 +22,45 @@ // 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 +68,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 +90,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 +111,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 +129,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 +144,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 +167,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 +175,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 +204,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 54% rename from cockatrice/src/picture_loader/picture_loader.h rename to cockatrice/src/interface/card_picture_loader/card_picture_loader.h index 05a82f708..964d08bcc 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/card_info.h" +#include "card_picture_loader_status_bar.h" +#include "card_picture_loader_worker.h" #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 78% 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..97d3eac1d 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/card_database/card_database_manager.h" +#include "card_picture_to_load.h" +#include "settings/cache_settings.h" #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 79% 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..919fde45c 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,24 @@ #ifndef PICTURE_LOADER_LOCAL_H #define PICTURE_LOADER_LOCAL_H -#include "../card/exact_card.h" +#include "card/card_printing/exact_card.h" #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..aae76c858 100644 --- a/cockatrice/src/picture_loader/picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -1,9 +1,9 @@ -#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/card_database/card_database_manager.h" +#include "card_picture_loader_local.h" +#include "card_picture_loader_worker_work.h" +#include "settings/cache_settings.h" #include #include @@ -14,7 +14,7 @@ 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 68% 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..9fdd387a8 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,11 @@ #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/card_database/card_database.h" +#include "card/card_info.h" +#include "card_picture_loader_local.h" +#include "card_picture_loader_worker_work.h" +#include "card_picture_to_load.h" #include #include @@ -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..fbbecbd51 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,8 @@ -#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/card_database/card_database_manager.h" +#include "card_picture_loader_worker.h" +#include "settings/cache_settings.h" #include #include @@ -16,15 +16,18 @@ // 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 75% 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..3e84a1d48 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,9 +7,9 @@ #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/card_database/card_database.h" +#include "card_picture_loader_worker.h" +#include "card_picture_to_load.h" #include #include @@ -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..d6cfd09d0 100644 --- a/cockatrice/src/picture_loader/picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -1,7 +1,7 @@ -#include "picture_to_load.h" +#include "card_picture_to_load.h" -#include "../settings/cache_settings.h" -#include "../utility/card_set_comparator.h" +#include "card/card_set/card_set_comparator.h" +#include "settings/cache_settings.h" #include #include @@ -9,7 +9,7 @@ #include #include -PictureToLoad::PictureToLoad(const ExactCard &_card) +CardPictureToLoad::CardPictureToLoad(const ExactCard &_card) : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) { if (card) { @@ -25,7 +25,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 +80,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 +113,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 +129,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 +139,7 @@ bool PictureToLoad::nextUrl() return false; } -QString PictureToLoad::getSetName() const +QString CardPictureToLoad::getSetName() const { if (currentSet) { return currentSet->getCorrectedShortName(); @@ -185,7 +185,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 +193,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 +208,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 +225,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 +279,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 77% 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..a447c95ac 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,13 @@ #ifndef PICTURE_TO_LOAD_H #define PICTURE_TO_LOAD_H -#include "../card/exact_card.h" +#include "card/card_printing/exact_card.h" #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 +24,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/tearoff_menu.h b/cockatrice/src/interface/tearoff_menu.h index 30a2542e4..b74340b4c 100644 --- a/cockatrice/src/interface/tearoff_menu.h +++ b/cockatrice/src/interface/tearoff_menu.h @@ -6,7 +6,7 @@ #pragma once -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index 58a411c99..915793010 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,6 +1,6 @@ #include "theme_manager.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include 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 93% 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..0eee7e955 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,7 +7,7 @@ #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 "card/card_database/card_database_manager.h" #include 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..f8fa3235d 100644 --- a/cockatrice/src/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/utility/sequence_edit.cpp @@ -1,6 +1,6 @@ #include "sequence_edit.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include 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..be1094e28 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,7 +1,7 @@ #include "color_identity_widget.h" -#include "../../../../settings/cache_settings.h" #include "mana_symbol_widget.h" +#include "settings/cache_settings.h" #include #include 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..edbd01751 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,7 +7,7 @@ #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H -#include "../../../../card/card_info.h" +#include "card/card_info.h" #include #include 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..ab262b2d8 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,7 +7,7 @@ #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H -#include "../../../../card/card_info.h" +#include "card/card_info.h" #include #include 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..ae99472d0 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,6 +1,6 @@ #include "mana_symbol_widget.h" -#include "../../../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include 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..d188d15f1 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,10 +1,10 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_info_comparator.h" #include 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..222502b53 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,11 +7,11 @@ #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" #include "../card_size_widget.h" +#include "card/card_info.h" #include #include 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..2ff2963d8 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_info_comparator.h" #include #include 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..37fc68bda 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_info_comparator.h" #include 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..dfbb4e079 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp @@ -1,8 +1,8 @@ #include "card_info_display_widget.h" -#include "../../../database/card_database_manager.h" #include "../../../game/board/card_item.h" #include "../../../main.h" +#include "card/card_database/card_database_manager.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" 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..e709048f6 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -7,7 +7,7 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H -#include "../../../card/exact_card.h" +#include "card/card_printing/exact_card.h" #include "card_ref.h" #include 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..99d16de82 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,12 +1,12 @@ #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/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" +#include "settings/cache_settings.h" #include #include 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..1e2de3350 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -7,7 +7,7 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include "../../../card/exact_card.h" +#include "card/card_printing/exact_card.h" #include "card_ref.h" #include 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..1c4b76ae0 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,7 +1,7 @@ #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 "settings/cache_settings.h" #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..e246677ee 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,7 +8,7 @@ #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H -#include "../../../card/exact_card.h" +#include "card/card_printing/exact_card.h" #include #include 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..37c8d1cdd 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -1,12 +1,12 @@ #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" +#include "card/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" +#include "settings/cache_settings.h" #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..bbde3caa7 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -7,7 +7,7 @@ #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H -#include "../../../card/exact_card.h" +#include "card/card_printing/exact_card.h" #include "card_info_picture_enlarged_widget.h" #include 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..d4947a58b 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,8 +1,8 @@ #include "card_info_text_widget.h" -#include "../../../card/card_relation.h" -#include "../../../card/game_specific_terms.h" #include "../../../game/board/card_item.h" +#include "card/card_relation/card_relation.h" +#include "card/game_specific_terms.h" #include #include 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..1c362458c 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -7,7 +7,7 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include "../../../card/card_info.h" +#include "card/card_info.h" #include class QLabel; diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp index 2b81b26d5..e058b335a 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -1,8 +1,8 @@ #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 "settings/cache_settings.h" /** * @class CardSizeWidget 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..456aaadcb 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,7 +1,7 @@ #include "deck_card_zone_display_widget.h" #include "../../../deck/deck_list_model.h" -#include "../../../utility/card_info_comparator.h" +#include "card/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" 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..59c3934bc 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,11 +7,11 @@ #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" #include "../visual_deck_editor/visual_deck_editor_widget.h" +#include "card/card_info.h" #include "card_group_display_widgets/card_group_display_widget.h" #include "card_info_picture_with_text_overlay_widget.h" #include "card_size_widget.h" 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..ddd9f52f3 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,6 +1,6 @@ #include "deck_preview_card_picture_widget.h" -#include "../../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include 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..14438e9b2 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -1,10 +1,10 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" #include #include 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..c4004d8d3 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -1,11 +1,11 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" #include #include 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..de9a5e53e 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -1,11 +1,11 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" #include #include 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..1a8442f60 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,12 +1,12 @@ #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" +#include "card/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" +#include "settings/cache_settings.h" #include #include 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..6018aed80 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,11 +8,11 @@ #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 "card/card_database/model/card_database_display_model.h" +#include "card/card_database/model/card_database_model.h" +#include "utility/key_signals.h" #include #include 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..377b2f904 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,7 +1,7 @@ #include "deck_editor_deck_dock_widget.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" +#include "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include #include 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..700d68989 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,11 +8,11 @@ #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 "card/card_info.h" +#include "utility/key_signals.h" #include #include 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..a1c756567 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,9 +1,9 @@ #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 "card/card_database/model/card_database_model.h" +#include "settings/cache_settings.h" #include #include 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..67c965177 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,7 +9,7 @@ #define DECK_EDITOR_FILTER_DOCK_WIDGET_H #include "../../../tabs/abstract_tab_deck_editor.h" -#include "../../../utility/key_signals.h" +#include "utility/key_signals.h" #include #include diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index 50823db4b..8efb8d0cc 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -1,12 +1,12 @@ #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" +#include "card/card_database/card_database_manager.h" #include "home_styled_button.h" +#include "settings/cache_settings.h" #include #include 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..bb3191ad0 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -8,11 +8,11 @@ #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" #include "../general/display/dynamic_font_size_push_button.h" +#include "card/card_info.h" #include #include diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index e49fd2c9d..646f32142 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -1,12 +1,12 @@ #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" #include "printing_selector_card_sorting_widget.h" +#include "settings/cache_settings.h" #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..e31456696 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -7,11 +7,11 @@ #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" #include "../quick_settings/settings_button_widget.h" +#include "card/card_info.h" #include #include 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..284830cc6 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,9 +7,9 @@ #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 "card/card_info.h" #include "printing_selector_card_overlay_widget.h" #include "set_name_and_collectors_number_display_widget.h" 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..2e5a7298b 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,9 +1,9 @@ #include "printing_selector_card_overlay_widget.h" -#include "../../../card/card_relation.h" -#include "../../../database/card_database_manager.h" -#include "../../../settings/cache_settings.h" +#include "card/card_database/card_database_manager.h" +#include "card/card_relation/card_relation.h" #include "printing_selector_card_display_widget.h" +#include "settings/cache_settings.h" #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..7c301b6f6 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,11 +7,11 @@ #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" #include "all_zones_card_amount_widget.h" +#include "card/card_info.h" #include "card_amount_widget.h" #include "set_name_and_collectors_number_display_widget.h" 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..e8e29b783 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 "card/card_set/card_set_comparator.h" +#include "settings/cache_settings.h" 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..81c314746 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,7 +1,7 @@ #include "visual_database_display_filter_save_load_widget.h" #include "../../../filters/filter_tree.h" -#include "../../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "visual_database_filter_display_widget.h" #include 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..517cce5a0 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,8 +1,8 @@ #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 "card/card_database/card_database_manager.h" #include #include 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..3f75e89ee 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include #include 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..8fe36378b 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,8 +1,8 @@ #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" +#include "card/card_database/card_database_manager.h" #include #include 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..f881eafef 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,15 +1,15 @@ #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" +#include "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.h" +#include "card/card_info_comparator.h" +#include "settings/cache_settings.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" 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..2aa1edfcc 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,18 +7,18 @@ #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" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" +#include "card/card_database/card_database.h" +#include "card/card_database/model/card_database_model.h" +#include "utility/key_signals.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" 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..d0e205576 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,6 +1,6 @@ #include "visual_database_filter_display_widget.h" -#include "../../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include 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..c8115233d 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" +#include "settings/cache_settings.h" #include 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..03d4f9d75 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,19 +1,19 @@ #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" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" +#include "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.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/card_database_model.h" +#include "card/card_info_comparator.h" #include #include 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..4cde8058a 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,16 +7,16 @@ #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" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" #include "../quick_settings/settings_button_widget.h" +#include "card/card_database/card_database.h" +#include "card/card_database/model/card/card_completer_proxy_model.h" +#include "card/card_database/model/card_database_display_model.h" +#include "card/card_database/model/card_database_model.h" #include #include 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..43a78618f 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,13 +1,13 @@ #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" #include "deck_preview_tag_dialog.h" #include "deck_preview_tag_display_widget.h" #include "deck_preview_widget.h" +#include "settings/cache_settings.h" #include #include 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..20b2237c7 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,8 +1,8 @@ #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" +#include "settings/cache_settings.h" #include #include 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..532a6b96d 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,8 +1,8 @@ #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 "settings/cache_settings.h" #include #include 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..3c1fe4357 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,10 +1,10 @@ #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 "card/card_database/card_database_manager.h" #include "deck_preview_deck_tags_display_widget.h" +#include "settings/cache_settings.h" #include #include 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..b5f868cf8 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,7 +1,7 @@ #include "visual_deck_storage_folder_display_widget.h" -#include "../../../settings/cache_settings.h" #include "deck_preview/deck_preview_widget.h" +#include "settings/cache_settings.h" #include #include 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..25f55ef69 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,6 +1,6 @@ #include "visual_deck_storage_quick_settings_widget.h" -#include "../../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include "visual_deck_storage_widget.h" #include 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..16b14c496 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,8 +2,8 @@ #include "../../../filters/deck_filter_string.h" #include "../../../filters/syntax_help.h" -#include "../../../settings/cache_settings.h" #include "../../pixel_map_generator.h" +#include "settings/cache_settings.h" #include 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..9c66ff6c9 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 "settings/cache_settings.h" /** * @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..701e48a20 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" #include "deck_preview/deck_preview_widget.h" +#include "settings/cache_settings.h" #include "visual_deck_storage_folder_display_widget.h" #include "visual_deck_storage_search_widget.h" #include "visual_deck_storage_sort_widget.h" diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index f1117c369..476785c3e 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,16 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.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 "settings/cache_settings.h" +#include "utility/logger.h" #include "version_string.h" #include diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index b6a6b3f98..9484db98f 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -2,11 +2,11 @@ #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 "settings/cache_settings.h" #include "user_level.h" #include diff --git a/cockatrice/src/server/games_model.cpp b/cockatrice/src/server/games_model.cpp index 5c336738c..8ecc8c5db 100644 --- a/cockatrice/src/server/games_model.cpp +++ b/cockatrice/src/server/games_model.cpp @@ -1,9 +1,9 @@ #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 "settings/cache_settings.h" #include "user/user_list_manager.h" #include "user/user_list_widget.h" diff --git a/cockatrice/src/server/handle_public_servers.cpp b/cockatrice/src/server/handle_public_servers.cpp index cc44ba262..f5151f121 100644 --- a/cockatrice/src/server/handle_public_servers.cpp +++ b/cockatrice/src/server/handle_public_servers.cpp @@ -1,6 +1,6 @@ #include "handle_public_servers.h" -#include "../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/server/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp index 1d8579c14..39b547a02 100644 --- a/cockatrice/src/server/remote/remote_client.cpp +++ b/cockatrice/src/server/remote/remote_client.cpp @@ -1,7 +1,6 @@ #include "remote_client.h" #include "../../main.h" -#include "../../settings/cache_settings.h" #include "../pending_command.h" #include "debug_pb_message.h" #include "passwordhasher.h" @@ -13,6 +12,7 @@ #include "pb/response_register.pb.h" #include "pb/server_message.pb.h" #include "pb/session_commands.pb.h" +#include "settings/cache_settings.h" #include "version_string.h" #include diff --git a/cockatrice/src/server/user/user_info_connection.cpp b/cockatrice/src/server/user/user_info_connection.cpp index 50ac129a8..0a18adbf2 100644 --- a/cockatrice/src/server/user/user_info_connection.cpp +++ b/cockatrice/src/server/user/user_info_connection.cpp @@ -1,6 +1,6 @@ #include "user_info_connection.h" -#include "../../settings/cache_settings.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index 3bd29b577..a00f9b81f 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,20 +1,20 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_database/model/card_database_model.h" #include "pb/command_deck_upload.pb.h" #include "pb/response.pb.h" +#include "settings/cache_settings.h" #include "tab_supervisor.h" #include "trice_limits.h" @@ -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..cd50ff03f 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" @@ -9,6 +8,7 @@ #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" +#include "card/card_info.h" #include "tab.h" class CardDatabaseModel; @@ -24,6 +24,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..b0278024a 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,7 +1,7 @@ #include "edhrec_api_response_card_details_display_widget.h" -#include "../../../../../database/card_database_manager.h" #include "../../tab_edhrec_main.h" +#include "card/card_database/card_database_manager.h" EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( QWidget *parent, 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..d5edd9dca 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,9 +1,9 @@ #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 "card/card_database/card_database_manager.h" EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h index ac3d7ea11..20803d8a3 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h @@ -7,9 +7,9 @@ #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 "card/card_info.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp index 36089886a..9f1d8cce6 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp @@ -1,14 +1,14 @@ #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" #include "api_response/top_cards/edhrec_top_cards_api_response.h" #include "api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "api_response/top_tags/edhrec_top_tags_api_response.h" +#include "card/card_database/card_database_manager.h" +#include "card/card_database/model/card/card_completer_proxy_model.h" +#include "card/card_database/model/card/card_search_model.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include "display/top_cards/edhrec_top_cards_api_response_display_widget.h" #include "display/top_commander/edhrec_top_commanders_api_response_display_widget.h" diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h index d9b96ac76..fd0f38d0e 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h @@ -7,11 +7,11 @@ #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" #include "../../tab.h" +#include "card/card_database/card_database.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index 1f56f7b7b..5eb856f97 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,7 +11,9 @@ #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 "card/card_database/card_database_manager.h" +#include "card/card_database/model/card_database_model.h" +#include "settings/cache_settings.h" #include "tab_supervisor.h" #include "trice_limits.h" diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h index 078560da1..1d5afbe14 100644 --- a/cockatrice/src/tabs/tab_deck_editor.h +++ b/cockatrice/src/tabs/tab_deck_editor.h @@ -1,10 +1,10 @@ #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 "card/card_info.h" +#include "utility/key_signals.h" class CardDatabaseModel; class CardDatabaseDisplayModel; diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index 898612e6f..f76f74ec6 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -4,7 +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" @@ -14,6 +13,7 @@ #include "pb/response.pb.h" #include "pb/response_deck_download.pb.h" #include "pb/response_deck_upload.pb.h" +#include "settings/cache_settings.h" #include #include diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index a07430dbb..39d86e9fa 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,18 +15,20 @@ #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 "card/card_database/card_database.h" +#include "card/card_database/card_database_manager.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 "settings/cache_settings.h" #include "tab_supervisor.h" #include "trice_limits.h" @@ -740,7 +740,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_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 6b4b7044b..c1ea99a86 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -7,10 +7,10 @@ #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 "settings/cache_settings.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index 2feb41383..b4a086c4b 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -3,7 +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" @@ -14,6 +13,7 @@ #include "pb/response.pb.h" #include "pb/response_replay_download.pb.h" #include "pb/response_replay_get_code.pb.h" +#include "settings/cache_settings.h" #include "tab_game.h" #include diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index ff6507b29..06937ac9d 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -8,7 +8,6 @@ #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" @@ -17,6 +16,7 @@ #include "pb/event_room_say.pb.h" #include "pb/room_commands.pb.h" #include "pb/serverinfo_room.pb.h" +#include "settings/cache_settings.h" #include "tab_account.h" #include "tab_supervisor.h" #include "trice_limits.h" diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp index 78fce4516..f369254b3 100644 --- a/cockatrice/src/tabs/tab_supervisor.cpp +++ b/cockatrice/src/tabs/tab_supervisor.cpp @@ -5,7 +5,6 @@ #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" @@ -16,6 +15,7 @@ #include "pb/room_event.pb.h" #include "pb/serverinfo_room.pb.h" #include "pb/serverinfo_user.pb.h" +#include "settings/cache_settings.h" #include "tab_account.h" #include "tab_admin.h" #include "tab_deck_editor.h" 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..5da4b4b85 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,10 +8,11 @@ #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 "card/card_database/model/card_database_model.h" #include "pb/command_deck_upload.pb.h" +#include "settings/cache_settings.h" #include "tab_deck_editor_visual_tab_widget.h" #include "trice_limits.h" 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..ff2818f33 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,9 +1,9 @@ #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 "card/card_database/model/card_database_model.h" #include "pb/command_deck_del.pb.h" #include diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index 4236e1374..36d7c41f6 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -1,47 +1,48 @@ -# CMakeLists for dbconverter directory - +cmake_minimum_required(VERSION 3.16) project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") +# ------------------------ +# Sources +# ------------------------ 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} ) +# ------------------------ +# Qt configuration +# ------------------------ set(QT_DONT_USE_QTGUI TRUE) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) -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() +# ------------------------ +# Build executable +# ------------------------ +add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES}) +# ------------------------ # Include directories -include_directories(../common) # Required due to card_ref.h +# ------------------------ +target_include_directories(dbconverter + PRIVATE ../common # shared common headers + PRIVATE ../libs/card/include # cardlib public headers +) -# Build servatrice binary and link it -add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES}) +# ------------------------ +# Link libraries +# ------------------------ +target_link_libraries(dbconverter + PRIVATE cardlib + PRIVATE settingslib + PRIVATE ${DB_CONVERTER_QT_MODULES} +) -target_link_libraries(dbconverter ${DB_CONVERTER_QT_MODULES}) - -# install rules +# ------------------------ +# Install rules +# ------------------------ if(UNIX) if(APPLE) set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") @@ -53,91 +54,90 @@ 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} - COMPONENT Runtime - FILES_MATCHING - PATTERN "*.dSYM" EXCLUDE - PATTERN "*_debug.dylib" EXCLUDE - PATTERN "platforms/*.dylib" + DIRECTORY "${QT_PLUGINS_DIR}/" + DESTINATION ${plugin_dest_dir} + COMPONENT Runtime + FILES_MATCHING + PATTERN "*.dSYM" EXCLUDE + PATTERN "*_debug.dylib" EXCLUDE + PATTERN "platforms/*.dylib" ) install( - CODE " + CODE " file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") - " - COMPONENT Runtime + " + COMPONENT Runtime ) install( - CODE " + 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}\") - " - COMPONENT Runtime + 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 .) install( - DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" - DESTINATION ./ - FILES_MATCHING - PATTERN "*.dll" - ) - - # Qt plugins: platforms - install( - DIRECTORY "${QT_PLUGINS_DIR}/" - DESTINATION ${plugin_dest_dir} - COMPONENT Runtime - FILES_MATCHING - PATTERN "platforms/qdirect2d.dll" - PATTERN "platforms/qminimal.dll" - PATTERN "platforms/qoffscreen.dll" - PATTERN "platforms/qwindows.dll" + DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" + DESTINATION ./ + FILES_MATCHING + PATTERN "*.dll" ) install( - CODE " + DIRECTORY "${QT_PLUGINS_DIR}/" + DESTINATION ${plugin_dest_dir} + COMPONENT Runtime + FILES_MATCHING + PATTERN "platforms/qdirect2d.dll" + PATTERN "platforms/qminimal.dll" + PATTERN "platforms/qoffscreen.dll" + PATTERN "platforms/qwindows.dll" + ) + + install( + CODE " file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") - " - COMPONENT Runtime + " + COMPONENT Runtime ) install( - CODE " + 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}\") - " - COMPONENT Runtime + 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..0303c0f1e 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 "card/card_database/card_database.h" +#include "card/card_database/parser/cockatrice_xml_4.h" 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..f46f37cfa 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 "card/card_database/card_database.h" +#include "settings/cache_settings.h" +#include "utility/macros.h" extern SettingsCache *settingsCache; -class PictureLoader +class CardPictureLoader { public: static void clearPixmapCache(CardInfoPtr card); diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 63b1974e4..7d745953b 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,145 +23,108 @@ 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 - MACOSX_BUNDLE - ${oracle_SOURCES} - ${oracle_RESOURCES_RCC} - ${oracle_MOC_SRCS} - MANUAL_FINALIZATION + oracle + WIN32 + MACOSX_BUNDLE + ${oracle_SOURCES} + ${oracle_RESOURCES_RCC} + ${oracle_MOC_SRCS} + 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,113 +135,112 @@ 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} - COMPONENT Runtime - FILES_MATCHING - PATTERN "*.dSYM" EXCLUDE - PATTERN "*_debug.dylib" EXCLUDE - PATTERN "iconengines/*.dylib" - PATTERN "platforms/*.dylib" - PATTERN "styles/*.dylib" - PATTERN "tls/*.dylib" + DIRECTORY "${QT_PLUGINS_DIR}/" + DESTINATION ${plugin_dest_dir} + COMPONENT Runtime + FILES_MATCHING + PATTERN "*.dSYM" EXCLUDE + PATTERN "*_debug.dylib" EXCLUDE + PATTERN "iconengines/*.dylib" + PATTERN "platforms/*.dylib" + PATTERN "styles/*.dylib" + PATTERN "tls/*.dylib" ) install( - CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + CODE " + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " - COMPONENT Runtime + COMPONENT Runtime ) 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}\") - " - COMPONENT Runtime + 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}\") + " + 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}) install( - DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" - DESTINATION ./ - FILES_MATCHING - PATTERN "*.dll" - ) - - # Qt plugins: iconengines, platforms, styles, tls (Qt6) - install( - DIRECTORY "${QT_PLUGINS_DIR}/" - DESTINATION ${plugin_dest_dir} - COMPONENT Runtime - FILES_MATCHING - PATTERN "iconengines/qsvgicon.dll" - PATTERN "platforms/qdirect2d.dll" - PATTERN "platforms/qminimal.dll" - PATTERN "platforms/qoffscreen.dll" - PATTERN "platforms/qwindows.dll" - PATTERN "styles/qcertonlybackend.dll" - PATTERN "styles/qopensslbackend.dll" - PATTERN "styles/qschannelbackend.dll" - PATTERN "styles/qwindowsvistastyle.dll" - PATTERN "tls/qcertonlybackend.dll" - PATTERN "tls/qopensslbackend.dll" - PATTERN "tls/qschannelbackend.dll" + DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" + DESTINATION ./ + FILES_MATCHING + PATTERN "*.dll" ) install( - CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + DIRECTORY "${QT_PLUGINS_DIR}/" + DESTINATION ${plugin_dest_dir} + COMPONENT Runtime + FILES_MATCHING + PATTERN "iconengines/qsvgicon.dll" + PATTERN "platforms/qdirect2d.dll" + PATTERN "platforms/qminimal.dll" + PATTERN "platforms/qoffscreen.dll" + PATTERN "platforms/qwindows.dll" + PATTERN "styles/qcertonlybackend.dll" + PATTERN "styles/qopensslbackend.dll" + PATTERN "styles/qschannelbackend.dll" + PATTERN "styles/qwindowsvistastyle.dll" + PATTERN "tls/qcertonlybackend.dll" + PATTERN "tls/qopensslbackend.dll" + PATTERN "tls/qschannelbackend.dll" + ) + + install( + CODE " + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " - COMPONENT Runtime + COMPONENT Runtime ) 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}\") - " - COMPONENT Runtime + 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}\") + " + 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} - QM_FILES_OUTPUT_VARIABLE - oracle_QM + oracle + TS_FILES ${oracle_TS} + SOURCES ${translate_oracle_SRCS} + QM_FILES_OUTPUT_VARIABLE oracle_QM ) else() qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 0c53c4ad9..37b817bae 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,13 +1,13 @@ #include "oracleimporter.h" -#include "database/parser/cockatrice_xml_4.h" +#include "card/card_database/parser/cockatrice_xml_4.h" #include "parsehelpers.h" #include "qt-json/json.h" #include #include #include -#include +#include #include SplitCardPart::SplitCardPart(const QString &_name, diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 913c1cc06..4046d33ef 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -1,70 +1,70 @@ +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/\"") -set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network - ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg +# ------------------------ +# 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( - 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 +target_link_libraries(carddatabase_test + PRIVATE cardlib + PRIVATE settingslib + PRIVATE cockatrice_common + PRIVATE Threads::Threads + PRIVATE ${GTEST_BOTH_LIBRARIES} + PRIVATE ${TEST_QT_MODULES} ) -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 + +add_test(NAME carddatabase_test COMMAND carddatabase_test) + +# ------------------------ +# Filter String Test +# ------------------------ +add_executable(filter_string_test + ${MOCKS_SOURCES} + ${VERSION_STRING_CPP} + ../../cockatrice/src/filters/filter_card.cpp + ../../cockatrice/src/filters/filter_string.cpp + ../../cockatrice/src/filters/filter_tree.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..178d15635 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -1,5 +1,5 @@ -#include "../../cockatrice/src/database/card_database_manager.h" #include "../../cockatrice/src/filters/filter_string.h" +#include "card/card_database/card_database_manager.h" #include "mocks.h" #include "gtest/gtest.h" 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..f46f37cfa 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 "card/card_database/card_database.h" +#include "settings/cache_settings.h" +#include "utility/macros.h" extern SettingsCache *settingsCache; -class PictureLoader +class CardPictureLoader { public: static void clearPixmapCache(CardInfoPtr card); 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';