From 01378b8314bc79f1517c4656e3167451bd45a405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sat, 4 Oct 2025 15:10:20 +0200 Subject: [PATCH] Turn things in common into separate libs. Took 2 hours 27 minutes --- cockatrice/CMakeLists.txt | 12 ++-- cockatrice/src/client/get_text_with_max.h | 2 +- .../src/client/tapped_out_interface.cpp | 4 +- cockatrice/src/client/tapped_out_interface.h | 2 +- cockatrice/src/deck/deck_list_model.h | 6 +- cockatrice/src/deck/deck_loader.cpp | 4 +- cockatrice/src/deck/deck_loader.h | 2 +- cockatrice/src/deck/deck_stats_interface.cpp | 4 +- cockatrice/src/deck/deck_stats_interface.h | 2 +- cockatrice/src/dialogs/dlg_connect.cpp | 2 +- cockatrice/src/dialogs/dlg_create_game.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_avatar.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_password.cpp | 2 +- cockatrice/src/dialogs/dlg_edit_tokens.cpp | 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_register.cpp | 2 +- .../src/game/board/abstract_card_item.h | 2 +- .../src/game/board/abstract_counter.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 4 +- .../src/game/deckview/deck_view_container.cpp | 2 +- .../src/game/dialogs/dlg_create_token.cpp | 4 +- cockatrice/src/game/dialogs/dlg_roll_dice.cpp | 2 +- cockatrice/src/game/game_event_handler.cpp | 2 +- cockatrice/src/game/log/message_log_widget.h | 2 +- cockatrice/src/game/player/menu/hand_menu.cpp | 4 +- .../src/game/player/menu/library_menu.cpp | 4 +- cockatrice/src/game/player/player_actions.cpp | 2 +- .../src/interface/pixel_map_generator.h | 2 +- .../widgets/cards/card_info_display_widget.h | 2 +- .../widgets/cards/card_info_frame_widget.h | 2 +- .../deck_analytics/deck_analytics_widget.h | 2 +- .../deck_analytics/mana_base_widget.cpp | 2 +- .../widgets/deck_analytics/mana_base_widget.h | 2 +- .../deck_analytics/mana_curve_widget.cpp | 2 +- .../deck_analytics/mana_devotion_widget.cpp | 2 +- .../deck_analytics/mana_devotion_widget.h | 2 +- .../deck_editor_deck_dock_widget.cpp | 2 +- cockatrice/src/main.cpp | 4 +- cockatrice/src/server/abstract_client.cpp | 4 +- cockatrice/src/server/chat_view/chat_view.cpp | 2 +- cockatrice/src/server/chat_view/chat_view.h | 4 +- cockatrice/src/server/local_client.cpp | 2 +- .../src/server/remote/remote_client.cpp | 4 +- .../src/server/user/user_context_menu.h | 2 +- cockatrice/src/server/user/user_info_box.cpp | 2 +- .../src/server/user/user_list_widget.cpp | 2 +- cockatrice/src/server/user/user_list_widget.h | 2 +- .../src/tabs/abstract_tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab.h | 2 +- cockatrice/src/tabs/tab_account.cpp | 2 +- cockatrice/src/tabs/tab_admin.cpp | 2 +- cockatrice/src/tabs/tab_deck_editor.cpp | 2 +- cockatrice/src/tabs/tab_deck_storage.cpp | 2 +- cockatrice/src/tabs/tab_game.cpp | 2 +- cockatrice/src/tabs/tab_logs.cpp | 2 +- cockatrice/src/tabs/tab_message.cpp | 2 +- cockatrice/src/tabs/tab_room.cpp | 4 +- .../tab_deck_editor_visual.cpp | 2 +- common/CMakeLists.txt | 36 ----------- common/server/game/server_arrowtarget.cpp | 2 - common/server/server_database_interface.cpp | 2 - {cockatrice/libs => libs}/card/CMakeLists.txt | 4 +- .../card/card_database/card_database.h | 2 +- .../card/card_database/card_database_loader.h | 0 .../card_database/card_database_manager.h | 0 .../card_database/card_database_querier.h | 2 +- .../model/card/card_completer_proxy_model.h | 0 .../model/card/card_search_model.h | 0 .../model/card_database_display_model.h | 0 .../card_database/model/card_database_model.h | 0 .../model/token/token_display_model.h | 0 .../model/token/token_edit_model.h | 0 .../parser/card_database_parser.h | 0 .../card_database/parser/cockatrice_xml_3.h | 0 .../card_database/parser/cockatrice_xml_4.h | 0 .../card/include/card/card_info.h | 0 .../card/include/card/card_info_comparator.h | 0 .../include/card/card_printing/exact_card.h | 0 .../card/card_printing/printing_info.h | 0 .../card/card_relation/card_relation.h | 0 .../card/card_relation/card_relation_type.h | 0 .../card/include/card/card_set/card_set.h | 0 .../card/card_set/card_set_comparator.h | 0 .../include/card/card_set/card_set_list.h | 0 .../card/include/card/game_specific_terms.h | 0 .../card/src/card_database/card_database.cpp | 0 .../card_database/card_database_loader.cpp | 0 .../card_database/card_database_manager.cpp | 0 .../card_database/card_database_querier.cpp | 0 .../model/card/card_completer_proxy_model.cpp | 0 .../model/card/card_search_model.cpp | 0 .../model/card_database_display_model.cpp | 0 .../model/card_database_model.cpp | 0 .../model/token/token_display_model.cpp | 0 .../model/token/token_edit_model.cpp | 0 .../parser/card_database_parser.cpp | 0 .../card_database/parser/cockatrice_xml_3.cpp | 0 .../card_database/parser/cockatrice_xml_4.cpp | 0 .../libs => libs}/card/src/card_info.cpp | 0 .../card/src/card_info_comparator.cpp | 0 .../card/src/card_printing/exact_card.cpp | 0 .../card/src/card_printing/printing_info.cpp | 0 .../card/src/card_relation/card_relation.cpp | 0 .../card/src/card_set/card_set.cpp | 0 .../card/src/card_set/card_set_list.cpp | 0 libs/deck_list/CMakeLists.txt | 36 +++++++++++ .../deck_list}/abstract_deck_list_card_node.h | 0 .../deck_list}/abstract_deck_list_node.h | 0 .../deck_list/include/deck_list}/deck_list.h | 2 +- .../include/deck_list}/deck_list_card_node.h | 2 +- .../include/deck_list}/inner_deck_list_node.h | 0 .../src}/abstract_deck_list_card_node.cpp | 2 +- .../src}/abstract_deck_list_node.cpp | 4 +- {common => libs/deck_list/src}/deck_list.cpp | 8 +-- .../deck_list/src}/deck_list_card_node.cpp | 2 +- .../deck_list/src}/inner_deck_list_node.cpp | 4 +- {common => libs}/pb/CMakeLists.txt | 0 {common => libs}/pb/admin_commands.proto | 0 {common => libs}/pb/card_attributes.proto | 0 {common => libs}/pb/color.proto | 0 {common => libs}/pb/command_attach_card.proto | 0 .../pb/command_change_zone_properties.proto | 0 {common => libs}/pb/command_concede.proto | 0 .../pb/command_create_arrow.proto | 0 .../pb/command_create_counter.proto | 0 .../pb/command_create_token.proto | 0 {common => libs}/pb/command_deck_del.proto | 0 .../pb/command_deck_del_dir.proto | 0 .../pb/command_deck_download.proto | 0 {common => libs}/pb/command_deck_list.proto | 0 .../pb/command_deck_new_dir.proto | 0 {common => libs}/pb/command_deck_select.proto | 0 {common => libs}/pb/command_deck_upload.proto | 0 {common => libs}/pb/command_del_counter.proto | 0 .../pb/command_delete_arrow.proto | 0 {common => libs}/pb/command_draw_cards.proto | 0 {common => libs}/pb/command_dump_zone.proto | 0 {common => libs}/pb/command_flip_card.proto | 0 {common => libs}/pb/command_game_say.proto | 0 .../pb/command_inc_card_counter.proto | 0 {common => libs}/pb/command_inc_counter.proto | 0 .../pb/command_kick_from_game.proto | 0 {common => libs}/pb/command_leave_game.proto | 0 {common => libs}/pb/command_move_card.proto | 0 {common => libs}/pb/command_mulligan.proto | 0 {common => libs}/pb/command_next_turn.proto | 0 {common => libs}/pb/command_ready_start.proto | 0 .../pb/command_replay_delete_match.proto | 0 .../pb/command_replay_download.proto | 0 .../pb/command_replay_get_code.proto | 0 {common => libs}/pb/command_replay_list.proto | 0 .../pb/command_replay_modify_match.proto | 0 .../pb/command_replay_submit_code.proto | 0 .../pb/command_reveal_cards.proto | 0 .../pb/command_reverse_turn.proto | 0 {common => libs}/pb/command_roll_die.proto | 0 .../pb/command_set_active_phase.proto | 0 .../pb/command_set_card_attr.proto | 0 .../pb/command_set_card_counter.proto | 0 {common => libs}/pb/command_set_counter.proto | 0 .../pb/command_set_sideboard_lock.proto | 0 .../pb/command_set_sideboard_plan.proto | 0 {common => libs}/pb/command_shuffle.proto | 0 {common => libs}/pb/command_undo_draw.proto | 0 {common => libs}/pb/commands.proto | 0 {common => libs}/pb/context_concede.proto | 0 .../pb/context_connection_state_changed.proto | 0 {common => libs}/pb/context_deck_select.proto | 0 {common => libs}/pb/context_move_card.proto | 0 {common => libs}/pb/context_mulligan.proto | 0 .../pb/context_ping_changed.proto | 0 {common => libs}/pb/context_ready_start.proto | 0 .../pb/context_set_sideboard_lock.proto | 0 {common => libs}/pb/context_undo_draw.proto | 0 {common => libs}/pb/event_add_to_list.proto | 0 {common => libs}/pb/event_attach_card.proto | 0 .../pb/event_change_zone_properties.proto | 0 .../pb/event_connection_closed.proto | 0 {common => libs}/pb/event_create_arrow.proto | 0 .../pb/event_create_counter.proto | 0 {common => libs}/pb/event_create_token.proto | 0 {common => libs}/pb/event_del_counter.proto | 0 {common => libs}/pb/event_delete_arrow.proto | 0 {common => libs}/pb/event_destroy_card.proto | 0 {common => libs}/pb/event_draw_cards.proto | 0 {common => libs}/pb/event_dump_zone.proto | 0 {common => libs}/pb/event_flip_card.proto | 0 {common => libs}/pb/event_game_closed.proto | 0 .../pb/event_game_host_changed.proto | 0 {common => libs}/pb/event_game_joined.proto | 0 {common => libs}/pb/event_game_say.proto | 0 .../pb/event_game_state_changed.proto | 0 {common => libs}/pb/event_join.proto | 0 {common => libs}/pb/event_join_room.proto | 0 {common => libs}/pb/event_kicked.proto | 0 {common => libs}/pb/event_leave.proto | 0 {common => libs}/pb/event_leave_room.proto | 0 {common => libs}/pb/event_list_games.proto | 0 {common => libs}/pb/event_list_rooms.proto | 0 {common => libs}/pb/event_move_card.proto | 0 {common => libs}/pb/event_notify_user.proto | 0 .../pb/event_player_properties_changed.proto | 0 .../pb/event_remove_from_list.proto | 0 .../pb/event_remove_messages.proto | 0 {common => libs}/pb/event_replay_added.proto | 0 {common => libs}/pb/event_reveal_cards.proto | 0 {common => libs}/pb/event_reverse_turn.proto | 0 {common => libs}/pb/event_roll_die.proto | 0 {common => libs}/pb/event_room_say.proto | 0 .../pb/event_server_complete_list.proto | 0 .../pb/event_server_identification.proto | 0 .../pb/event_server_message.proto | 0 .../pb/event_server_shutdown.proto | 0 .../pb/event_set_active_phase.proto | 0 .../pb/event_set_active_player.proto | 0 {common => libs}/pb/event_set_card_attr.proto | 0 .../pb/event_set_card_counter.proto | 0 {common => libs}/pb/event_set_counter.proto | 0 {common => libs}/pb/event_shuffle.proto | 0 {common => libs}/pb/event_user_joined.proto | 0 {common => libs}/pb/event_user_left.proto | 0 {common => libs}/pb/event_user_message.proto | 0 {common => libs}/pb/game_commands.proto | 0 {common => libs}/pb/game_event.proto | 0 .../pb/game_event_container.proto | 0 {common => libs}/pb/game_event_context.proto | 0 {common => libs}/pb/game_replay.proto | 0 {common => libs}/pb/isl_message.proto | 0 {common => libs}/pb/moderator_commands.proto | 0 {common => libs}/pb/move_card_to_zone.proto | 0 {common => libs}/pb/response.proto | 0 {common => libs}/pb/response_activate.proto | 0 {common => libs}/pb/response_adjust_mod.proto | 0 .../pb/response_ban_history.proto | 0 .../pb/response_deck_download.proto | 0 {common => libs}/pb/response_deck_list.proto | 0 .../pb/response_deck_upload.proto | 0 {common => libs}/pb/response_dump_zone.proto | 0 .../pb/response_forgotpasswordrequest.proto | 0 .../pb/response_get_admin_notes.proto | 0 .../pb/response_get_games_of_user.proto | 0 .../pb/response_get_user_info.proto | 0 {common => libs}/pb/response_join_room.proto | 0 {common => libs}/pb/response_list_users.proto | 0 {common => libs}/pb/response_login.proto | 0 .../pb/response_password_salt.proto | 0 {common => libs}/pb/response_register.proto | 0 .../pb/response_replay_download.proto | 0 .../pb/response_replay_get_code.proto | 0 .../pb/response_replay_list.proto | 0 .../pb/response_viewlog_history.proto | 0 .../pb/response_warn_history.proto | 0 {common => libs}/pb/response_warn_list.proto | 0 {common => libs}/pb/room_commands.proto | 0 {common => libs}/pb/room_event.proto | 0 {common => libs}/pb/server_message.proto | 0 {common => libs}/pb/serverinfo_arrow.proto | 0 {common => libs}/pb/serverinfo_ban.proto | 0 {common => libs}/pb/serverinfo_card.proto | 0 .../pb/serverinfo_cardcounter.proto | 0 .../pb/serverinfo_chat_message.proto | 0 {common => libs}/pb/serverinfo_counter.proto | 0 .../pb/serverinfo_deckstorage.proto | 0 {common => libs}/pb/serverinfo_game.proto | 0 {common => libs}/pb/serverinfo_gametype.proto | 0 {common => libs}/pb/serverinfo_player.proto | 0 .../pb/serverinfo_playerping.proto | 0 .../pb/serverinfo_playerproperties.proto | 0 {common => libs}/pb/serverinfo_replay.proto | 0 .../pb/serverinfo_replay_match.proto | 0 {common => libs}/pb/serverinfo_room.proto | 0 {common => libs}/pb/serverinfo_user.proto | 0 {common => libs}/pb/serverinfo_warning.proto | 0 {common => libs}/pb/serverinfo_zone.proto | 0 {common => libs}/pb/session_commands.proto | 0 {common => libs}/pb/session_event.proto | 0 libs/rng/CMakeLists.txt | 27 ++++++++ .../rng/include/rng}/rng_abstract.h | 0 {common => libs/rng/include/rng}/rng_sfmt.h | 0 .../rng/include/rng}/sfmt/LICENSE.txt | 0 .../rng/include/rng}/sfmt/SFMT-common.h | 0 .../rng/include/rng}/sfmt/SFMT-params.h | 0 .../rng/include/rng}/sfmt/SFMT-params19937.h | 0 {common => libs/rng/include/rng}/sfmt/SFMT.h | 0 {common => libs/rng/src}/rng_abstract.cpp | 2 +- {common => libs/rng/src}/rng_sfmt.cpp | 2 +- {common => libs/rng/src}/sfmt/SFMT.c | 6 +- libs/server/CMakeLists.txt | 62 +++++++++++++++++++ {common => libs/server}/debug_pb_message.cpp | 4 +- {common => libs/server}/debug_pb_message.h | 0 {common => libs/server}/get_pb_extension.cpp | 0 {common => libs/server}/get_pb_extension.h | 0 .../game/server_abstract_participant.h | 2 +- .../server/include}/game/server_arrow.h | 0 .../server/include}/game/server_arrowtarget.h | 0 .../server/include}/game/server_card.h | 2 +- .../server/include}/game/server_cardzone.h | 0 .../server/include}/game/server_counter.h | 0 .../server/include}/game/server_game.h | 0 .../server/include}/game/server_player.h | 2 +- .../server/include}/game/server_spectator.h | 0 .../server/include}/room_message_type.h | 0 .../server => libs/server/include}/server.h | 0 .../include}/server_abstractuserinterface.h | 2 +- .../include}/server_database_interface.h | 0 .../server/include}/server_player_reference.h | 0 .../server/include}/server_protocolhandler.h | 0 .../include}/server_remoteuserinterface.h | 0 .../include}/server_response_containers.h | 0 .../server/include}/server_room.h | 0 .../include}/serverinfo_user_container.h | 0 {common => libs/server/include}/user_level.h | 0 .../src}/game/server_abstract_participant.cpp | 14 ++--- .../server/src}/game/server_arrow.cpp | 8 +-- libs/server/src/game/server_arrowtarget.cpp | 2 + .../server/src}/game/server_card.cpp | 6 +- .../server/src}/game/server_cardzone.cpp | 6 +- .../server/src}/game/server_counter.cpp | 2 +- .../server/src}/game/server_game.cpp | 12 ++-- .../server/src}/game/server_player.cpp | 12 ++-- .../server/src}/game/server_spectator.cpp | 2 +- {common/server => libs/server/src}/server.cpp | 14 ++--- .../src}/server_abstractuserinterface.cpp | 14 ++--- libs/server/src/server_database_interface.cpp | 2 + .../server/src}/server_protocolhandler.cpp | 10 +-- .../src}/server_remoteuserinterface.cpp | 4 +- .../src}/server_response_containers.cpp | 4 +- .../server/src}/server_room.cpp | 6 +- .../server/src}/serverinfo_user_container.cpp | 2 +- .../libs => libs}/settings/CMakeLists.txt | 4 +- .../include/settings/cache_settings.h | 0 .../include/settings/card_counter_settings.h | 0 .../include/settings/card_database_settings.h | 0 .../include/settings/card_override_settings.h | 2 +- .../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 | 0 .../settings/src/card_counter_settings.cpp | 0 .../settings/src/card_database_settings.cpp | 0 .../settings/src/card_override_settings.cpp | 0 .../settings/src/debug_settings.cpp | 0 .../settings/src/download_settings.cpp | 0 .../settings/src/game_filters_settings.cpp | 0 .../settings/src/layouts_settings.cpp | 0 .../settings/src/message_settings.cpp | 0 .../settings/src/recents_settings.cpp | 0 .../settings/src/servers_settings.cpp | 0 .../settings/src/settings_manager.cpp | 0 .../settings/src/shortcut_treeview.cpp | 0 .../settings/src/shortcuts_settings.cpp | 0 .../libs => libs}/utility/CMakeLists.txt | 16 ++++- .../utility/include/utility}/card_ref.h | 0 .../utility/include/utility}/color.h | 0 .../utility/include/utility}/expression.h | 0 .../utility/include/utility}/featureset.h | 0 .../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/include/utility}/passwordhasher.h | 0 .../utility/include/utility}/trice_limits.h | 0 {common => libs/utility/src}/expression.cpp | 4 +- {common => libs/utility/src}/featureset.cpp | 2 +- .../libs => libs}/utility/src/key_signals.cpp | 0 .../libs => libs}/utility/src/levenshtein.cpp | 0 .../libs => libs}/utility/src/logger.cpp | 0 .../utility/src}/passwordhasher.cpp | 4 +- oracle/CMakeLists.txt | 4 +- servatrice/src/isl_interface.cpp | 4 +- servatrice/src/main.cpp | 4 +- servatrice/src/servatrice.cpp | 4 +- .../src/servatrice_database_interface.cpp | 4 +- servatrice/src/serversocketinterface.cpp | 4 +- tests/expression_test.cpp | 2 +- tests/loading_from_clipboard/CMakeLists.txt | 2 +- .../clipboard_testing.cpp | 2 +- .../clipboard_testing.h | 2 +- tests/password_hash_test.cpp | 6 +- 389 files changed, 336 insertions(+), 233 deletions(-) delete mode 100644 common/server/game/server_arrowtarget.cpp delete mode 100644 common/server/server_database_interface.cpp rename {cockatrice/libs => libs}/card/CMakeLists.txt (95%) rename {cockatrice/libs => libs}/card/include/card/card_database/card_database.h (98%) rename {cockatrice/libs => libs}/card/include/card/card_database/card_database_loader.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/card_database_manager.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/card_database_querier.h (98%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/card/card_completer_proxy_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/card/card_search_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/card_database_display_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/card_database_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/token/token_display_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/model/token/token_edit_model.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/parser/card_database_parser.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/parser/cockatrice_xml_3.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_database/parser/cockatrice_xml_4.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_info.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_info_comparator.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_printing/exact_card.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_printing/printing_info.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_relation/card_relation.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_relation/card_relation_type.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_set/card_set.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_set/card_set_comparator.h (100%) rename {cockatrice/libs => libs}/card/include/card/card_set/card_set_list.h (100%) rename {cockatrice/libs => libs}/card/include/card/game_specific_terms.h (100%) rename {cockatrice/libs => libs}/card/src/card_database/card_database.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/card_database_loader.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/card_database_manager.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/card_database_querier.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/card/card_completer_proxy_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/card/card_search_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/card_database_display_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/card_database_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/token/token_display_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/model/token/token_edit_model.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/parser/card_database_parser.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/parser/cockatrice_xml_3.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_database/parser/cockatrice_xml_4.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_info.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_info_comparator.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_printing/exact_card.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_printing/printing_info.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_relation/card_relation.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_set/card_set.cpp (100%) rename {cockatrice/libs => libs}/card/src/card_set/card_set_list.cpp (100%) create mode 100644 libs/deck_list/CMakeLists.txt rename {common => libs/deck_list/include/deck_list}/abstract_deck_list_card_node.h (100%) rename {common => libs/deck_list/include/deck_list}/abstract_deck_list_node.h (100%) rename {common => libs/deck_list/include/deck_list}/deck_list.h (99%) rename {common => libs/deck_list/include/deck_list}/deck_list_card_node.h (99%) rename {common => libs/deck_list/include/deck_list}/inner_deck_list_node.h (100%) rename {common => libs/deck_list/src}/abstract_deck_list_card_node.cpp (96%) rename {common => libs/deck_list/src}/abstract_deck_list_node.cpp (78%) rename {common => libs/deck_list/src}/deck_list.cpp (99%) rename {common => libs/deck_list/src}/deck_list_card_node.cpp (85%) rename {common => libs/deck_list/src}/inner_deck_list_node.cpp (98%) rename {common => libs}/pb/CMakeLists.txt (100%) rename {common => libs}/pb/admin_commands.proto (100%) rename {common => libs}/pb/card_attributes.proto (100%) rename {common => libs}/pb/color.proto (100%) rename {common => libs}/pb/command_attach_card.proto (100%) rename {common => libs}/pb/command_change_zone_properties.proto (100%) rename {common => libs}/pb/command_concede.proto (100%) rename {common => libs}/pb/command_create_arrow.proto (100%) rename {common => libs}/pb/command_create_counter.proto (100%) rename {common => libs}/pb/command_create_token.proto (100%) rename {common => libs}/pb/command_deck_del.proto (100%) rename {common => libs}/pb/command_deck_del_dir.proto (100%) rename {common => libs}/pb/command_deck_download.proto (100%) rename {common => libs}/pb/command_deck_list.proto (100%) rename {common => libs}/pb/command_deck_new_dir.proto (100%) rename {common => libs}/pb/command_deck_select.proto (100%) rename {common => libs}/pb/command_deck_upload.proto (100%) rename {common => libs}/pb/command_del_counter.proto (100%) rename {common => libs}/pb/command_delete_arrow.proto (100%) rename {common => libs}/pb/command_draw_cards.proto (100%) rename {common => libs}/pb/command_dump_zone.proto (100%) rename {common => libs}/pb/command_flip_card.proto (100%) rename {common => libs}/pb/command_game_say.proto (100%) rename {common => libs}/pb/command_inc_card_counter.proto (100%) rename {common => libs}/pb/command_inc_counter.proto (100%) rename {common => libs}/pb/command_kick_from_game.proto (100%) rename {common => libs}/pb/command_leave_game.proto (100%) rename {common => libs}/pb/command_move_card.proto (100%) rename {common => libs}/pb/command_mulligan.proto (100%) rename {common => libs}/pb/command_next_turn.proto (100%) rename {common => libs}/pb/command_ready_start.proto (100%) rename {common => libs}/pb/command_replay_delete_match.proto (100%) rename {common => libs}/pb/command_replay_download.proto (100%) rename {common => libs}/pb/command_replay_get_code.proto (100%) rename {common => libs}/pb/command_replay_list.proto (100%) rename {common => libs}/pb/command_replay_modify_match.proto (100%) rename {common => libs}/pb/command_replay_submit_code.proto (100%) rename {common => libs}/pb/command_reveal_cards.proto (100%) rename {common => libs}/pb/command_reverse_turn.proto (100%) rename {common => libs}/pb/command_roll_die.proto (100%) rename {common => libs}/pb/command_set_active_phase.proto (100%) rename {common => libs}/pb/command_set_card_attr.proto (100%) rename {common => libs}/pb/command_set_card_counter.proto (100%) rename {common => libs}/pb/command_set_counter.proto (100%) rename {common => libs}/pb/command_set_sideboard_lock.proto (100%) rename {common => libs}/pb/command_set_sideboard_plan.proto (100%) rename {common => libs}/pb/command_shuffle.proto (100%) rename {common => libs}/pb/command_undo_draw.proto (100%) rename {common => libs}/pb/commands.proto (100%) rename {common => libs}/pb/context_concede.proto (100%) rename {common => libs}/pb/context_connection_state_changed.proto (100%) rename {common => libs}/pb/context_deck_select.proto (100%) rename {common => libs}/pb/context_move_card.proto (100%) rename {common => libs}/pb/context_mulligan.proto (100%) rename {common => libs}/pb/context_ping_changed.proto (100%) rename {common => libs}/pb/context_ready_start.proto (100%) rename {common => libs}/pb/context_set_sideboard_lock.proto (100%) rename {common => libs}/pb/context_undo_draw.proto (100%) rename {common => libs}/pb/event_add_to_list.proto (100%) rename {common => libs}/pb/event_attach_card.proto (100%) rename {common => libs}/pb/event_change_zone_properties.proto (100%) rename {common => libs}/pb/event_connection_closed.proto (100%) rename {common => libs}/pb/event_create_arrow.proto (100%) rename {common => libs}/pb/event_create_counter.proto (100%) rename {common => libs}/pb/event_create_token.proto (100%) rename {common => libs}/pb/event_del_counter.proto (100%) rename {common => libs}/pb/event_delete_arrow.proto (100%) rename {common => libs}/pb/event_destroy_card.proto (100%) rename {common => libs}/pb/event_draw_cards.proto (100%) rename {common => libs}/pb/event_dump_zone.proto (100%) rename {common => libs}/pb/event_flip_card.proto (100%) rename {common => libs}/pb/event_game_closed.proto (100%) rename {common => libs}/pb/event_game_host_changed.proto (100%) rename {common => libs}/pb/event_game_joined.proto (100%) rename {common => libs}/pb/event_game_say.proto (100%) rename {common => libs}/pb/event_game_state_changed.proto (100%) rename {common => libs}/pb/event_join.proto (100%) rename {common => libs}/pb/event_join_room.proto (100%) rename {common => libs}/pb/event_kicked.proto (100%) rename {common => libs}/pb/event_leave.proto (100%) rename {common => libs}/pb/event_leave_room.proto (100%) rename {common => libs}/pb/event_list_games.proto (100%) rename {common => libs}/pb/event_list_rooms.proto (100%) rename {common => libs}/pb/event_move_card.proto (100%) rename {common => libs}/pb/event_notify_user.proto (100%) rename {common => libs}/pb/event_player_properties_changed.proto (100%) rename {common => libs}/pb/event_remove_from_list.proto (100%) rename {common => libs}/pb/event_remove_messages.proto (100%) rename {common => libs}/pb/event_replay_added.proto (100%) rename {common => libs}/pb/event_reveal_cards.proto (100%) rename {common => libs}/pb/event_reverse_turn.proto (100%) rename {common => libs}/pb/event_roll_die.proto (100%) rename {common => libs}/pb/event_room_say.proto (100%) rename {common => libs}/pb/event_server_complete_list.proto (100%) rename {common => libs}/pb/event_server_identification.proto (100%) rename {common => libs}/pb/event_server_message.proto (100%) rename {common => libs}/pb/event_server_shutdown.proto (100%) rename {common => libs}/pb/event_set_active_phase.proto (100%) rename {common => libs}/pb/event_set_active_player.proto (100%) rename {common => libs}/pb/event_set_card_attr.proto (100%) rename {common => libs}/pb/event_set_card_counter.proto (100%) rename {common => libs}/pb/event_set_counter.proto (100%) rename {common => libs}/pb/event_shuffle.proto (100%) rename {common => libs}/pb/event_user_joined.proto (100%) rename {common => libs}/pb/event_user_left.proto (100%) rename {common => libs}/pb/event_user_message.proto (100%) rename {common => libs}/pb/game_commands.proto (100%) rename {common => libs}/pb/game_event.proto (100%) rename {common => libs}/pb/game_event_container.proto (100%) rename {common => libs}/pb/game_event_context.proto (100%) rename {common => libs}/pb/game_replay.proto (100%) rename {common => libs}/pb/isl_message.proto (100%) rename {common => libs}/pb/moderator_commands.proto (100%) rename {common => libs}/pb/move_card_to_zone.proto (100%) rename {common => libs}/pb/response.proto (100%) rename {common => libs}/pb/response_activate.proto (100%) rename {common => libs}/pb/response_adjust_mod.proto (100%) rename {common => libs}/pb/response_ban_history.proto (100%) rename {common => libs}/pb/response_deck_download.proto (100%) rename {common => libs}/pb/response_deck_list.proto (100%) rename {common => libs}/pb/response_deck_upload.proto (100%) rename {common => libs}/pb/response_dump_zone.proto (100%) rename {common => libs}/pb/response_forgotpasswordrequest.proto (100%) rename {common => libs}/pb/response_get_admin_notes.proto (100%) rename {common => libs}/pb/response_get_games_of_user.proto (100%) rename {common => libs}/pb/response_get_user_info.proto (100%) rename {common => libs}/pb/response_join_room.proto (100%) rename {common => libs}/pb/response_list_users.proto (100%) rename {common => libs}/pb/response_login.proto (100%) rename {common => libs}/pb/response_password_salt.proto (100%) rename {common => libs}/pb/response_register.proto (100%) rename {common => libs}/pb/response_replay_download.proto (100%) rename {common => libs}/pb/response_replay_get_code.proto (100%) rename {common => libs}/pb/response_replay_list.proto (100%) rename {common => libs}/pb/response_viewlog_history.proto (100%) rename {common => libs}/pb/response_warn_history.proto (100%) rename {common => libs}/pb/response_warn_list.proto (100%) rename {common => libs}/pb/room_commands.proto (100%) rename {common => libs}/pb/room_event.proto (100%) rename {common => libs}/pb/server_message.proto (100%) rename {common => libs}/pb/serverinfo_arrow.proto (100%) rename {common => libs}/pb/serverinfo_ban.proto (100%) rename {common => libs}/pb/serverinfo_card.proto (100%) rename {common => libs}/pb/serverinfo_cardcounter.proto (100%) rename {common => libs}/pb/serverinfo_chat_message.proto (100%) rename {common => libs}/pb/serverinfo_counter.proto (100%) rename {common => libs}/pb/serverinfo_deckstorage.proto (100%) rename {common => libs}/pb/serverinfo_game.proto (100%) rename {common => libs}/pb/serverinfo_gametype.proto (100%) rename {common => libs}/pb/serverinfo_player.proto (100%) rename {common => libs}/pb/serverinfo_playerping.proto (100%) rename {common => libs}/pb/serverinfo_playerproperties.proto (100%) rename {common => libs}/pb/serverinfo_replay.proto (100%) rename {common => libs}/pb/serverinfo_replay_match.proto (100%) rename {common => libs}/pb/serverinfo_room.proto (100%) rename {common => libs}/pb/serverinfo_user.proto (100%) rename {common => libs}/pb/serverinfo_warning.proto (100%) rename {common => libs}/pb/serverinfo_zone.proto (100%) rename {common => libs}/pb/session_commands.proto (100%) rename {common => libs}/pb/session_event.proto (100%) create mode 100644 libs/rng/CMakeLists.txt rename {common => libs/rng/include/rng}/rng_abstract.h (100%) rename {common => libs/rng/include/rng}/rng_sfmt.h (100%) rename {common => libs/rng/include/rng}/sfmt/LICENSE.txt (100%) rename {common => libs/rng/include/rng}/sfmt/SFMT-common.h (100%) rename {common => libs/rng/include/rng}/sfmt/SFMT-params.h (100%) rename {common => libs/rng/include/rng}/sfmt/SFMT-params19937.h (100%) rename {common => libs/rng/include/rng}/sfmt/SFMT.h (100%) rename {common => libs/rng/src}/rng_abstract.cpp (95%) rename {common => libs/rng/src}/rng_sfmt.cpp (99%) rename {common => libs/rng/src}/sfmt/SFMT.c (99%) create mode 100644 libs/server/CMakeLists.txt rename {common => libs/server}/debug_pb_message.cpp (97%) rename {common => libs/server}/debug_pb_message.h (100%) rename {common => libs/server}/get_pb_extension.cpp (100%) rename {common => libs/server}/get_pb_extension.h (100%) rename {common/server => libs/server/include}/game/server_abstract_participant.h (99%) rename {common/server => libs/server/include}/game/server_arrow.h (100%) rename {common/server => libs/server/include}/game/server_arrowtarget.h (100%) rename {common/server => libs/server/include}/game/server_card.h (99%) rename {common/server => libs/server/include}/game/server_cardzone.h (100%) rename {common/server => libs/server/include}/game/server_counter.h (100%) rename {common/server => libs/server/include}/game/server_game.h (100%) rename {common/server => libs/server/include}/game/server_player.h (99%) rename {common/server => libs/server/include}/game/server_spectator.h (100%) rename {common => libs/server/include}/room_message_type.h (100%) rename {common/server => libs/server/include}/server.h (100%) rename {common/server => libs/server/include}/server_abstractuserinterface.h (97%) rename {common/server => libs/server/include}/server_database_interface.h (100%) rename {common/server => libs/server/include}/server_player_reference.h (100%) rename {common/server => libs/server/include}/server_protocolhandler.h (100%) rename {common/server => libs/server/include}/server_remoteuserinterface.h (100%) rename {common/server => libs/server/include}/server_response_containers.h (100%) rename {common/server => libs/server/include}/server_room.h (100%) rename {common => libs/server/include}/serverinfo_user_container.h (100%) rename {common => libs/server/include}/user_level.h (100%) rename {common/server => libs/server/src}/game/server_abstract_participant.cpp (98%) rename {common/server => libs/server/src}/game/server_arrow.cpp (84%) create mode 100644 libs/server/src/game/server_arrowtarget.cpp rename {common/server => libs/server/src}/game/server_card.cpp (97%) rename {common/server => libs/server/src}/game/server_cardzone.cpp (98%) rename {common/server => libs/server/src}/game/server_counter.cpp (91%) rename {common/server => libs/server/src}/game/server_game.cpp (99%) rename {common/server => libs/server/src}/game/server_player.cpp (99%) rename {common/server => libs/server/src}/game/server_spectator.cpp (89%) rename {common/server => libs/server/src}/server.cpp (98%) rename {common/server => libs/server/src}/server_abstractuserinterface.cpp (93%) create mode 100644 libs/server/src/server_database_interface.cpp rename {common/server => libs/server/src}/server_protocolhandler.cpp (99%) rename {common/server => libs/server/src}/server_remoteuserinterface.cpp (89%) rename {common/server => libs/server/src}/server_response_containers.cpp (97%) rename {common/server => libs/server/src}/server_room.cpp (99%) rename {common => libs/server/src}/serverinfo_user_container.cpp (96%) rename {cockatrice/libs => libs}/settings/CMakeLists.txt (93%) rename {cockatrice/libs => libs}/settings/include/settings/cache_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/card_counter_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/card_database_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/card_override_settings.h (93%) rename {cockatrice/libs => libs}/settings/include/settings/debug_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/download_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/game_filters_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/layouts_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/message_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/recents_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/servers_settings.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/settings_manager.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/shortcut_treeview.h (100%) rename {cockatrice/libs => libs}/settings/include/settings/shortcuts_settings.h (100%) rename {cockatrice/libs => libs}/settings/src/cache_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/card_counter_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/card_database_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/card_override_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/debug_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/download_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/game_filters_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/layouts_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/message_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/recents_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/servers_settings.cpp (100%) rename {cockatrice/libs => libs}/settings/src/settings_manager.cpp (100%) rename {cockatrice/libs => libs}/settings/src/shortcut_treeview.cpp (100%) rename {cockatrice/libs => libs}/settings/src/shortcuts_settings.cpp (100%) rename {cockatrice/libs => libs}/utility/CMakeLists.txt (64%) rename {common => libs/utility/include/utility}/card_ref.h (100%) rename {common => libs/utility/include/utility}/color.h (100%) rename {common => libs/utility/include/utility}/expression.h (100%) rename {common => libs/utility/include/utility}/featureset.h (100%) rename {cockatrice/libs => libs}/utility/include/utility/key_signals.h (100%) rename {cockatrice/libs => libs}/utility/include/utility/levenshtein.h (100%) rename {cockatrice/libs => libs}/utility/include/utility/logger.h (100%) rename {cockatrice/libs => libs}/utility/include/utility/macros.h (100%) rename {common => libs/utility/include/utility}/passwordhasher.h (100%) rename {common => libs/utility/include/utility}/trice_limits.h (100%) rename {common => libs/utility/src}/expression.cpp (97%) rename {common => libs/utility/src}/featureset.cpp (98%) rename {cockatrice/libs => libs}/utility/src/key_signals.cpp (100%) rename {cockatrice/libs => libs}/utility/src/levenshtein.cpp (100%) rename {cockatrice/libs => libs}/utility/src/logger.cpp (100%) rename {common => libs/utility/src}/passwordhasher.cpp (91%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index ec5fcb248..21b37a620 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -270,9 +270,11 @@ set(cockatrice_SOURCES src/interface/utility/sequence_edit.cpp ) -add_subdirectory(libs/settings) -add_subdirectory(libs/card) -add_subdirectory(libs/utility) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card) +add_subdirectory(${CMAKE_SOURCE_DIR}/libs/utility ${CMAKE_BINARY_DIR}/libs/utility) add_subdirectory(sounds) add_subdirectory(themes) configure_file( @@ -365,9 +367,9 @@ elseif(Qt5_FOUND) endif() if(Qt5_FOUND) - target_link_libraries(cockatrice cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries(cockatrice cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES}) else() - target_link_libraries(cockatrice PUBLIC cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES}) + target_link_libraries(cockatrice PUBLIC cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES}) endif() if(UNIX) diff --git a/cockatrice/src/client/get_text_with_max.h b/cockatrice/src/client/get_text_with_max.h index 2e633d494..7cdb6a4ea 100644 --- a/cockatrice/src/client/get_text_with_max.h +++ b/cockatrice/src/client/get_text_with_max.h @@ -7,7 +7,7 @@ #ifndef GETTEXTWITHMAX_H #define GETTEXTWITHMAX_H -#include "trice_limits.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index 43ceb6cdd..434ba2799 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -1,7 +1,7 @@ #include "tapped_out_interface.h" -#include "deck_list.h" -#include "deck_list_card_node.h" +#include "../../../libs/deck/deck_list.h" +#include "../../../libs/deck/deck_list_card_node.h" #include #include diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index bc5988b4a..c8202a037 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,8 +7,8 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H +#include "../../../libs/deck/deck_list.h" #include "card/card_database/card_database.h" -#include "deck_list.h" #include #include diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index 4d706a136..4d8068f8b 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,10 +1,10 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "abstract_deck_list_card_node.h" +#include "../../../libs/deck/abstract_deck_list_card_node.h" +#include "../../../libs/deck/deck_list.h" +#include "../../../libs/deck/deck_list_card_node.h" #include "card/card_printing/exact_card.h" -#include "deck_list.h" -#include "deck_list_card_node.h" #include #include diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index cc3d8f122..2a677dfad 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,10 +1,10 @@ #include "deck_loader.h" +#include "../../../libs/deck/deck_list.h" +#include "../../../libs/deck/deck_list_card_node.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" #include #include diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index 53c4ef434..797fee9e9 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -7,7 +7,7 @@ #ifndef DECK_LOADER_H #define DECK_LOADER_H -#include "deck_list.h" +#include "../../../libs/deck/deck_list.h" #include diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp index 96865d9e7..24492f0eb 100644 --- a/cockatrice/src/deck/deck_stats_interface.cpp +++ b/cockatrice/src/deck/deck_stats_interface.cpp @@ -1,7 +1,7 @@ #include "deck_stats_interface.h" -#include "deck_list.h" -#include "deck_list_card_node.h" +#include "../../../libs/deck/deck_list.h" +#include "../../../libs/deck/deck_list_card_node.h" #include #include diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index af8b9a879..5cbd87f96 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -7,8 +7,8 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H +#include "../../../libs/deck/deck_list.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 168bd9aa3..310177782 100644 --- a/cockatrice/src/dialogs/dlg_connect.cpp +++ b/cockatrice/src/dialogs/dlg_connect.cpp @@ -1,7 +1,7 @@ #include "dlg_connect.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index e0a3eaecb..669a02b24 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,10 +1,10 @@ #include "dlg_create_game.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../server/pending_command.h" #include "../tabs/tab_room.h" #include "pb/serverinfo_game.pb.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/dialogs/dlg_edit_avatar.cpp index 98a41bdfa..f25800655 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.cpp +++ b/cockatrice/src/dialogs/dlg_edit_avatar.cpp @@ -1,6 +1,6 @@ #include "dlg_edit_avatar.h" -#include "trice_limits.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp index 0015b9175..bdebe2909 100644 --- a/cockatrice/src/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/dialogs/dlg_edit_password.cpp @@ -1,7 +1,7 @@ #include "dlg_edit_password.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index e9ab4f7b1..c14b25b5a 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -1,12 +1,12 @@ #include "dlg_edit_tokens.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/get_text_with_max.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 #include diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp index 6df7b4b5d..01dc8358c 100644 --- a/cockatrice/src/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/dialogs/dlg_edit_user.cpp @@ -1,7 +1,7 @@ #include "dlg_edit_user.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp index d21087e2b..b5014ce3d 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp @@ -1,7 +1,7 @@ #include "dlg_forgot_password_challenge.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp index 9ac665a44..df1cdea5f 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp @@ -1,7 +1,7 @@ #include "dlg_forgot_password_request.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp index ad40cc5fc..8bdfad394 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp @@ -1,7 +1,7 @@ #include "dlg_forgot_password_reset.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/dialogs/dlg_register.cpp b/cockatrice/src/dialogs/dlg_register.cpp index 874c1d0b5..b1e22c4fe 100644 --- a/cockatrice/src/dialogs/dlg_register.cpp +++ b/cockatrice/src/dialogs/dlg_register.cpp @@ -1,8 +1,8 @@ #include "dlg_register.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "pb/serverinfo_user.pb.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h index 2e95d366a..3669121e1 100644 --- a/cockatrice/src/game/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -7,9 +7,9 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H +#include "../../../../libs/utility/include/utility/card_ref.h" #include "arrow_target.h" #include "card/card_printing/exact_card.h" -#include "card_ref.h" #include "graphics_item_type.h" class Player; diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index 5ad983b05..facf9bc4c 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,8 +1,8 @@ #include "abstract_counter.h" +#include "../../../../libs/utility/include/utility/expression.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" diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index 1a6a4689d..e6c4a6daf 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,9 +1,9 @@ #include "deck_view.h" +#include "../../../../libs/deck/deck_list.h" +#include "../../../../libs/deck/deck_list_card_node.h" #include "../../interface/theme_manager.h" #include "card/card_info.h" -#include "deck_list.h" -#include "deck_list_card_node.h" #include "settings/cache_settings.h" #include diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index b1740e59d..898ed506d 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,5 +1,6 @@ #include "deck_view_container.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../deck/deck_loader.h" #include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h" @@ -18,7 +19,6 @@ #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 #include diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp index 92a7889bb..55feb28da 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -1,13 +1,13 @@ #include "dlg_create_token.h" +#include "../../../../libs/deck/deck_list.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../interface/widgets/cards/card_info_picture_widget.h" #include "../../main.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 #include diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp index 7a1a2bb9b..f3958b9ee 100644 --- a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp +++ b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp @@ -1,6 +1,6 @@ #include "dlg_roll_dice.h" -#include "trice_limits.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include #include diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index d5848ffdb..a75bb2ed4 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,10 +1,10 @@ #include "game_event_handler.h" +#include "../../../libs/server/get_pb_extension.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "../tabs/tab_game.h" #include "abstract_game.h" -#include "get_pb_extension.h" #include "log/message_log_widget.h" #include "pb/command_concede.pb.h" #include "pb/command_delete_arrow.pb.h" diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h index 128d8ba0e..724b57231 100644 --- a/cockatrice/src/game/log/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -7,10 +7,10 @@ #ifndef MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H +#include "../../../../libs/server/include/user_level.h" #include "../../client/translation.h" #include "../../server/chat_view/chat_view.h" #include "../zones/logic/card_zone_logic.h" -#include "user_level.h" class AbstractGame; class CardItem; diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp index 3f506de00..2ac36a2e6 100644 --- a/cockatrice/src/game/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -1,11 +1,11 @@ #include "hand_menu.h" -#include "../../../settings/cache_settings.h" -#include "../../../settings/shortcuts_settings.h" #include "../../abstract_game.h" #include "../../zones/hand_zone.h" #include "../player.h" #include "../player_actions.h" +#include "settings/cache_settings.h" +#include "settings/shortcuts_settings.h" #include #include diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp index 704e03e9f..466c7e0ec 100644 --- a/cockatrice/src/game/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -1,11 +1,11 @@ #include "library_menu.h" -#include "../../../settings/cache_settings.h" -#include "../../../settings/shortcuts_settings.h" #include "../../../tabs/tab_game.h" #include "../../abstract_game.h" #include "../player.h" #include "../player_actions.h" +#include "settings/cache_settings.h" +#include "settings/shortcuts_settings.h" #include #include diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index a910cf72a..ade75c124 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,5 +1,6 @@ #include "player_actions.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../../common/pb/context_move_card.pb.h" #include "../../client/get_text_with_max.h" #include "../../tabs/tab_game.h" @@ -25,7 +26,6 @@ #include "pb/command_set_card_counter.pb.h" #include "pb/command_shuffle.pb.h" #include "pb/command_undo_draw.pb.h" -#include "trice_limits.h" // milliseconds in between triggers of the move top cards until action static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100; diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index dcc4f689f..4002227de 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -7,7 +7,7 @@ #ifndef PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H -#include "user_level.h" +#include "../../../libs/server/include/user_level.h" #include #include 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 e709048f6..b746348e4 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -7,8 +7,8 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H +#include "../../../../../libs/utility/include/utility/card_ref.h" #include "card/card_printing/exact_card.h" -#include "card_ref.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 1e2de3350..5bbd62779 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -7,8 +7,8 @@ #ifndef CARDFRAME_H #define CARDFRAME_H +#include "../../../../../libs/utility/include/utility/card_ref.h" #include "card/card_printing/exact_card.h" -#include "card_ref.h" #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index f2ae805d1..55ead69d8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -13,11 +13,11 @@ #include "mana_curve_widget.h" #include "mana_devotion_widget.h" +#include <../../../../../libs/deck/deck_list.h> #include #include #include #include -#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index 14438e9b2..6c0380b81 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -6,9 +6,9 @@ #include "card/card_database/card_database.h" #include "card/card_database/card_database_manager.h" +#include <../../../../../libs/deck/deck_list.h> #include #include -#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index c0d970db2..d5b4c38bf 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h @@ -10,9 +10,9 @@ #include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" +#include <../../../../../libs/deck/deck_list.h> #include #include -#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index c4004d8d3..3615a6be0 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -7,7 +7,7 @@ #include "card/card_database/card_database.h" #include "card/card_database/card_database_manager.h" -#include +#include <../../../../../libs/deck/deck_list.h> #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index de9a5e53e..a92e16963 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -7,7 +7,7 @@ #include "card/card_database/card_database.h" #include "card/card_database/card_database_manager.h" -#include +#include <../../../../../libs/deck/deck_list.h> #include #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index 003770b51..61f157b3b 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h @@ -10,9 +10,9 @@ #include "../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" +#include <../../../../../libs/deck/deck_list.h> #include #include -#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 377b2f904..0d805fbb8 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 @@ -3,13 +3,13 @@ #include "card/card_database/card_database_manager.h" #include "settings/cache_settings.h" +#include <../../../../../libs/utility/include/utility/trice_limits.h> #include #include #include #include #include #include -#include DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 3a047ef98..ead218f30 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -20,15 +20,15 @@ #include "main.h" +#include "../../libs/rng/include/rng/rng_sfmt.h" +#include "../../libs/utility/include/utility/featureset.h" #include "QtNetwork/QNetworkInterface" #include "client/network/spoiler_background_updater.h" #include "client/sound_engine.h" #include "dialogs/dlg_settings.h" -#include "featureset.h" #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" #include "interface/window_main.h" -#include "rng_sfmt.h" #include "settings/cache_settings.h" #include "utility/logger.h" #include "version_string.h" diff --git a/cockatrice/src/server/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp index 4f3098871..dd6ea3cda 100644 --- a/cockatrice/src/server/abstract_client.cpp +++ b/cockatrice/src/server/abstract_client.cpp @@ -1,7 +1,7 @@ #include "abstract_client.h" -#include "featureset.h" -#include "get_pb_extension.h" +#include "../../../libs/server/get_pb_extension.h" +#include "../../../libs/utility/include/utility/featureset.h" #include "pb/commands.pb.h" #include "pb/event_add_to_list.pb.h" #include "pb/event_connection_closed.pb.h" diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index 9484db98f..e0d55c1ff 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -1,5 +1,6 @@ #include "chat_view.h" +#include "../../../../libs/server/include/user_level.h" #include "../../client/sound_engine.h" #include "../../interface/pixel_map_generator.h" #include "../../tabs/tab_account.h" @@ -7,7 +8,6 @@ #include "../user/user_list_manager.h" #include "../user/user_list_proxy.h" #include "settings/cache_settings.h" -#include "user_level.h" #include #include diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h index 924c2ff42..abd91ae4c 100644 --- a/cockatrice/src/server/chat_view/chat_view.h +++ b/cockatrice/src/server/chat_view/chat_view.h @@ -8,10 +8,10 @@ #ifndef CHATVIEW_H #define CHATVIEW_H +#include "../../../../libs/server/include/room_message_type.h" +#include "../../../../libs/server/include/user_level.h" #include "../../tabs/tab_supervisor.h" #include "../user/user_list_widget.h" -#include "room_message_type.h" -#include "user_level.h" #include #include diff --git a/cockatrice/src/server/local_client.cpp b/cockatrice/src/server/local_client.cpp index 734660af1..d6f9d9bb2 100644 --- a/cockatrice/src/server/local_client.cpp +++ b/cockatrice/src/server/local_client.cpp @@ -1,6 +1,6 @@ #include "local_client.h" -#include "debug_pb_message.h" +#include "../../../libs/server/debug_pb_message.h" #include "local_server_interface.h" #include "pb/session_commands.pb.h" diff --git a/cockatrice/src/server/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp index 39b547a02..ed6026050 100644 --- a/cockatrice/src/server/remote/remote_client.cpp +++ b/cockatrice/src/server/remote/remote_client.cpp @@ -1,9 +1,9 @@ #include "remote_client.h" +#include "../../../../libs/server/debug_pb_message.h" +#include "../../../../libs/utility/passwordhasher.h" #include "../../main.h" #include "../pending_command.h" -#include "debug_pb_message.h" -#include "passwordhasher.h" #include "pb/event_server_identification.pb.h" #include "pb/response_activate.pb.h" #include "pb/response_forgotpasswordrequest.pb.h" diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h index d6f48f836..2516df9ce 100644 --- a/cockatrice/src/server/user/user_context_menu.h +++ b/cockatrice/src/server/user/user_context_menu.h @@ -7,7 +7,7 @@ #ifndef USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H -#include "user_level.h" +#include "../../../../libs/server/include/user_level.h" #include diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index cec0c38e8..96d7d048f 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -1,5 +1,6 @@ #include "user_info_box.h" +#include "../../../../libs/utility/passwordhasher.h" #include "../../client/get_text_with_max.h" #include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_password.h" @@ -7,7 +8,6 @@ #include "../../interface/pixel_map_generator.h" #include "../abstract_client.h" #include "../pending_command.h" -#include "passwordhasher.h" #include "pb/response_get_user_info.pb.h" #include "pb/serverinfo_user.pb.h" #include "pb/session_commands.pb.h" diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index d4dad5919..4da6e323e 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -1,5 +1,6 @@ #include "user_list_widget.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../interface/pixel_map_generator.h" #include "../../tabs/tab_account.h" #include "../../tabs/tab_supervisor.h" @@ -10,7 +11,6 @@ #include "pb/response_get_games_of_user.pb.h" #include "pb/response_get_user_info.pb.h" #include "pb/session_commands.pb.h" -#include "trice_limits.h" #include "user_context_menu.h" #include "user_list_manager.h" diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h index 8a1674549..5fce9b782 100644 --- a/cockatrice/src/server/user/user_list_widget.h +++ b/cockatrice/src/server/user/user_list_widget.h @@ -7,8 +7,8 @@ #ifndef USERLIST_H #define USERLIST_H +#include "../../../../libs/server/include/user_level.h" #include "pb/moderator_commands.pb.h" -#include "user_level.h" #include #include diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index a00f9b81f..bb7a5247e 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,5 +1,6 @@ #include "abstract_tab_deck_editor.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/tapped_out_interface.h" #include "../deck/deck_stats_interface.h" #include "../dialogs/dlg_load_deck.h" @@ -16,7 +17,6 @@ #include "pb/response.pb.h" #include "settings/cache_settings.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab.h b/cockatrice/src/tabs/tab.h index a431aac75..bfac8c7f5 100644 --- a/cockatrice/src/tabs/tab.h +++ b/cockatrice/src/tabs/tab.h @@ -7,7 +7,7 @@ #ifndef TAB_H #define TAB_H -#include "card_ref.h" +#include "../../../libs/utility/include/utility/card_ref.h" #include diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index ba82857fe..d6f163513 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -1,5 +1,6 @@ #include "tab_account.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" #include "../server/abstract_client.h" @@ -14,7 +15,6 @@ #include "pb/response_list_users.pb.h" #include "pb/session_commands.pb.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp index a3d9e34e8..a3bb900a1 100644 --- a/cockatrice/src/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -1,11 +1,11 @@ #include "tab_admin.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "pb/admin_commands.pb.h" #include "pb/event_replay_added.pb.h" #include "pb/moderator_commands.pb.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index 5eb856f97..2cf40b19a 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -1,5 +1,6 @@ #include "tab_deck_editor.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/deck_editor_menu.h" #include "../client/tapped_out_interface.h" #include "../dialogs/dlg_load_deck.h" @@ -15,7 +16,6 @@ #include "card/card_database/model/card_database_model.h" #include "settings/cache_settings.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index f76f74ec6..0b6311748 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -1,10 +1,10 @@ #include "tab_deck_storage.h" +#include "../../../libs/deck/deck_list.h" #include "../client/get_text_with_max.h" #include "../deck/deck_loader.h" #include "../server/pending_command.h" #include "../server/remote/remote_decklist_tree_widget.h" -#include "deck_list.h" #include "pb/command_deck_del.pb.h" #include "pb/command_deck_del_dir.pb.h" #include "pb/command_deck_download.pb.h" diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index 39d86e9fa..b7fdc754e 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -1,5 +1,6 @@ #include "tab_game.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/network/replay_timeline_widget.h" #include "../dialogs/dlg_create_game.h" #include "../game/board/arrow_item.h" @@ -30,7 +31,6 @@ #include "pb/serverinfo_user.pb.h" #include "settings/cache_settings.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index 4a791a27e..e56e50768 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -1,12 +1,12 @@ #include "tab_logs.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../deck/custom_line_edit.h" #include "../dialogs/dlg_manage_sets.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "pb/moderator_commands.pb.h" #include "pb/response_viewlog_history.pb.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index c1ea99a86..856cfb9c7 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -1,5 +1,6 @@ #include "tab_message.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../client/sound_engine.h" #include "../deck/custom_line_edit.h" #include "../main.h" @@ -11,7 +12,6 @@ #include "pb/serverinfo_user.pb.h" #include "pb/session_commands.pb.h" #include "settings/cache_settings.h" -#include "trice_limits.h" #include #include diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index 06937ac9d..3ae857e38 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -1,5 +1,7 @@ #include "tab_room.h" +#include "../../../libs/server/get_pb_extension.h" +#include "../../../libs/utility/include/utility/trice_limits.h" #include "../dialogs/dlg_settings.h" #include "../main.h" #include "../server/abstract_client.h" @@ -8,7 +10,6 @@ #include "../server/pending_command.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "get_pb_extension.h" #include "pb/event_join_room.pb.h" #include "pb/event_leave_room.pb.h" #include "pb/event_list_games.pb.h" @@ -19,7 +20,6 @@ #include "settings/cache_settings.h" #include "tab_account.h" #include "tab_supervisor.h" -#include "trice_limits.h" #include #include 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 5da4b4b85..ff5bde4a1 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,5 +1,6 @@ #include "tab_deck_editor_visual.h" +#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../deck/deck_list_model.h" #include "../../deck/deck_stats_interface.h" #include "../../filters/filter_builder.h" @@ -14,7 +15,6 @@ #include "pb/command_deck_upload.pb.h" #include "settings/cache_settings.h" #include "tab_deck_editor_visual_tab_widget.h" -#include "trice_limits.h" #include #include diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index cf2f15db1..b92285850 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -2,48 +2,12 @@ # # provides the common library -add_subdirectory(pb) - set(common_SOURCES - abstract_deck_list_card_node.cpp - abstract_deck_list_node.cpp - debug_pb_message.cpp - deck_list_card_node.cpp - deck_list.cpp - expression.cpp - featureset.cpp - get_pb_extension.cpp - inner_deck_list_node.cpp - passwordhasher.cpp - rng_abstract.cpp - rng_sfmt.cpp - server/game/server_abstract_participant.cpp - server/game/server_arrow.cpp - server/game/server_arrowtarget.cpp - server/game/server_card.cpp - server/game/server_cardzone.cpp - server/game/server_counter.cpp - server/game/server_game.cpp - server/game/server_player.cpp - server/game/server_spectator.cpp - server/server.cpp - server/server_abstractuserinterface.cpp - server/server_database_interface.cpp - server/server_protocolhandler.cpp - server/server_remoteuserinterface.cpp - server/server_response_containers.cpp - server/server_room.cpp - serverinfo_user_container.cpp - sfmt/SFMT.c ) set(ORACLE_LIBS) -include_directories(pb) -include_directories(sfmt) -include_directories(${PROTOBUF_INCLUDE_DIR}) include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS}) -target_link_libraries(cockatrice_common PUBLIC cockatrice_protocol) diff --git a/common/server/game/server_arrowtarget.cpp b/common/server/game/server_arrowtarget.cpp deleted file mode 100644 index 1b3385d58..000000000 --- a/common/server/game/server_arrowtarget.cpp +++ /dev/null @@ -1,2 +0,0 @@ - -#include "server_arrowtarget.h" diff --git a/common/server/server_database_interface.cpp b/common/server/server_database_interface.cpp deleted file mode 100644 index a375f6031..000000000 --- a/common/server/server_database_interface.cpp +++ /dev/null @@ -1,2 +0,0 @@ - -#include "server_database_interface.h" diff --git a/cockatrice/libs/card/CMakeLists.txt b/libs/card/CMakeLists.txt similarity index 95% rename from cockatrice/libs/card/CMakeLists.txt rename to libs/card/CMakeLists.txt index d66b72964..4e99c7fb6 100644 --- a/cockatrice/libs/card/CMakeLists.txt +++ b/libs/card/CMakeLists.txt @@ -55,9 +55,9 @@ qt_add_library(cardlib STATIC ) target_include_directories(cardlib - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + PUBLIC include PUBLIC ${CMAKE_SOURCE_DIR}/common - PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/settings/include + PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters ) diff --git a/cockatrice/libs/card/include/card/card_database/card_database.h b/libs/card/include/card/card_database/card_database.h similarity index 98% rename from cockatrice/libs/card/include/card/card_database/card_database.h rename to libs/card/include/card/card_database/card_database.h index 15e8e69a1..6e3b7fb94 100644 --- a/cockatrice/libs/card/include/card/card_database/card_database.h +++ b/libs/card/include/card/card_database/card_database.h @@ -7,10 +7,10 @@ #ifndef CARDDATABASE_H #define CARDDATABASE_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 "utility/card_ref.h" #include #include diff --git a/cockatrice/libs/card/include/card/card_database/card_database_loader.h b/libs/card/include/card/card_database/card_database_loader.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/card_database_loader.h rename to libs/card/include/card/card_database/card_database_loader.h diff --git a/cockatrice/libs/card/include/card/card_database/card_database_manager.h b/libs/card/include/card/card_database/card_database_manager.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/card_database_manager.h rename to libs/card/include/card/card_database/card_database_manager.h diff --git a/cockatrice/libs/card/include/card/card_database/card_database_querier.h b/libs/card/include/card/card_database/card_database_querier.h similarity index 98% rename from cockatrice/libs/card/include/card/card_database/card_database_querier.h rename to libs/card/include/card/card_database/card_database_querier.h index 983484745..e020dcac5 100644 --- a/cockatrice/libs/card/include/card/card_database/card_database_querier.h +++ b/libs/card/include/card/card_database/card_database_querier.h @@ -7,9 +7,9 @@ #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H #define COCKATRICE_CARD_DATABASE_QUERIER_H -#include "../../common/card_ref.h" #include "card/card_info.h" #include "card/card_printing/exact_card.h" +#include "utility/card_ref.h" #include diff --git a/cockatrice/libs/card/include/card/card_database/model/card/card_completer_proxy_model.h b/libs/card/include/card/card_database/model/card/card_completer_proxy_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/card/card_completer_proxy_model.h rename to libs/card/include/card/card_database/model/card/card_completer_proxy_model.h diff --git a/cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h b/libs/card/include/card/card_database/model/card/card_search_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h rename to libs/card/include/card/card_database/model/card/card_search_model.h diff --git a/cockatrice/libs/card/include/card/card_database/model/card_database_display_model.h b/libs/card/include/card/card_database/model/card_database_display_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/card_database_display_model.h rename to libs/card/include/card/card_database/model/card_database_display_model.h diff --git a/cockatrice/libs/card/include/card/card_database/model/card_database_model.h b/libs/card/include/card/card_database/model/card_database_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/card_database_model.h rename to libs/card/include/card/card_database/model/card_database_model.h diff --git a/cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h b/libs/card/include/card/card_database/model/token/token_display_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h rename to libs/card/include/card/card_database/model/token/token_display_model.h diff --git a/cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h b/libs/card/include/card/card_database/model/token/token_edit_model.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h rename to libs/card/include/card/card_database/model/token/token_edit_model.h diff --git a/cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h b/libs/card/include/card/card_database/parser/card_database_parser.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h rename to libs/card/include/card/card_database/parser/card_database_parser.h diff --git a/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h b/libs/card/include/card/card_database/parser/cockatrice_xml_3.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h rename to libs/card/include/card/card_database/parser/cockatrice_xml_3.h diff --git a/cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h b/libs/card/include/card/card_database/parser/cockatrice_xml_4.h similarity index 100% rename from cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h rename to libs/card/include/card/card_database/parser/cockatrice_xml_4.h diff --git a/cockatrice/libs/card/include/card/card_info.h b/libs/card/include/card/card_info.h similarity index 100% rename from cockatrice/libs/card/include/card/card_info.h rename to libs/card/include/card/card_info.h diff --git a/cockatrice/libs/card/include/card/card_info_comparator.h b/libs/card/include/card/card_info_comparator.h similarity index 100% rename from cockatrice/libs/card/include/card/card_info_comparator.h rename to libs/card/include/card/card_info_comparator.h diff --git a/cockatrice/libs/card/include/card/card_printing/exact_card.h b/libs/card/include/card/card_printing/exact_card.h similarity index 100% rename from cockatrice/libs/card/include/card/card_printing/exact_card.h rename to libs/card/include/card/card_printing/exact_card.h diff --git a/cockatrice/libs/card/include/card/card_printing/printing_info.h b/libs/card/include/card/card_printing/printing_info.h similarity index 100% rename from cockatrice/libs/card/include/card/card_printing/printing_info.h rename to libs/card/include/card/card_printing/printing_info.h diff --git a/cockatrice/libs/card/include/card/card_relation/card_relation.h b/libs/card/include/card/card_relation/card_relation.h similarity index 100% rename from cockatrice/libs/card/include/card/card_relation/card_relation.h rename to libs/card/include/card/card_relation/card_relation.h diff --git a/cockatrice/libs/card/include/card/card_relation/card_relation_type.h b/libs/card/include/card/card_relation/card_relation_type.h similarity index 100% rename from cockatrice/libs/card/include/card/card_relation/card_relation_type.h rename to libs/card/include/card/card_relation/card_relation_type.h diff --git a/cockatrice/libs/card/include/card/card_set/card_set.h b/libs/card/include/card/card_set/card_set.h similarity index 100% rename from cockatrice/libs/card/include/card/card_set/card_set.h rename to libs/card/include/card/card_set/card_set.h diff --git a/cockatrice/libs/card/include/card/card_set/card_set_comparator.h b/libs/card/include/card/card_set/card_set_comparator.h similarity index 100% rename from cockatrice/libs/card/include/card/card_set/card_set_comparator.h rename to libs/card/include/card/card_set/card_set_comparator.h diff --git a/cockatrice/libs/card/include/card/card_set/card_set_list.h b/libs/card/include/card/card_set/card_set_list.h similarity index 100% rename from cockatrice/libs/card/include/card/card_set/card_set_list.h rename to libs/card/include/card/card_set/card_set_list.h diff --git a/cockatrice/libs/card/include/card/game_specific_terms.h b/libs/card/include/card/game_specific_terms.h similarity index 100% rename from cockatrice/libs/card/include/card/game_specific_terms.h rename to libs/card/include/card/game_specific_terms.h diff --git a/cockatrice/libs/card/src/card_database/card_database.cpp b/libs/card/src/card_database/card_database.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/card_database.cpp rename to libs/card/src/card_database/card_database.cpp diff --git a/cockatrice/libs/card/src/card_database/card_database_loader.cpp b/libs/card/src/card_database/card_database_loader.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/card_database_loader.cpp rename to libs/card/src/card_database/card_database_loader.cpp diff --git a/cockatrice/libs/card/src/card_database/card_database_manager.cpp b/libs/card/src/card_database/card_database_manager.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/card_database_manager.cpp rename to libs/card/src/card_database/card_database_manager.cpp diff --git a/cockatrice/libs/card/src/card_database/card_database_querier.cpp b/libs/card/src/card_database/card_database_querier.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/card_database_querier.cpp rename to libs/card/src/card_database/card_database_querier.cpp diff --git a/cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp b/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp rename to libs/card/src/card_database/model/card/card_completer_proxy_model.cpp diff --git a/cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp b/libs/card/src/card_database/model/card/card_search_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp rename to libs/card/src/card_database/model/card/card_search_model.cpp diff --git a/cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp b/libs/card/src/card_database/model/card_database_display_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp rename to libs/card/src/card_database/model/card_database_display_model.cpp diff --git a/cockatrice/libs/card/src/card_database/model/card_database_model.cpp b/libs/card/src/card_database/model/card_database_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/card_database_model.cpp rename to libs/card/src/card_database/model/card_database_model.cpp diff --git a/cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp b/libs/card/src/card_database/model/token/token_display_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp rename to libs/card/src/card_database/model/token/token_display_model.cpp diff --git a/cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp b/libs/card/src/card_database/model/token/token_edit_model.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp rename to libs/card/src/card_database/model/token/token_edit_model.cpp diff --git a/cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp b/libs/card/src/card_database/parser/card_database_parser.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp rename to libs/card/src/card_database/parser/card_database_parser.cpp diff --git a/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp b/libs/card/src/card_database/parser/cockatrice_xml_3.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp rename to libs/card/src/card_database/parser/cockatrice_xml_3.cpp diff --git a/cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp b/libs/card/src/card_database/parser/cockatrice_xml_4.cpp similarity index 100% rename from cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp rename to libs/card/src/card_database/parser/cockatrice_xml_4.cpp diff --git a/cockatrice/libs/card/src/card_info.cpp b/libs/card/src/card_info.cpp similarity index 100% rename from cockatrice/libs/card/src/card_info.cpp rename to libs/card/src/card_info.cpp diff --git a/cockatrice/libs/card/src/card_info_comparator.cpp b/libs/card/src/card_info_comparator.cpp similarity index 100% rename from cockatrice/libs/card/src/card_info_comparator.cpp rename to libs/card/src/card_info_comparator.cpp diff --git a/cockatrice/libs/card/src/card_printing/exact_card.cpp b/libs/card/src/card_printing/exact_card.cpp similarity index 100% rename from cockatrice/libs/card/src/card_printing/exact_card.cpp rename to libs/card/src/card_printing/exact_card.cpp diff --git a/cockatrice/libs/card/src/card_printing/printing_info.cpp b/libs/card/src/card_printing/printing_info.cpp similarity index 100% rename from cockatrice/libs/card/src/card_printing/printing_info.cpp rename to libs/card/src/card_printing/printing_info.cpp diff --git a/cockatrice/libs/card/src/card_relation/card_relation.cpp b/libs/card/src/card_relation/card_relation.cpp similarity index 100% rename from cockatrice/libs/card/src/card_relation/card_relation.cpp rename to libs/card/src/card_relation/card_relation.cpp diff --git a/cockatrice/libs/card/src/card_set/card_set.cpp b/libs/card/src/card_set/card_set.cpp similarity index 100% rename from cockatrice/libs/card/src/card_set/card_set.cpp rename to libs/card/src/card_set/card_set.cpp diff --git a/cockatrice/libs/card/src/card_set/card_set_list.cpp b/libs/card/src/card_set/card_set_list.cpp similarity index 100% rename from cockatrice/libs/card/src/card_set/card_set_list.cpp rename to libs/card/src/card_set/card_set_list.cpp diff --git a/libs/deck_list/CMakeLists.txt b/libs/deck_list/CMakeLists.txt new file mode 100644 index 000000000..95f7134d6 --- /dev/null +++ b/libs/deck_list/CMakeLists.txt @@ -0,0 +1,36 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + include/deck_list/abstract_deck_list_card_node.h + include/deck_list/abstract_deck_list_node.h + include/deck_list/deck_list.h + include/deck_list/deck_list_card_node.h + include/deck_list/inner_deck_list_node.h +) + +if (Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif (Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif () + +qt_add_library(cardlib STATIC + src/abstract_deck_list_card_node.cpp + src/abstract_deck_list_node.cpp + src/deck_list.cpp + src/deck_list_card_node.cpp + src/inner_deck_list_node.cpp + ${MOC_SOURCES} +) + +target_include_directories(deck_list + PUBLIC include + PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include +) + +target_link_libraries(deck_list + utility + PUBLIC ${COCKATRICE_QT_MODULES} +) diff --git a/common/abstract_deck_list_card_node.h b/libs/deck_list/include/deck_list/abstract_deck_list_card_node.h similarity index 100% rename from common/abstract_deck_list_card_node.h rename to libs/deck_list/include/deck_list/abstract_deck_list_card_node.h diff --git a/common/abstract_deck_list_node.h b/libs/deck_list/include/deck_list/abstract_deck_list_node.h similarity index 100% rename from common/abstract_deck_list_node.h rename to libs/deck_list/include/deck_list/abstract_deck_list_node.h diff --git a/common/deck_list.h b/libs/deck_list/include/deck_list/deck_list.h similarity index 99% rename from common/deck_list.h rename to libs/deck_list/include/deck_list/deck_list.h index 2a70ea4b1..8a6c74439 100644 --- a/common/deck_list.h +++ b/libs/deck_list/include/deck_list/deck_list.h @@ -10,8 +10,8 @@ #ifndef DECKLIST_H #define DECKLIST_H -#include "card_ref.h" #include "inner_deck_list_node.h" +#include "utility/card_ref.h" #include #include diff --git a/common/deck_list_card_node.h b/libs/deck_list/include/deck_list/deck_list_card_node.h similarity index 99% rename from common/deck_list_card_node.h rename to libs/deck_list/include/deck_list/deck_list_card_node.h index 84a396daf..df98c585c 100644 --- a/common/deck_list_card_node.h +++ b/libs/deck_list/include/deck_list/deck_list_card_node.h @@ -13,7 +13,7 @@ #define COCKATRICE_DECK_LIST_CARD_NODE_H #include "abstract_deck_list_card_node.h" -#include "card_ref.h" +#include "utility/card_ref.h" /** * @class DecklistCardNode diff --git a/common/inner_deck_list_node.h b/libs/deck_list/include/deck_list/inner_deck_list_node.h similarity index 100% rename from common/inner_deck_list_node.h rename to libs/deck_list/include/deck_list/inner_deck_list_node.h diff --git a/common/abstract_deck_list_card_node.cpp b/libs/deck_list/src/abstract_deck_list_card_node.cpp similarity index 96% rename from common/abstract_deck_list_card_node.cpp rename to libs/deck_list/src/abstract_deck_list_card_node.cpp index b8a497c20..d83fcd8b2 100644 --- a/common/abstract_deck_list_card_node.cpp +++ b/libs/deck_list/src/abstract_deck_list_card_node.cpp @@ -1,4 +1,4 @@ -#include "abstract_deck_list_card_node.h" +#include "../include/deck_list/abstract_deck_list_card_node.h" bool AbstractDecklistCardNode::compare(AbstractDecklistNode *other) const { diff --git a/common/abstract_deck_list_node.cpp b/libs/deck_list/src/abstract_deck_list_node.cpp similarity index 78% rename from common/abstract_deck_list_node.cpp rename to libs/deck_list/src/abstract_deck_list_node.cpp index 0f39ce71a..3be19af0f 100644 --- a/common/abstract_deck_list_node.cpp +++ b/libs/deck_list/src/abstract_deck_list_node.cpp @@ -1,6 +1,6 @@ -#include "abstract_deck_list_node.h" +#include "../include/deck_list/abstract_deck_list_node.h" -#include "inner_deck_list_node.h" +#include "../include/deck_list/inner_deck_list_node.h" AbstractDecklistNode::AbstractDecklistNode(InnerDecklistNode *_parent, int position) : parent(_parent), sortMethod(Default) diff --git a/common/deck_list.cpp b/libs/deck_list/src/deck_list.cpp similarity index 99% rename from common/deck_list.cpp rename to libs/deck_list/src/deck_list.cpp index b2fbdb028..14b6d96dc 100644 --- a/common/deck_list.cpp +++ b/libs/deck_list/src/deck_list.cpp @@ -1,8 +1,8 @@ -#include "deck_list.h" +#include "../include/deck_list/deck_list.h" -#include "abstract_deck_list_node.h" -#include "deck_list_card_node.h" -#include "inner_deck_list_node.h" +#include "../include/deck_list/abstract_deck_list_node.h" +#include "../include/deck_list/deck_list_card_node.h" +#include "../include/deck_list/inner_deck_list_node.h" #include #include diff --git a/common/deck_list_card_node.cpp b/libs/deck_list/src/deck_list_card_node.cpp similarity index 85% rename from common/deck_list_card_node.cpp rename to libs/deck_list/src/deck_list_card_node.cpp index 1791c09a6..f27b528cd 100644 --- a/common/deck_list_card_node.cpp +++ b/libs/deck_list/src/deck_list_card_node.cpp @@ -1,4 +1,4 @@ -#include "deck_list_card_node.h" +#include "../include/deck_list/deck_list_card_node.h" DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent) : AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()), diff --git a/common/inner_deck_list_node.cpp b/libs/deck_list/src/inner_deck_list_node.cpp similarity index 98% rename from common/inner_deck_list_node.cpp rename to libs/deck_list/src/inner_deck_list_node.cpp index c91b3ea14..3e92a7d69 100644 --- a/common/inner_deck_list_node.cpp +++ b/libs/deck_list/src/inner_deck_list_node.cpp @@ -1,6 +1,6 @@ -#include "inner_deck_list_node.h" +#include "../include/deck_list/inner_deck_list_node.h" -#include "deck_list_card_node.h" +#include "../include/deck_list/deck_list_card_node.h" InnerDecklistNode::InnerDecklistNode(InnerDecklistNode *other, InnerDecklistNode *_parent) : AbstractDecklistNode(_parent), name(other->getName()) diff --git a/common/pb/CMakeLists.txt b/libs/pb/CMakeLists.txt similarity index 100% rename from common/pb/CMakeLists.txt rename to libs/pb/CMakeLists.txt diff --git a/common/pb/admin_commands.proto b/libs/pb/admin_commands.proto similarity index 100% rename from common/pb/admin_commands.proto rename to libs/pb/admin_commands.proto diff --git a/common/pb/card_attributes.proto b/libs/pb/card_attributes.proto similarity index 100% rename from common/pb/card_attributes.proto rename to libs/pb/card_attributes.proto diff --git a/common/pb/color.proto b/libs/pb/color.proto similarity index 100% rename from common/pb/color.proto rename to libs/pb/color.proto diff --git a/common/pb/command_attach_card.proto b/libs/pb/command_attach_card.proto similarity index 100% rename from common/pb/command_attach_card.proto rename to libs/pb/command_attach_card.proto diff --git a/common/pb/command_change_zone_properties.proto b/libs/pb/command_change_zone_properties.proto similarity index 100% rename from common/pb/command_change_zone_properties.proto rename to libs/pb/command_change_zone_properties.proto diff --git a/common/pb/command_concede.proto b/libs/pb/command_concede.proto similarity index 100% rename from common/pb/command_concede.proto rename to libs/pb/command_concede.proto diff --git a/common/pb/command_create_arrow.proto b/libs/pb/command_create_arrow.proto similarity index 100% rename from common/pb/command_create_arrow.proto rename to libs/pb/command_create_arrow.proto diff --git a/common/pb/command_create_counter.proto b/libs/pb/command_create_counter.proto similarity index 100% rename from common/pb/command_create_counter.proto rename to libs/pb/command_create_counter.proto diff --git a/common/pb/command_create_token.proto b/libs/pb/command_create_token.proto similarity index 100% rename from common/pb/command_create_token.proto rename to libs/pb/command_create_token.proto diff --git a/common/pb/command_deck_del.proto b/libs/pb/command_deck_del.proto similarity index 100% rename from common/pb/command_deck_del.proto rename to libs/pb/command_deck_del.proto diff --git a/common/pb/command_deck_del_dir.proto b/libs/pb/command_deck_del_dir.proto similarity index 100% rename from common/pb/command_deck_del_dir.proto rename to libs/pb/command_deck_del_dir.proto diff --git a/common/pb/command_deck_download.proto b/libs/pb/command_deck_download.proto similarity index 100% rename from common/pb/command_deck_download.proto rename to libs/pb/command_deck_download.proto diff --git a/common/pb/command_deck_list.proto b/libs/pb/command_deck_list.proto similarity index 100% rename from common/pb/command_deck_list.proto rename to libs/pb/command_deck_list.proto diff --git a/common/pb/command_deck_new_dir.proto b/libs/pb/command_deck_new_dir.proto similarity index 100% rename from common/pb/command_deck_new_dir.proto rename to libs/pb/command_deck_new_dir.proto diff --git a/common/pb/command_deck_select.proto b/libs/pb/command_deck_select.proto similarity index 100% rename from common/pb/command_deck_select.proto rename to libs/pb/command_deck_select.proto diff --git a/common/pb/command_deck_upload.proto b/libs/pb/command_deck_upload.proto similarity index 100% rename from common/pb/command_deck_upload.proto rename to libs/pb/command_deck_upload.proto diff --git a/common/pb/command_del_counter.proto b/libs/pb/command_del_counter.proto similarity index 100% rename from common/pb/command_del_counter.proto rename to libs/pb/command_del_counter.proto diff --git a/common/pb/command_delete_arrow.proto b/libs/pb/command_delete_arrow.proto similarity index 100% rename from common/pb/command_delete_arrow.proto rename to libs/pb/command_delete_arrow.proto diff --git a/common/pb/command_draw_cards.proto b/libs/pb/command_draw_cards.proto similarity index 100% rename from common/pb/command_draw_cards.proto rename to libs/pb/command_draw_cards.proto diff --git a/common/pb/command_dump_zone.proto b/libs/pb/command_dump_zone.proto similarity index 100% rename from common/pb/command_dump_zone.proto rename to libs/pb/command_dump_zone.proto diff --git a/common/pb/command_flip_card.proto b/libs/pb/command_flip_card.proto similarity index 100% rename from common/pb/command_flip_card.proto rename to libs/pb/command_flip_card.proto diff --git a/common/pb/command_game_say.proto b/libs/pb/command_game_say.proto similarity index 100% rename from common/pb/command_game_say.proto rename to libs/pb/command_game_say.proto diff --git a/common/pb/command_inc_card_counter.proto b/libs/pb/command_inc_card_counter.proto similarity index 100% rename from common/pb/command_inc_card_counter.proto rename to libs/pb/command_inc_card_counter.proto diff --git a/common/pb/command_inc_counter.proto b/libs/pb/command_inc_counter.proto similarity index 100% rename from common/pb/command_inc_counter.proto rename to libs/pb/command_inc_counter.proto diff --git a/common/pb/command_kick_from_game.proto b/libs/pb/command_kick_from_game.proto similarity index 100% rename from common/pb/command_kick_from_game.proto rename to libs/pb/command_kick_from_game.proto diff --git a/common/pb/command_leave_game.proto b/libs/pb/command_leave_game.proto similarity index 100% rename from common/pb/command_leave_game.proto rename to libs/pb/command_leave_game.proto diff --git a/common/pb/command_move_card.proto b/libs/pb/command_move_card.proto similarity index 100% rename from common/pb/command_move_card.proto rename to libs/pb/command_move_card.proto diff --git a/common/pb/command_mulligan.proto b/libs/pb/command_mulligan.proto similarity index 100% rename from common/pb/command_mulligan.proto rename to libs/pb/command_mulligan.proto diff --git a/common/pb/command_next_turn.proto b/libs/pb/command_next_turn.proto similarity index 100% rename from common/pb/command_next_turn.proto rename to libs/pb/command_next_turn.proto diff --git a/common/pb/command_ready_start.proto b/libs/pb/command_ready_start.proto similarity index 100% rename from common/pb/command_ready_start.proto rename to libs/pb/command_ready_start.proto diff --git a/common/pb/command_replay_delete_match.proto b/libs/pb/command_replay_delete_match.proto similarity index 100% rename from common/pb/command_replay_delete_match.proto rename to libs/pb/command_replay_delete_match.proto diff --git a/common/pb/command_replay_download.proto b/libs/pb/command_replay_download.proto similarity index 100% rename from common/pb/command_replay_download.proto rename to libs/pb/command_replay_download.proto diff --git a/common/pb/command_replay_get_code.proto b/libs/pb/command_replay_get_code.proto similarity index 100% rename from common/pb/command_replay_get_code.proto rename to libs/pb/command_replay_get_code.proto diff --git a/common/pb/command_replay_list.proto b/libs/pb/command_replay_list.proto similarity index 100% rename from common/pb/command_replay_list.proto rename to libs/pb/command_replay_list.proto diff --git a/common/pb/command_replay_modify_match.proto b/libs/pb/command_replay_modify_match.proto similarity index 100% rename from common/pb/command_replay_modify_match.proto rename to libs/pb/command_replay_modify_match.proto diff --git a/common/pb/command_replay_submit_code.proto b/libs/pb/command_replay_submit_code.proto similarity index 100% rename from common/pb/command_replay_submit_code.proto rename to libs/pb/command_replay_submit_code.proto diff --git a/common/pb/command_reveal_cards.proto b/libs/pb/command_reveal_cards.proto similarity index 100% rename from common/pb/command_reveal_cards.proto rename to libs/pb/command_reveal_cards.proto diff --git a/common/pb/command_reverse_turn.proto b/libs/pb/command_reverse_turn.proto similarity index 100% rename from common/pb/command_reverse_turn.proto rename to libs/pb/command_reverse_turn.proto diff --git a/common/pb/command_roll_die.proto b/libs/pb/command_roll_die.proto similarity index 100% rename from common/pb/command_roll_die.proto rename to libs/pb/command_roll_die.proto diff --git a/common/pb/command_set_active_phase.proto b/libs/pb/command_set_active_phase.proto similarity index 100% rename from common/pb/command_set_active_phase.proto rename to libs/pb/command_set_active_phase.proto diff --git a/common/pb/command_set_card_attr.proto b/libs/pb/command_set_card_attr.proto similarity index 100% rename from common/pb/command_set_card_attr.proto rename to libs/pb/command_set_card_attr.proto diff --git a/common/pb/command_set_card_counter.proto b/libs/pb/command_set_card_counter.proto similarity index 100% rename from common/pb/command_set_card_counter.proto rename to libs/pb/command_set_card_counter.proto diff --git a/common/pb/command_set_counter.proto b/libs/pb/command_set_counter.proto similarity index 100% rename from common/pb/command_set_counter.proto rename to libs/pb/command_set_counter.proto diff --git a/common/pb/command_set_sideboard_lock.proto b/libs/pb/command_set_sideboard_lock.proto similarity index 100% rename from common/pb/command_set_sideboard_lock.proto rename to libs/pb/command_set_sideboard_lock.proto diff --git a/common/pb/command_set_sideboard_plan.proto b/libs/pb/command_set_sideboard_plan.proto similarity index 100% rename from common/pb/command_set_sideboard_plan.proto rename to libs/pb/command_set_sideboard_plan.proto diff --git a/common/pb/command_shuffle.proto b/libs/pb/command_shuffle.proto similarity index 100% rename from common/pb/command_shuffle.proto rename to libs/pb/command_shuffle.proto diff --git a/common/pb/command_undo_draw.proto b/libs/pb/command_undo_draw.proto similarity index 100% rename from common/pb/command_undo_draw.proto rename to libs/pb/command_undo_draw.proto diff --git a/common/pb/commands.proto b/libs/pb/commands.proto similarity index 100% rename from common/pb/commands.proto rename to libs/pb/commands.proto diff --git a/common/pb/context_concede.proto b/libs/pb/context_concede.proto similarity index 100% rename from common/pb/context_concede.proto rename to libs/pb/context_concede.proto diff --git a/common/pb/context_connection_state_changed.proto b/libs/pb/context_connection_state_changed.proto similarity index 100% rename from common/pb/context_connection_state_changed.proto rename to libs/pb/context_connection_state_changed.proto diff --git a/common/pb/context_deck_select.proto b/libs/pb/context_deck_select.proto similarity index 100% rename from common/pb/context_deck_select.proto rename to libs/pb/context_deck_select.proto diff --git a/common/pb/context_move_card.proto b/libs/pb/context_move_card.proto similarity index 100% rename from common/pb/context_move_card.proto rename to libs/pb/context_move_card.proto diff --git a/common/pb/context_mulligan.proto b/libs/pb/context_mulligan.proto similarity index 100% rename from common/pb/context_mulligan.proto rename to libs/pb/context_mulligan.proto diff --git a/common/pb/context_ping_changed.proto b/libs/pb/context_ping_changed.proto similarity index 100% rename from common/pb/context_ping_changed.proto rename to libs/pb/context_ping_changed.proto diff --git a/common/pb/context_ready_start.proto b/libs/pb/context_ready_start.proto similarity index 100% rename from common/pb/context_ready_start.proto rename to libs/pb/context_ready_start.proto diff --git a/common/pb/context_set_sideboard_lock.proto b/libs/pb/context_set_sideboard_lock.proto similarity index 100% rename from common/pb/context_set_sideboard_lock.proto rename to libs/pb/context_set_sideboard_lock.proto diff --git a/common/pb/context_undo_draw.proto b/libs/pb/context_undo_draw.proto similarity index 100% rename from common/pb/context_undo_draw.proto rename to libs/pb/context_undo_draw.proto diff --git a/common/pb/event_add_to_list.proto b/libs/pb/event_add_to_list.proto similarity index 100% rename from common/pb/event_add_to_list.proto rename to libs/pb/event_add_to_list.proto diff --git a/common/pb/event_attach_card.proto b/libs/pb/event_attach_card.proto similarity index 100% rename from common/pb/event_attach_card.proto rename to libs/pb/event_attach_card.proto diff --git a/common/pb/event_change_zone_properties.proto b/libs/pb/event_change_zone_properties.proto similarity index 100% rename from common/pb/event_change_zone_properties.proto rename to libs/pb/event_change_zone_properties.proto diff --git a/common/pb/event_connection_closed.proto b/libs/pb/event_connection_closed.proto similarity index 100% rename from common/pb/event_connection_closed.proto rename to libs/pb/event_connection_closed.proto diff --git a/common/pb/event_create_arrow.proto b/libs/pb/event_create_arrow.proto similarity index 100% rename from common/pb/event_create_arrow.proto rename to libs/pb/event_create_arrow.proto diff --git a/common/pb/event_create_counter.proto b/libs/pb/event_create_counter.proto similarity index 100% rename from common/pb/event_create_counter.proto rename to libs/pb/event_create_counter.proto diff --git a/common/pb/event_create_token.proto b/libs/pb/event_create_token.proto similarity index 100% rename from common/pb/event_create_token.proto rename to libs/pb/event_create_token.proto diff --git a/common/pb/event_del_counter.proto b/libs/pb/event_del_counter.proto similarity index 100% rename from common/pb/event_del_counter.proto rename to libs/pb/event_del_counter.proto diff --git a/common/pb/event_delete_arrow.proto b/libs/pb/event_delete_arrow.proto similarity index 100% rename from common/pb/event_delete_arrow.proto rename to libs/pb/event_delete_arrow.proto diff --git a/common/pb/event_destroy_card.proto b/libs/pb/event_destroy_card.proto similarity index 100% rename from common/pb/event_destroy_card.proto rename to libs/pb/event_destroy_card.proto diff --git a/common/pb/event_draw_cards.proto b/libs/pb/event_draw_cards.proto similarity index 100% rename from common/pb/event_draw_cards.proto rename to libs/pb/event_draw_cards.proto diff --git a/common/pb/event_dump_zone.proto b/libs/pb/event_dump_zone.proto similarity index 100% rename from common/pb/event_dump_zone.proto rename to libs/pb/event_dump_zone.proto diff --git a/common/pb/event_flip_card.proto b/libs/pb/event_flip_card.proto similarity index 100% rename from common/pb/event_flip_card.proto rename to libs/pb/event_flip_card.proto diff --git a/common/pb/event_game_closed.proto b/libs/pb/event_game_closed.proto similarity index 100% rename from common/pb/event_game_closed.proto rename to libs/pb/event_game_closed.proto diff --git a/common/pb/event_game_host_changed.proto b/libs/pb/event_game_host_changed.proto similarity index 100% rename from common/pb/event_game_host_changed.proto rename to libs/pb/event_game_host_changed.proto diff --git a/common/pb/event_game_joined.proto b/libs/pb/event_game_joined.proto similarity index 100% rename from common/pb/event_game_joined.proto rename to libs/pb/event_game_joined.proto diff --git a/common/pb/event_game_say.proto b/libs/pb/event_game_say.proto similarity index 100% rename from common/pb/event_game_say.proto rename to libs/pb/event_game_say.proto diff --git a/common/pb/event_game_state_changed.proto b/libs/pb/event_game_state_changed.proto similarity index 100% rename from common/pb/event_game_state_changed.proto rename to libs/pb/event_game_state_changed.proto diff --git a/common/pb/event_join.proto b/libs/pb/event_join.proto similarity index 100% rename from common/pb/event_join.proto rename to libs/pb/event_join.proto diff --git a/common/pb/event_join_room.proto b/libs/pb/event_join_room.proto similarity index 100% rename from common/pb/event_join_room.proto rename to libs/pb/event_join_room.proto diff --git a/common/pb/event_kicked.proto b/libs/pb/event_kicked.proto similarity index 100% rename from common/pb/event_kicked.proto rename to libs/pb/event_kicked.proto diff --git a/common/pb/event_leave.proto b/libs/pb/event_leave.proto similarity index 100% rename from common/pb/event_leave.proto rename to libs/pb/event_leave.proto diff --git a/common/pb/event_leave_room.proto b/libs/pb/event_leave_room.proto similarity index 100% rename from common/pb/event_leave_room.proto rename to libs/pb/event_leave_room.proto diff --git a/common/pb/event_list_games.proto b/libs/pb/event_list_games.proto similarity index 100% rename from common/pb/event_list_games.proto rename to libs/pb/event_list_games.proto diff --git a/common/pb/event_list_rooms.proto b/libs/pb/event_list_rooms.proto similarity index 100% rename from common/pb/event_list_rooms.proto rename to libs/pb/event_list_rooms.proto diff --git a/common/pb/event_move_card.proto b/libs/pb/event_move_card.proto similarity index 100% rename from common/pb/event_move_card.proto rename to libs/pb/event_move_card.proto diff --git a/common/pb/event_notify_user.proto b/libs/pb/event_notify_user.proto similarity index 100% rename from common/pb/event_notify_user.proto rename to libs/pb/event_notify_user.proto diff --git a/common/pb/event_player_properties_changed.proto b/libs/pb/event_player_properties_changed.proto similarity index 100% rename from common/pb/event_player_properties_changed.proto rename to libs/pb/event_player_properties_changed.proto diff --git a/common/pb/event_remove_from_list.proto b/libs/pb/event_remove_from_list.proto similarity index 100% rename from common/pb/event_remove_from_list.proto rename to libs/pb/event_remove_from_list.proto diff --git a/common/pb/event_remove_messages.proto b/libs/pb/event_remove_messages.proto similarity index 100% rename from common/pb/event_remove_messages.proto rename to libs/pb/event_remove_messages.proto diff --git a/common/pb/event_replay_added.proto b/libs/pb/event_replay_added.proto similarity index 100% rename from common/pb/event_replay_added.proto rename to libs/pb/event_replay_added.proto diff --git a/common/pb/event_reveal_cards.proto b/libs/pb/event_reveal_cards.proto similarity index 100% rename from common/pb/event_reveal_cards.proto rename to libs/pb/event_reveal_cards.proto diff --git a/common/pb/event_reverse_turn.proto b/libs/pb/event_reverse_turn.proto similarity index 100% rename from common/pb/event_reverse_turn.proto rename to libs/pb/event_reverse_turn.proto diff --git a/common/pb/event_roll_die.proto b/libs/pb/event_roll_die.proto similarity index 100% rename from common/pb/event_roll_die.proto rename to libs/pb/event_roll_die.proto diff --git a/common/pb/event_room_say.proto b/libs/pb/event_room_say.proto similarity index 100% rename from common/pb/event_room_say.proto rename to libs/pb/event_room_say.proto diff --git a/common/pb/event_server_complete_list.proto b/libs/pb/event_server_complete_list.proto similarity index 100% rename from common/pb/event_server_complete_list.proto rename to libs/pb/event_server_complete_list.proto diff --git a/common/pb/event_server_identification.proto b/libs/pb/event_server_identification.proto similarity index 100% rename from common/pb/event_server_identification.proto rename to libs/pb/event_server_identification.proto diff --git a/common/pb/event_server_message.proto b/libs/pb/event_server_message.proto similarity index 100% rename from common/pb/event_server_message.proto rename to libs/pb/event_server_message.proto diff --git a/common/pb/event_server_shutdown.proto b/libs/pb/event_server_shutdown.proto similarity index 100% rename from common/pb/event_server_shutdown.proto rename to libs/pb/event_server_shutdown.proto diff --git a/common/pb/event_set_active_phase.proto b/libs/pb/event_set_active_phase.proto similarity index 100% rename from common/pb/event_set_active_phase.proto rename to libs/pb/event_set_active_phase.proto diff --git a/common/pb/event_set_active_player.proto b/libs/pb/event_set_active_player.proto similarity index 100% rename from common/pb/event_set_active_player.proto rename to libs/pb/event_set_active_player.proto diff --git a/common/pb/event_set_card_attr.proto b/libs/pb/event_set_card_attr.proto similarity index 100% rename from common/pb/event_set_card_attr.proto rename to libs/pb/event_set_card_attr.proto diff --git a/common/pb/event_set_card_counter.proto b/libs/pb/event_set_card_counter.proto similarity index 100% rename from common/pb/event_set_card_counter.proto rename to libs/pb/event_set_card_counter.proto diff --git a/common/pb/event_set_counter.proto b/libs/pb/event_set_counter.proto similarity index 100% rename from common/pb/event_set_counter.proto rename to libs/pb/event_set_counter.proto diff --git a/common/pb/event_shuffle.proto b/libs/pb/event_shuffle.proto similarity index 100% rename from common/pb/event_shuffle.proto rename to libs/pb/event_shuffle.proto diff --git a/common/pb/event_user_joined.proto b/libs/pb/event_user_joined.proto similarity index 100% rename from common/pb/event_user_joined.proto rename to libs/pb/event_user_joined.proto diff --git a/common/pb/event_user_left.proto b/libs/pb/event_user_left.proto similarity index 100% rename from common/pb/event_user_left.proto rename to libs/pb/event_user_left.proto diff --git a/common/pb/event_user_message.proto b/libs/pb/event_user_message.proto similarity index 100% rename from common/pb/event_user_message.proto rename to libs/pb/event_user_message.proto diff --git a/common/pb/game_commands.proto b/libs/pb/game_commands.proto similarity index 100% rename from common/pb/game_commands.proto rename to libs/pb/game_commands.proto diff --git a/common/pb/game_event.proto b/libs/pb/game_event.proto similarity index 100% rename from common/pb/game_event.proto rename to libs/pb/game_event.proto diff --git a/common/pb/game_event_container.proto b/libs/pb/game_event_container.proto similarity index 100% rename from common/pb/game_event_container.proto rename to libs/pb/game_event_container.proto diff --git a/common/pb/game_event_context.proto b/libs/pb/game_event_context.proto similarity index 100% rename from common/pb/game_event_context.proto rename to libs/pb/game_event_context.proto diff --git a/common/pb/game_replay.proto b/libs/pb/game_replay.proto similarity index 100% rename from common/pb/game_replay.proto rename to libs/pb/game_replay.proto diff --git a/common/pb/isl_message.proto b/libs/pb/isl_message.proto similarity index 100% rename from common/pb/isl_message.proto rename to libs/pb/isl_message.proto diff --git a/common/pb/moderator_commands.proto b/libs/pb/moderator_commands.proto similarity index 100% rename from common/pb/moderator_commands.proto rename to libs/pb/moderator_commands.proto diff --git a/common/pb/move_card_to_zone.proto b/libs/pb/move_card_to_zone.proto similarity index 100% rename from common/pb/move_card_to_zone.proto rename to libs/pb/move_card_to_zone.proto diff --git a/common/pb/response.proto b/libs/pb/response.proto similarity index 100% rename from common/pb/response.proto rename to libs/pb/response.proto diff --git a/common/pb/response_activate.proto b/libs/pb/response_activate.proto similarity index 100% rename from common/pb/response_activate.proto rename to libs/pb/response_activate.proto diff --git a/common/pb/response_adjust_mod.proto b/libs/pb/response_adjust_mod.proto similarity index 100% rename from common/pb/response_adjust_mod.proto rename to libs/pb/response_adjust_mod.proto diff --git a/common/pb/response_ban_history.proto b/libs/pb/response_ban_history.proto similarity index 100% rename from common/pb/response_ban_history.proto rename to libs/pb/response_ban_history.proto diff --git a/common/pb/response_deck_download.proto b/libs/pb/response_deck_download.proto similarity index 100% rename from common/pb/response_deck_download.proto rename to libs/pb/response_deck_download.proto diff --git a/common/pb/response_deck_list.proto b/libs/pb/response_deck_list.proto similarity index 100% rename from common/pb/response_deck_list.proto rename to libs/pb/response_deck_list.proto diff --git a/common/pb/response_deck_upload.proto b/libs/pb/response_deck_upload.proto similarity index 100% rename from common/pb/response_deck_upload.proto rename to libs/pb/response_deck_upload.proto diff --git a/common/pb/response_dump_zone.proto b/libs/pb/response_dump_zone.proto similarity index 100% rename from common/pb/response_dump_zone.proto rename to libs/pb/response_dump_zone.proto diff --git a/common/pb/response_forgotpasswordrequest.proto b/libs/pb/response_forgotpasswordrequest.proto similarity index 100% rename from common/pb/response_forgotpasswordrequest.proto rename to libs/pb/response_forgotpasswordrequest.proto diff --git a/common/pb/response_get_admin_notes.proto b/libs/pb/response_get_admin_notes.proto similarity index 100% rename from common/pb/response_get_admin_notes.proto rename to libs/pb/response_get_admin_notes.proto diff --git a/common/pb/response_get_games_of_user.proto b/libs/pb/response_get_games_of_user.proto similarity index 100% rename from common/pb/response_get_games_of_user.proto rename to libs/pb/response_get_games_of_user.proto diff --git a/common/pb/response_get_user_info.proto b/libs/pb/response_get_user_info.proto similarity index 100% rename from common/pb/response_get_user_info.proto rename to libs/pb/response_get_user_info.proto diff --git a/common/pb/response_join_room.proto b/libs/pb/response_join_room.proto similarity index 100% rename from common/pb/response_join_room.proto rename to libs/pb/response_join_room.proto diff --git a/common/pb/response_list_users.proto b/libs/pb/response_list_users.proto similarity index 100% rename from common/pb/response_list_users.proto rename to libs/pb/response_list_users.proto diff --git a/common/pb/response_login.proto b/libs/pb/response_login.proto similarity index 100% rename from common/pb/response_login.proto rename to libs/pb/response_login.proto diff --git a/common/pb/response_password_salt.proto b/libs/pb/response_password_salt.proto similarity index 100% rename from common/pb/response_password_salt.proto rename to libs/pb/response_password_salt.proto diff --git a/common/pb/response_register.proto b/libs/pb/response_register.proto similarity index 100% rename from common/pb/response_register.proto rename to libs/pb/response_register.proto diff --git a/common/pb/response_replay_download.proto b/libs/pb/response_replay_download.proto similarity index 100% rename from common/pb/response_replay_download.proto rename to libs/pb/response_replay_download.proto diff --git a/common/pb/response_replay_get_code.proto b/libs/pb/response_replay_get_code.proto similarity index 100% rename from common/pb/response_replay_get_code.proto rename to libs/pb/response_replay_get_code.proto diff --git a/common/pb/response_replay_list.proto b/libs/pb/response_replay_list.proto similarity index 100% rename from common/pb/response_replay_list.proto rename to libs/pb/response_replay_list.proto diff --git a/common/pb/response_viewlog_history.proto b/libs/pb/response_viewlog_history.proto similarity index 100% rename from common/pb/response_viewlog_history.proto rename to libs/pb/response_viewlog_history.proto diff --git a/common/pb/response_warn_history.proto b/libs/pb/response_warn_history.proto similarity index 100% rename from common/pb/response_warn_history.proto rename to libs/pb/response_warn_history.proto diff --git a/common/pb/response_warn_list.proto b/libs/pb/response_warn_list.proto similarity index 100% rename from common/pb/response_warn_list.proto rename to libs/pb/response_warn_list.proto diff --git a/common/pb/room_commands.proto b/libs/pb/room_commands.proto similarity index 100% rename from common/pb/room_commands.proto rename to libs/pb/room_commands.proto diff --git a/common/pb/room_event.proto b/libs/pb/room_event.proto similarity index 100% rename from common/pb/room_event.proto rename to libs/pb/room_event.proto diff --git a/common/pb/server_message.proto b/libs/pb/server_message.proto similarity index 100% rename from common/pb/server_message.proto rename to libs/pb/server_message.proto diff --git a/common/pb/serverinfo_arrow.proto b/libs/pb/serverinfo_arrow.proto similarity index 100% rename from common/pb/serverinfo_arrow.proto rename to libs/pb/serverinfo_arrow.proto diff --git a/common/pb/serverinfo_ban.proto b/libs/pb/serverinfo_ban.proto similarity index 100% rename from common/pb/serverinfo_ban.proto rename to libs/pb/serverinfo_ban.proto diff --git a/common/pb/serverinfo_card.proto b/libs/pb/serverinfo_card.proto similarity index 100% rename from common/pb/serverinfo_card.proto rename to libs/pb/serverinfo_card.proto diff --git a/common/pb/serverinfo_cardcounter.proto b/libs/pb/serverinfo_cardcounter.proto similarity index 100% rename from common/pb/serverinfo_cardcounter.proto rename to libs/pb/serverinfo_cardcounter.proto diff --git a/common/pb/serverinfo_chat_message.proto b/libs/pb/serverinfo_chat_message.proto similarity index 100% rename from common/pb/serverinfo_chat_message.proto rename to libs/pb/serverinfo_chat_message.proto diff --git a/common/pb/serverinfo_counter.proto b/libs/pb/serverinfo_counter.proto similarity index 100% rename from common/pb/serverinfo_counter.proto rename to libs/pb/serverinfo_counter.proto diff --git a/common/pb/serverinfo_deckstorage.proto b/libs/pb/serverinfo_deckstorage.proto similarity index 100% rename from common/pb/serverinfo_deckstorage.proto rename to libs/pb/serverinfo_deckstorage.proto diff --git a/common/pb/serverinfo_game.proto b/libs/pb/serverinfo_game.proto similarity index 100% rename from common/pb/serverinfo_game.proto rename to libs/pb/serverinfo_game.proto diff --git a/common/pb/serverinfo_gametype.proto b/libs/pb/serverinfo_gametype.proto similarity index 100% rename from common/pb/serverinfo_gametype.proto rename to libs/pb/serverinfo_gametype.proto diff --git a/common/pb/serverinfo_player.proto b/libs/pb/serverinfo_player.proto similarity index 100% rename from common/pb/serverinfo_player.proto rename to libs/pb/serverinfo_player.proto diff --git a/common/pb/serverinfo_playerping.proto b/libs/pb/serverinfo_playerping.proto similarity index 100% rename from common/pb/serverinfo_playerping.proto rename to libs/pb/serverinfo_playerping.proto diff --git a/common/pb/serverinfo_playerproperties.proto b/libs/pb/serverinfo_playerproperties.proto similarity index 100% rename from common/pb/serverinfo_playerproperties.proto rename to libs/pb/serverinfo_playerproperties.proto diff --git a/common/pb/serverinfo_replay.proto b/libs/pb/serverinfo_replay.proto similarity index 100% rename from common/pb/serverinfo_replay.proto rename to libs/pb/serverinfo_replay.proto diff --git a/common/pb/serverinfo_replay_match.proto b/libs/pb/serverinfo_replay_match.proto similarity index 100% rename from common/pb/serverinfo_replay_match.proto rename to libs/pb/serverinfo_replay_match.proto diff --git a/common/pb/serverinfo_room.proto b/libs/pb/serverinfo_room.proto similarity index 100% rename from common/pb/serverinfo_room.proto rename to libs/pb/serverinfo_room.proto diff --git a/common/pb/serverinfo_user.proto b/libs/pb/serverinfo_user.proto similarity index 100% rename from common/pb/serverinfo_user.proto rename to libs/pb/serverinfo_user.proto diff --git a/common/pb/serverinfo_warning.proto b/libs/pb/serverinfo_warning.proto similarity index 100% rename from common/pb/serverinfo_warning.proto rename to libs/pb/serverinfo_warning.proto diff --git a/common/pb/serverinfo_zone.proto b/libs/pb/serverinfo_zone.proto similarity index 100% rename from common/pb/serverinfo_zone.proto rename to libs/pb/serverinfo_zone.proto diff --git a/common/pb/session_commands.proto b/libs/pb/session_commands.proto similarity index 100% rename from common/pb/session_commands.proto rename to libs/pb/session_commands.proto diff --git a/common/pb/session_event.proto b/libs/pb/session_event.proto similarity index 100% rename from common/pb/session_event.proto rename to libs/pb/session_event.proto diff --git a/libs/rng/CMakeLists.txt b/libs/rng/CMakeLists.txt new file mode 100644 index 000000000..130cd1e07 --- /dev/null +++ b/libs/rng/CMakeLists.txt @@ -0,0 +1,27 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + include/rng/rng_abstract.h + include/rng/rng_sfmt.h + include/rng/sfmt/SFMT.h +) + +if (Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif (Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif () + +add_library(cockatrice_rng STATIC + src/rng_abstract.cpp + src/rng_sfmt.cpp + src/sfmt/SFMT.c + ${MOC_SOURCES} +) + +target_include_directories(cockatrice_rng + PUBLIC include + PUBLIC include/sfmt +) \ No newline at end of file diff --git a/common/rng_abstract.h b/libs/rng/include/rng/rng_abstract.h similarity index 100% rename from common/rng_abstract.h rename to libs/rng/include/rng/rng_abstract.h diff --git a/common/rng_sfmt.h b/libs/rng/include/rng/rng_sfmt.h similarity index 100% rename from common/rng_sfmt.h rename to libs/rng/include/rng/rng_sfmt.h diff --git a/common/sfmt/LICENSE.txt b/libs/rng/include/rng/sfmt/LICENSE.txt similarity index 100% rename from common/sfmt/LICENSE.txt rename to libs/rng/include/rng/sfmt/LICENSE.txt diff --git a/common/sfmt/SFMT-common.h b/libs/rng/include/rng/sfmt/SFMT-common.h similarity index 100% rename from common/sfmt/SFMT-common.h rename to libs/rng/include/rng/sfmt/SFMT-common.h diff --git a/common/sfmt/SFMT-params.h b/libs/rng/include/rng/sfmt/SFMT-params.h similarity index 100% rename from common/sfmt/SFMT-params.h rename to libs/rng/include/rng/sfmt/SFMT-params.h diff --git a/common/sfmt/SFMT-params19937.h b/libs/rng/include/rng/sfmt/SFMT-params19937.h similarity index 100% rename from common/sfmt/SFMT-params19937.h rename to libs/rng/include/rng/sfmt/SFMT-params19937.h diff --git a/common/sfmt/SFMT.h b/libs/rng/include/rng/sfmt/SFMT.h similarity index 100% rename from common/sfmt/SFMT.h rename to libs/rng/include/rng/sfmt/SFMT.h diff --git a/common/rng_abstract.cpp b/libs/rng/src/rng_abstract.cpp similarity index 95% rename from common/rng_abstract.cpp rename to libs/rng/src/rng_abstract.cpp index 63072b988..83b3a4e79 100644 --- a/common/rng_abstract.cpp +++ b/libs/rng/src/rng_abstract.cpp @@ -1,4 +1,4 @@ -#include "rng_abstract.h" +#include "../include/rng/rng_abstract.h" #include diff --git a/common/rng_sfmt.cpp b/libs/rng/src/rng_sfmt.cpp similarity index 99% rename from common/rng_sfmt.cpp rename to libs/rng/src/rng_sfmt.cpp index 5a6d8c862..0267b857d 100644 --- a/common/rng_sfmt.cpp +++ b/libs/rng/src/rng_sfmt.cpp @@ -1,4 +1,4 @@ -#include "rng_sfmt.h" +#include "../include/rng/rng_sfmt.h" #include #include diff --git a/common/sfmt/SFMT.c b/libs/rng/src/sfmt/SFMT.c similarity index 99% rename from common/sfmt/SFMT.c rename to libs/rng/src/sfmt/SFMT.c index b4ac9308b..248adde02 100644 --- a/common/sfmt/SFMT.c +++ b/libs/rng/src/sfmt/SFMT.c @@ -23,9 +23,9 @@ extern "C" { #include #include -#include "SFMT.h" -#include "SFMT-params.h" -#include "SFMT-common.h" +#include "../include/rng/sfmt/SFMT.h" +#include "../include/rng/sfmt/SFMT-params.h" +#include "../include/rng/sfmt/SFMT-common.h" #if defined(__BIG_ENDIAN__) && !defined(__amd64) && !defined(BIG_ENDIAN64) #define BIG_ENDIAN64 1 diff --git a/libs/server/CMakeLists.txt b/libs/server/CMakeLists.txt new file mode 100644 index 000000000..e136aef90 --- /dev/null +++ b/libs/server/CMakeLists.txt @@ -0,0 +1,62 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + include/game/server_abstract_participant.h + include/game/server_arrow.h + include/game/server_arrowtarget.h + include/game/server_card.h + include/game/server_cardzone.h + include/game/server_counter.h + include/game/server_game.h + include/game/server_player.h + include/game/server_spectator.h + include/server.h + include/server_abstractuserinterface.h + include/server_database_interface.h + include/server_protocolhandler.h + include/server_remoteuserinterface.h + include/server_response_containers.h + include/server_room.h + include/serverinfo_user_container.h +) + +if (Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif (Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif () + +add_library(serverlib STATIC + src/game/server_abstract_participant.cpp + src/game/server_arrow.cpp + src/game/server_arrowtarget.cpp + src/game/server_card.cpp + src/game/server_cardzone.cpp + src/game/server_counter.cpp + src/game/server_game.cpp + src/game/server_player.cpp + src/game/server_spectator.cpp + src/server.cpp + src/server_abstractuserinterface.cpp + src/server_database_interface.cpp + src/server_protocolhandler.cpp + src/server_remoteuserinterface.cpp + src/server_response_containers.cpp + src/server_room.cpp + src/serverinfo_user_container.cpp + ${MOC_SOURCES} +) + +target_include_directories(serverlib + PUBLIC include + PUBLIC ${CMAKE_SOURCE_DIR}/common + PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb + PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility +) + +# Make serverlib depend on cockatrice_protocol +target_link_libraries(serverlib + PUBLIC cockatrice_common cockatrice_protocol utility ${COCKATRICE_QT_MODULES} +) \ No newline at end of file diff --git a/common/debug_pb_message.cpp b/libs/server/debug_pb_message.cpp similarity index 97% rename from common/debug_pb_message.cpp rename to libs/server/debug_pb_message.cpp index dda672689..deaaacde1 100644 --- a/common/debug_pb_message.cpp +++ b/libs/server/debug_pb_message.cpp @@ -1,6 +1,6 @@ -#include "debug_pb_message.h" +#include "../../common/debug_pb_message.h" -#include "trice_limits.h" +#include "../utility/include/utility/trice_limits.h" #include #include diff --git a/common/debug_pb_message.h b/libs/server/debug_pb_message.h similarity index 100% rename from common/debug_pb_message.h rename to libs/server/debug_pb_message.h diff --git a/common/get_pb_extension.cpp b/libs/server/get_pb_extension.cpp similarity index 100% rename from common/get_pb_extension.cpp rename to libs/server/get_pb_extension.cpp diff --git a/common/get_pb_extension.h b/libs/server/get_pb_extension.h similarity index 100% rename from common/get_pb_extension.h rename to libs/server/get_pb_extension.h diff --git a/common/server/game/server_abstract_participant.h b/libs/server/include/game/server_abstract_participant.h similarity index 99% rename from common/server/game/server_abstract_participant.h rename to libs/server/include/game/server_abstract_participant.h index dcae09741..d3a76a8cd 100644 --- a/common/server/game/server_abstract_participant.h +++ b/libs/server/include/game/server_abstract_participant.h @@ -1,7 +1,7 @@ #ifndef ABSTRACT_PARTICIPANT_H #define ABSTRACT_PARTICIPANT_H -#include "../../serverinfo_user_container.h" +#include "../serverinfo_user_container.h" #include "pb/card_attributes.pb.h" #include "pb/response.pb.h" #include "server_arrowtarget.h" diff --git a/common/server/game/server_arrow.h b/libs/server/include/game/server_arrow.h similarity index 100% rename from common/server/game/server_arrow.h rename to libs/server/include/game/server_arrow.h diff --git a/common/server/game/server_arrowtarget.h b/libs/server/include/game/server_arrowtarget.h similarity index 100% rename from common/server/game/server_arrowtarget.h rename to libs/server/include/game/server_arrowtarget.h diff --git a/common/server/game/server_card.h b/libs/server/include/game/server_card.h similarity index 99% rename from common/server/game/server_card.h rename to libs/server/include/game/server_card.h index a24be2046..b612e59bf 100644 --- a/common/server/game/server_card.h +++ b/libs/server/include/game/server_card.h @@ -20,10 +20,10 @@ #ifndef SERVER_CARD_H #define SERVER_CARD_H -#include "../../card_ref.h" #include "pb/card_attributes.pb.h" #include "pb/serverinfo_card.pb.h" #include "server_arrowtarget.h" +#include "utility/card_ref.h" #include #include diff --git a/common/server/game/server_cardzone.h b/libs/server/include/game/server_cardzone.h similarity index 100% rename from common/server/game/server_cardzone.h rename to libs/server/include/game/server_cardzone.h diff --git a/common/server/game/server_counter.h b/libs/server/include/game/server_counter.h similarity index 100% rename from common/server/game/server_counter.h rename to libs/server/include/game/server_counter.h diff --git a/common/server/game/server_game.h b/libs/server/include/game/server_game.h similarity index 100% rename from common/server/game/server_game.h rename to libs/server/include/game/server_game.h diff --git a/common/server/game/server_player.h b/libs/server/include/game/server_player.h similarity index 99% rename from common/server/game/server_player.h rename to libs/server/include/game/server_player.h index fc3e69ee8..f6c1e1e6d 100644 --- a/common/server/game/server_player.h +++ b/libs/server/include/game/server_player.h @@ -1,7 +1,7 @@ #ifndef PLAYER_H #define PLAYER_H -#include "../../serverinfo_user_container.h" +#include "../serverinfo_user_container.h" #include "server_abstract_participant.h" #include diff --git a/common/server/game/server_spectator.h b/libs/server/include/game/server_spectator.h similarity index 100% rename from common/server/game/server_spectator.h rename to libs/server/include/game/server_spectator.h diff --git a/common/room_message_type.h b/libs/server/include/room_message_type.h similarity index 100% rename from common/room_message_type.h rename to libs/server/include/room_message_type.h diff --git a/common/server/server.h b/libs/server/include/server.h similarity index 100% rename from common/server/server.h rename to libs/server/include/server.h diff --git a/common/server/server_abstractuserinterface.h b/libs/server/include/server_abstractuserinterface.h similarity index 97% rename from common/server/server_abstractuserinterface.h rename to libs/server/include/server_abstractuserinterface.h index c65d8a5c4..763bcc567 100644 --- a/common/server/server_abstractuserinterface.h +++ b/libs/server/include/server_abstractuserinterface.h @@ -1,9 +1,9 @@ #ifndef SERVER_ABSTRACTUSERINTERFACE #define SERVER_ABSTRACTUSERINTERFACE -#include "../serverinfo_user_container.h" #include "pb/response.pb.h" #include "pb/server_message.pb.h" +#include "serverinfo_user_container.h" #include #include diff --git a/common/server/server_database_interface.h b/libs/server/include/server_database_interface.h similarity index 100% rename from common/server/server_database_interface.h rename to libs/server/include/server_database_interface.h diff --git a/common/server/server_player_reference.h b/libs/server/include/server_player_reference.h similarity index 100% rename from common/server/server_player_reference.h rename to libs/server/include/server_player_reference.h diff --git a/common/server/server_protocolhandler.h b/libs/server/include/server_protocolhandler.h similarity index 100% rename from common/server/server_protocolhandler.h rename to libs/server/include/server_protocolhandler.h diff --git a/common/server/server_remoteuserinterface.h b/libs/server/include/server_remoteuserinterface.h similarity index 100% rename from common/server/server_remoteuserinterface.h rename to libs/server/include/server_remoteuserinterface.h diff --git a/common/server/server_response_containers.h b/libs/server/include/server_response_containers.h similarity index 100% rename from common/server/server_response_containers.h rename to libs/server/include/server_response_containers.h diff --git a/common/server/server_room.h b/libs/server/include/server_room.h similarity index 100% rename from common/server/server_room.h rename to libs/server/include/server_room.h diff --git a/common/serverinfo_user_container.h b/libs/server/include/serverinfo_user_container.h similarity index 100% rename from common/serverinfo_user_container.h rename to libs/server/include/serverinfo_user_container.h diff --git a/common/user_level.h b/libs/server/include/user_level.h similarity index 100% rename from common/user_level.h rename to libs/server/include/user_level.h diff --git a/common/server/game/server_abstract_participant.cpp b/libs/server/src/game/server_abstract_participant.cpp similarity index 98% rename from common/server/game/server_abstract_participant.cpp rename to libs/server/src/game/server_abstract_participant.cpp index 1ef765d8b..7f46f0471 100644 --- a/common/server/game/server_abstract_participant.cpp +++ b/libs/server/src/game/server_abstract_participant.cpp @@ -1,9 +1,15 @@ -#include "server_abstract_participant.h" +#include "../../include/game/server_abstract_participant.h" #include "../../color.h" #include "../../deck_list.h" #include "../../deck_list_card_node.h" +#include "../../game/server_arrow.h" +#include "../../game/server_counter.h" #include "../../get_pb_extension.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_game.h" +#include "../../include/game/server_player.h" #include "../../rng_abstract.h" #include "../../trice_limits.h" #include "../server.h" @@ -76,12 +82,6 @@ #include "pb/response_dump_zone.pb.h" #include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_user.pb.h" -#include "server_arrow.h" -#include "server_card.h" -#include "server_cardzone.h" -#include "server_counter.h" -#include "server_game.h" -#include "server_player.h" #include #include diff --git a/common/server/game/server_arrow.cpp b/libs/server/src/game/server_arrow.cpp similarity index 84% rename from common/server/game/server_arrow.cpp rename to libs/server/src/game/server_arrow.cpp index fe02995d3..6885ec068 100644 --- a/common/server/game/server_arrow.cpp +++ b/libs/server/src/game/server_arrow.cpp @@ -1,9 +1,9 @@ -#include "server_arrow.h" +#include "../../include/game/server_arrow.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_player.h" #include "pb/serverinfo_arrow.pb.h" -#include "server_card.h" -#include "server_cardzone.h" -#include "server_player.h" Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor) : id(_id), startCard(_startCard), targetItem(_targetItem), arrowColor(_arrowColor) diff --git a/libs/server/src/game/server_arrowtarget.cpp b/libs/server/src/game/server_arrowtarget.cpp new file mode 100644 index 000000000..c8724f7dd --- /dev/null +++ b/libs/server/src/game/server_arrowtarget.cpp @@ -0,0 +1,2 @@ + +#include "../../include/game/server_arrowtarget.h" diff --git a/common/server/game/server_card.cpp b/libs/server/src/game/server_card.cpp similarity index 97% rename from common/server/game/server_card.cpp rename to libs/server/src/game/server_card.cpp index 323b4d827..455f37ebc 100644 --- a/common/server/game/server_card.cpp +++ b/libs/server/src/game/server_card.cpp @@ -17,13 +17,13 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "server_card.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_player.h" #include "pb/event_set_card_attr.pb.h" #include "pb/event_set_card_counter.pb.h" #include "pb/serverinfo_card.pb.h" -#include "server_cardzone.h" -#include "server_player.h" #include diff --git a/common/server/game/server_cardzone.cpp b/libs/server/src/game/server_cardzone.cpp similarity index 98% rename from common/server/game/server_cardzone.cpp rename to libs/server/src/game/server_cardzone.cpp index 44b946fa0..734f9f0f9 100644 --- a/common/server/game/server_cardzone.cpp +++ b/libs/server/src/game/server_cardzone.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "server_cardzone.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_player.h" #include "../rng_abstract.h" #include "pb/command_move_card.pb.h" -#include "server_card.h" -#include "server_player.h" #include #include diff --git a/common/server/game/server_counter.cpp b/libs/server/src/game/server_counter.cpp similarity index 91% rename from common/server/game/server_counter.cpp rename to libs/server/src/game/server_counter.cpp index 3dc5c6d66..f348c0ed0 100644 --- a/common/server/game/server_counter.cpp +++ b/libs/server/src/game/server_counter.cpp @@ -1,4 +1,4 @@ -#include "server_counter.h" +#include "../../include/game/server_counter.h" #include "pb/serverinfo_counter.pb.h" diff --git a/common/server/game/server_game.cpp b/libs/server/src/game/server_game.cpp similarity index 99% rename from common/server/game/server_game.cpp rename to libs/server/src/game/server_game.cpp index eb064d878..2b63b18da 100644 --- a/common/server/game/server_game.cpp +++ b/libs/server/src/game/server_game.cpp @@ -17,9 +17,14 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "server_game.h" +#include "../../include/game/server_game.h" #include "../../deck_list.h" +#include "../../include/game/server_arrow.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_player.h" +#include "../../include/game/server_spectator.h" #include "../server.h" #include "../server_database_interface.h" #include "../server_protocolhandler.h" @@ -41,11 +46,6 @@ #include "pb/event_set_active_player.pb.h" #include "pb/game_replay.pb.h" #include "pb/serverinfo_playerping.pb.h" -#include "server_arrow.h" -#include "server_card.h" -#include "server_cardzone.h" -#include "server_player.h" -#include "server_spectator.h" #include #include diff --git a/common/server/game/server_player.cpp b/libs/server/src/game/server_player.cpp similarity index 99% rename from common/server/game/server_player.cpp rename to libs/server/src/game/server_player.cpp index b8b9b7cd5..484fe240f 100644 --- a/common/server/game/server_player.cpp +++ b/libs/server/src/game/server_player.cpp @@ -1,9 +1,14 @@ -#include "server_player.h" +#include "../../include/game/server_player.h" #include "../../color.h" #include "../../deck_list.h" #include "../../deck_list_card_node.h" #include "../../get_pb_extension.h" +#include "../../include/game/server_arrow.h" +#include "../../include/game/server_card.h" +#include "../../include/game/server_cardzone.h" +#include "../../include/game/server_counter.h" +#include "../../include/game/server_game.h" #include "../../rng_abstract.h" #include "../../trice_limits.h" #include "../server.h" @@ -76,11 +81,6 @@ #include "pb/response_dump_zone.pb.h" #include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_user.pb.h" -#include "server_arrow.h" -#include "server_card.h" -#include "server_cardzone.h" -#include "server_counter.h" -#include "server_game.h" #include #include diff --git a/common/server/game/server_spectator.cpp b/libs/server/src/game/server_spectator.cpp similarity index 89% rename from common/server/game/server_spectator.cpp rename to libs/server/src/game/server_spectator.cpp index bc873e386..773244bdf 100644 --- a/common/server/game/server_spectator.cpp +++ b/libs/server/src/game/server_spectator.cpp @@ -1,4 +1,4 @@ -#include "server_spectator.h" +#include "../../include/game/server_spectator.h" Server_Spectator::Server_Spectator(Server_Game *_game, int _playerId, diff --git a/common/server/server.cpp b/libs/server/src/server.cpp similarity index 98% rename from common/server/server.cpp rename to libs/server/src/server.cpp index a80c9ee8f..4cdf08cf5 100644 --- a/common/server/server.cpp +++ b/libs/server/src/server.cpp @@ -17,22 +17,22 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "server.h" +#include "../include/server.h" #include "../debug_pb_message.h" #include "../featureset.h" -#include "game/server_game.h" -#include "game/server_player.h" +#include "../include/game/server_game.h" +#include "../include/game/server_player.h" +#include "../include/server_database_interface.h" +#include "../include/server_protocolhandler.h" +#include "../include/server_remoteuserinterface.h" +#include "../include/server_room.h" #include "pb/event_connection_closed.pb.h" #include "pb/event_list_rooms.pb.h" #include "pb/event_user_joined.pb.h" #include "pb/event_user_left.pb.h" #include "pb/isl_message.pb.h" #include "pb/session_event.pb.h" -#include "server_database_interface.h" -#include "server_protocolhandler.h" -#include "server_remoteuserinterface.h" -#include "server_room.h" #include #include diff --git a/common/server/server_abstractuserinterface.cpp b/libs/server/src/server_abstractuserinterface.cpp similarity index 93% rename from common/server/server_abstractuserinterface.cpp rename to libs/server/src/server_abstractuserinterface.cpp index 5016a8867..33c7903a5 100644 --- a/common/server/server_abstractuserinterface.cpp +++ b/libs/server/src/server_abstractuserinterface.cpp @@ -1,13 +1,13 @@ -#include "server_abstractuserinterface.h" +#include "../include/server_abstractuserinterface.h" -#include "game/server_game.h" -#include "game/server_player.h" +#include "../include/game/server_game.h" +#include "../include/game/server_player.h" +#include "../include/server.h" +#include "../include/server_player_reference.h" +#include "../include/server_response_containers.h" +#include "../include/server_room.h" #include "pb/event_game_joined.pb.h" #include "pb/event_game_state_changed.pb.h" -#include "server.h" -#include "server_player_reference.h" -#include "server_response_containers.h" -#include "server_room.h" #include #include diff --git a/libs/server/src/server_database_interface.cpp b/libs/server/src/server_database_interface.cpp new file mode 100644 index 000000000..9720ff9dd --- /dev/null +++ b/libs/server/src/server_database_interface.cpp @@ -0,0 +1,2 @@ + +#include "../include/server_database_interface.h" diff --git a/common/server/server_protocolhandler.cpp b/libs/server/src/server_protocolhandler.cpp similarity index 99% rename from common/server/server_protocolhandler.cpp rename to libs/server/src/server_protocolhandler.cpp index c06ee7624..a29d62654 100644 --- a/common/server/server_protocolhandler.cpp +++ b/libs/server/src/server_protocolhandler.cpp @@ -1,11 +1,13 @@ -#include "server_protocolhandler.h" +#include "../include/server_protocolhandler.h" #include "../debug_pb_message.h" #include "../featureset.h" #include "../get_pb_extension.h" +#include "../include/game/server_game.h" +#include "../include/game/server_player.h" +#include "../include/server_database_interface.h" +#include "../include/server_room.h" #include "../trice_limits.h" -#include "game/server_game.h" -#include "game/server_player.h" #include "pb/commands.pb.h" #include "pb/event_game_joined.pb.h" #include "pb/event_list_rooms.pb.h" @@ -20,8 +22,6 @@ #include "pb/response_list_users.pb.h" #include "pb/response_login.pb.h" #include "pb/serverinfo_user.pb.h" -#include "server_database_interface.h" -#include "server_room.h" #include #include diff --git a/common/server/server_remoteuserinterface.cpp b/libs/server/src/server_remoteuserinterface.cpp similarity index 89% rename from common/server/server_remoteuserinterface.cpp rename to libs/server/src/server_remoteuserinterface.cpp index ec9b5d88a..e5b9b7e2c 100644 --- a/common/server/server_remoteuserinterface.cpp +++ b/libs/server/src/server_remoteuserinterface.cpp @@ -1,7 +1,7 @@ -#include "server_remoteuserinterface.h" +#include "../include/server_remoteuserinterface.h" +#include "../include/server.h" #include "pb/serverinfo_user.pb.h" -#include "server.h" void Server_RemoteUserInterface::sendProtocolItem(const Response &item) { diff --git a/common/server/server_response_containers.cpp b/libs/server/src/server_response_containers.cpp similarity index 97% rename from common/server/server_response_containers.cpp rename to libs/server/src/server_response_containers.cpp index 9b07bdb91..9156d64e4 100644 --- a/common/server/server_response_containers.cpp +++ b/libs/server/src/server_response_containers.cpp @@ -1,6 +1,6 @@ -#include "server_response_containers.h" +#include "../include/server_response_containers.h" -#include "game/server_game.h" +#include "../include/game/server_game.h" #include diff --git a/common/server/server_room.cpp b/libs/server/src/server_room.cpp similarity index 99% rename from common/server/server_room.cpp rename to libs/server/src/server_room.cpp index badb37642..f3cc990f9 100644 --- a/common/server/server_room.cpp +++ b/libs/server/src/server_room.cpp @@ -1,7 +1,8 @@ -#include "server_room.h" +#include "../include/server_room.h" +#include "../include/game/server_game.h" +#include "../include/server_protocolhandler.h" #include "../trice_limits.h" -#include "game/server_game.h" #include "pb/commands.pb.h" #include "pb/event_join_room.pb.h" #include "pb/event_leave_room.pb.h" @@ -11,7 +12,6 @@ #include "pb/room_commands.pb.h" #include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_room.pb.h" -#include "server_protocolhandler.h" #include #include diff --git a/common/serverinfo_user_container.cpp b/libs/server/src/serverinfo_user_container.cpp similarity index 96% rename from common/serverinfo_user_container.cpp rename to libs/server/src/serverinfo_user_container.cpp index 597ebd01a..d4328f527 100644 --- a/common/serverinfo_user_container.cpp +++ b/libs/server/src/serverinfo_user_container.cpp @@ -1,4 +1,4 @@ -#include "serverinfo_user_container.h" +#include "../../common/serverinfo_user_container.h" #include "pb/serverinfo_user.pb.h" diff --git a/cockatrice/libs/settings/CMakeLists.txt b/libs/settings/CMakeLists.txt similarity index 93% rename from cockatrice/libs/settings/CMakeLists.txt rename to libs/settings/CMakeLists.txt index b37d20213..08f9ba07e 100644 --- a/cockatrice/libs/settings/CMakeLists.txt +++ b/libs/settings/CMakeLists.txt @@ -44,9 +44,9 @@ add_library(settingslib STATIC ) target_include_directories(settingslib - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + PUBLIC include PUBLIC ${CMAKE_SOURCE_DIR}/common - PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/utility/include + PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network ) diff --git a/cockatrice/libs/settings/include/settings/cache_settings.h b/libs/settings/include/settings/cache_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/cache_settings.h rename to libs/settings/include/settings/cache_settings.h diff --git a/cockatrice/libs/settings/include/settings/card_counter_settings.h b/libs/settings/include/settings/card_counter_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/card_counter_settings.h rename to libs/settings/include/settings/card_counter_settings.h diff --git a/cockatrice/libs/settings/include/settings/card_database_settings.h b/libs/settings/include/settings/card_database_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/card_database_settings.h rename to libs/settings/include/settings/card_database_settings.h diff --git a/cockatrice/libs/settings/include/settings/card_override_settings.h b/libs/settings/include/settings/card_override_settings.h similarity index 93% rename from cockatrice/libs/settings/include/settings/card_override_settings.h rename to libs/settings/include/settings/card_override_settings.h index 90a1a1681..6fa640c50 100644 --- a/cockatrice/libs/settings/include/settings/card_override_settings.h +++ b/libs/settings/include/settings/card_override_settings.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H -#include "../common/card_ref.h" +#include "../../../utility/include/utility/card_ref.h" #include "settings_manager.h" #include diff --git a/cockatrice/libs/settings/include/settings/debug_settings.h b/libs/settings/include/settings/debug_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/debug_settings.h rename to libs/settings/include/settings/debug_settings.h diff --git a/cockatrice/libs/settings/include/settings/download_settings.h b/libs/settings/include/settings/download_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/download_settings.h rename to libs/settings/include/settings/download_settings.h diff --git a/cockatrice/libs/settings/include/settings/game_filters_settings.h b/libs/settings/include/settings/game_filters_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/game_filters_settings.h rename to libs/settings/include/settings/game_filters_settings.h diff --git a/cockatrice/libs/settings/include/settings/layouts_settings.h b/libs/settings/include/settings/layouts_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/layouts_settings.h rename to libs/settings/include/settings/layouts_settings.h diff --git a/cockatrice/libs/settings/include/settings/message_settings.h b/libs/settings/include/settings/message_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/message_settings.h rename to libs/settings/include/settings/message_settings.h diff --git a/cockatrice/libs/settings/include/settings/recents_settings.h b/libs/settings/include/settings/recents_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/recents_settings.h rename to libs/settings/include/settings/recents_settings.h diff --git a/cockatrice/libs/settings/include/settings/servers_settings.h b/libs/settings/include/settings/servers_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/servers_settings.h rename to libs/settings/include/settings/servers_settings.h diff --git a/cockatrice/libs/settings/include/settings/settings_manager.h b/libs/settings/include/settings/settings_manager.h similarity index 100% rename from cockatrice/libs/settings/include/settings/settings_manager.h rename to libs/settings/include/settings/settings_manager.h diff --git a/cockatrice/libs/settings/include/settings/shortcut_treeview.h b/libs/settings/include/settings/shortcut_treeview.h similarity index 100% rename from cockatrice/libs/settings/include/settings/shortcut_treeview.h rename to libs/settings/include/settings/shortcut_treeview.h diff --git a/cockatrice/libs/settings/include/settings/shortcuts_settings.h b/libs/settings/include/settings/shortcuts_settings.h similarity index 100% rename from cockatrice/libs/settings/include/settings/shortcuts_settings.h rename to libs/settings/include/settings/shortcuts_settings.h diff --git a/cockatrice/libs/settings/src/cache_settings.cpp b/libs/settings/src/cache_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/cache_settings.cpp rename to libs/settings/src/cache_settings.cpp diff --git a/cockatrice/libs/settings/src/card_counter_settings.cpp b/libs/settings/src/card_counter_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/card_counter_settings.cpp rename to libs/settings/src/card_counter_settings.cpp diff --git a/cockatrice/libs/settings/src/card_database_settings.cpp b/libs/settings/src/card_database_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/card_database_settings.cpp rename to libs/settings/src/card_database_settings.cpp diff --git a/cockatrice/libs/settings/src/card_override_settings.cpp b/libs/settings/src/card_override_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/card_override_settings.cpp rename to libs/settings/src/card_override_settings.cpp diff --git a/cockatrice/libs/settings/src/debug_settings.cpp b/libs/settings/src/debug_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/debug_settings.cpp rename to libs/settings/src/debug_settings.cpp diff --git a/cockatrice/libs/settings/src/download_settings.cpp b/libs/settings/src/download_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/download_settings.cpp rename to libs/settings/src/download_settings.cpp diff --git a/cockatrice/libs/settings/src/game_filters_settings.cpp b/libs/settings/src/game_filters_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/game_filters_settings.cpp rename to libs/settings/src/game_filters_settings.cpp diff --git a/cockatrice/libs/settings/src/layouts_settings.cpp b/libs/settings/src/layouts_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/layouts_settings.cpp rename to libs/settings/src/layouts_settings.cpp diff --git a/cockatrice/libs/settings/src/message_settings.cpp b/libs/settings/src/message_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/message_settings.cpp rename to libs/settings/src/message_settings.cpp diff --git a/cockatrice/libs/settings/src/recents_settings.cpp b/libs/settings/src/recents_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/recents_settings.cpp rename to libs/settings/src/recents_settings.cpp diff --git a/cockatrice/libs/settings/src/servers_settings.cpp b/libs/settings/src/servers_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/servers_settings.cpp rename to libs/settings/src/servers_settings.cpp diff --git a/cockatrice/libs/settings/src/settings_manager.cpp b/libs/settings/src/settings_manager.cpp similarity index 100% rename from cockatrice/libs/settings/src/settings_manager.cpp rename to libs/settings/src/settings_manager.cpp diff --git a/cockatrice/libs/settings/src/shortcut_treeview.cpp b/libs/settings/src/shortcut_treeview.cpp similarity index 100% rename from cockatrice/libs/settings/src/shortcut_treeview.cpp rename to libs/settings/src/shortcut_treeview.cpp diff --git a/cockatrice/libs/settings/src/shortcuts_settings.cpp b/libs/settings/src/shortcuts_settings.cpp similarity index 100% rename from cockatrice/libs/settings/src/shortcuts_settings.cpp rename to libs/settings/src/shortcuts_settings.cpp diff --git a/cockatrice/libs/utility/CMakeLists.txt b/libs/utility/CMakeLists.txt similarity index 64% rename from cockatrice/libs/utility/CMakeLists.txt rename to libs/utility/CMakeLists.txt index e896e9a82..6632dc8cd 100644 --- a/cockatrice/libs/utility/CMakeLists.txt +++ b/libs/utility/CMakeLists.txt @@ -6,16 +6,24 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(UTILITY_SOURCES + src/expression.cpp + src/featureset.cpp src/key_signals.cpp src/levenshtein.cpp src/logger.cpp + src/passwordhasher.cpp ) set(UTILITY_HEADERS + include/utility/color.h + include/utility/expression.h + include/utility/featureset.h include/utility/key_signals.h include/utility/levenshtein.h include/utility/logger.h include/utility/macros.h + include/utility/passwordhasher.h + include/utility/trice_limits.h ) qt_add_library(utility STATIC @@ -24,9 +32,13 @@ qt_add_library(utility STATIC ) target_include_directories(utility - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include + PUBLIC include ) target_link_libraries(utility PUBLIC ${COCKATRICE_QT_MODULES} -) \ No newline at end of file +) + +set(ORACLE_LIBS) + +include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) diff --git a/common/card_ref.h b/libs/utility/include/utility/card_ref.h similarity index 100% rename from common/card_ref.h rename to libs/utility/include/utility/card_ref.h diff --git a/common/color.h b/libs/utility/include/utility/color.h similarity index 100% rename from common/color.h rename to libs/utility/include/utility/color.h diff --git a/common/expression.h b/libs/utility/include/utility/expression.h similarity index 100% rename from common/expression.h rename to libs/utility/include/utility/expression.h diff --git a/common/featureset.h b/libs/utility/include/utility/featureset.h similarity index 100% rename from common/featureset.h rename to libs/utility/include/utility/featureset.h diff --git a/cockatrice/libs/utility/include/utility/key_signals.h b/libs/utility/include/utility/key_signals.h similarity index 100% rename from cockatrice/libs/utility/include/utility/key_signals.h rename to libs/utility/include/utility/key_signals.h diff --git a/cockatrice/libs/utility/include/utility/levenshtein.h b/libs/utility/include/utility/levenshtein.h similarity index 100% rename from cockatrice/libs/utility/include/utility/levenshtein.h rename to libs/utility/include/utility/levenshtein.h diff --git a/cockatrice/libs/utility/include/utility/logger.h b/libs/utility/include/utility/logger.h similarity index 100% rename from cockatrice/libs/utility/include/utility/logger.h rename to libs/utility/include/utility/logger.h diff --git a/cockatrice/libs/utility/include/utility/macros.h b/libs/utility/include/utility/macros.h similarity index 100% rename from cockatrice/libs/utility/include/utility/macros.h rename to libs/utility/include/utility/macros.h diff --git a/common/passwordhasher.h b/libs/utility/include/utility/passwordhasher.h similarity index 100% rename from common/passwordhasher.h rename to libs/utility/include/utility/passwordhasher.h diff --git a/common/trice_limits.h b/libs/utility/include/utility/trice_limits.h similarity index 100% rename from common/trice_limits.h rename to libs/utility/include/utility/trice_limits.h diff --git a/common/expression.cpp b/libs/utility/src/expression.cpp similarity index 97% rename from common/expression.cpp rename to libs/utility/src/expression.cpp index 9cb40ea3c..5d76c1eeb 100644 --- a/common/expression.cpp +++ b/libs/utility/src/expression.cpp @@ -1,6 +1,6 @@ -#include "expression.h" +#include "../include/utility/expression.h" -#include "./lib/peglib.h" +#include "../../../common/lib/peglib.h" #include #include diff --git a/common/featureset.cpp b/libs/utility/src/featureset.cpp similarity index 98% rename from common/featureset.cpp rename to libs/utility/src/featureset.cpp index d9f253ab9..0fdc282c5 100644 --- a/common/featureset.cpp +++ b/libs/utility/src/featureset.cpp @@ -1,4 +1,4 @@ -#include "featureset.h" +#include "../include/utility/featureset.h" #include #include diff --git a/cockatrice/libs/utility/src/key_signals.cpp b/libs/utility/src/key_signals.cpp similarity index 100% rename from cockatrice/libs/utility/src/key_signals.cpp rename to libs/utility/src/key_signals.cpp diff --git a/cockatrice/libs/utility/src/levenshtein.cpp b/libs/utility/src/levenshtein.cpp similarity index 100% rename from cockatrice/libs/utility/src/levenshtein.cpp rename to libs/utility/src/levenshtein.cpp diff --git a/cockatrice/libs/utility/src/logger.cpp b/libs/utility/src/logger.cpp similarity index 100% rename from cockatrice/libs/utility/src/logger.cpp rename to libs/utility/src/logger.cpp diff --git a/common/passwordhasher.cpp b/libs/utility/src/passwordhasher.cpp similarity index 91% rename from common/passwordhasher.cpp rename to libs/utility/src/passwordhasher.cpp index bc5f072e8..51dfecb34 100644 --- a/common/passwordhasher.cpp +++ b/libs/utility/src/passwordhasher.cpp @@ -1,6 +1,6 @@ -#include "passwordhasher.h" +#include "../include/utility/passwordhasher.h" -#include "rng_sfmt.h" +#include "../../rng/include/rng/rng_sfmt.h" #include diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 7d745953b..201aedcfc 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -45,8 +45,8 @@ endif() # Include directories # ------------------------ include_directories( - ../cockatrice/libs/card/include - ../cockatrice/libs/settings/include + ../libs/card/include + ../libs/settings/include ../cockatrice/src ../common ) diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index 0c13bcd0f..a98ad26ad 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -1,7 +1,7 @@ #include "isl_interface.h" -#include "debug_pb_message.h" -#include "get_pb_extension.h" +#include "../../libs/server/debug_pb_message.h" +#include "../../libs/server/get_pb_extension.h" #include "main.h" #include "pb/event_game_joined.pb.h" #include "pb/event_join_room.pb.h" diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index c8950d973..853f89bd0 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -18,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "passwordhasher.h" -#include "rng_sfmt.h" +#include "../../libs/rng/include/rng/rng_sfmt.h" +#include "../../libs/utility/include/utility/passwordhasher.h" #include "servatrice.h" #include "server_logger.h" #include "settingscache.h" diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index e1288a627..4804bd7d2 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "servatrice.h" -#include "deck_list.h" +#include "../../libs/deck/deck_list.h" +#include "../../libs/utility/include/utility/featureset.h" #include "email_parser.h" -#include "featureset.h" #include "isl_interface.h" #include "main.h" #include "pb/event_connection_closed.pb.h" diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 289059846..cf88fae01 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,7 +1,7 @@ #include "servatrice_database_interface.h" -#include "deck_list.h" -#include "passwordhasher.h" +#include "../../libs/deck/deck_list.h" +#include "../../libs/utility/passwordhasher.h" #include "pb/game_replay.pb.h" #include "servatrice.h" #include "serversocketinterface.h" diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 9b08ee330..5543b67d2 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -20,7 +20,8 @@ #include "serversocketinterface.h" -#include "deck_list.h" +#include "../../libs/deck/deck_list.h" +#include "../../libs/utility/include/utility/trice_limits.h" #include "email_parser.h" #include "main.h" #include "pb/command_deck_del.pb.h" @@ -70,7 +71,6 @@ #include "server/server_room.h" #include "server_logger.h" #include "settingscache.h" -#include "trice_limits.h" #include "version_string.h" #include diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp index 51c4039a4..6deac964d 100644 --- a/tests/expression_test.cpp +++ b/tests/expression_test.cpp @@ -1,4 +1,4 @@ -#include "../common/expression.h" +#include "../libs/utility/include/utility/expression.h" #include "gtest/gtest.h" #include diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt index be8ac6374..6b888e052 100644 --- a/tests/loading_from_clipboard/CMakeLists.txt +++ b/tests/loading_from_clipboard/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_executable( - loading_from_clipboard_test ../../common/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp + loading_from_clipboard_test ../../libs/deck/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp ) if(NOT GTEST_FOUND) diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp index 943c6a05d..312d9b6f1 100644 --- a/tests/loading_from_clipboard/clipboard_testing.cpp +++ b/tests/loading_from_clipboard/clipboard_testing.cpp @@ -1,6 +1,6 @@ #include "clipboard_testing.h" -#include "../../common/deck_list_card_node.h" +#include "../../libs/deck/deck_list_card_node.h" #include diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h index 8f1b215b8..5dc7cc1af 100644 --- a/tests/loading_from_clipboard/clipboard_testing.h +++ b/tests/loading_from_clipboard/clipboard_testing.h @@ -1,7 +1,7 @@ #ifndef CLIPBOARD_TESTING_H #define CLIPBOARD_TESTING_H -#include "../../common/deck_list.h" +#include "../../libs/deck/deck_list.h" #include "gtest/gtest.h" diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp index 84e7c8eb1..fecb7712e 100644 --- a/tests/password_hash_test.cpp +++ b/tests/password_hash_test.cpp @@ -1,6 +1,6 @@ -#include "../common/passwordhasher.h" -#include "../common/rng_abstract.h" -#include "../common/rng_sfmt.h" +#include "../libs/rng/include/rng/rng_abstract.h" +#include "../libs/rng/include/rng/rng_sfmt.h" +#include "../libs/utility/include/utility/passwordhasher.h" #include "gtest/gtest.h"