From 39fda639fd7e7674714d7644072d9b919a7cacba Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 14 Sep 2025 21:45:45 -0700 Subject: [PATCH] big move --- cockatrice/CMakeLists.txt | 34 +++++++++---------- .../card_completer_proxy_model.cpp | 0 .../card_completer_proxy_model.h | 0 .../{game/cards => card}/card_database.cpp | 0 .../src/{game/cards => card}/card_database.h | 0 .../cards => card}/card_database_manager.cpp | 0 .../cards => card}/card_database_manager.h | 0 .../cards => card}/card_database_model.cpp | 0 .../cards => card}/card_database_model.h | 0 .../card_database_parser.cpp | 0 .../card_database_parser.h | 0 .../card_database_parser/cockatrice_xml_3.cpp | 0 .../card_database_parser/cockatrice_xml_3.h | 0 .../card_database_parser/cockatrice_xml_4.cpp | 0 .../card_database_parser/cockatrice_xml_4.h | 0 .../src/{game/cards => card}/card_info.cpp | 0 .../src/{game/cards => card}/card_info.h | 0 .../cards => card}/card_search_model.cpp | 0 .../{game/cards => card}/card_search_model.h | 0 .../src/{game/cards => card}/exact_card.cpp | 0 .../src/{game/cards => card}/exact_card.h | 0 .../{game => }/filters/deck_filter_string.cpp | 0 .../{game => }/filters/deck_filter_string.h | 0 .../src/{game => }/filters/filter_builder.cpp | 0 .../src/{game => }/filters/filter_builder.h | 0 .../src/{game => }/filters/filter_card.cpp | 0 .../src/{game => }/filters/filter_card.h | 0 .../src/{game => }/filters/filter_string.cpp | 0 .../src/{game => }/filters/filter_string.h | 0 .../src/{game => }/filters/filter_tree.cpp | 0 .../src/{game => }/filters/filter_tree.h | 0 .../{game => }/filters/filter_tree_model.cpp | 0 .../{game => }/filters/filter_tree_model.h | 0 .../src/{game => }/filters/syntax_help.cpp | 0 .../src/{game => }/filters/syntax_help.h | 0 dbconverter/CMakeLists.txt | 12 +++---- oracle/CMakeLists.txt | 8 ++--- tests/carddatabase/CMakeLists.txt | 32 ++++++++--------- 38 files changed, 43 insertions(+), 43 deletions(-) rename cockatrice/src/{game/cards => card}/card_completer_proxy_model.cpp (100%) rename cockatrice/src/{game/cards => card}/card_completer_proxy_model.h (100%) rename cockatrice/src/{game/cards => card}/card_database.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database.h (100%) rename cockatrice/src/{game/cards => card}/card_database_manager.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database_manager.h (100%) rename cockatrice/src/{game/cards => card}/card_database_model.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database_model.h (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/card_database_parser.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/card_database_parser.h (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/cockatrice_xml_3.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/cockatrice_xml_3.h (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/cockatrice_xml_4.cpp (100%) rename cockatrice/src/{game/cards => card}/card_database_parser/cockatrice_xml_4.h (100%) rename cockatrice/src/{game/cards => card}/card_info.cpp (100%) rename cockatrice/src/{game/cards => card}/card_info.h (100%) rename cockatrice/src/{game/cards => card}/card_search_model.cpp (100%) rename cockatrice/src/{game/cards => card}/card_search_model.h (100%) rename cockatrice/src/{game/cards => card}/exact_card.cpp (100%) rename cockatrice/src/{game/cards => card}/exact_card.h (100%) rename cockatrice/src/{game => }/filters/deck_filter_string.cpp (100%) rename cockatrice/src/{game => }/filters/deck_filter_string.h (100%) rename cockatrice/src/{game => }/filters/filter_builder.cpp (100%) rename cockatrice/src/{game => }/filters/filter_builder.h (100%) rename cockatrice/src/{game => }/filters/filter_card.cpp (100%) rename cockatrice/src/{game => }/filters/filter_card.h (100%) rename cockatrice/src/{game => }/filters/filter_string.cpp (100%) rename cockatrice/src/{game => }/filters/filter_string.h (100%) rename cockatrice/src/{game => }/filters/filter_tree.cpp (100%) rename cockatrice/src/{game => }/filters/filter_tree.h (100%) rename cockatrice/src/{game => }/filters/filter_tree_model.cpp (100%) rename cockatrice/src/{game => }/filters/filter_tree_model.h (100%) rename cockatrice/src/{game => }/filters/syntax_help.cpp (100%) rename cockatrice/src/{game => }/filters/syntax_help.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index b34a41410..442ecd2c2 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -192,26 +192,26 @@ set(cockatrice_SOURCES src/game/board/card_item.cpp src/game/board/card_list.cpp src/game/board/counter_general.cpp - src/game/cards/card_completer_proxy_model.cpp - src/game/cards/card_database.cpp - src/game/cards/card_database_manager.cpp - src/game/cards/card_database_model.cpp - src/game/cards/card_database_parser/card_database_parser.cpp - src/game/cards/card_database_parser/cockatrice_xml_3.cpp - src/game/cards/card_database_parser/cockatrice_xml_4.cpp - src/game/cards/card_info.cpp - src/game/cards/card_search_model.cpp - src/game/cards/exact_card.cpp + src/card/card_completer_proxy_model.cpp + src/card/card_database.cpp + src/card/card_database_manager.cpp + src/card/card_database_model.cpp + src/card/card_database_parser/card_database_parser.cpp + src/card/card_database_parser/cockatrice_xml_3.cpp + src/card/card_database_parser/cockatrice_xml_4.cpp + src/card/card_info.cpp + src/card/card_search_model.cpp + src/card/exact_card.cpp src/game/deckview/deck_view.cpp src/game/deckview/deck_view_container.cpp src/game/deckview/tabbed_deck_view_container.cpp - src/game/filters/deck_filter_string.cpp - src/game/filters/filter_builder.cpp - src/game/filters/filter_card.cpp - src/game/filters/filter_string.cpp - src/game/filters/filter_tree.cpp - src/game/filters/filter_tree_model.cpp - src/game/filters/syntax_help.cpp + src/filters/deck_filter_string.cpp + src/filters/filter_builder.cpp + src/filters/filter_card.cpp + src/filters/filter_string.cpp + src/filters/filter_tree.cpp + src/filters/filter_tree_model.cpp + src/filters/syntax_help.cpp src/game/abstract_game.cpp src/game/game.cpp src/game/game_event_handler.cpp diff --git a/cockatrice/src/game/cards/card_completer_proxy_model.cpp b/cockatrice/src/card/card_completer_proxy_model.cpp similarity index 100% rename from cockatrice/src/game/cards/card_completer_proxy_model.cpp rename to cockatrice/src/card/card_completer_proxy_model.cpp diff --git a/cockatrice/src/game/cards/card_completer_proxy_model.h b/cockatrice/src/card/card_completer_proxy_model.h similarity index 100% rename from cockatrice/src/game/cards/card_completer_proxy_model.h rename to cockatrice/src/card/card_completer_proxy_model.h diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/card/card_database.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database.cpp rename to cockatrice/src/card/card_database.cpp diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/card/card_database.h similarity index 100% rename from cockatrice/src/game/cards/card_database.h rename to cockatrice/src/card/card_database.h diff --git a/cockatrice/src/game/cards/card_database_manager.cpp b/cockatrice/src/card/card_database_manager.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_manager.cpp rename to cockatrice/src/card/card_database_manager.cpp diff --git a/cockatrice/src/game/cards/card_database_manager.h b/cockatrice/src/card/card_database_manager.h similarity index 100% rename from cockatrice/src/game/cards/card_database_manager.h rename to cockatrice/src/card/card_database_manager.h diff --git a/cockatrice/src/game/cards/card_database_model.cpp b/cockatrice/src/card/card_database_model.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_model.cpp rename to cockatrice/src/card/card_database_model.cpp diff --git a/cockatrice/src/game/cards/card_database_model.h b/cockatrice/src/card/card_database_model.h similarity index 100% rename from cockatrice/src/game/cards/card_database_model.h rename to cockatrice/src/card/card_database_model.h diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp b/cockatrice/src/card/card_database_parser/card_database_parser.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp rename to cockatrice/src/card/card_database_parser/card_database_parser.cpp diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h b/cockatrice/src/card/card_database_parser/card_database_parser.h similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/card_database_parser.h rename to cockatrice/src/card/card_database_parser/card_database_parser.h diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp b/cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp rename to cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h b/cockatrice/src/card/card_database_parser/cockatrice_xml_3.h similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h rename to cockatrice/src/card/card_database_parser/cockatrice_xml_3.h diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp b/cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp rename to cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h b/cockatrice/src/card/card_database_parser/cockatrice_xml_4.h similarity index 100% rename from cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h rename to cockatrice/src/card/card_database_parser/cockatrice_xml_4.h diff --git a/cockatrice/src/game/cards/card_info.cpp b/cockatrice/src/card/card_info.cpp similarity index 100% rename from cockatrice/src/game/cards/card_info.cpp rename to cockatrice/src/card/card_info.cpp diff --git a/cockatrice/src/game/cards/card_info.h b/cockatrice/src/card/card_info.h similarity index 100% rename from cockatrice/src/game/cards/card_info.h rename to cockatrice/src/card/card_info.h diff --git a/cockatrice/src/game/cards/card_search_model.cpp b/cockatrice/src/card/card_search_model.cpp similarity index 100% rename from cockatrice/src/game/cards/card_search_model.cpp rename to cockatrice/src/card/card_search_model.cpp diff --git a/cockatrice/src/game/cards/card_search_model.h b/cockatrice/src/card/card_search_model.h similarity index 100% rename from cockatrice/src/game/cards/card_search_model.h rename to cockatrice/src/card/card_search_model.h diff --git a/cockatrice/src/game/cards/exact_card.cpp b/cockatrice/src/card/exact_card.cpp similarity index 100% rename from cockatrice/src/game/cards/exact_card.cpp rename to cockatrice/src/card/exact_card.cpp diff --git a/cockatrice/src/game/cards/exact_card.h b/cockatrice/src/card/exact_card.h similarity index 100% rename from cockatrice/src/game/cards/exact_card.h rename to cockatrice/src/card/exact_card.h diff --git a/cockatrice/src/game/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp similarity index 100% rename from cockatrice/src/game/filters/deck_filter_string.cpp rename to cockatrice/src/filters/deck_filter_string.cpp diff --git a/cockatrice/src/game/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h similarity index 100% rename from cockatrice/src/game/filters/deck_filter_string.h rename to cockatrice/src/filters/deck_filter_string.h diff --git a/cockatrice/src/game/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_builder.cpp rename to cockatrice/src/filters/filter_builder.cpp diff --git a/cockatrice/src/game/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h similarity index 100% rename from cockatrice/src/game/filters/filter_builder.h rename to cockatrice/src/filters/filter_builder.h diff --git a/cockatrice/src/game/filters/filter_card.cpp b/cockatrice/src/filters/filter_card.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_card.cpp rename to cockatrice/src/filters/filter_card.cpp diff --git a/cockatrice/src/game/filters/filter_card.h b/cockatrice/src/filters/filter_card.h similarity index 100% rename from cockatrice/src/game/filters/filter_card.h rename to cockatrice/src/filters/filter_card.h diff --git a/cockatrice/src/game/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_string.cpp rename to cockatrice/src/filters/filter_string.cpp diff --git a/cockatrice/src/game/filters/filter_string.h b/cockatrice/src/filters/filter_string.h similarity index 100% rename from cockatrice/src/game/filters/filter_string.h rename to cockatrice/src/filters/filter_string.h diff --git a/cockatrice/src/game/filters/filter_tree.cpp b/cockatrice/src/filters/filter_tree.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_tree.cpp rename to cockatrice/src/filters/filter_tree.cpp diff --git a/cockatrice/src/game/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h similarity index 100% rename from cockatrice/src/game/filters/filter_tree.h rename to cockatrice/src/filters/filter_tree.h diff --git a/cockatrice/src/game/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp similarity index 100% rename from cockatrice/src/game/filters/filter_tree_model.cpp rename to cockatrice/src/filters/filter_tree_model.cpp diff --git a/cockatrice/src/game/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h similarity index 100% rename from cockatrice/src/game/filters/filter_tree_model.h rename to cockatrice/src/filters/filter_tree_model.h diff --git a/cockatrice/src/game/filters/syntax_help.cpp b/cockatrice/src/filters/syntax_help.cpp similarity index 100% rename from cockatrice/src/game/filters/syntax_help.cpp rename to cockatrice/src/filters/syntax_help.cpp diff --git a/cockatrice/src/game/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h similarity index 100% rename from cockatrice/src/game/filters/syntax_help.h rename to cockatrice/src/filters/syntax_help.h diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index a2ce75a31..dbbb6fc33 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -5,12 +5,12 @@ project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.$ set(dbconverter_SOURCES src/main.cpp src/mocks.cpp - ../cockatrice/src/game/cards/card_database.cpp - ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../cockatrice/src/game/cards/card_info.cpp - ../cockatrice/src/game/cards/exact_card.cpp + ../cockatrice/src/card/card_database.cpp + ../cockatrice/src/card/card_database_parser/card_database_parser.cpp + ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp + ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp + ../cockatrice/src/card/card_info.cpp + ../cockatrice/src/card/exact_card.cpp ../cockatrice/src/settings/settings_manager.cpp ${VERSION_STRING_CPP} ) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 5a76f3274..4d866b49c 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -17,12 +17,12 @@ set(oracle_SOURCES src/pagetemplates.cpp src/parsehelpers.cpp src/qt-json/json.cpp - ../cockatrice/src/game/cards/card_info.cpp + ../cockatrice/src/card/card_info.cpp ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp - ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp + ../cockatrice/src/card/card_database_parser/card_database_parser.cpp + ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp + ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp ../cockatrice/src/settings/cache_settings.cpp ../cockatrice/src/settings/shortcuts_settings.cpp ../cockatrice/src/settings/card_counter_settings.cpp diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 4b82e2fb6..c553c41b7 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -18,12 +18,12 @@ add_executable( carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} - ../../cockatrice/src/game/cards/card_database.cpp - ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../../cockatrice/src/game/cards/card_info.cpp - ../../cockatrice/src/game/cards/exact_card.cpp + ../../cockatrice/src/card/card_database.cpp + ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp + ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp + ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp + ../../cockatrice/src/card/card_info.cpp + ../../cockatrice/src/card/exact_card.cpp ../../cockatrice/src/settings/settings_manager.cpp carddatabase_test.cpp mocks.cpp @@ -32,16 +32,16 @@ add_executable( filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} - ../../cockatrice/src/game/cards/card_database.cpp - ../../cockatrice/src/game/cards/card_database_manager.cpp - ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp - ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp - ../../cockatrice/src/game/cards/card_info.cpp - ../../cockatrice/src/game/cards/exact_card.cpp - ../../cockatrice/src/game/filters/filter_card.cpp - ../../cockatrice/src/game/filters/filter_string.cpp - ../../cockatrice/src/game/filters/filter_tree.cpp + ../../cockatrice/src/card/card_database.cpp + ../../cockatrice/src/card/card_database_manager.cpp + ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp + ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp + ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp + ../../cockatrice/src/card/card_info.cpp + ../../cockatrice/src/card/exact_card.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