big move

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/card/card_completer_proxy_model.cpp
-    src/game/cards/card_database.cpp
+    src/card/card_database.cpp
-    src/game/cards/card_database_manager.cpp
+    src/card/card_database_manager.cpp
-    src/game/cards/card_database_model.cpp
+    src/card/card_database_model.cpp
-    src/game/cards/card_database_parser/card_database_parser.cpp
+    src/card/card_database_parser/card_database_parser.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    src/card/card_database_parser/cockatrice_xml_3.cpp
-    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    src/card/card_database_parser/cockatrice_xml_4.cpp
-    src/game/cards/card_info.cpp
+    src/card/card_info.cpp
-    src/game/cards/card_search_model.cpp
+    src/card/card_search_model.cpp
-    src/game/cards/exact_card.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/filters/deck_filter_string.cpp
-    src/game/filters/filter_builder.cpp
+    src/filters/filter_builder.cpp
-    src/game/filters/filter_card.cpp
+    src/filters/filter_card.cpp
-    src/game/filters/filter_string.cpp
+    src/filters/filter_string.cpp
-    src/game/filters/filter_tree.cpp
+    src/filters/filter_tree.cpp
-    src/game/filters/filter_tree_model.cpp
+    src/filters/filter_tree_model.cpp
-    src/game/filters/syntax_help.cpp
+    src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
     src/game/game.cpp
     src/game/game_event_handler.cpp

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/card/card_database.cpp
-    ../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+    ../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
-    ../cockatrice/src/game/cards/card_info.cpp
+    ../cockatrice/src/card/card_info.cpp
-    ../cockatrice/src/game/cards/exact_card.cpp
+    ../cockatrice/src/card/exact_card.cpp
     ../cockatrice/src/settings/settings_manager.cpp
     ${VERSION_STRING_CPP}
 )

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/card/card_database_parser/card_database_parser.cpp
-    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-    ../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.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

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/card/card_database.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+  ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
-  ../../cockatrice/src/game/cards/card_info.cpp
+  ../../cockatrice/src/card/card_info.cpp
-  ../../cockatrice/src/game/cards/exact_card.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/card/card_database.cpp
-  ../../cockatrice/src/game/cards/card_database_manager.cpp
+  ../../cockatrice/src/card/card_database_manager.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
+  ../../cockatrice/src/card/card_database_parser/card_database_parser.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
-  ../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
-  ../../cockatrice/src/game/cards/card_info.cpp
+  ../../cockatrice/src/card/card_info.cpp
-  ../../cockatrice/src/game/cards/exact_card.cpp
+  ../../cockatrice/src/card/exact_card.cpp
-  ../../cockatrice/src/game/filters/filter_card.cpp
+  ../../cockatrice/src/filters/filter_card.cpp
-  ../../cockatrice/src/game/filters/filter_string.cpp
+  ../../cockatrice/src/filters/filter_string.cpp
-  ../../cockatrice/src/game/filters/filter_tree.cpp
+  ../../cockatrice/src/filters/filter_tree.cpp
   ../../cockatrice/src/settings/settings_manager.cpp
   filter_string_test.cpp
   mocks.cpp