diff --git a/CMakeLists.txt b/CMakeLists.txt index 47febc9ed..32e7aebd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,14 +326,13 @@ endif() include(CPack) -add_subdirectory(common) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/protocol ${CMAKE_BINARY_DIR}/libs/protocol) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng) -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(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_server ${CMAKE_BINARY_DIR}/libcockatrice_server) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card) +add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility) if(WITH_SERVER) add_subdirectory(servatrice) set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 85f101033..3d4717a97 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -364,24 +364,17 @@ endif() if(Qt5_FOUND) target_link_libraries( cockatrice - cockatrice_card - cockatrice_deck_list - utility - cockatrice_server - cockatrice_rng - cockatrice_common + libcockatrice_card + libcockatrice_deck_list + libcockatrice_utility + libcockatrice_server + libcockatrice_rng ${COCKATRICE_QT_MODULES} ) else() target_link_libraries( - cockatrice - PUBLIC cockatrice_card - cockatrice_deck_list - utility - cockatrice_server - cockatrice_rng - cockatrice_common - ${COCKATRICE_QT_MODULES} + cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_server + libcockatrice_rng ${COCKATRICE_QT_MODULES} ) endif() diff --git a/cockatrice/src/client/deck_editor_menu.cpp b/cockatrice/src/client/deck_editor_menu.cpp index c012f9761..bc6337b56 100644 --- a/cockatrice/src/client/deck_editor_menu.cpp +++ b/cockatrice/src/client/deck_editor_menu.cpp @@ -1,7 +1,7 @@ #include "deck_editor_menu.h" -#include "settings/cache_settings.h" -#include "settings/shortcuts_settings.h" +#include +#include DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent) { diff --git a/cockatrice/src/client/get_text_with_max.h b/cockatrice/src/client/get_text_with_max.h index 7cdb6a4ea..894eb80f2 100644 --- a/cockatrice/src/client/get_text_with_max.h +++ b/cockatrice/src/client/get_text_with_max.h @@ -7,9 +7,8 @@ #ifndef GETTEXTWITHMAX_H #define GETTEXTWITHMAX_H -#include "../../../libs/utility/include/utility/trice_limits.h" - #include +#include QString getTextWithMax(QWidget *parent, const QString &title, diff --git a/cockatrice/src/client/network/client_update_checker.cpp b/cockatrice/src/client/network/client_update_checker.cpp index ccb6d2034..f965ff6dc 100644 --- a/cockatrice/src/client/network/client_update_checker.cpp +++ b/cockatrice/src/client/network/client_update_checker.cpp @@ -1,7 +1,8 @@ #include "client_update_checker.h" #include "release_channel.h" -#include "settings/cache_settings.h" + +#include ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent) { diff --git a/cockatrice/src/client/network/replay_timeline_widget.cpp b/cockatrice/src/client/network/replay_timeline_widget.cpp index 26176d04d..2b9ab72e9 100644 --- a/cockatrice/src/client/network/replay_timeline_widget.cpp +++ b/cockatrice/src/client/network/replay_timeline_widget.cpp @@ -1,11 +1,10 @@ #include "replay_timeline_widget.h" -#include "settings/cache_settings.h" - #include #include #include #include +#include ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent) : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0), diff --git a/cockatrice/src/client/network/sets_model.h b/cockatrice/src/client/network/sets_model.h index 1c973b055..b024ccd49 100644 --- a/cockatrice/src/client/network/sets_model.h +++ b/cockatrice/src/client/network/sets_model.h @@ -7,12 +7,11 @@ #ifndef SETSMODEL_H #define SETSMODEL_H -#include "card/card_database/card_database.h" - #include #include #include #include +#include class SetsProxyModel; diff --git a/cockatrice/src/client/network/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp index 9772bebc2..3a35620bb 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/spoiler_background_updater.cpp @@ -2,9 +2,6 @@ #include "../../interface/window_main.h" #include "../../main.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" #include #include @@ -16,6 +13,9 @@ #include #include #include +#include +#include +#include #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled" #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" diff --git a/cockatrice/src/client/replay_manager.h b/cockatrice/src/client/replay_manager.h index 55a64768c..8b9ed4e1f 100644 --- a/cockatrice/src/client/replay_manager.h +++ b/cockatrice/src/client/replay_manager.h @@ -9,10 +9,10 @@ #define REPLAY_MANAGER_H #include "network/replay_timeline_widget.h" -#include "pb/game_replay.pb.h" #include #include +#include class TabGame; diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index 31cb2a35e..05f2d12d8 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -1,9 +1,8 @@ #include "sound_engine.h" -#include "settings/cache_settings.h" - #include #include +#include #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #include diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index 52c00f0c0..d18d811b0 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -1,8 +1,5 @@ #include "tapped_out_interface.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent) : QObject(parent), cardDatabase(_cardDatabase) diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index a39a5b572..449bdc5bb 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,11 +7,10 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H -#include "card/card_database/card_database.h" -#include "deck_list/deck_list.h" - #include #include +#include +#include inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface"); diff --git a/cockatrice/src/deck/custom_line_edit.cpp b/cockatrice/src/deck/custom_line_edit.cpp index 58561f019..532afc114 100644 --- a/cockatrice/src/deck/custom_line_edit.cpp +++ b/cockatrice/src/deck/custom_line_edit.cpp @@ -1,13 +1,12 @@ #include "custom_line_edit.h" -#include "settings/cache_settings.h" -#include "settings/shortcuts_settings.h" - #include #include #include #include #include +#include +#include LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent) { diff --git a/cockatrice/src/deck/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp index a6bc1d402..93179d79c 100644 --- a/cockatrice/src/deck/deck_list_model.cpp +++ b/cockatrice/src/deck/deck_list_model.cpp @@ -1,9 +1,7 @@ #include "deck_list_model.h" #include "../main.h" -#include "card/card_database/card_database_manager.h" #include "deck_loader.h" -#include "settings/cache_settings.h" #include #include @@ -13,6 +11,8 @@ #include #include #include +#include +#include DeckListModel::DeckListModel(QObject *parent) : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder) diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index a417d5058..a3e448de4 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,13 +1,12 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "card/card_printing/exact_card.h" -#include "deck_list/abstract_deck_list_card_node.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" - #include #include +#include +#include +#include +#include class DeckLoader; class CardDatabase; diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 4b3c6cc16..ee28ec1a6 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,10 +1,6 @@ #include "deck_loader.h" #include "../main.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" #include #include @@ -16,6 +12,10 @@ #include #include #include +#include +#include +#include +#include const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"}; diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index 3617bfcb9..f11ded444 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -7,9 +7,8 @@ #ifndef DECK_LOADER_H #define DECK_LOADER_H -#include "deck_list/deck_list.h" - #include +#include inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader") diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp index 3bd6961e1..a5cea5358 100644 --- a/cockatrice/src/deck/deck_stats_interface.cpp +++ b/cockatrice/src/deck/deck_stats_interface.cpp @@ -1,8 +1,5 @@ #include "deck_stats_interface.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent) : QObject(parent), cardDatabase(_cardDatabase) diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index bad7394a4..890516a58 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -7,10 +7,9 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H -#include "card/card_database/card_database.h" -#include "deck_list/deck_list.h" - #include +#include +#include class QByteArray; class QNetworkAccessManager; diff --git a/cockatrice/src/dialogs/dlg_connect.cpp b/cockatrice/src/dialogs/dlg_connect.cpp index 310177782..3f398218e 100644 --- a/cockatrice/src/dialogs/dlg_connect.cpp +++ b/cockatrice/src/dialogs/dlg_connect.cpp @@ -1,8 +1,5 @@ #include "dlg_connect.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include @@ -15,6 +12,8 @@ #include #include #include +#include +#include DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h index 406410b89..fd571fc30 100644 --- a/cockatrice/src/dialogs/dlg_connect.h +++ b/cockatrice/src/dialogs/dlg_connect.h @@ -9,10 +9,10 @@ #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" -#include "utility/macros.h" #include #include +#include class QCheckBox; class QComboBox; diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp index 669a02b24..73bb4d72c 100644 --- a/cockatrice/src/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/dialogs/dlg_create_game.cpp @@ -1,10 +1,7 @@ #include "dlg_create_game.h" -#include "../../../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 #include @@ -19,6 +16,9 @@ #include #include #include +#include +#include +#include void DlgCreateGame::sharedCtor() { diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/dialogs/dlg_create_game.h index f9420ca1c..71359a758 100644 --- a/cockatrice/src/dialogs/dlg_create_game.h +++ b/cockatrice/src/dialogs/dlg_create_game.h @@ -7,10 +7,9 @@ #ifndef DLG_CREATEGAME_H #define DLG_CREATEGAME_H -#include "utility/macros.h" - #include #include +#include class QCheckBox; class QDialogButtonBox; diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp index c5ec95a98..39b7333c5 100644 --- a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp +++ b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp @@ -1,9 +1,8 @@ #include "dlg_default_tags_editor.h" -#include "settings/cache_settings.h" - #include #include +#include DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/dialogs/dlg_edit_avatar.cpp index f25800655..28be359a3 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.cpp +++ b/cockatrice/src/dialogs/dlg_edit_avatar.cpp @@ -1,7 +1,5 @@ #include "dlg_edit_avatar.h" -#include "../../../libs/utility/include/utility/trice_limits.h" - #include #include #include @@ -11,6 +9,7 @@ #include #include #include +#include DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image() { diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp index bdebe2909..105783210 100644 --- a/cockatrice/src/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/dialogs/dlg_edit_password.cpp @@ -1,13 +1,12 @@ #include "dlg_edit_password.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include #include #include +#include +#include DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index c14b25b5a..5cf502cfd 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -1,12 +1,7 @@ #include "dlg_edit_tokens.h" -#include "../../../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 #include @@ -22,6 +17,11 @@ #include #include #include +#include +#include +#include +#include +#include DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr) { diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h index 93f089bfe..f19646756 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.h +++ b/cockatrice/src/dialogs/dlg_edit_tokens.h @@ -7,9 +7,8 @@ #ifndef DLG_EDIT_TOKENS_H #define DLG_EDIT_TOKENS_H -#include "card/card_info.h" - #include +#include class QModelIndex; class CardDatabaseModel; diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp index 01dc8358c..70e99ca28 100644 --- a/cockatrice/src/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/dialogs/dlg_edit_user.cpp @@ -1,13 +1,12 @@ #include "dlg_edit_user.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include #include #include +#include +#include DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp index b5014ce3d..a8999d1e3 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_challenge.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp index df1cdea5f..000e7b0f1 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_request.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp index 8bdfad394..43b6c2fb9 100644 --- a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp @@ -1,8 +1,5 @@ #include "dlg_forgot_password_reset.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "settings/cache_settings.h" - #include #include #include @@ -10,6 +7,8 @@ #include #include #include +#include +#include DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp index 3a77fc216..fe9151b54 100644 --- a/cockatrice/src/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck.cpp @@ -1,7 +1,8 @@ #include "dlg_load_deck.h" #include "../deck/deck_loader.h" -#include "settings/cache_settings.h" + +#include DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) { diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp index f2b514fa4..3f0275dd7 100644 --- a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp @@ -2,7 +2,6 @@ #include "../deck/deck_loader.h" #include "dlg_settings.h" -#include "settings/cache_settings.h" #include #include @@ -13,6 +12,7 @@ #include #include #include +#include /** * Creates the main layout and connects the signals that are common to all versions of this window diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index 41a21a67f..ea95c1ed6 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -4,8 +4,6 @@ #include "../deck/custom_line_edit.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../main.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" #include #include @@ -22,6 +20,8 @@ #include #include #include +#include +#include #define SORT_RESET -1 diff --git a/cockatrice/src/dialogs/dlg_register.cpp b/cockatrice/src/dialogs/dlg_register.cpp index b1e22c4fe..e71759554 100644 --- a/cockatrice/src/dialogs/dlg_register.cpp +++ b/cockatrice/src/dialogs/dlg_register.cpp @@ -1,9 +1,5 @@ #include "dlg_register.h" -#include "../../../libs/utility/include/utility/trice_limits.h" -#include "pb/serverinfo_user.pb.h" -#include "settings/cache_settings.h" - #include #include #include @@ -11,6 +7,9 @@ #include #include #include +#include +#include +#include DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index c142ec3a2..b6da8fafe 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -3,7 +3,6 @@ #include "../deck/deck_loader.h" #include "../interface/widgets/cards/card_info_picture_widget.h" #include "../interface/widgets/general/layout_containers/flow_widget.h" -#include "card/card_database/card_database_manager.h" #include "dlg_select_set_for_cards.h" #include @@ -17,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index 37e106fc4..d772dacd6 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -11,11 +11,6 @@ #include "../interface/widgets/general/background_sources.h" #include "../main.h" #include "../tabs/tab_supervisor.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" -#include "settings/card_counter_settings.h" -#include "settings/shortcut_treeview.h" #include #include @@ -48,6 +43,11 @@ #include #include #include +#include +#include +#include +#include +#include #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs" #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts" diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h index 5519493a9..b23e45606 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -7,8 +7,6 @@ #ifndef DLG_SETTINGS_H #define DLG_SETTINGS_H -#include "utility/macros.h" - #include #include #include @@ -17,6 +15,7 @@ #include #include #include +#include inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings"); diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/dialogs/dlg_startup_card_check.cpp index 7c2b73042..c2a03a55e 100644 --- a/cockatrice/src/dialogs/dlg_startup_card_check.cpp +++ b/cockatrice/src/dialogs/dlg_startup_card_check.cpp @@ -1,8 +1,7 @@ #include "dlg_startup_card_check.h" -#include "settings/cache_settings.h" - #include +#include DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp index 10240d6bc..6023ac48c 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp @@ -1,6 +1,5 @@ #include "dlg_tip_of_the_day.h" -#include "settings/cache_settings.h" #include "tip_of_the_day.h" #include @@ -10,6 +9,7 @@ #include #include #include +#include #define MIN_TIP_IMAGE_HEIGHT 200 #define MIN_TIP_IMAGE_WIDTH 200 diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp index eb8913525..ca5100f09 100644 --- a/cockatrice/src/dialogs/dlg_update.cpp +++ b/cockatrice/src/dialogs/dlg_update.cpp @@ -3,7 +3,6 @@ #include "../client/network/client_update_checker.h" #include "../client/network/release_channel.h" #include "../interface/window_main.h" -#include "settings/cache_settings.h" #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/dialogs/dlg_view_log.cpp b/cockatrice/src/dialogs/dlg_view_log.cpp index 1ec25d139..7ad8ec9ab 100644 --- a/cockatrice/src/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/dialogs/dlg_view_log.cpp @@ -1,13 +1,12 @@ #include "dlg_view_log.h" -#include "settings/cache_settings.h" -#include "utility/logger.h" - #include #include #include #include #include +#include +#include DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index c9d919043..44ef6c2bd 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,8 +1,9 @@ #include "deck_filter_string.h" -#include "card/card_database/card_database_manager.h" +#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" #include "filter_string.h" -#include "lib/peglib.h" + +#include static peg::parser search(R"( Start <- QueryPartList diff --git a/cockatrice/src/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp index 02fc1e1ec..9a9cc080e 100644 --- a/cockatrice/src/filters/filter_string.cpp +++ b/cockatrice/src/filters/filter_string.cpp @@ -1,6 +1,6 @@ #include "filter_string.h" -#include "../../../common/lib/peglib.h" +#include "../../../libcockatrice_utility/libcockatrice/utility/peglib.h" #include #include diff --git a/cockatrice/src/filters/filter_string.h b/cockatrice/src/filters/filter_string.h index 3502c6ea9..4e6cb38bf 100644 --- a/cockatrice/src/filters/filter_string.h +++ b/cockatrice/src/filters/filter_string.h @@ -7,13 +7,13 @@ #ifndef FILTER_STRING_H #define FILTER_STRING_H -#include "card/card_info.h" #include "filter_tree.h" #include #include #include #include +#include #include inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string"); diff --git a/cockatrice/src/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h index 3f3855a4d..dc64f79fe 100644 --- a/cockatrice/src/filters/filter_tree.h +++ b/cockatrice/src/filters/filter_tree.h @@ -7,12 +7,12 @@ #ifndef FILTERTREE_H #define FILTERTREE_H -#include "card/card_database/card_database.h" #include "filter_card.h" #include #include #include +#include #include class FilterTreeNode diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h index 93b9fe76b..cb4dbac2a 100644 --- a/cockatrice/src/game/abstract_game.h +++ b/cockatrice/src/game/abstract_game.h @@ -10,10 +10,10 @@ #include "game_event_handler.h" #include "game_meta_info.h" #include "game_state.h" -#include "pb/game_replay.pb.h" #include "player/player_manager.h" #include +#include class CardItem; class TabGame; diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp index d773b34a9..3507a5a27 100644 --- a/cockatrice/src/game/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -1,11 +1,10 @@ #include "abstract_card_drag_item.h" -#include "settings/cache_settings.h" - #include #include #include #include +#include static const float CARD_WIDTH_HALF = CARD_WIDTH / 2; static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2; diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index c673b1fc6..f5edf1d62 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -2,15 +2,15 @@ #include "../../interface/card_picture_loader/card_picture_loader.h" #include "../game_scene.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include +#include AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id) : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0), diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h index 3669121e1..8aa5a606b 100644 --- a/cockatrice/src/game/board/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -7,11 +7,12 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H -#include "../../../../libs/utility/include/utility/card_ref.h" #include "arrow_target.h" -#include "card/card_printing/exact_card.h" #include "graphics_item_type.h" +#include +#include + class Player; const int CARD_WIDTH = 72; diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index facf9bc4c..cfc20341f 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,11 +1,7 @@ #include "abstract_counter.h" -#include "../../../../libs/utility/include/utility/expression.h" #include "../../tabs/tab_game.h" #include "../player/player.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_set_counter.pb.h" -#include "settings/cache_settings.h" #include "translate_counter_name.h" #include @@ -16,6 +12,10 @@ #include #include #include +#include +#include +#include +#include AbstractCounter::AbstractCounter(Player *_player, int _id, diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index 3a6fb1fee..cc4a4e6aa 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -4,19 +4,19 @@ #include "../player/player.h" #include "../player/player_target.h" #include "../zones/card_zone.h" -#include "card/card_info.h" #include "card_item.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "settings/cache_settings.h" -#include "utility/color.h" #include #include #include #include #include +#include +#include +#include +#include +#include +#include ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color) : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false), diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index 93a635576..2bb36725f 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -8,16 +8,16 @@ #include "../zones/table_zone.h" #include "../zones/view_zone.h" #include "arrow_item.h" -#include "card/card_info.h" #include "card_drag_item.h" -#include "pb/serverinfo_card.pb.h" -#include "settings/cache_settings.h" -#include "settings/card_counter_settings.h" #include #include #include #include +#include +#include +#include +#include CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone) : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false), diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h index 5408a5f3a..d8dbe2f44 100644 --- a/cockatrice/src/game/board/card_item.h +++ b/cockatrice/src/game/board/card_item.h @@ -9,7 +9,8 @@ #include "../zones/logic/card_zone_logic.h" #include "abstract_card_item.h" -#include "server/game/server_card.h" + +#include class CardDatabase; class CardDragItem; diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp index 391a96ad3..c324ca10a 100644 --- a/cockatrice/src/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,10 +1,10 @@ #include "card_list.h" -#include "card/card_info.h" #include "card_item.h" #include #include +#include CardList::CardList(bool _contentsKnown) : QList(), contentsKnown(_contentsKnown) { diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index f03b9625b..da9c97db9 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,16 +1,16 @@ #include "deck_view.h" #include "../../interface/theme_manager.h" -#include "card/card_info.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include +#include +#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h index 06fb7294a..7d01d5670 100644 --- a/cockatrice/src/game/deckview/deck_view.h +++ b/cockatrice/src/game/deckview/deck_view.h @@ -8,13 +8,13 @@ #define DECKVIEW_H #include "../board/abstract_card_drag_item.h" -#include "pb/move_card_to_zone.pb.h" #include #include #include #include #include +#include class DeckList; class InnerDecklistNode; diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 898ed506d..3f2d6d483 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,6 +1,5 @@ #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" @@ -10,20 +9,21 @@ #include "../../server/pending_command.h" #include "../../tabs/tab_game.h" #include "../game_scene.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" #include "deck_view.h" -#include "pb/command_deck_select.pb.h" -#include "pb/command_ready_start.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/response_deck_download.pb.h" -#include "settings/cache_settings.h" #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false) { diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp index 694d5dead..aeb9be453 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -2,12 +2,6 @@ #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/deck_list.h" -#include "settings/cache_settings.h" -#include "utility/trice_limits.h" #include #include @@ -22,6 +16,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent) : QDialog(parent), predefinedTokens(_predefinedTokens) diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp index cf00eeb95..f73968d7a 100644 --- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp +++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp @@ -1,8 +1,6 @@ #include "dlg_move_top_cards_until.h" #include "../../filters/filter_string.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" #include #include @@ -12,6 +10,8 @@ #include #include #include +#include +#include DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay) : QDialog(parent) diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp index f3958b9ee..dfb3d0bc5 100644 --- a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp +++ b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp @@ -1,12 +1,11 @@ #include "dlg_roll_dice.h" -#include "../../../../libs/utility/include/utility/trice_limits.h" - #include #include #include #include #include +#include DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index d24d4cb51..a81f838a3 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -1,7 +1,8 @@ #include "game.h" #include "../tabs/tab_game.h" -#include "pb/event_game_joined.pb.h" + +#include Game::Game(TabGame *_tab, QList &_clients, diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index 0baf30482..f765c35b8 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -1,33 +1,34 @@ #include "game_event_handler.h" -#include "../../../libs/server/include/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 "log/message_log_widget.h" -#include "pb/command_concede.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_leave_game.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_ping_changed.pb.h" -#include "pb/event_game_closed.pb.h" -#include "pb/event_game_host_changed.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_game_state_changed.pb.h" -#include "pb/event_join.pb.h" -#include "pb/event_kicked.pb.h" -#include "pb/event_leave.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_set_active_phase.pb.h" -#include "pb/event_set_active_player.pb.h" -#include "pb/game_event_container.pb.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game) { diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h index 4f44cd83e..2709cdcd5 100644 --- a/cockatrice/src/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -7,12 +7,12 @@ #ifndef COCKATRICE_GAME_EVENT_HANDLER_H #define COCKATRICE_GAME_EVENT_HANDLER_H -#include "pb/event_leave.pb.h" -#include "pb/serverinfo_player.pb.h" #include "player/event_processing_options.h" #include #include +#include +#include class AbstractClient; class Response; diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h index e3c0c22e0..b5f5bfe4f 100644 --- a/cockatrice/src/game/game_meta_info.h +++ b/cockatrice/src/game/game_meta_info.h @@ -7,10 +7,9 @@ #ifndef GAME_META_INFO_H #define GAME_META_INFO_H -#include "pb/serverinfo_game.pb.h" - #include #include +#include // Translation layer class to expose protobuf safely and hook it up to Qt Signals. // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object. diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index 7e0d37f3f..5af7b2e1d 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -4,7 +4,6 @@ #include "phases_toolbar.h" #include "player/player.h" #include "player/player_graphics_item.h" -#include "settings/cache_settings.h" #include "zones/view_zone.h" #include "zones/view_zone_widget.h" @@ -15,6 +14,7 @@ #include #include #include +#include #include /** diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h index 0ad24633c..19c9cddbc 100644 --- a/cockatrice/src/game/game_state.h +++ b/cockatrice/src/game/game_state.h @@ -8,10 +8,10 @@ #define COCKATRICE_GAME_STATE_H #include "../server/abstract_client.h" -#include "pb/serverinfo_game.pb.h" #include #include +#include class AbstractGame; class ServerInfo_PlayerProperties; diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp index a7f8ccd41..607f0c85a 100644 --- a/cockatrice/src/game/game_view.cpp +++ b/cockatrice/src/game/game_view.cpp @@ -1,11 +1,11 @@ #include "game_view.h" #include "game_scene.h" -#include "settings/cache_settings.h" #include #include #include +#include GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0) { diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp index 2614c175a..1d76ba31f 100644 --- a/cockatrice/src/game/log/message_log_widget.cpp +++ b/cockatrice/src/game/log/message_log_widget.cpp @@ -7,11 +7,11 @@ #include "../phase.h" #include "../player/player.h" #include "../zones/card_zone.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "settings/card_counter_settings.h" +#include +#include +#include +#include #include static const QString TABLE_ZONE_NAME = "table"; diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h index be751883a..16be19a3e 100644 --- a/cockatrice/src/game/log/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -7,11 +7,12 @@ #ifndef MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H -#include "../../../../libs/server/include/server/user_level.h" #include "../../client/translation.h" #include "../../server/chat_view/chat_view.h" #include "../zones/logic/card_zone_logic.h" +#include + class AbstractGame; class CardItem; class GameEventContext; diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp index 2fef5321c..5106e40de 100644 --- a/cockatrice/src/game/phases_toolbar.cpp +++ b/cockatrice/src/game/phases_toolbar.cpp @@ -1,16 +1,16 @@ #include "phases_toolbar.h" #include "../interface/pixel_map_generator.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/command_set_card_attr.pb.h" #include #include #include #include #include +#include +#include +#include +#include PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable) : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable), diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 84ad32886..86942258c 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -6,11 +6,12 @@ #include "../card_menu_action_type.h" #include "../player.h" #include "../player_actions.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" #include "move_menu.h" #include "pt_menu.h" -#include "settings/card_counter_settings.h" + +#include +#include +#include CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive) : player(_player), card(_card), shortcutsActive(_shortcutsActive) diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp index 2ac36a2e6..b8908bc3e 100644 --- a/cockatrice/src/game/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -4,11 +4,11 @@ #include "../../zones/hand_zone.h" #include "../player.h" #include "../player_actions.h" -#include "settings/cache_settings.h" -#include "settings/shortcuts_settings.h" #include #include +#include +#include HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player) { diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp index 466c7e0ec..53fd58eba 100644 --- a/cockatrice/src/game/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -4,11 +4,11 @@ #include "../../abstract_game.h" #include "../player.h" #include "../player_actions.h" -#include "settings/cache_settings.h" -#include "settings/shortcuts_settings.h" #include #include +#include +#include LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) { diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index 51ec6535b..cc9e284dd 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -5,10 +5,11 @@ #include "../../zones/hand_zone.h" #include "../card_menu_action_type.h" #include "../player_actions.h" -#include "card/card_database/card_database_manager.h" #include "card_menu.h" #include "hand_menu.h" -#include "pb/command_reveal_cards.pb.h" + +#include +#include PlayerMenu::PlayerMenu(Player *_player) : player(_player) { diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp index d24a82565..7db8f60be 100644 --- a/cockatrice/src/game/player/menu/say_menu.cpp +++ b/cockatrice/src/game/player/menu/say_menu.cpp @@ -2,7 +2,8 @@ #include "../player.h" #include "../player_actions.h" -#include "settings/cache_settings.h" + +#include SayMenu::SayMenu(Player *_player) : player(_player) { diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 375759e6f..6390bbd84 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -12,22 +12,22 @@ #include "../zones/stack_zone.h" #include "../zones/table_zone.h" #include "../zones/view_zone.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/serverinfo_zone.pb.h" #include "player_target.h" -#include "utility/color.h" #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent) : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)), diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 94c910580..cd0e3cec7 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -11,10 +11,7 @@ #include "../../interface/tearoff_menu.h" #include "../board/abstract_graphics_item.h" #include "../dialogs/dlg_create_token.h" -#include "card/card_info.h" #include "menu/player_menu.h" -#include "pb/card_attributes.pb.h" -#include "pb/game_event.pb.h" #include "player_actions.h" #include "player_area.h" #include "player_event_handler.h" @@ -26,6 +23,9 @@ #include #include #include +#include +#include +#include inline Q_LOGGING_CATEGORY(PlayerLog, "player"); diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 8a3277c7f..004053b1e 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -6,26 +6,27 @@ #include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_roll_dice.h" #include "../zones/logic/view_zone_logic.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" #include "card_menu_action_type.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_concede.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "pb/context_move_card.pb.h" -#include "utility/trice_limits.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // milliseconds in between triggers of the move top cards until action static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100; diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h index fcac5d1c4..3838d52f5 100644 --- a/cockatrice/src/game/player/player_actions.h +++ b/cockatrice/src/game/player/player_actions.h @@ -7,12 +7,12 @@ #ifndef COCKATRICE_PLAYER_ACTIONS_H #define COCKATRICE_PLAYER_ACTIONS_H -#include "card/card_relation/card_relation_type.h" #include "event_processing_options.h" #include "player.h" #include #include +#include namespace google { diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index 969ffd4d2..eacc2dd2b 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -5,30 +5,31 @@ #include "../board/card_item.h" #include "../board/card_list.h" #include "../zones/view_zone.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" #include "player.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player) { } diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h index e7d47b0de..5d1ddd4b4 100644 --- a/cockatrice/src/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -9,8 +9,8 @@ #include "event_processing_options.h" #include -#include -#include +#include +#include class CardItem; class CardZoneLogic; diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h index c4ffdef60..a8bd63cd0 100644 --- a/cockatrice/src/game/player/player_info.h +++ b/cockatrice/src/game/player/player_info.h @@ -12,10 +12,10 @@ #include "../zones/pile_zone.h" #include "../zones/stack_zone.h" #include "../zones/table_zone.h" -#include "pb/serverinfo_user.pb.h" #include "player_target.h" #include +#include class PlayerInfo : public QObject { diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index 9df7e94da..6669a0a37 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -8,14 +8,14 @@ #include "../../tabs/tab_account.h" #include "../../tabs/tab_game.h" #include "../../tabs/tab_supervisor.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/serverinfo_playerproperties.pb.h" -#include "pb/session_commands.pb.h" #include #include #include #include +#include +#include +#include PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent) { diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h index 2c257f7b4..20542d466 100644 --- a/cockatrice/src/game/player/player_manager.h +++ b/cockatrice/src/game/player/player_manager.h @@ -7,10 +7,9 @@ #ifndef COCKATRICE_PLAYER_MANAGER_H #define COCKATRICE_PLAYER_MANAGER_H -#include "pb/serverinfo_playerproperties.pb.h" - #include #include +#include class AbstractGame; class Player; diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp index 6ece3e261..a7a5cc5e7 100644 --- a/cockatrice/src/game/player/player_target.cpp +++ b/cockatrice/src/game/player/player_target.cpp @@ -1,13 +1,13 @@ #include "player_target.h" #include "../../interface/pixel_map_generator.h" -#include "pb/serverinfo_user.pb.h" #include "player.h" #include #include #include #include +#include PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent) : AbstractCounter(_player, _id, _name, false, _value, false, parent) diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index d00214774..5d63e8a28 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -4,10 +4,10 @@ #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" -#include "pb/command_move_card.pb.h" -#include "settings/cache_settings.h" #include +#include +#include HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp index c1fca132a..8147a0ddf 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp @@ -4,13 +4,13 @@ #include "../../player/player.h" #include "../pile_zone.h" #include "../view_zone.h" -#include "card/card_database/card_database_manager.h" -#include "pb/command_move_card.pb.h" -#include "pb/serverinfo_user.pb.h" #include "view_zone_logic.h" #include #include +#include +#include +#include /** * @param _player the player that the zone belongs to diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp index fab157b0b..e61c126e7 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -1,7 +1,8 @@ #include "view_zone_logic.h" #include "../../board/card_item.h" -#include "settings/cache_settings.h" + +#include /** * @param _player the player that the cards are revealed to. diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp index 5df91a64d..cafb29038 100644 --- a/cockatrice/src/game/zones/pile_zone.cpp +++ b/cockatrice/src/game/zones/pile_zone.cpp @@ -4,12 +4,12 @@ #include "../board/card_item.h" #include "../player/player.h" #include "logic/pile_zone_logic.h" -#include "pb/command_move_card.pb.h" #include "view_zone.h" #include #include #include +#include PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent) { diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp index e71c572cf..ec24e4f9f 100644 --- a/cockatrice/src/game/zones/select_zone.cpp +++ b/cockatrice/src/game/zones/select_zone.cpp @@ -2,10 +2,10 @@ #include "../board/card_item.h" #include "../game_scene.h" -#include "settings/cache_settings.h" #include #include +#include qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse) { diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 3cf1fff9b..4d8c15da8 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -6,11 +6,11 @@ #include "../board/card_item.h" #include "../player/player.h" #include "logic/stack_zone_logic.h" -#include "pb/command_move_card.pb.h" -#include "settings/cache_settings.h" #include #include +#include +#include StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index 2c7287e35..b0484f984 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -5,15 +5,15 @@ #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" -#include "card/card_info.h" #include "logic/table_zone_logic.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "settings/cache_settings.h" #include #include #include +#include +#include +#include +#include const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100); const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80); diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index b403aad61..29be25640 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -4,18 +4,18 @@ #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" -#include "card/card_info.h" #include "logic/view_zone_logic.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_card.pb.h" #include #include #include #include #include +#include +#include +#include +#include +#include /** * @param parent the parent QGraphicsWidget containing the reveal zone @@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) qobject_cast(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE); reorganizeCards(); - emit getLogic()->cardCountChanged(); + emit getLogic() -> cardCountChanged(); } // Because of boundingRect(), this function must not be called before the zone was added to a scene. diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index e452ecedd..06c1e77fb 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -13,7 +13,7 @@ #include #include -#include +#include inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone"); diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index 1b8ca1f02..2424feb9b 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -5,8 +5,6 @@ #include "../board/card_item.h" #include "../game_scene.h" #include "../player/player.h" -#include "pb/command_shuffle.pb.h" -#include "settings/cache_settings.h" #include "view_zone.h" #include @@ -18,6 +16,8 @@ #include #include #include +#include +#include /** * @param _player the player the cards were revealed to. diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h index 97ebc97f9..272ff5560 100644 --- a/cockatrice/src/game/zones/view_zone_widget.h +++ b/cockatrice/src/game/zones/view_zone_widget.h @@ -8,13 +8,13 @@ #define ZONEVIEWWIDGET_H #include "logic/card_zone_logic.h" -#include "utility/macros.h" #include #include #include #include #include +#include class QLabel; class QPushButton; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp index c86768f3a..56b00e4b8 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,7 +1,5 @@ #include "card_picture_loader.h" -#include "settings/cache_settings.h" - #include #include #include @@ -17,6 +15,7 @@ #include #include #include +#include #include // never cache more than 300 cards at once for a single deck diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h index 964d08bcc..213231cd9 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h @@ -7,11 +7,11 @@ #ifndef CARD_PICTURE_LOADER_H #define CARD_PICTURE_LOADER_H -#include "card/card_info.h" #include "card_picture_loader_status_bar.h" #include "card_picture_loader_worker.h" #include +#include inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader"); inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail"); diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp index 97d3eac1d..0f95f03ad 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -1,11 +1,11 @@ #include "card_picture_loader_local.h" -#include "card/card_database/card_database_manager.h" #include "card_picture_to_load.h" -#include "settings/cache_settings.h" #include #include +#include +#include static constexpr int REFRESH_INTERVAL_MS = 10 * 1000; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h index 919fde45c..1954e1698 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h @@ -7,11 +7,10 @@ #ifndef PICTURE_LOADER_LOCAL_H #define PICTURE_LOADER_LOCAL_H -#include "card/card_printing/exact_card.h" - #include #include #include +#include inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local"); diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index aae76c858..301b0d4fb 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -1,15 +1,15 @@ #include "card_picture_loader_worker.h" -#include "card/card_database/card_database_manager.h" #include "card_picture_loader_local.h" #include "card_picture_loader_worker_work.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include #include static constexpr int MAX_REQUESTS_PER_SEC = 10; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h index 9fdd387a8..028ffbf85 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h @@ -7,8 +7,6 @@ #ifndef PICTURE_LOADER_WORKER_H #define PICTURE_LOADER_WORKER_H -#include "card/card_database/card_database.h" -#include "card/card_info.h" #include "card_picture_loader_local.h" #include "card_picture_loader_worker_work.h" #include "card_picture_to_load.h" @@ -20,6 +18,8 @@ #include #include #include +#include +#include #define REDIRECT_HEADER_NAME "redirects" #define REDIRECT_ORIGINAL_URL "original" diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp index fbbecbd51..ba0e6e7e1 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp @@ -1,8 +1,6 @@ #include "card_picture_loader_worker_work.h" -#include "card/card_database/card_database_manager.h" #include "card_picture_loader_worker.h" -#include "settings/cache_settings.h" #include #include @@ -12,6 +10,8 @@ #include #include #include +#include +#include // Card back returned by gatherer when card is not found static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"}; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h index 3e84a1d48..69b18a5fd 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h @@ -7,7 +7,6 @@ #ifndef PICTURE_LOADER_WORKER_WORK_H #define PICTURE_LOADER_WORKER_WORK_H -#include "card/card_database/card_database.h" #include "card_picture_loader_worker.h" #include "card_picture_to_load.h" @@ -16,6 +15,7 @@ #include #include #include +#include #define REDIRECT_HEADER_NAME "redirects" #define REDIRECT_ORIGINAL_URL "original" diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp index d6cfd09d0..1908a6b80 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -1,13 +1,12 @@ #include "card_picture_to_load.h" -#include "card/card_set/card_set_comparator.h" -#include "settings/cache_settings.h" - #include #include #include #include #include +#include +#include CardPictureToLoad::CardPictureToLoad(const ExactCard &_card) : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h index a447c95ac..c91296ab4 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h @@ -7,9 +7,8 @@ #ifndef PICTURE_TO_LOAD_H #define PICTURE_TO_LOAD_H -#include "card/card_printing/exact_card.h" - #include +#include inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load"); diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp index 25bd67264..382fff317 100644 --- a/cockatrice/src/interface/pixel_map_generator.cpp +++ b/cockatrice/src/interface/pixel_map_generator.cpp @@ -1,13 +1,12 @@ #include "pixel_map_generator.h" -#include "pb/serverinfo_user.pb.h" - #include #include #include #include #include #include +#include #define DEFAULT_COLOR_UNREGISTERED "#32c8ec"; #define DEFAULT_COLOR_REGISTERED "#5ed900"; diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index 7c871e829..b38b16a96 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -7,12 +7,11 @@ #ifndef PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H -#include "server/user_level.h" - #include #include #include #include +#include inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator"); diff --git a/cockatrice/src/interface/tearoff_menu.h b/cockatrice/src/interface/tearoff_menu.h index b74340b4c..d2b3f3413 100644 --- a/cockatrice/src/interface/tearoff_menu.h +++ b/cockatrice/src/interface/tearoff_menu.h @@ -6,9 +6,8 @@ #pragma once -#include "settings/cache_settings.h" - #include +#include class TearOffMenu : public QMenu { diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index 915793010..4cb66e2b1 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,13 +1,12 @@ #include "theme_manager.h" -#include "settings/cache_settings.h" - #include #include #include #include #include #include +#include #define NONE_THEME_NAME "Default" #define STYLE_CSS_NAME "style.css" diff --git a/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h index 0eee7e955..0ea6d7495 100644 --- a/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h +++ b/cockatrice/src/interface/utility/deck_list_sort_filter_proxy_model.h @@ -7,9 +7,8 @@ #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H -#include "card/card_database/card_database_manager.h" - #include +#include class DeckListSortFilterProxyModel : public QSortFilterProxyModel { diff --git a/cockatrice/src/interface/utility/sequence_edit.cpp b/cockatrice/src/interface/utility/sequence_edit.cpp index f8fa3235d..53776a3b0 100644 --- a/cockatrice/src/interface/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/utility/sequence_edit.cpp @@ -1,10 +1,9 @@ #include "sequence_edit.h" -#include "settings/cache_settings.h" - #include #include #include +#include #include SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp index be1094e28..c134b0aff 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp @@ -1,7 +1,6 @@ #include "color_identity_widget.h" #include "mana_symbol_widget.h" -#include "settings/cache_settings.h" #include #include @@ -9,6 +8,7 @@ #include #include #include +#include ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card) { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h index edbd01751..60d69af06 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h @@ -7,10 +7,9 @@ #ifndef COLOR_IDENTITY_WIDGET_H #define COLOR_IDENTITY_WIDGET_H -#include "card/card_info.h" - #include #include +#include class ColorIdentityWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h index ab262b2d8..26a186c59 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h @@ -7,10 +7,9 @@ #ifndef MANA_COST_WIDGET_H #define MANA_COST_WIDGET_H -#include "card/card_info.h" - #include #include +#include class ManaCostWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp index ae99472d0..942635871 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -1,8 +1,7 @@ #include "mana_symbol_widget.h" -#include "settings/cache_settings.h" - #include +#include ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled) : QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled) diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index d188d15f1..36f0e6a4e 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -3,10 +3,10 @@ #include "../../../../deck/deck_list_model.h" #include "../../../utility/deck_list_sort_filter_proxy_model.h" #include "../card_info_picture_with_text_overlay_widget.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_info_comparator.h" #include +#include +#include CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 222502b53..4920d97d8 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -11,11 +11,11 @@ #include "../../general/display/banner_widget.h" #include "../card_info_picture_with_text_overlay_widget.h" #include "../card_size_widget.h" -#include "card/card_info.h" #include #include #include +#include class CardGroupDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 2ff2963d8..cc46d59eb 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -2,10 +2,10 @@ #include "../../../../deck/deck_list_model.h" #include "../card_info_picture_with_text_overlay_widget.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_info_comparator.h" #include +#include +#include #include FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index 37fc68bda..df02c9e1c 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -2,10 +2,10 @@ #include "../../../../deck/deck_list_model.h" #include "../card_info_picture_with_text_overlay_widget.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_info_comparator.h" #include +#include +#include OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp index dfbb4e079..f6533e3ca 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp @@ -2,13 +2,13 @@ #include "../../../game/board/card_item.h" #include "../../../main.h" -#include "card/card_database/card_database_manager.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" #include #include #include +#include #include CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags) diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h index b746348e4..f5b2ea2f2 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h @@ -7,12 +7,11 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H -#include "../../../../../libs/utility/include/utility/card_ref.h" -#include "card/card_printing/exact_card.h" - #include #include #include +#include +#include class CardInfoPictureWidget; class CardInfoTextWidget; diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp index 99d16de82..fe9385a23 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,15 +1,15 @@ #include "card_info_frame_widget.h" #include "../../../game/board/card_item.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" #include "card_info_text_widget.h" -#include "settings/cache_settings.h" #include #include +#include +#include +#include #include CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent) diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h index 5bbd62779..f534ab956 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h @@ -7,11 +7,10 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include "../../../../../libs/utility/include/utility/card_ref.h" -#include "card/card_printing/exact_card.h" - #include #include +#include +#include class AbstractCardItem; class CardInfoPictureWidget; diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp index 1c4b76ae0..ead669e7c 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp @@ -1,10 +1,10 @@ #include "card_info_picture_enlarged_widget.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" -#include "settings/cache_settings.h" #include #include +#include #include /** diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h index e246677ee..cc37f2f0b 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h @@ -8,10 +8,9 @@ #ifndef CARD_PICTURE_ENLARGED_WIDGET_H #define CARD_PICTURE_ENLARGED_WIDGET_H -#include "card/card_printing/exact_card.h" - #include #include +#include class CardInfoPictureEnlargedWidget final : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 37c8d1cdd..7e87d6587 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -4,15 +4,15 @@ #include "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../tabs/tab_supervisor.h" #include "../../window_main.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include +#include #include /** diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h index bbde3caa7..3cbdd46db 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -7,12 +7,12 @@ #ifndef CARD_INFO_PICTURE_H #define CARD_INFO_PICTURE_H -#include "card/card_printing/exact_card.h" #include "card_info_picture_enlarged_widget.h" #include #include #include +#include inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget"); diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp index d4947a58b..0a040ff29 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,8 +1,6 @@ #include "card_info_text_widget.h" #include "../../../game/board/card_item.h" -#include "card/card_relation/card_relation.h" -#include "card/game_specific_terms.h" #include #include @@ -10,6 +8,8 @@ #include #include #include +#include +#include CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr) { diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h index 1c362458c..8711422b0 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -7,9 +7,8 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include "card/card_info.h" - #include +#include class QLabel; class QScrollArea; class QTextEdit; diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp index e058b335a..c084dac64 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -2,7 +2,8 @@ #include "../printing_selector/printing_selector.h" #include "../visual_deck_storage/visual_deck_storage_widget.h" -#include "settings/cache_settings.h" + +#include /** * @class CardSizeWidget diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 456aaadcb..892652c02 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -1,11 +1,11 @@ #include "deck_card_zone_display_widget.h" #include "../../../deck/deck_list_model.h" -#include "card/card_info_comparator.h" #include "card_group_display_widgets/flat_card_group_display_widget.h" #include "card_group_display_widgets/overlapped_card_group_display_widget.h" #include +#include DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 59c3934bc..12be2debf 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -11,13 +11,13 @@ #include "../general/display/banner_widget.h" #include "../general/layout_containers/overlap_widget.h" #include "../visual_deck_editor/visual_deck_editor_widget.h" -#include "card/card_info.h" #include "card_group_display_widgets/card_group_display_widget.h" #include "card_info_picture_with_text_overlay_widget.h" #include "card_size_widget.h" #include #include +#include class DeckCardZoneDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp index ddd9f52f3..dfa7bc025 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -1,7 +1,5 @@ #include "deck_preview_card_picture_widget.h" -#include "settings/cache_settings.h" - #include #include #include @@ -9,6 +7,7 @@ #include #include #include +#include /** * @brief Constructs a CardPictureWithTextOverlay widget. diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index 1df7f2f11..e1c4627fe 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index 280a7753d..4981d0a2d 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -3,12 +3,12 @@ #include "../../../deck/deck_loader.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" #include #include -#include +#include +#include +#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index 28b693bd1..f202eb31e 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index 42bc0b22a..5b50d953f 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -4,10 +4,10 @@ #include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include +#include +#include +#include #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index 75d767d4a..cfe5684c8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -4,11 +4,11 @@ #include "../../../main.h" #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include #include +#include +#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index b59f0a6d4..03cb9aa38 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index 1a8442f60..ab8a5dca2 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -4,9 +4,6 @@ #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/tab_supervisor.h" #include "../../pixel_map_generator.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" -#include "settings/cache_settings.h" #include #include @@ -15,6 +12,9 @@ #include #include #include +#include +#include +#include static bool canBeCommander(const CardInfo &cardInfo) { diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index 6018aed80..8fc9176bd 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -10,12 +10,12 @@ #include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" -#include "card/card_database/model/card_database_display_model.h" -#include "card/card_database/model/card_database_model.h" -#include "utility/key_signals.h" #include #include +#include +#include +#include class AbstractTabDeckEditor; class DeckEditorDatabaseDisplayWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 4f1cf893b..270c055c5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -1,15 +1,14 @@ #include "deck_editor_deck_dock_widget.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" - #include #include #include #include #include #include -#include +#include +#include +#include DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 700d68989..7c568f6ca 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -11,14 +11,14 @@ #include "../../../deck/custom_line_edit.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" -#include "card/card_info.h" -#include "utility/key_signals.h" #include #include #include #include #include +#include +#include class DeckListModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index a1c756567..89e93d376 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -2,12 +2,12 @@ #include "../../../filters/filter_builder.h" #include "../../../filters/filter_tree_model.h" -#include "card/card_database/model/card_database_model.h" -#include "settings/cache_settings.h" #include #include #include +#include +#include DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h index 67c965177..740f5c759 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -9,10 +9,10 @@ #define DECK_EDITOR_FILTER_DOCK_WIDGET_H #include "../../../tabs/abstract_tab_deck_editor.h" -#include "utility/key_signals.h" #include #include +#include class FilterTreeModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index 8efb8d0cc..35f069763 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -4,14 +4,14 @@ #include "../../../tabs/tab_supervisor.h" #include "../../window_main.h" #include "background_sources.h" -#include "card/card_database/card_database_manager.h" #include "home_styled_button.h" -#include "settings/cache_settings.h" #include #include #include #include +#include +#include HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice") diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index bb3191ad0..5e23ccf2a 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -12,13 +12,13 @@ #include "../../../deck/deck_loader.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../general/display/dynamic_font_size_push_button.h" -#include "card/card_info.h" #include #include #include #include #include +#include class CardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index 646f32142..f581312f2 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -6,10 +6,10 @@ #include "printing_selector_card_search_widget.h" #include "printing_selector_card_selection_widget.h" #include "printing_selector_card_sorting_widget.h" -#include "settings/cache_settings.h" #include #include +#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index e31456696..c44057070 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -11,7 +11,6 @@ #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../quick_settings/settings_button_widget.h" -#include "card/card_info.h" #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #define BATCH_SIZE 10 diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index 284830cc6..f5b4a1392 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -9,12 +9,12 @@ #include "../../../deck/deck_list_model.h" #include "../../../tabs/abstract_tab_deck_editor.h" -#include "card/card_info.h" #include "printing_selector_card_overlay_widget.h" #include "set_name_and_collectors_number_display_widget.h" #include #include +#include class PrintingSelectorCardDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 2e5a7298b..ccda1ba34 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,13 +1,13 @@ #include "printing_selector_card_overlay_widget.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_relation/card_relation.h" #include "printing_selector_card_display_widget.h" -#include "settings/cache_settings.h" #include #include #include +#include +#include +#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 7c301b6f6..25c8f771c 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -11,10 +11,11 @@ #include "../../../tabs/abstract_tab_deck_editor.h" #include "../cards/card_info_picture_widget.h" #include "all_zones_card_amount_widget.h" -#include "card/card_info.h" #include "card_amount_widget.h" #include "set_name_and_collectors_number_display_widget.h" +#include + class PrintingSelectorCardOverlayWidget : public QWidget { Q_OBJECT diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index e8e29b783..312bae9a1 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -1,7 +1,7 @@ #include "printing_selector_card_sorting_widget.h" -#include "card/card_set/card_set_comparator.h" -#include "settings/cache_settings.h" +#include +#include const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index 81c314746..e8c42a28a 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -1,13 +1,13 @@ #include "visual_database_display_filter_save_load_widget.h" #include "../../../filters/filter_tree.h" -#include "settings/cache_settings.h" #include "visual_database_filter_display_widget.h" #include #include #include #include +#include VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp index 517cce5a0..47c00ac48 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp @@ -2,11 +2,11 @@ #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" -#include "card/card_database/card_database_manager.h" #include #include #include +#include VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp index 3f75e89ee..17c26b544 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp @@ -2,13 +2,13 @@ #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" #include #include #include #include +#include +#include VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp index 8fe36378b..02047723f 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp @@ -2,12 +2,12 @@ #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" -#include "card/card_database/card_database_manager.h" #include #include #include #include +#include VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index f881eafef..b436c84f5 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -6,10 +6,6 @@ #include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../quick_settings/settings_button_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_info_comparator.h" -#include "settings/cache_settings.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" @@ -19,6 +15,10 @@ #include #include +#include +#include +#include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 2aa1edfcc..736223dee 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -16,9 +16,6 @@ #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/model/card_database_model.h" -#include "utility/key_signals.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_main_type_filter_widget.h" @@ -31,6 +28,9 @@ #include #include #include +#include +#include +#include #include inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display"); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp index d0e205576..093a52d72 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp @@ -1,13 +1,12 @@ #include "visual_database_filter_display_widget.h" -#include "settings/cache_settings.h" - #include #include #include #include #include #include +#include FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel) : QWidget(parent), filterFilename(filename), filterModel(_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index c8115233d..c73260115 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -2,9 +2,9 @@ #include "../../../deck/deck_loader.h" #include "../cards/card_info_picture_widget.h" -#include "card/card_database/card_database_manager.h" -#include "settings/cache_settings.h" +#include +#include #include VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 03d4f9d75..bf2c7f7e7 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -8,12 +8,6 @@ #include "../cards/deck_card_zone_display_widget.h" #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_database/model/card/card_completer_proxy_model.h" -#include "card/card_database/model/card/card_search_model.h" -#include "card/card_database/model/card_database_model.h" -#include "card/card_info_comparator.h" #include #include @@ -21,6 +15,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index 4cde8058a..06e41f408 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -13,15 +13,15 @@ #include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/overlap_control_widget.h" #include "../quick_settings/settings_button_widget.h" -#include "card/card_database/card_database.h" -#include "card/card_database/model/card/card_completer_proxy_model.h" -#include "card/card_database/model/card_database_display_model.h" -#include "card/card_database/model/card_database_model.h" #include #include #include #include +#include +#include +#include +#include #include class DeckCardZoneDisplayWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index 43a78618f..067318ab5 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -7,12 +7,12 @@ #include "deck_preview_tag_dialog.h" #include "deck_preview_tag_display_widget.h" #include "deck_preview_widget.h" -#include "settings/cache_settings.h" #include #include #include #include +#include DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList) : QWidget(_parent), deckList(nullptr) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 20b2237c7..21e2b0364 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -2,12 +2,12 @@ #include "../../../../tabs/abstract_tab_deck_editor.h" #include "deck_preview_tag_dialog.h" -#include "settings/cache_settings.h" #include #include #include #include +#include #include DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp index 532a6b96d..513c2543b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp @@ -2,7 +2,6 @@ #include "../../../../dialogs/dlg_default_tags_editor.h" #include "deck_preview_tag_item_widget.h" -#include "settings/cache_settings.h" #include #include @@ -12,6 +11,7 @@ #include #include #include +#include DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags, const QStringList &_activeTags, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 3c1fe4357..6a240020f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -2,9 +2,7 @@ #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" -#include "card/card_database/card_database_manager.h" #include "deck_preview_deck_tags_display_widget.h" -#include "settings/cache_settings.h" #include #include @@ -15,6 +13,8 @@ #include #include #include +#include +#include DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, VisualDeckStorageWidget *_visualDeckStorageWidget, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp index b5f868cf8..f36b84a1c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp @@ -1,10 +1,10 @@ #include "visual_deck_storage_folder_display_widget.h" #include "deck_preview/deck_preview_widget.h" -#include "settings/cache_settings.h" #include #include +#include VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp index 25f55ef69..19bf070c9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -1,11 +1,11 @@ #include "visual_deck_storage_quick_settings_widget.h" -#include "settings/cache_settings.h" #include "visual_deck_storage_widget.h" #include #include #include +#include VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 16b14c496..18430d698 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -3,9 +3,9 @@ #include "../../../filters/deck_filter_string.h" #include "../../../filters/syntax_help.h" #include "../../pixel_map_generator.h" -#include "settings/cache_settings.h" #include +#include /** * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp index 9c66ff6c9..c68dfdc3b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_sort_widget.h" -#include "settings/cache_settings.h" +#include /** * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 701e48a20..847846c53 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,9 +1,7 @@ #include "visual_deck_storage_widget.h" #include "../quick_settings/settings_button_widget.h" -#include "card/card_database/card_database_manager.h" #include "deck_preview/deck_preview_widget.h" -#include "settings/cache_settings.h" #include "visual_deck_storage_folder_display_widget.h" #include "visual_deck_storage_search_widget.h" #include "visual_deck_storage_sort_widget.h" @@ -14,6 +12,8 @@ #include #include #include +#include +#include VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr) { diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 476785c3e..9225f2990 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -41,14 +41,6 @@ #include "../server/remote/remote_client.h" #include "../tabs/tab_game.h" #include "../tabs/tab_supervisor.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_server_shutdown.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/room_commands.pb.h" -#include "settings/cache_settings.h" -#include "utility/logger.h" #include "version_string.h" #include @@ -72,6 +64,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 3b1b25638..a9e11f8de 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -26,7 +26,6 @@ #define WINDOW_H #include "../server/abstract_client.h" -#include "pb/response.pb.h" #include #include @@ -35,6 +34,7 @@ #include #include #include +#include inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main"); inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup"); diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index ead218f30..ca2a7b8d4 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -20,8 +20,6 @@ #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" @@ -29,8 +27,6 @@ #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" #include "interface/window_main.h" -#include "settings/cache_settings.h" -#include "utility/logger.h" #include "version_string.h" #include @@ -45,6 +41,10 @@ #include #include #include +#include +#include +#include +#include QTranslator *translator, *qtTranslator; RNG_Abstract *rng; diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h index 1cdc4e78d..487abc0ea 100644 --- a/cockatrice/src/main.h +++ b/cockatrice/src/main.h @@ -7,9 +7,8 @@ #ifndef MAIN_H #define MAIN_H -#include "utility/macros.h" - #include +#include inline Q_LOGGING_CATEGORY(MainLog, "main"); inline Q_LOGGING_CATEGORY(QtTranslatorDebug, "qt_translator"); diff --git a/cockatrice/src/server/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp index 6fab1cd70..03c5fc3ae 100644 --- a/cockatrice/src/server/abstract_client.cpp +++ b/cockatrice/src/server/abstract_client.cpp @@ -1,25 +1,25 @@ #include "abstract_client.h" -#include "../../../libs/server/include/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" -#include "pb/event_game_joined.pb.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_server_identification.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_server_shutdown.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/server_message.pb.h" #include "pending_command.h" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include AbstractClient::AbstractClient(QObject *parent) : QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false) diff --git a/cockatrice/src/server/abstract_client.h b/cockatrice/src/server/abstract_client.h index e6a812df1..165737e95 100644 --- a/cockatrice/src/server/abstract_client.h +++ b/cockatrice/src/server/abstract_client.h @@ -7,12 +7,11 @@ #ifndef ABSTRACTCLIENT_H #define ABSTRACTCLIENT_H -#include "pb/response.pb.h" -#include "pb/serverinfo_user.pb.h" - #include #include #include +#include +#include class PendingCommand; class CommandContainer; diff --git a/cockatrice/src/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp index 1d7f610f3..e3ccb1f20 100644 --- a/cockatrice/src/server/chat_view/chat_view.cpp +++ b/cockatrice/src/server/chat_view/chat_view.cpp @@ -1,19 +1,19 @@ #include "chat_view.h" -#include "../../../../libs/server/include/server/user_level.h" #include "../../client/sound_engine.h" #include "../../interface/pixel_map_generator.h" #include "../../tabs/tab_account.h" #include "../user/user_context_menu.h" #include "../user/user_list_manager.h" #include "../user/user_list_proxy.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47); diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h index c7c1515ce..c3e9ce19a 100644 --- a/cockatrice/src/server/chat_view/chat_view.h +++ b/cockatrice/src/server/chat_view/chat_view.h @@ -8,8 +8,6 @@ #ifndef CHATVIEW_H #define CHATVIEW_H -#include "../../../../libs/server/include/server/room_message_type.h" -#include "../../../../libs/server/include/server/user_level.h" #include "../../tabs/tab_supervisor.h" #include "../user/user_list_widget.h" @@ -18,6 +16,8 @@ #include #include #include +#include +#include class AbstractGame; class QTextTable; diff --git a/cockatrice/src/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp index 3cfd3315a..2cf7eff55 100644 --- a/cockatrice/src/server/game_selector.cpp +++ b/cockatrice/src/server/game_selector.cpp @@ -9,9 +9,6 @@ #include "../tabs/tab_supervisor.h" #include "abstract_client.h" #include "games_model.h" -#include "pb/response.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_game.pb.h" #include "pending_command.h" #include "user/user_list_manager.h" @@ -26,6 +23,9 @@ #include #include #include +#include +#include +#include GameSelector::GameSelector(AbstractClient *_client, TabSupervisor *_tabSupervisor, diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/server/game_selector.h index 303ae4768..0ca477fa9 100644 --- a/cockatrice/src/server/game_selector.h +++ b/cockatrice/src/server/game_selector.h @@ -10,9 +10,9 @@ #include "game_type_map.h" #include -#include -#include -#include +#include +#include +#include class QTreeView; class GamesModel; diff --git a/cockatrice/src/server/games_model.cpp b/cockatrice/src/server/games_model.cpp index 8ecc8c5db..3a8c626ea 100644 --- a/cockatrice/src/server/games_model.cpp +++ b/cockatrice/src/server/games_model.cpp @@ -2,8 +2,6 @@ #include "../interface/pixel_map_generator.h" #include "../tabs/tab_account.h" -#include "pb/serverinfo_game.pb.h" -#include "settings/cache_settings.h" #include "user/user_list_manager.h" #include "user/user_list_widget.h" @@ -13,6 +11,8 @@ #include #include #include +#include +#include enum GameListColumn { diff --git a/cockatrice/src/server/games_model.h b/cockatrice/src/server/games_model.h index 03717bce8..1541b57bf 100644 --- a/cockatrice/src/server/games_model.h +++ b/cockatrice/src/server/games_model.h @@ -8,7 +8,6 @@ #define GAMESMODEL_H #include "game_type_map.h" -#include "pb/serverinfo_game.pb.h" #include #include @@ -16,6 +15,7 @@ #include #include #include +#include class UserListProxy; diff --git a/cockatrice/src/server/handle_public_servers.cpp b/cockatrice/src/server/handle_public_servers.cpp index f5151f121..2497ecdcc 100644 --- a/cockatrice/src/server/handle_public_servers.cpp +++ b/cockatrice/src/server/handle_public_servers.cpp @@ -1,12 +1,11 @@ #include "handle_public_servers.h" -#include "settings/cache_settings.h" - #include #include #include #include #include +#include #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json" diff --git a/cockatrice/src/server/local_client.cpp b/cockatrice/src/server/local_client.cpp index 2270cac63..f227a2f28 100644 --- a/cockatrice/src/server/local_client.cpp +++ b/cockatrice/src/server/local_client.cpp @@ -1,8 +1,9 @@ #include "local_client.h" -#include "../../../libs/server/include/server/debug_pb_message.h" #include "local_server_interface.h" -#include "pb/session_commands.pb.h" + +#include +#include LocalClient::LocalClient(LocalServerInterface *_lsi, const QString &_playerName, diff --git a/cockatrice/src/server/local_server.cpp b/cockatrice/src/server/local_server.cpp index 74ee8601d..381b30de7 100644 --- a/cockatrice/src/server/local_server.cpp +++ b/cockatrice/src/server/local_server.cpp @@ -1,7 +1,8 @@ #include "local_server.h" #include "local_server_interface.h" -#include "server/server_room.h" + +#include LocalServer::LocalServer(QObject *parent) : Server(parent) { diff --git a/cockatrice/src/server/local_server.h b/cockatrice/src/server/local_server.h index 9546e3f9c..2a1d141a0 100644 --- a/cockatrice/src/server/local_server.h +++ b/cockatrice/src/server/local_server.h @@ -7,8 +7,8 @@ #ifndef LOCALSERVER_H #define LOCALSERVER_H -#include "server/server.h" -#include "server/server_database_interface.h" +#include +#include class LocalServerInterface; diff --git a/cockatrice/src/server/local_server_interface.h b/cockatrice/src/server/local_server_interface.h index 5551b47a5..08dce1feb 100644 --- a/cockatrice/src/server/local_server_interface.h +++ b/cockatrice/src/server/local_server_interface.h @@ -7,7 +7,7 @@ #ifndef LOCALSERVERINTERFACE_H #define LOCALSERVERINTERFACE_H -#include "server/server_protocolhandler.h" +#include class LocalServer; diff --git a/cockatrice/src/server/pending_command.h b/cockatrice/src/server/pending_command.h index df452b10a..1d2d9ff17 100644 --- a/cockatrice/src/server/pending_command.h +++ b/cockatrice/src/server/pending_command.h @@ -7,10 +7,9 @@ #ifndef PENDING_COMMAND_H #define PENDING_COMMAND_H -#include "pb/commands.pb.h" -#include "pb/response.pb.h" - #include +#include +#include class PendingCommand : public QObject { diff --git a/cockatrice/src/server/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp index 114efe3d4..9de8677b0 100644 --- a/cockatrice/src/server/remote/remote_client.cpp +++ b/cockatrice/src/server/remote/remote_client.cpp @@ -2,17 +2,6 @@ #include "../../main.h" #include "../pending_command.h" -#include "pb/event_server_identification.pb.h" -#include "pb/response_activate.pb.h" -#include "pb/response_forgotpasswordrequest.pb.h" -#include "pb/response_login.pb.h" -#include "pb/response_password_salt.pb.h" -#include "pb/response_register.pb.h" -#include "pb/server_message.pb.h" -#include "pb/session_commands.pb.h" -#include "server/debug_pb_message.h" -#include "settings/cache_settings.h" -#include "utility/passwordhasher.h" #include "version_string.h" #include @@ -23,6 +12,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned int protocolVersion = 14; diff --git a/cockatrice/src/server/remote/remote_client.h b/cockatrice/src/server/remote/remote_client.h index 365b5b520..f6b019af2 100644 --- a/cockatrice/src/server/remote/remote_client.h +++ b/cockatrice/src/server/remote/remote_client.h @@ -8,11 +8,11 @@ #define REMOTECLIENT_H #include "../abstract_client.h" -#include "pb/commands.pb.h" #include #include #include +#include inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client"); diff --git a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp index dfed741f9..5606fb707 100644 --- a/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp @@ -2,13 +2,13 @@ #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/command_deck_list.pb.h" -#include "pb/response_deck_list.pb.h" -#include "pb/serverinfo_deckstorage.pb.h" #include #include #include +#include +#include +#include RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name, RemoteDeckList_TreeModel::DirectoryNode *_parent) diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp index 1fa72b20c..c25391b1a 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp @@ -2,13 +2,13 @@ #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/command_replay_list.pb.h" -#include "pb/response_replay_list.pb.h" -#include "pb/serverinfo_replay.pb.h" #include #include #include +#include +#include +#include const int RemoteReplayList_TreeModel::numberOfColumns = 6; diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h index ccff71c47..d5d70af53 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.h +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h @@ -9,12 +9,11 @@ #ifndef REMOTEREPLAYLIST_TREEWIDGET_H #define REMOTEREPLAYLIST_TREEWIDGET_H -#include "pb/serverinfo_replay.pb.h" -#include "pb/serverinfo_replay_match.pb.h" - #include #include #include +#include +#include class Response; class AbstractClient; diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp index c6782ef18..44cad3d9b 100644 --- a/cockatrice/src/server/user/user_context_menu.cpp +++ b/cockatrice/src/server/user/user_context_menu.cpp @@ -7,16 +7,6 @@ #include "../chat_view/chat_view.h" #include "../game_selector.h" #include "../pending_command.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/commands.pb.h" -#include "pb/moderator_commands.pb.h" -#include "pb/response_ban_history.pb.h" -#include "pb/response_get_admin_notes.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/response_warn_history.pb.h" -#include "pb/response_warn_list.pb.h" -#include "pb/session_commands.pb.h" #include "user_info_box.h" #include "user_list_manager.h" #include "user_list_proxy.h" @@ -28,6 +18,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game) : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor), diff --git a/cockatrice/src/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h index 8b3f53890..76af4acdc 100644 --- a/cockatrice/src/server/user/user_context_menu.h +++ b/cockatrice/src/server/user/user_context_menu.h @@ -7,9 +7,8 @@ #ifndef USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H -#include "../../../../libs/server/include/server/user_level.h" - #include +#include class AbstractGame; class UserListProxy; diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp index a650714aa..59422203b 100644 --- a/cockatrice/src/server/user/user_info_box.cpp +++ b/cockatrice/src/server/user/user_info_box.cpp @@ -7,10 +7,6 @@ #include "../../interface/pixel_map_generator.h" #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/session_commands.pb.h" -#include "utility/passwordhasher.h" #include #include @@ -18,6 +14,10 @@ #include #include #include +#include +#include +#include +#include UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags), client(_client), editable(_editable) diff --git a/cockatrice/src/server/user/user_info_connection.cpp b/cockatrice/src/server/user/user_info_connection.cpp index 0a18adbf2..813a9236c 100644 --- a/cockatrice/src/server/user/user_info_connection.cpp +++ b/cockatrice/src/server/user/user_info_connection.cpp @@ -1,8 +1,7 @@ #include "user_info_connection.h" -#include "settings/cache_settings.h" - #include +#include #include UserConnection_Information::UserConnection_Information() = default; diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp index c74706955..47fd86f88 100644 --- a/cockatrice/src/server/user/user_list_manager.cpp +++ b/cockatrice/src/server/user/user_list_manager.cpp @@ -3,14 +3,15 @@ #include "../../client/sound_engine.h" #include "../abstract_client.h" #include "../pending_command.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/session_commands.pb.h" #include "user_info_box.h" +#include +#include +#include +#include +#include +#include + UserListManager::UserListManager(AbstractClient *_client, QObject *parent) : QObject(parent), client(_client), ownUserInfo(nullptr) { diff --git a/cockatrice/src/server/user/user_list_manager.h b/cockatrice/src/server/user/user_list_manager.h index b02a43808..56f50c0be 100644 --- a/cockatrice/src/server/user/user_list_manager.h +++ b/cockatrice/src/server/user/user_list_manager.h @@ -7,11 +7,11 @@ #ifndef COCKATRICE_USER_LIST_MANAGER_H #define COCKATRICE_USER_LIST_MANAGER_H -#include "pb/serverinfo_user.pb.h" #include "user_list_proxy.h" #include #include +#include class AbstractClient; class Event_AddToList; diff --git a/cockatrice/src/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp index 4da6e323e..0a0cf4dbf 100644 --- a/cockatrice/src/server/user/user_list_widget.cpp +++ b/cockatrice/src/server/user/user_list_widget.cpp @@ -1,16 +1,11 @@ #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" #include "../abstract_client.h" #include "../game_selector.h" #include "../pending_command.h" -#include "pb/moderator_commands.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/session_commands.pb.h" #include "user_context_menu.h" #include "user_list_manager.h" @@ -30,6 +25,11 @@ #include #include #include +#include +#include +#include +#include +#include BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h index a3be08ec3..2b1a40f95 100644 --- a/cockatrice/src/server/user/user_list_widget.h +++ b/cockatrice/src/server/user/user_list_widget.h @@ -7,15 +7,14 @@ #ifndef USERLIST_H #define USERLIST_H -#include "../../../../libs/server/include/server/user_level.h" -#include "pb/moderator_commands.pb.h" - #include #include #include #include #include #include +#include +#include class QTreeWidget; class ServerInfo_User; diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp index bb7a5247e..753d89851 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp @@ -1,6 +1,5 @@ #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" @@ -11,11 +10,6 @@ #include "../interface/widgets/cards/card_info_frame_widget.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_database/model/card_database_model.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/response.pb.h" -#include "settings/cache_settings.h" #include "tab_supervisor.h" #include @@ -39,6 +33,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) { diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/tabs/abstract_tab_deck_editor.h index cd50ff03f..9e4e6c14e 100644 --- a/cockatrice/src/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/tabs/abstract_tab_deck_editor.h @@ -8,7 +8,6 @@ #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" -#include "card/card_info.h" #include "tab.h" class CardDatabaseModel; diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp index b0278024a..79880b9ee 100644 --- a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp @@ -1,7 +1,8 @@ #include "edhrec_api_response_card_details_display_widget.h" #include "../../tab_edhrec_main.h" -#include "card/card_database/card_database_manager.h" + +#include EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index d5edd9dca..6c05320e0 100644 --- a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -3,7 +3,8 @@ #include "../../../../../interface/widgets/cards/card_info_picture_widget.h" #include "../../tab_edhrec_main.h" #include "../card_prices/edhrec_api_response_card_prices_display_widget.h" -#include "card/card_database/card_database_manager.h" + +#include EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h index 20803d8a3..0cf48c3e0 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h @@ -9,10 +9,10 @@ #include "../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" -#include "card/card_info.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include +#include class TabEdhRec : public Tab { diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp index 9f1d8cce6..89f17ba64 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp @@ -6,9 +6,6 @@ #include "api_response/top_cards/edhrec_top_cards_api_response.h" #include "api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "api_response/top_tags/edhrec_top_tags_api_response.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_database/model/card/card_completer_proxy_model.h" -#include "card/card_database/model/card/card_search_model.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include "display/top_cards/edhrec_top_cards_api_response_display_widget.h" #include "display/top_commander/edhrec_top_commanders_api_response_display_widget.h" @@ -25,6 +22,9 @@ #include #include #include +#include +#include +#include static bool canBeCommander(const CardInfoPtr &cardInfo) { diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h index fd0f38d0e..b6f8b5ce6 100644 --- a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h @@ -11,13 +11,13 @@ #include "../../../interface/widgets/general/layout_containers/flow_widget.h" #include "../../../interface/widgets/quick_settings/settings_button_widget.h" #include "../../tab.h" -#include "card/card_database/card_database.h" #include "display/commander/edhrec_commander_api_response_display_widget.h" #include #include #include #include +#include class TabEdhRecMain : public Tab { diff --git a/cockatrice/src/tabs/tab.h b/cockatrice/src/tabs/tab.h index bfac8c7f5..56a9f0b7e 100644 --- a/cockatrice/src/tabs/tab.h +++ b/cockatrice/src/tabs/tab.h @@ -7,9 +7,8 @@ #ifndef TAB_H #define TAB_H -#include "../../../libs/utility/include/utility/card_ref.h" - #include +#include class QMenu; class TabSupervisor; diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp index d6f163513..34b06f1ee 100644 --- a/cockatrice/src/tabs/tab_account.cpp +++ b/cockatrice/src/tabs/tab_account.cpp @@ -1,6 +1,5 @@ #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" @@ -8,16 +7,17 @@ #include "../server/user/user_info_box.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/session_commands.pb.h" #include "tab_supervisor.h" #include #include +#include +#include +#include +#include +#include +#include +#include TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/tabs/tab_account.h b/cockatrice/src/tabs/tab_account.h index 4e6abb24b..e09c12eb2 100644 --- a/cockatrice/src/tabs/tab_account.h +++ b/cockatrice/src/tabs/tab_account.h @@ -7,9 +7,10 @@ #ifndef TAB_ACCOUNT_H #define TAB_ACCOUNT_H -#include "pb/serverinfo_user.pb.h" #include "tab.h" +#include + class AbstractClient; class Event_AddToList; class Event_ListRooms; diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp index a3bb900a1..d8a4b52b7 100644 --- a/cockatrice/src/tabs/tab_admin.cpp +++ b/cockatrice/src/tabs/tab_admin.cpp @@ -1,11 +1,7 @@ #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 #include @@ -15,6 +11,10 @@ #include #include #include +#include +#include +#include +#include ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/tabs/tab_admin.h b/cockatrice/src/tabs/tab_admin.h index 60722b778..5b44a6569 100644 --- a/cockatrice/src/tabs/tab_admin.h +++ b/cockatrice/src/tabs/tab_admin.h @@ -7,11 +7,11 @@ #ifndef TAB_ADMIN_H #define TAB_ADMIN_H -#include "pb/commands.pb.h" -#include "pb/response.pb.h" #include "tab.h" #include +#include +#include class AbstractClient; diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp index 2cf40b19a..8250a5580 100644 --- a/cockatrice/src/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/tabs/tab_deck_editor.cpp @@ -1,6 +1,5 @@ #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" @@ -12,9 +11,6 @@ #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../server/abstract_client.h" #include "../server/pending_command.h" -#include "card/card_database/card_database_manager.h" -#include "card/card_database/model/card_database_model.h" -#include "settings/cache_settings.h" #include "tab_supervisor.h" #include @@ -38,6 +34,10 @@ #include #include #include +#include +#include +#include +#include TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) { diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h index 1d5afbe14..ec953055c 100644 --- a/cockatrice/src/tabs/tab_deck_editor.h +++ b/cockatrice/src/tabs/tab_deck_editor.h @@ -3,8 +3,9 @@ #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "abstract_tab_deck_editor.h" -#include "card/card_info.h" -#include "utility/key_signals.h" + +#include +#include class CardDatabaseModel; class CardDatabaseDisplayModel; diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp index 4f0643b21..181e6b3a4 100644 --- a/cockatrice/src/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/tabs/tab_deck_storage.cpp @@ -4,16 +4,6 @@ #include "../deck/deck_loader.h" #include "../server/pending_command.h" #include "../server/remote/remote_decklist_tree_widget.h" -#include "deck_list/deck_list.h" -#include "pb/command_deck_del.pb.h" -#include "pb/command_deck_del_dir.pb.h" -#include "pb/command_deck_download.pb.h" -#include "pb/command_deck_new_dir.pb.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_deck_upload.pb.h" -#include "settings/cache_settings.h" #include #include @@ -29,6 +19,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp index b7fdc754e..bf4422b4a 100644 --- a/cockatrice/src/tabs/tab_game.cpp +++ b/cockatrice/src/tabs/tab_game.cpp @@ -1,6 +1,5 @@ #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" @@ -23,13 +22,6 @@ #include "../main.h" #include "../server/abstract_client.h" #include "../server/user/user_list_manager.h" -#include "card/card_database/card_database.h" -#include "card/card_database/card_database_manager.h" -#include "pb/event_game_joined.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "settings/cache_settings.h" #include "tab_supervisor.h" #include @@ -46,6 +38,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr) diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h index eee5769ab..956b72c9b 100644 --- a/cockatrice/src/tabs/tab_game.h +++ b/cockatrice/src/tabs/tab_game.h @@ -15,12 +15,12 @@ #include "../game/player/player.h" #include "../interface/tearoff_menu.h" #include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" -#include "pb/event_leave.pb.h" #include "tab.h" #include #include #include +#include class ServerInfo_PlayerProperties; class TabbedDeckViewContainer; diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp index e56e50768..c1722df5a 100644 --- a/cockatrice/src/tabs/tab_logs.cpp +++ b/cockatrice/src/tabs/tab_logs.cpp @@ -1,12 +1,9 @@ #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 #include @@ -20,6 +17,9 @@ #include #include #include +#include +#include +#include TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp index 856cfb9c7..4ca598518 100644 --- a/cockatrice/src/tabs/tab_message.cpp +++ b/cockatrice/src/tabs/tab_message.cpp @@ -1,6 +1,5 @@ #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" @@ -8,16 +7,17 @@ #include "../server/chat_view/chat_view.h" #include "../server/pending_command.h" #include "../server/user/user_list_manager.h" -#include "pb/event_user_message.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/session_commands.pb.h" -#include "settings/cache_settings.h" #include #include #include #include #include +#include +#include +#include +#include +#include TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp index b4a086c4b..adb75e79e 100644 --- a/cockatrice/src/tabs/tab_replays.cpp +++ b/cockatrice/src/tabs/tab_replays.cpp @@ -3,17 +3,6 @@ #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "../server/remote/remote_replay_list_tree_widget.h" -#include "pb/command_replay_delete_match.pb.h" -#include "pb/command_replay_download.pb.h" -#include "pb/command_replay_get_code.pb.h" -#include "pb/command_replay_modify_match.pb.h" -#include "pb/command_replay_submit_code.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/response.pb.h" -#include "pb/response_replay_download.pb.h" -#include "pb/response_replay_get_code.pb.h" -#include "settings/cache_settings.h" #include "tab_game.h" #include @@ -30,6 +19,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp index 66f3ed960..a691a3b6a 100644 --- a/cockatrice/src/tabs/tab_room.cpp +++ b/cockatrice/src/tabs/tab_room.cpp @@ -1,7 +1,5 @@ #include "tab_room.h" -#include "../../../libs/server/include/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" @@ -10,14 +8,6 @@ #include "../server/pending_command.h" #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "settings/cache_settings.h" #include "tab_account.h" #include "tab_supervisor.h" @@ -32,6 +22,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp index 069f06313..fbfc5b11a 100644 --- a/cockatrice/src/tabs/tab_server.cpp +++ b/cockatrice/src/tabs/tab_server.cpp @@ -3,10 +3,6 @@ #include "../server/abstract_client.h" #include "../server/pending_command.h" #include "../server/user/user_list_widget.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/response_join_room.pb.h" -#include "pb/session_commands.pb.h" #include "tab_supervisor.h" #include @@ -20,6 +16,10 @@ #include #include #include +#include +#include +#include +#include RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client) { diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp index f369254b3..99b3f71a9 100644 --- a/cockatrice/src/tabs/tab_supervisor.cpp +++ b/cockatrice/src/tabs/tab_supervisor.cpp @@ -6,16 +6,6 @@ #include "../server/user/user_list_manager.h" #include "../server/user/user_list_widget.h" #include "api/edhrec/tab_edhrec_main.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/game_event_container.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/room_event.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "settings/cache_settings.h" #include "tab_account.h" #include "tab_admin.h" #include "tab_deck_editor.h" @@ -36,6 +26,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const { diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index ff5bde4a1..596d99a17 100644 --- a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,6 +1,5 @@ #include "tab_deck_editor_visual.h" -#include "../../../../libs/utility/include/utility/trice_limits.h" #include "../../deck/deck_list_model.h" #include "../../deck/deck_stats_interface.h" #include "../../filters/filter_builder.h" @@ -11,9 +10,6 @@ #include "../../server/pending_command.h" #include "../tab_deck_editor.h" #include "../tab_supervisor.h" -#include "card/card_database/model/card_database_model.h" -#include "pb/command_deck_upload.pb.h" -#include "settings/cache_settings.h" #include "tab_deck_editor_visual_tab_widget.h" #include @@ -33,6 +29,10 @@ #include #include #include +#include +#include +#include +#include TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) { diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index ff2818f33..f918f61ad 100644 --- a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -3,11 +3,11 @@ #include "../../interface/widgets/cards/deck_preview_card_picture_widget.h" #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../tab_supervisor.h" -#include "card/card_database/model/card_database_model.h" -#include "pb/command_deck_del.pb.h" #include #include +#include +#include TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt deleted file mode 100644 index a21e3cdb2..000000000 --- a/common/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# CMakeLists for common directory -# -# provides the common library - -set(common_SOURCES) - -set(ORACLE_LIBS) - -include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS}) diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index 1043a87fe..acf60bf03 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -19,22 +19,13 @@ set(CMAKE_AUTORCC ON) # ------------------------ add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES}) -# ------------------------ -# Include directories -# ------------------------ -target_include_directories( - dbconverter - PRIVATE ../common # shared common headers - PRIVATE ../libs/card/include # cockatrice_card public headers -) - # ------------------------ # Link libraries # ------------------------ target_link_libraries( dbconverter - PRIVATE cockatrice_card - PRIVATE cockatrice_settings + PRIVATE libcockatrice_card + PRIVATE libcockatrice_settings PRIVATE ${DB_CONVERTER_QT_MODULES} ) diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h index 0303c0f1e..b7b9350b5 100644 --- a/dbconverter/src/main.h +++ b/dbconverter/src/main.h @@ -1,8 +1,8 @@ #ifndef MAIN_H #define MAIN_H -#include "card/card_database/card_database.h" -#include "card/card_database/parser/cockatrice_xml_4.h" +#include +#include class CardDatabaseConverter : public CardDatabase { diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h index f46f37cfa..3a8495fb9 100644 --- a/dbconverter/src/mocks.h +++ b/dbconverter/src/mocks.h @@ -10,9 +10,9 @@ #define PICTURELOADER_H -#include "card/card_database/card_database.h" -#include "settings/cache_settings.h" -#include "utility/macros.h" +#include +#include +#include extern SettingsCache *settingsCache; diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt new file mode 100644 index 000000000..6acdad8d6 --- /dev/null +++ b/libcockatrice_card/CMakeLists.txt @@ -0,0 +1,68 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/card/card_info.h + libcockatrice/card/card_info_comparator.h + libcockatrice/card/card_database/card_database.h + libcockatrice/card/card_database/card_database_loader.h + libcockatrice/card/card_database/card_database_manager.h + libcockatrice/card/card_database/card_database_querier.h + libcockatrice/card/card_database/model/card_database_model.h + libcockatrice/card/card_database/model/card_database_display_model.h + libcockatrice/card/card_database/model/card/card_completer_proxy_model.h + libcockatrice/card/card_database/model/card/card_search_model.h + libcockatrice/card/card_database/model/token/token_display_model.h + libcockatrice/card/card_database/model/token/token_edit_model.h + libcockatrice/card/card_database/parser/card_database_parser.h + libcockatrice/card/card_database/parser/cockatrice_xml_3.h + libcockatrice/card/card_database/parser/cockatrice_xml_4.h + libcockatrice/card/card_printing/exact_card.h + libcockatrice/card/card_printing/printing_info.h + libcockatrice/card/card_set/card_set.h + libcockatrice/card/card_relation/card_relation.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_card STATIC + ${MOC_SOURCES} + libcockatrice/card/card_database/card_database.cpp + libcockatrice/card/card_database/card_database_loader.cpp + libcockatrice/card/card_database/card_database_manager.cpp + libcockatrice/card/card_database/card_database_querier.cpp + libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp + libcockatrice/card/card_database/model/card/card_search_model.cpp + libcockatrice/card/card_database/model/card_database_display_model.cpp + libcockatrice/card/card_database/model/card_database_model.cpp + libcockatrice/card/card_database/model/token/token_display_model.cpp + libcockatrice/card/card_database/model/token/token_edit_model.cpp + libcockatrice/card/card_database/parser/card_database_parser.cpp + libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp + libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp + libcockatrice/card/card_info.cpp + libcockatrice/card/card_info_comparator.cpp + libcockatrice/card/card_printing/exact_card.cpp + libcockatrice/card/card_printing/printing_info.cpp + libcockatrice/card/card_relation/card_relation.cpp + libcockatrice/card/card_set/card_set.cpp + libcockatrice/card/card_set/card_set_list.cpp +) + +target_include_directories( + libcockatrice_card + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters +) + +target_link_libraries( + libcockatrice_card + PUBLIC libcockatrice_settings + PUBLIC ${COCKATRICE_QT_MODULES} +) diff --git a/libs/card/src/card_database/card_database.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp similarity index 95% rename from libs/card/src/card_database/card_database.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database.cpp index 7830b947f..212397c17 100644 --- a/libs/card/src/card_database/card_database.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database.cpp @@ -1,9 +1,8 @@ -#include "card/card_database/card_database.h" +#include "card_database.h" -#include "card/card_database/parser/cockatrice_xml_3.h" -#include "card/card_database/parser/cockatrice_xml_4.h" -#include "card/card_relation/card_relation.h" -#include "settings/cache_settings.h" +#include "../card_relation/card_relation.h" +#include "parser/cockatrice_xml_3.h" +#include "parser/cockatrice_xml_4.h" #include #include @@ -13,6 +12,7 @@ #include #include #include +#include #include CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded) diff --git a/libs/card/include/card/card_database/card_database.h b/libcockatrice_card/libcockatrice/card/card_database/card_database.h similarity index 94% rename from libs/card/include/card/card_database/card_database.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database.h index 6e3b7fb94..01d1c61e4 100644 --- a/libs/card/include/card/card_database/card_database.h +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database.h @@ -7,10 +7,9 @@ #ifndef CARDDATABASE_H #define CARDDATABASE_H -#include "card/card_database/card_database_loader.h" -#include "card/card_set/card_set_list.h" +#include "../card_set/card_set_list.h" +#include "card_database_loader.h" #include "card_database_querier.h" -#include "utility/card_ref.h" #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #include inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database"); diff --git a/libs/card/src/card_database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp similarity index 95% rename from libs/card/src/card_database/card_database_loader.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp index 31e54528d..756464683 100644 --- a/libs/card/src/card_database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.cpp @@ -1,9 +1,9 @@ -#include "card/card_database/card_database_loader.h" +#include "card_database_loader.h" -#include "card/card_database/card_database.h" -#include "card/card_database/parser/cockatrice_xml_3.h" -#include "card/card_database/parser/cockatrice_xml_4.h" -#include "settings/cache_settings.h" +#include "card_database.h" +#include "parser/cockatrice_xml_3.h" +#include "parser/cockatrice_xml_4.h" +#include #include #include diff --git a/libs/card/include/card/card_database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h similarity index 100% rename from libs/card/include/card/card_database/card_database_loader.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_loader.h diff --git a/libs/card/src/card_database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp similarity index 81% rename from libs/card/src/card_database/card_database_manager.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp index df7872d1a..4ffe0cc70 100644 --- a/libs/card/src/card_database/card_database_manager.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.cpp @@ -1,4 +1,4 @@ -#include "card/card_database/card_database_manager.h" +#include "card_database_manager.h" CardDatabase *CardDatabaseManager::getInstance() { diff --git a/libs/card/include/card/card_database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h similarity index 100% rename from libs/card/include/card/card_database/card_database_manager.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_manager.h diff --git a/libs/card/src/card_database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp similarity index 97% rename from libs/card/src/card_database/card_database_querier.cpp rename to libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp index b428a4462..2eb6c6e92 100644 --- a/libs/card/src/card_database/card_database_querier.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.cpp @@ -1,9 +1,9 @@ -#include "card/card_database/card_database_querier.h" +#include "card_database_querier.h" -#include "card/card_database/card_database.h" -#include "card/card_info.h" -#include "card/card_printing/exact_card.h" -#include "card/card_set/card_set_comparator.h" +#include "../card_info.h" +#include "../card_printing/exact_card.h" +#include "../card_set/card_set_comparator.h" +#include "card_database.h" #include diff --git a/libs/card/include/card/card_database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h similarity index 95% rename from libs/card/include/card/card_database/card_database_querier.h rename to libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h index e020dcac5..11e485695 100644 --- a/libs/card/include/card/card_database/card_database_querier.h +++ b/libcockatrice_card/libcockatrice/card/card_database/card_database_querier.h @@ -7,11 +7,11 @@ #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H #define COCKATRICE_CARD_DATABASE_QUERIER_H -#include "card/card_info.h" -#include "card/card_printing/exact_card.h" -#include "utility/card_ref.h" +#include "../card_info.h" +#include "../card_printing/exact_card.h" #include +#include class CardDatabase; class CardDatabaseQuerier : public QObject diff --git a/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp similarity index 88% rename from libs/card/src/card_database/model/card/card_completer_proxy_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp index fcc224f2e..387eb454f 100644 --- a/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp @@ -1,4 +1,4 @@ -#include "card/card_database/model/card/card_completer_proxy_model.h" +#include "card_completer_proxy_model.h" CardCompleterProxyModel::CardCompleterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) { diff --git a/libs/card/include/card/card_database/model/card/card_completer_proxy_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h similarity index 100% rename from libs/card/include/card/card_database/model/card/card_completer_proxy_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_completer_proxy_model.h diff --git a/libs/card/src/card_database/model/card/card_search_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp similarity index 90% rename from libs/card/src/card_database/model/card/card_search_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp index b648554b3..432d82ef7 100644 --- a/libs/card/src/card_database/model/card/card_search_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.cpp @@ -1,8 +1,8 @@ -#include "card/card_database/model/card/card_search_model.h" +#include "card_search_model.h" -#include "card/card_database/model/card_database_display_model.h" -#include "card/card_database/model/card_database_model.h" -#include "utility/levenshtein.h" +#include "../card_database_display_model.h" +#include "../card_database_model.h" +#include #include diff --git a/libs/card/include/card/card_database/model/card/card_search_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h similarity index 92% rename from libs/card/include/card/card_database/model/card/card_search_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h index 0cceedb96..2b1e3b38d 100644 --- a/libs/card/include/card/card_database/model/card/card_search_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card/card_search_model.h @@ -7,9 +7,8 @@ #ifndef CARD_SEARCH_MODEL_H #define CARD_SEARCH_MODEL_H -#include "card/card_database/model/card_database_display_model.h" - #include +#include "../card_database_display_model.h" class CardSearchModel : public QAbstractListModel { diff --git a/libs/card/src/card_database/model/card_database_display_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp similarity index 98% rename from libs/card/src/card_database/model/card_database_display_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp index 4fed0e7f8..fc1b20cf6 100644 --- a/libs/card/src/card_database/model/card_database_display_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.cpp @@ -1,6 +1,6 @@ -#include "card/card_database/model/card_database_display_model.h" +#include "card_database_display_model.h" -#include "card/card_database/model/card_database_model.h" +#include "card_database_model.h" CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent) : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr) diff --git a/libs/card/include/card/card_database/model/card_database_display_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h similarity index 100% rename from libs/card/include/card/card_database/model/card_database_display_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_display_model.h diff --git a/libs/card/src/card_database/model/card_database_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp similarity index 97% rename from libs/card/src/card_database/model/card_database_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp index 35e3dfb2c..6144121ac 100644 --- a/libs/card/src/card_database/model/card_database_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.cpp @@ -1,6 +1,6 @@ -#include "card/card_database/model/card_database_model.h" +#include "card_database_model.h" -#include "card/card_database/card_database.h" +#include "../card_database.h" #include diff --git a/libs/card/include/card/card_database/model/card_database_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h similarity index 97% rename from libs/card/include/card/card_database/model/card_database_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h index 92bb8f79c..fc89e0572 100644 --- a/libs/card/include/card/card_database/model/card_database_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/card_database_model.h @@ -7,7 +7,7 @@ #ifndef CARDDATABASEMODEL_H #define CARDDATABASEMODEL_H -#include "card/card_database/card_database.h" +#include "../card_database.h" #include #include diff --git a/libs/card/src/card_database/model/token/token_display_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp similarity index 80% rename from libs/card/src/card_database/model/token/token_display_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp index d8df25550..4282c6dc8 100644 --- a/libs/card/src/card_database/model/token/token_display_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.cpp @@ -1,6 +1,6 @@ -#include "card/card_database/model/token/token_display_model.h" +#include "token_display_model.h" -#include "card/card_database/model/card_database_model.h" +#include "../card_database_model.h" TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent) { diff --git a/libs/card/include/card/card_database/model/token/token_display_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h similarity index 89% rename from libs/card/include/card/card_database/model/token/token_display_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h index fe0792a93..5d3b63a36 100644 --- a/libs/card/include/card/card_database/model/token/token_display_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_display_model.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H #define COCKATRICE_TOKEN_DISPLAY_MODEL_H -#include "card/card_database/model/card_database_display_model.h" +#include "../card_database_display_model.h" class TokenDisplayModel : public CardDatabaseDisplayModel { diff --git a/libs/card/src/card_database/model/token/token_edit_model.cpp b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp similarity index 72% rename from libs/card/src/card_database/model/token/token_edit_model.cpp rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp index 6fa71161d..8ce290b03 100644 --- a/libs/card/src/card_database/model/token/token_edit_model.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.cpp @@ -1,8 +1,8 @@ -#include "card/card_database/model/token/token_edit_model.h" +#include "../token/token_edit_model.h" -#include "card/card_database/model/card_database_display_model.h" -#include "card/card_database/model/card_database_model.h" -#include "card/card_info.h" +#include "../../../card_info.h" +#include "../card_database_display_model.h" +#include "../card_database_model.h" TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent) { diff --git a/libs/card/include/card/card_database/model/token/token_edit_model.h b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h similarity index 88% rename from libs/card/include/card/card_database/model/token/token_edit_model.h rename to libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h index 907439976..50c7eb642 100644 --- a/libs/card/include/card/card_database/model/token/token_edit_model.h +++ b/libcockatrice_card/libcockatrice/card/card_database/model/token/token_edit_model.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H #define COCKATRICE_TOKEN_EDIT_MODEL_H -#include "card/card_database/model/card_database_display_model.h" +#include "../card_database_display_model.h" class TokenEditModel : public CardDatabaseDisplayModel { diff --git a/libs/card/src/card_database/parser/card_database_parser.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp similarity index 93% rename from libs/card/src/card_database/parser/card_database_parser.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp index 76c071507..ac1372f7f 100644 --- a/libs/card/src/card_database/parser/card_database_parser.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.cpp @@ -1,4 +1,4 @@ -#include "card/card_database/parser/card_database_parser.h" +#include "card_database_parser.h" SetNameMap ICardDatabaseParser::sets; diff --git a/libs/card/include/card/card_database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h similarity index 98% rename from libs/card/include/card/card_database/parser/card_database_parser.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h index 822d392bf..cce06191e 100644 --- a/libs/card/include/card/card_database/parser/card_database_parser.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/card_database_parser.h @@ -7,10 +7,9 @@ #ifndef CARDDATABASE_PARSER_H #define CARDDATABASE_PARSER_H -#include "card/card_info.h" - #include #include +#include "../../card_info.h" #define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance" diff --git a/libs/card/src/card_database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp similarity index 99% rename from libs/card/src/card_database/parser/cockatrice_xml_3.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp index 211e35710..295d307b6 100644 --- a/libs/card/src/card_database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp @@ -1,7 +1,7 @@ -#include "card/card_database/parser/cockatrice_xml_3.h" +#include "cockatrice_xml_3.h" -#include "card/card_relation/card_relation.h" -#include "card/card_relation/card_relation_type.h" +#include "../../card_relation/card_relation.h" +#include "../../card_relation/card_relation_type.h" #include #include diff --git a/libs/card/include/card/card_database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h similarity index 94% rename from libs/card/include/card/card_database/parser/cockatrice_xml_3.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h index e487091e2..50fa9c587 100644 --- a/libs/card/include/card/card_database/parser/cockatrice_xml_3.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_3.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_XML3_H #define COCKATRICE_XML3_H -#include "card/card_database/parser/card_database_parser.h" +#include "card_database_parser.h" #include #include diff --git a/libs/card/src/card_database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp similarity index 99% rename from libs/card/src/card_database/parser/cockatrice_xml_4.cpp rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp index aff52ea65..d4870f3b3 100644 --- a/libs/card/src/card_database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp @@ -1,12 +1,12 @@ -#include "card/card_database/parser/cockatrice_xml_4.h" +#include "cockatrice_xml_4.h" -#include "card/card_relation/card_relation.h" -#include "settings/cache_settings.h" +#include "../../card_relation/card_relation.h" #include #include #include #include +#include #include #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase" diff --git a/libs/card/include/card/card_database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h similarity index 94% rename from libs/card/include/card/card_database/parser/cockatrice_xml_4.h rename to libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h index c75858755..f438f94b2 100644 --- a/libs/card/include/card/card_database/parser/cockatrice_xml_4.h +++ b/libcockatrice_card/libcockatrice/card/card_database/parser/cockatrice_xml_4.h @@ -7,7 +7,7 @@ #ifndef COCKATRICE_XML4_H #define COCKATRICE_XML4_H -#include "card/card_database/parser/card_database_parser.h" +#include "card_database_parser.h" #include #include diff --git a/libs/card/src/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp similarity index 96% rename from libs/card/src/card_info.cpp rename to libcockatrice_card/libcockatrice/card/card_info.cpp index 69dd41b98..0434bcf00 100644 --- a/libs/card/src/card_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info.cpp @@ -1,10 +1,9 @@ -#include "card/card_info.h" +#include "card_info.h" -#include "card/card_printing/printing_info.h" -#include "card/card_relation/card_relation.h" -#include "card/card_set/card_set.h" -#include "card/game_specific_terms.h" -#include "settings/cache_settings.h" +#include "card_printing/printing_info.h" +#include "card_relation/card_relation.h" +#include "card_set/card_set.h" +#include "game_specific_terms.h" #include #include @@ -12,6 +11,7 @@ #include #include #include +#include #include class CardRelation; diff --git a/libs/card/include/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h similarity index 99% rename from libs/card/include/card/card_info.h rename to libcockatrice_card/libcockatrice/card/card_info.h index 771f07464..f613686be 100644 --- a/libs/card/include/card/card_info.h +++ b/libcockatrice_card/libcockatrice/card/card_info.h @@ -7,8 +7,6 @@ #ifndef CARD_INFO_H #define CARD_INFO_H -#include "card_printing/printing_info.h" - #include #include #include @@ -18,6 +16,7 @@ #include #include #include +#include "card_printing/printing_info.h" #include inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info"); diff --git a/libs/card/src/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp similarity index 98% rename from libs/card/src/card_info_comparator.cpp rename to libcockatrice_card/libcockatrice/card/card_info_comparator.cpp index 7e002d312..821cc8675 100644 --- a/libs/card/src/card_info_comparator.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp @@ -1,4 +1,4 @@ -#include "card/card_info_comparator.h" +#include "card_info_comparator.h" CardInfoComparator::CardInfoComparator(const QStringList &properties, Qt::SortOrder order) : m_properties(properties), m_order(order) diff --git a/libs/card/include/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h similarity index 100% rename from libs/card/include/card/card_info_comparator.h rename to libcockatrice_card/libcockatrice/card/card_info_comparator.h diff --git a/libs/card/src/card_printing/exact_card.cpp b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp similarity index 93% rename from libs/card/src/card_printing/exact_card.cpp rename to libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp index cc79a5c83..993b5b96e 100644 --- a/libs/card/src/card_printing/exact_card.cpp +++ b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.cpp @@ -1,7 +1,7 @@ -#include "card/card_printing/exact_card.h" +#include "exact_card.h" -#include "card/card_info.h" -#include "card/card_printing/printing_info.h" +#include "../card_info.h" +#include "printing_info.h" /** * Default constructor. diff --git a/libs/card/include/card/card_printing/exact_card.h b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.h similarity index 97% rename from libs/card/include/card/card_printing/exact_card.h rename to libcockatrice_card/libcockatrice/card/card_printing/exact_card.h index 97b42df6f..e3d5d828a 100644 --- a/libs/card/include/card/card_printing/exact_card.h +++ b/libcockatrice_card/libcockatrice/card/card_printing/exact_card.h @@ -1,7 +1,7 @@ #ifndef EXACT_CARD_H #define EXACT_CARD_H -#include "card/card_info.h" +#include "../card_info.h" /** * @class ExactCard diff --git a/libs/card/src/card_printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp similarity index 75% rename from libs/card/src/card_printing/printing_info.cpp rename to libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp index 3b8ce3ed1..17a0d6317 100644 --- a/libs/card/src/card_printing/printing_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.cpp @@ -1,6 +1,6 @@ -#include "card/card_printing/printing_info.h" +#include "printing_info.h" -#include "card/card_set/card_set.h" +#include "../card_set/card_set.h" PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set) { diff --git a/libs/card/include/card/card_printing/printing_info.h b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h similarity index 96% rename from libs/card/include/card/card_printing/printing_info.h rename to libcockatrice_card/libcockatrice/card/card_printing/printing_info.h index 583bcd234..0b5a14a0a 100644 --- a/libs/card/include/card/card_printing/printing_info.h +++ b/libcockatrice_card/libcockatrice/card/card_printing/printing_info.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_PRINTING_INFO_H #define COCKATRICE_PRINTING_INFO_H -#include "card/card_set/card_set.h" +#include "../card_set/card_set.h" #include #include diff --git a/libs/card/src/card_relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp similarity index 83% rename from libs/card/src/card_relation/card_relation.cpp rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp index 0b59545c6..a88729b5f 100644 --- a/libs/card/src/card_relation/card_relation.cpp +++ b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.cpp @@ -1,6 +1,5 @@ -#include "card/card_relation/card_relation.h" - -#include "card/card_relation/card_relation_type.h" +#include "card_relation.h" +#include "card_relation_type.h" CardRelation::CardRelation(const QString &_name, CardRelationType _attachType, diff --git a/libs/card/include/card/card_relation/card_relation.h b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.h similarity index 96% rename from libs/card/include/card/card_relation/card_relation.h rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation.h index 50645fcea..34f88e651 100644 --- a/libs/card/include/card/card_relation/card_relation.h +++ b/libcockatrice_card/libcockatrice/card/card_relation/card_relation.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_CARD_RELATION_H #define COCKATRICE_CARD_RELATION_H -#include "card/card_relation/card_relation_type.h" +#include "card_relation_type.h" #include #include diff --git a/libs/card/include/card/card_relation/card_relation_type.h b/libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h similarity index 100% rename from libs/card/include/card/card_relation/card_relation_type.h rename to libcockatrice_card/libcockatrice/card/card_relation/card_relation_type.h diff --git a/libs/card/src/card_set/card_set.cpp b/libcockatrice_card/libcockatrice/card/card_set/card_set.cpp similarity index 97% rename from libs/card/src/card_set/card_set.cpp rename to libcockatrice_card/libcockatrice/card/card_set/card_set.cpp index 99acfc85e..6b4a8f764 100644 --- a/libs/card/src/card_set/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/card_set/card_set.cpp @@ -1,6 +1,6 @@ -#include "card/card_set/card_set.h" +#include "card_set.h" -#include "settings/cache_settings.h" +#include const char *CardSet::TOKENS_SETNAME = "TK"; diff --git a/libs/card/include/card/card_set/card_set.h b/libcockatrice_card/libcockatrice/card/card_set/card_set.h similarity index 100% rename from libs/card/include/card/card_set/card_set.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set.h diff --git a/libs/card/include/card/card_set/card_set_comparator.h b/libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h similarity index 96% rename from libs/card/include/card/card_set/card_set_comparator.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h index 9f8be6676..53e2cb97d 100644 --- a/libs/card/include/card/card_set/card_set_comparator.h +++ b/libcockatrice_card/libcockatrice/card/card_set/card_set_comparator.h @@ -7,7 +7,7 @@ #ifndef SET_PRIORITY_COMPARATOR_H #define SET_PRIORITY_COMPARATOR_H -#include "card/card_info.h" +#include "../card_info.h" class SetPriorityComparator { diff --git a/libs/card/src/card_set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp similarity index 98% rename from libs/card/src/card_set/card_set_list.cpp rename to libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp index 1324f94dd..8d6aa7365 100644 --- a/libs/card/src/card_set/card_set_list.cpp +++ b/libcockatrice_card/libcockatrice/card/card_set/card_set_list.cpp @@ -1,4 +1,4 @@ -#include "card/card_set/card_set_list.h" +#include "card_set_list.h" class CardSetList::KeyCompareFunctor { diff --git a/libs/card/include/card/card_set/card_set_list.h b/libcockatrice_card/libcockatrice/card/card_set/card_set_list.h similarity index 100% rename from libs/card/include/card/card_set/card_set_list.h rename to libcockatrice_card/libcockatrice/card/card_set/card_set_list.h diff --git a/libs/card/include/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h similarity index 100% rename from libs/card/include/card/game_specific_terms.h rename to libcockatrice_card/libcockatrice/card/game_specific_terms.h diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt new file mode 100644 index 000000000..5ba0b32c9 --- /dev/null +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -0,0 +1,30 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/deck_list/abstract_deck_list_card_node.h libcockatrice/deck_list/abstract_deck_list_node.h + libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/deck_list_card_node.h + libcockatrice/deck_list/inner_deck_list_node.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_deck_list STATIC + ${MOC_SOURCES} libcockatrice/deck_list/abstract_deck_list_card_node.cpp + libcockatrice/deck_list/abstract_deck_list_node.cpp libcockatrice/deck_list/deck_list.cpp + libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_node.cpp +) + +add_dependencies(libcockatrice_deck_list libcockatrice_protocol_wrapper) + +target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries( + libcockatrice_deck_list PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility ${COCKATRICE_QT_MODULES} +) diff --git a/libs/deck_list/src/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.cpp similarity index 96% rename from libs/deck_list/src/abstract_deck_list_card_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.cpp index d83fcd8b2..b8a497c20 100644 --- a/libs/deck_list/src/abstract_deck_list_card_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.cpp @@ -1,4 +1,4 @@ -#include "../include/deck_list/abstract_deck_list_card_node.h" +#include "abstract_deck_list_card_node.h" bool AbstractDecklistCardNode::compare(AbstractDecklistNode *other) const { diff --git a/libs/deck_list/include/deck_list/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.h similarity index 100% rename from libs/deck_list/include/deck_list/abstract_deck_list_card_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_card_node.h diff --git a/libs/deck_list/src/abstract_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.cpp similarity index 78% rename from libs/deck_list/src/abstract_deck_list_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.cpp index 3be19af0f..0f39ce71a 100644 --- a/libs/deck_list/src/abstract_deck_list_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.cpp @@ -1,6 +1,6 @@ -#include "../include/deck_list/abstract_deck_list_node.h" +#include "abstract_deck_list_node.h" -#include "../include/deck_list/inner_deck_list_node.h" +#include "inner_deck_list_node.h" AbstractDecklistNode::AbstractDecklistNode(InnerDecklistNode *_parent, int position) : parent(_parent), sortMethod(Default) diff --git a/libs/deck_list/include/deck_list/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.h similarity index 100% rename from libs/deck_list/include/deck_list/abstract_deck_list_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/abstract_deck_list_node.h diff --git a/libs/deck_list/src/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp similarity index 99% rename from libs/deck_list/src/deck_list.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index 14b6d96dc..b2fbdb028 100644 --- a/libs/deck_list/src/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -1,8 +1,8 @@ -#include "../include/deck_list/deck_list.h" +#include "deck_list.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 "abstract_deck_list_node.h" +#include "deck_list_card_node.h" +#include "inner_deck_list_node.h" #include #include diff --git a/libs/deck_list/include/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h similarity index 98% rename from libs/deck_list/include/deck_list/deck_list.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index db65282ee..f7e5cafa7 100644 --- a/libs/deck_list/include/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -11,8 +11,8 @@ #define DECKLIST_H #include "inner_deck_list_node.h" -#include "pb/move_card_to_zone.pb.h" -#include "utility/card_ref.h" +#include +#include #include #include diff --git a/libs/deck_list/src/deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.cpp similarity index 85% rename from libs/deck_list/src/deck_list_card_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.cpp index f27b528cd..1791c09a6 100644 --- a/libs/deck_list/src/deck_list_card_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.cpp @@ -1,4 +1,4 @@ -#include "../include/deck_list/deck_list_card_node.h" +#include "deck_list_card_node.h" DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent) : AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()), diff --git a/libs/deck_list/include/deck_list/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h similarity index 99% rename from libs/deck_list/include/deck_list/deck_list_card_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h index df98c585c..fb1e553a8 100644 --- a/libs/deck_list/include/deck_list/deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h @@ -13,7 +13,7 @@ #define COCKATRICE_DECK_LIST_CARD_NODE_H #include "abstract_deck_list_card_node.h" -#include "utility/card_ref.h" +#include /** * @class DecklistCardNode diff --git a/libs/deck_list/src/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp similarity index 98% rename from libs/deck_list/src/inner_deck_list_node.cpp rename to libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp index 3e92a7d69..c91b3ea14 100644 --- a/libs/deck_list/src/inner_deck_list_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp @@ -1,6 +1,6 @@ -#include "../include/deck_list/inner_deck_list_node.h" +#include "inner_deck_list_node.h" -#include "../include/deck_list/deck_list_card_node.h" +#include "deck_list_card_node.h" InnerDecklistNode::InnerDecklistNode(InnerDecklistNode *other, InnerDecklistNode *_parent) : AbstractDecklistNode(_parent), name(other->getName()) diff --git a/libs/deck_list/include/deck_list/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.h similarity index 100% rename from libs/deck_list/include/deck_list/inner_deck_list_node.h rename to libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.h diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt new file mode 100644 index 000000000..42c2af503 --- /dev/null +++ b/libcockatrice_protocol/CMakeLists.txt @@ -0,0 +1,13 @@ +# Top-level wrapper for the protobuf library + +add_subdirectory(libcockatrice/protocol/pb) + +add_library(libcockatrice_protocol_wrapper STATIC) + +# Link the actual generated protobuf library +target_link_libraries(libcockatrice_protocol_wrapper PUBLIC libcockatrice_protocol) + +# Expose the pb/ folder so consumers can do #include +target_include_directories( + libcockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers +) diff --git a/libs/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt similarity index 90% rename from libs/protocol/pb/CMakeLists.txt rename to libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index dc48823fd..2d3051863 100644 --- a/libs/protocol/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -171,12 +171,12 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") include_directories(${CMAKE_CURRENT_BINARY_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) - add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) - set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) + add_library(libcockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) + set(libcockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) if(UNIX) - set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lpthread) + set(libcockatrice_protocol_LIBS ${libcockatrice_protocol_LIBS} -lpthread) endif(UNIX) - target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS}) + target_link_libraries(libcockatrice_protocol ${libcockatrice_protocol_LIBS}) # ubuntu uses an outdated package for protobuf, 3.1.0 is required if(${Protobuf_VERSION} VERSION_LESS "3.1.0") @@ -188,12 +188,10 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0") ) endif() else() - add_library(cockatrice_protocol ${PROTO_FILES}) - target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf) + add_library(libcockatrice_protocol ${PROTO_FILES}) + target_link_libraries(libcockatrice_protocol PUBLIC protobuf::libprotobuf) set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") - target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") + target_include_directories(libcockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}") - protobuf_generate( - TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}" - ) + protobuf_generate(TARGET libcockatrice_protocol IMPORT_DIRS "." PROTOC_OUT_DIR "${PROTO_BINARY_DIR}") endif() diff --git a/libs/protocol/pb/admin_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto similarity index 100% rename from libs/protocol/pb/admin_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto diff --git a/libs/protocol/pb/card_attributes.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto similarity index 100% rename from libs/protocol/pb/card_attributes.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto diff --git a/libs/protocol/pb/color.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/color.proto similarity index 100% rename from libs/protocol/pb/color.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/color.proto diff --git a/libs/protocol/pb/command_attach_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto similarity index 100% rename from libs/protocol/pb/command_attach_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto diff --git a/libs/protocol/pb/command_change_zone_properties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto similarity index 100% rename from libs/protocol/pb/command_change_zone_properties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto diff --git a/libs/protocol/pb/command_concede.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto similarity index 100% rename from libs/protocol/pb/command_concede.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto diff --git a/libs/protocol/pb/command_create_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto similarity index 100% rename from libs/protocol/pb/command_create_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto diff --git a/libs/protocol/pb/command_create_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto similarity index 100% rename from libs/protocol/pb/command_create_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto diff --git a/libs/protocol/pb/command_create_token.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto similarity index 100% rename from libs/protocol/pb/command_create_token.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto diff --git a/libs/protocol/pb/command_deck_del.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto similarity index 100% rename from libs/protocol/pb/command_deck_del.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto diff --git a/libs/protocol/pb/command_deck_del_dir.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto similarity index 100% rename from libs/protocol/pb/command_deck_del_dir.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto diff --git a/libs/protocol/pb/command_deck_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto similarity index 100% rename from libs/protocol/pb/command_deck_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto diff --git a/libs/protocol/pb/command_deck_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto similarity index 100% rename from libs/protocol/pb/command_deck_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto diff --git a/libs/protocol/pb/command_deck_new_dir.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto similarity index 100% rename from libs/protocol/pb/command_deck_new_dir.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto diff --git a/libs/protocol/pb/command_deck_select.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto similarity index 100% rename from libs/protocol/pb/command_deck_select.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto diff --git a/libs/protocol/pb/command_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto similarity index 100% rename from libs/protocol/pb/command_deck_upload.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto diff --git a/libs/protocol/pb/command_del_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto similarity index 100% rename from libs/protocol/pb/command_del_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto diff --git a/libs/protocol/pb/command_delete_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto similarity index 100% rename from libs/protocol/pb/command_delete_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto diff --git a/libs/protocol/pb/command_draw_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto similarity index 100% rename from libs/protocol/pb/command_draw_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto diff --git a/libs/protocol/pb/command_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto similarity index 100% rename from libs/protocol/pb/command_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto diff --git a/libs/protocol/pb/command_flip_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto similarity index 100% rename from libs/protocol/pb/command_flip_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto diff --git a/libs/protocol/pb/command_game_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto similarity index 100% rename from libs/protocol/pb/command_game_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto diff --git a/libs/protocol/pb/command_inc_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto similarity index 100% rename from libs/protocol/pb/command_inc_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto diff --git a/libs/protocol/pb/command_inc_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto similarity index 100% rename from libs/protocol/pb/command_inc_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto diff --git a/libs/protocol/pb/command_kick_from_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto similarity index 100% rename from libs/protocol/pb/command_kick_from_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto diff --git a/libs/protocol/pb/command_leave_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto similarity index 100% rename from libs/protocol/pb/command_leave_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto diff --git a/libs/protocol/pb/command_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto similarity index 100% rename from libs/protocol/pb/command_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto diff --git a/libs/protocol/pb/command_mulligan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto similarity index 100% rename from libs/protocol/pb/command_mulligan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto diff --git a/libs/protocol/pb/command_next_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto similarity index 100% rename from libs/protocol/pb/command_next_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto diff --git a/libs/protocol/pb/command_ready_start.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto similarity index 100% rename from libs/protocol/pb/command_ready_start.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto diff --git a/libs/protocol/pb/command_replay_delete_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto similarity index 100% rename from libs/protocol/pb/command_replay_delete_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto diff --git a/libs/protocol/pb/command_replay_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto similarity index 100% rename from libs/protocol/pb/command_replay_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto diff --git a/libs/protocol/pb/command_replay_get_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto similarity index 100% rename from libs/protocol/pb/command_replay_get_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto diff --git a/libs/protocol/pb/command_replay_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto similarity index 100% rename from libs/protocol/pb/command_replay_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto diff --git a/libs/protocol/pb/command_replay_modify_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto similarity index 100% rename from libs/protocol/pb/command_replay_modify_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto diff --git a/libs/protocol/pb/command_replay_submit_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto similarity index 100% rename from libs/protocol/pb/command_replay_submit_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto diff --git a/libs/protocol/pb/command_reveal_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto similarity index 100% rename from libs/protocol/pb/command_reveal_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto diff --git a/libs/protocol/pb/command_reverse_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto similarity index 100% rename from libs/protocol/pb/command_reverse_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto diff --git a/libs/protocol/pb/command_roll_die.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto similarity index 100% rename from libs/protocol/pb/command_roll_die.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto diff --git a/libs/protocol/pb/command_set_active_phase.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto similarity index 100% rename from libs/protocol/pb/command_set_active_phase.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto diff --git a/libs/protocol/pb/command_set_card_attr.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto similarity index 100% rename from libs/protocol/pb/command_set_card_attr.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto diff --git a/libs/protocol/pb/command_set_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto similarity index 100% rename from libs/protocol/pb/command_set_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto diff --git a/libs/protocol/pb/command_set_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto similarity index 100% rename from libs/protocol/pb/command_set_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto diff --git a/libs/protocol/pb/command_set_sideboard_lock.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto similarity index 100% rename from libs/protocol/pb/command_set_sideboard_lock.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto diff --git a/libs/protocol/pb/command_set_sideboard_plan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto similarity index 100% rename from libs/protocol/pb/command_set_sideboard_plan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto diff --git a/libs/protocol/pb/command_shuffle.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto similarity index 100% rename from libs/protocol/pb/command_shuffle.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto diff --git a/libs/protocol/pb/command_undo_draw.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto similarity index 100% rename from libs/protocol/pb/command_undo_draw.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto diff --git a/libs/protocol/pb/commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto similarity index 100% rename from libs/protocol/pb/commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto diff --git a/libs/protocol/pb/context_concede.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto similarity index 100% rename from libs/protocol/pb/context_concede.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto diff --git a/libs/protocol/pb/context_connection_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto similarity index 100% rename from libs/protocol/pb/context_connection_state_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto diff --git a/libs/protocol/pb/context_deck_select.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto similarity index 100% rename from libs/protocol/pb/context_deck_select.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto diff --git a/libs/protocol/pb/context_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto similarity index 100% rename from libs/protocol/pb/context_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto diff --git a/libs/protocol/pb/context_mulligan.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto similarity index 100% rename from libs/protocol/pb/context_mulligan.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto diff --git a/libs/protocol/pb/context_ping_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto similarity index 100% rename from libs/protocol/pb/context_ping_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto diff --git a/libs/protocol/pb/context_ready_start.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto similarity index 100% rename from libs/protocol/pb/context_ready_start.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto diff --git a/libs/protocol/pb/context_set_sideboard_lock.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto similarity index 100% rename from libs/protocol/pb/context_set_sideboard_lock.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto diff --git a/libs/protocol/pb/context_undo_draw.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto similarity index 100% rename from libs/protocol/pb/context_undo_draw.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto diff --git a/libs/protocol/pb/event_add_to_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto similarity index 100% rename from libs/protocol/pb/event_add_to_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto diff --git a/libs/protocol/pb/event_attach_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto similarity index 100% rename from libs/protocol/pb/event_attach_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto diff --git a/libs/protocol/pb/event_change_zone_properties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto similarity index 100% rename from libs/protocol/pb/event_change_zone_properties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto diff --git a/libs/protocol/pb/event_connection_closed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto similarity index 100% rename from libs/protocol/pb/event_connection_closed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto diff --git a/libs/protocol/pb/event_create_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto similarity index 100% rename from libs/protocol/pb/event_create_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto diff --git a/libs/protocol/pb/event_create_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto similarity index 100% rename from libs/protocol/pb/event_create_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto diff --git a/libs/protocol/pb/event_create_token.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto similarity index 100% rename from libs/protocol/pb/event_create_token.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto diff --git a/libs/protocol/pb/event_del_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto similarity index 100% rename from libs/protocol/pb/event_del_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto diff --git a/libs/protocol/pb/event_delete_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto similarity index 100% rename from libs/protocol/pb/event_delete_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto diff --git a/libs/protocol/pb/event_destroy_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto similarity index 100% rename from libs/protocol/pb/event_destroy_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto diff --git a/libs/protocol/pb/event_draw_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto similarity index 100% rename from libs/protocol/pb/event_draw_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto diff --git a/libs/protocol/pb/event_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto similarity index 100% rename from libs/protocol/pb/event_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto diff --git a/libs/protocol/pb/event_flip_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto similarity index 100% rename from libs/protocol/pb/event_flip_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto diff --git a/libs/protocol/pb/event_game_closed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto similarity index 100% rename from libs/protocol/pb/event_game_closed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto diff --git a/libs/protocol/pb/event_game_host_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto similarity index 100% rename from libs/protocol/pb/event_game_host_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto diff --git a/libs/protocol/pb/event_game_joined.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto similarity index 100% rename from libs/protocol/pb/event_game_joined.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto diff --git a/libs/protocol/pb/event_game_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto similarity index 100% rename from libs/protocol/pb/event_game_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto diff --git a/libs/protocol/pb/event_game_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto similarity index 100% rename from libs/protocol/pb/event_game_state_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto diff --git a/libs/protocol/pb/event_join.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto similarity index 100% rename from libs/protocol/pb/event_join.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto diff --git a/libs/protocol/pb/event_join_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto similarity index 100% rename from libs/protocol/pb/event_join_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto diff --git a/libs/protocol/pb/event_kicked.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto similarity index 100% rename from libs/protocol/pb/event_kicked.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto diff --git a/libs/protocol/pb/event_leave.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto similarity index 100% rename from libs/protocol/pb/event_leave.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto diff --git a/libs/protocol/pb/event_leave_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto similarity index 100% rename from libs/protocol/pb/event_leave_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto diff --git a/libs/protocol/pb/event_list_games.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto similarity index 100% rename from libs/protocol/pb/event_list_games.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto diff --git a/libs/protocol/pb/event_list_rooms.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto similarity index 100% rename from libs/protocol/pb/event_list_rooms.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto diff --git a/libs/protocol/pb/event_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto similarity index 100% rename from libs/protocol/pb/event_move_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto diff --git a/libs/protocol/pb/event_notify_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto similarity index 100% rename from libs/protocol/pb/event_notify_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto diff --git a/libs/protocol/pb/event_player_properties_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto similarity index 100% rename from libs/protocol/pb/event_player_properties_changed.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto diff --git a/libs/protocol/pb/event_remove_from_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto similarity index 100% rename from libs/protocol/pb/event_remove_from_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto diff --git a/libs/protocol/pb/event_remove_messages.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto similarity index 100% rename from libs/protocol/pb/event_remove_messages.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto diff --git a/libs/protocol/pb/event_replay_added.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto similarity index 100% rename from libs/protocol/pb/event_replay_added.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto diff --git a/libs/protocol/pb/event_reveal_cards.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto similarity index 100% rename from libs/protocol/pb/event_reveal_cards.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto diff --git a/libs/protocol/pb/event_reverse_turn.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto similarity index 100% rename from libs/protocol/pb/event_reverse_turn.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto diff --git a/libs/protocol/pb/event_roll_die.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto similarity index 100% rename from libs/protocol/pb/event_roll_die.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto diff --git a/libs/protocol/pb/event_room_say.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto similarity index 100% rename from libs/protocol/pb/event_room_say.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto diff --git a/libs/protocol/pb/event_server_complete_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto similarity index 100% rename from libs/protocol/pb/event_server_complete_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto diff --git a/libs/protocol/pb/event_server_identification.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto similarity index 100% rename from libs/protocol/pb/event_server_identification.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto diff --git a/libs/protocol/pb/event_server_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto similarity index 100% rename from libs/protocol/pb/event_server_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto diff --git a/libs/protocol/pb/event_server_shutdown.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto similarity index 100% rename from libs/protocol/pb/event_server_shutdown.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto diff --git a/libs/protocol/pb/event_set_active_phase.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto similarity index 100% rename from libs/protocol/pb/event_set_active_phase.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto diff --git a/libs/protocol/pb/event_set_active_player.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto similarity index 100% rename from libs/protocol/pb/event_set_active_player.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto diff --git a/libs/protocol/pb/event_set_card_attr.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto similarity index 100% rename from libs/protocol/pb/event_set_card_attr.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto diff --git a/libs/protocol/pb/event_set_card_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto similarity index 100% rename from libs/protocol/pb/event_set_card_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto diff --git a/libs/protocol/pb/event_set_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto similarity index 100% rename from libs/protocol/pb/event_set_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto diff --git a/libs/protocol/pb/event_shuffle.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto similarity index 100% rename from libs/protocol/pb/event_shuffle.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto diff --git a/libs/protocol/pb/event_user_joined.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto similarity index 100% rename from libs/protocol/pb/event_user_joined.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto diff --git a/libs/protocol/pb/event_user_left.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto similarity index 100% rename from libs/protocol/pb/event_user_left.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto diff --git a/libs/protocol/pb/event_user_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto similarity index 100% rename from libs/protocol/pb/event_user_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto diff --git a/libs/protocol/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto similarity index 100% rename from libs/protocol/pb/game_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto diff --git a/libs/protocol/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto similarity index 100% rename from libs/protocol/pb/game_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto diff --git a/libs/protocol/pb/game_event_container.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto similarity index 100% rename from libs/protocol/pb/game_event_container.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto diff --git a/libs/protocol/pb/game_event_context.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto similarity index 100% rename from libs/protocol/pb/game_event_context.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto diff --git a/libs/protocol/pb/game_replay.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto similarity index 100% rename from libs/protocol/pb/game_replay.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto diff --git a/libs/protocol/pb/isl_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto similarity index 100% rename from libs/protocol/pb/isl_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto diff --git a/libs/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto similarity index 100% rename from libs/protocol/pb/moderator_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto diff --git a/libs/protocol/pb/move_card_to_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto similarity index 100% rename from libs/protocol/pb/move_card_to_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto diff --git a/libs/protocol/pb/response.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto similarity index 100% rename from libs/protocol/pb/response.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response.proto diff --git a/libs/protocol/pb/response_activate.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto similarity index 100% rename from libs/protocol/pb/response_activate.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto diff --git a/libs/protocol/pb/response_adjust_mod.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto similarity index 100% rename from libs/protocol/pb/response_adjust_mod.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto diff --git a/libs/protocol/pb/response_ban_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto similarity index 100% rename from libs/protocol/pb/response_ban_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto diff --git a/libs/protocol/pb/response_deck_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto similarity index 100% rename from libs/protocol/pb/response_deck_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto diff --git a/libs/protocol/pb/response_deck_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto similarity index 100% rename from libs/protocol/pb/response_deck_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto diff --git a/libs/protocol/pb/response_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto similarity index 100% rename from libs/protocol/pb/response_deck_upload.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto diff --git a/libs/protocol/pb/response_dump_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto similarity index 100% rename from libs/protocol/pb/response_dump_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto diff --git a/libs/protocol/pb/response_forgotpasswordrequest.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto similarity index 100% rename from libs/protocol/pb/response_forgotpasswordrequest.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto diff --git a/libs/protocol/pb/response_get_admin_notes.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto similarity index 100% rename from libs/protocol/pb/response_get_admin_notes.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto diff --git a/libs/protocol/pb/response_get_games_of_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto similarity index 100% rename from libs/protocol/pb/response_get_games_of_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto diff --git a/libs/protocol/pb/response_get_user_info.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto similarity index 100% rename from libs/protocol/pb/response_get_user_info.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto diff --git a/libs/protocol/pb/response_join_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto similarity index 100% rename from libs/protocol/pb/response_join_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto diff --git a/libs/protocol/pb/response_list_users.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto similarity index 100% rename from libs/protocol/pb/response_list_users.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto diff --git a/libs/protocol/pb/response_login.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto similarity index 100% rename from libs/protocol/pb/response_login.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto diff --git a/libs/protocol/pb/response_password_salt.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto similarity index 100% rename from libs/protocol/pb/response_password_salt.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto diff --git a/libs/protocol/pb/response_register.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto similarity index 100% rename from libs/protocol/pb/response_register.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto diff --git a/libs/protocol/pb/response_replay_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto similarity index 100% rename from libs/protocol/pb/response_replay_download.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto diff --git a/libs/protocol/pb/response_replay_get_code.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto similarity index 100% rename from libs/protocol/pb/response_replay_get_code.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto diff --git a/libs/protocol/pb/response_replay_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto similarity index 100% rename from libs/protocol/pb/response_replay_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto diff --git a/libs/protocol/pb/response_viewlog_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto similarity index 100% rename from libs/protocol/pb/response_viewlog_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto diff --git a/libs/protocol/pb/response_warn_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto similarity index 100% rename from libs/protocol/pb/response_warn_history.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto diff --git a/libs/protocol/pb/response_warn_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto similarity index 100% rename from libs/protocol/pb/response_warn_list.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto diff --git a/libs/protocol/pb/room_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto similarity index 100% rename from libs/protocol/pb/room_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto diff --git a/libs/protocol/pb/room_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto similarity index 100% rename from libs/protocol/pb/room_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto diff --git a/libs/protocol/pb/server_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto similarity index 100% rename from libs/protocol/pb/server_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto diff --git a/libs/protocol/pb/serverinfo_arrow.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto similarity index 100% rename from libs/protocol/pb/serverinfo_arrow.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto diff --git a/libs/protocol/pb/serverinfo_ban.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto similarity index 100% rename from libs/protocol/pb/serverinfo_ban.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto diff --git a/libs/protocol/pb/serverinfo_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto similarity index 100% rename from libs/protocol/pb/serverinfo_card.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto diff --git a/libs/protocol/pb/serverinfo_cardcounter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto similarity index 100% rename from libs/protocol/pb/serverinfo_cardcounter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto diff --git a/libs/protocol/pb/serverinfo_chat_message.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto similarity index 100% rename from libs/protocol/pb/serverinfo_chat_message.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto diff --git a/libs/protocol/pb/serverinfo_counter.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto similarity index 100% rename from libs/protocol/pb/serverinfo_counter.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto diff --git a/libs/protocol/pb/serverinfo_deckstorage.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto similarity index 100% rename from libs/protocol/pb/serverinfo_deckstorage.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto diff --git a/libs/protocol/pb/serverinfo_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto similarity index 100% rename from libs/protocol/pb/serverinfo_game.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto diff --git a/libs/protocol/pb/serverinfo_gametype.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto similarity index 100% rename from libs/protocol/pb/serverinfo_gametype.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto diff --git a/libs/protocol/pb/serverinfo_player.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto similarity index 100% rename from libs/protocol/pb/serverinfo_player.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto diff --git a/libs/protocol/pb/serverinfo_playerping.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto similarity index 100% rename from libs/protocol/pb/serverinfo_playerping.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto diff --git a/libs/protocol/pb/serverinfo_playerproperties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto similarity index 100% rename from libs/protocol/pb/serverinfo_playerproperties.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto diff --git a/libs/protocol/pb/serverinfo_replay.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto similarity index 100% rename from libs/protocol/pb/serverinfo_replay.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto diff --git a/libs/protocol/pb/serverinfo_replay_match.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto similarity index 100% rename from libs/protocol/pb/serverinfo_replay_match.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto diff --git a/libs/protocol/pb/serverinfo_room.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto similarity index 100% rename from libs/protocol/pb/serverinfo_room.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto diff --git a/libs/protocol/pb/serverinfo_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto similarity index 100% rename from libs/protocol/pb/serverinfo_user.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto diff --git a/libs/protocol/pb/serverinfo_warning.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto similarity index 100% rename from libs/protocol/pb/serverinfo_warning.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto diff --git a/libs/protocol/pb/serverinfo_zone.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto similarity index 100% rename from libs/protocol/pb/serverinfo_zone.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto diff --git a/libs/protocol/pb/session_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto similarity index 100% rename from libs/protocol/pb/session_commands.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto diff --git a/libs/protocol/pb/session_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto similarity index 100% rename from libs/protocol/pb/session_event.proto rename to libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt new file mode 100644 index 000000000..0e29e96f2 --- /dev/null +++ b/libcockatrice_rng/CMakeLists.txt @@ -0,0 +1,20 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp + libcockatrice/rng/sfmt/SFMT.c +) + +target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(libcockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}) diff --git a/libs/rng/src/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp similarity index 95% rename from libs/rng/src/rng_abstract.cpp rename to libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp index 83b3a4e79..63072b988 100644 --- a/libs/rng/src/rng_abstract.cpp +++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp @@ -1,4 +1,4 @@ -#include "../include/rng/rng_abstract.h" +#include "rng_abstract.h" #include diff --git a/libs/rng/include/rng/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h similarity index 100% rename from libs/rng/include/rng/rng_abstract.h rename to libcockatrice_rng/libcockatrice/rng/rng_abstract.h diff --git a/libs/rng/src/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp similarity index 99% rename from libs/rng/src/rng_sfmt.cpp rename to libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp index 0267b857d..5a6d8c862 100644 --- a/libs/rng/src/rng_sfmt.cpp +++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp @@ -1,4 +1,4 @@ -#include "../include/rng/rng_sfmt.h" +#include "rng_sfmt.h" #include #include diff --git a/libs/rng/include/rng/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h similarity index 100% rename from libs/rng/include/rng/rng_sfmt.h rename to libcockatrice_rng/libcockatrice/rng/rng_sfmt.h diff --git a/libs/rng/include/rng/sfmt/LICENSE.txt b/libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt similarity index 100% rename from libs/rng/include/rng/sfmt/LICENSE.txt rename to libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt diff --git a/libs/rng/include/rng/sfmt/SFMT-common.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h similarity index 100% rename from libs/rng/include/rng/sfmt/SFMT-common.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h diff --git a/libs/rng/include/rng/sfmt/SFMT-params.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h similarity index 100% rename from libs/rng/include/rng/sfmt/SFMT-params.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h diff --git a/libs/rng/include/rng/sfmt/SFMT-params19937.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h similarity index 100% rename from libs/rng/include/rng/sfmt/SFMT-params19937.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h diff --git a/libs/rng/src/sfmt/SFMT.c b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c similarity index 99% rename from libs/rng/src/sfmt/SFMT.c rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c index 248adde02..b4ac9308b 100644 --- a/libs/rng/src/sfmt/SFMT.c +++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c @@ -23,9 +23,9 @@ extern "C" { #include #include -#include "../include/rng/sfmt/SFMT.h" -#include "../include/rng/sfmt/SFMT-params.h" -#include "../include/rng/sfmt/SFMT-common.h" +#include "SFMT.h" +#include "SFMT-params.h" +#include "SFMT-common.h" #if defined(__BIG_ENDIAN__) && !defined(__amd64) && !defined(BIG_ENDIAN64) #define BIG_ENDIAN64 1 diff --git a/libs/rng/include/rng/sfmt/SFMT.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h similarity index 100% rename from libs/rng/include/rng/sfmt/SFMT.h rename to libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h diff --git a/libcockatrice_server/CMakeLists.txt b/libcockatrice_server/CMakeLists.txt new file mode 100644 index 000000000..28bc6411e --- /dev/null +++ b/libcockatrice_server/CMakeLists.txt @@ -0,0 +1,65 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/server/game/server_abstract_participant.h + libcockatrice/server/game/server_arrow.h + libcockatrice/server/game/server_arrowtarget.h + libcockatrice/server/game/server_card.h + libcockatrice/server/game/server_cardzone.h + libcockatrice/server/game/server_counter.h + libcockatrice/server/game/server_game.h + libcockatrice/server/game/server_player.h + libcockatrice/server/game/server_spectator.h + libcockatrice/server/debug_pb_message.h + libcockatrice/server/get_pb_extension.h + libcockatrice/server/server.h + libcockatrice/server/server_abstractuserinterface.h + libcockatrice/server/server_database_interface.h + libcockatrice/server/server_protocolhandler.h + libcockatrice/server/server_remoteuserinterface.h + libcockatrice/server/server_response_containers.h + libcockatrice/server/server_room.h + libcockatrice/server/serverinfo_user_container.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_server STATIC + ${MOC_SOURCES} + libcockatrice/server/debug_pb_message.cpp + libcockatrice/server/game/server_abstract_participant.cpp + libcockatrice/server/game/server_arrow.cpp + libcockatrice/server/game/server_arrowtarget.cpp + libcockatrice/server/game/server_card.cpp + libcockatrice/server/game/server_cardzone.cpp + libcockatrice/server/game/server_counter.cpp + libcockatrice/server/game/server_game.cpp + libcockatrice/server/game/server_player.cpp + libcockatrice/server/game/server_spectator.cpp + libcockatrice/server/get_pb_extension.cpp + libcockatrice/server/server.cpp + libcockatrice/server/server_abstractuserinterface.cpp + libcockatrice/server/server_database_interface.cpp + libcockatrice/server/server_protocolhandler.cpp + libcockatrice/server/server_remoteuserinterface.cpp + libcockatrice/server/server_response_containers.cpp + libcockatrice/server/server_room.cpp + libcockatrice/server/serverinfo_user_container.cpp +) + +add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper) + +target_include_directories(libcockatrice_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +# Make cockatrice_server depend on cockatrice_protocol +target_link_libraries( + libcockatrice_server PUBLIC libcockatrice_protocol_wrapper libcockatrice_utility libcockatrice_rng + libcockatrice_deck_list ${COCKATRICE_QT_MODULES} +) diff --git a/libs/server/src/debug_pb_message.cpp b/libcockatrice_server/libcockatrice/server/debug_pb_message.cpp similarity index 98% rename from libs/server/src/debug_pb_message.cpp rename to libcockatrice_server/libcockatrice/server/debug_pb_message.cpp index 1ea14415f..f0c3448b5 100644 --- a/libs/server/src/debug_pb_message.cpp +++ b/libcockatrice_server/libcockatrice/server/debug_pb_message.cpp @@ -1,12 +1,11 @@ -#include "../include/server/debug_pb_message.h" - -#include "utility/trice_limits.h" +#include "debug_pb_message.h" #include #include #include #include #include +#include // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it #if GOOGLE_PROTOBUF_VERSION > 3004000 diff --git a/libs/server/include/server/debug_pb_message.h b/libcockatrice_server/libcockatrice/server/debug_pb_message.h similarity index 100% rename from libs/server/include/server/debug_pb_message.h rename to libcockatrice_server/libcockatrice/server/debug_pb_message.h diff --git a/libs/server/src/game/server_abstract_participant.cpp b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp similarity index 82% rename from libs/server/src/game/server_abstract_participant.cpp rename to libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp index 1aaf9f3c9..82720e079 100644 --- a/libs/server/src/game/server_abstract_participant.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp @@ -1,91 +1,91 @@ -#include "../../include/server/game/server_abstract_participant.h" +#include "server_abstract_participant.h" -#include "../../include/server/game/server_arrow.h" -#include "../../include/server/game/server_card.h" -#include "../../include/server/game/server_cardzone.h" -#include "../../include/server/game/server_counter.h" -#include "../../include/server/game/server_game.h" -#include "../../include/server/game/server_player.h" -#include "../../include/server/get_pb_extension.h" -#include "../../include/server/server.h" -#include "../../include/server/server_database_interface.h" -#include "../../include/server/server_room.h" -#include "../include/server/server_abstractuserinterface.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_concede.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_create_counter.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_deck_select.pb.h" -#include "pb/command_del_counter.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_inc_card_counter.pb.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/command_leave_game.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_ready_start.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/command_set_counter.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "pb/context_concede.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/context_ready_start.pb.h" -#include "pb/context_set_sideboard_lock.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "rng/rng_abstract.h" -#include "utility/color.h" -#include "utility/trice_limits.h" +#include "../get_pb_extension.h" +#include "../server.h" +#include "../server_abstractuserinterface.h" +#include "../server_database_interface.h" +#include "../server_room.h" +#include "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 #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game, int _playerId, diff --git a/libs/server/include/server/game/server_abstract_participant.h b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h similarity index 98% rename from libs/server/include/server/game/server_abstract_participant.h rename to libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h index d3a76a8cd..10fbb3349 100644 --- a/libs/server/include/server/game/server_abstract_participant.h +++ b/libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h @@ -2,11 +2,11 @@ #define ABSTRACT_PARTICIPANT_H #include "../serverinfo_user_container.h" -#include "pb/card_attributes.pb.h" -#include "pb/response.pb.h" #include "server_arrowtarget.h" #include +#include +#include class Server_Game; class Server_AbstractUserInterface; diff --git a/libs/server/src/game/server_arrow.cpp b/libcockatrice_server/libcockatrice/server/game/server_arrow.cpp similarity index 79% rename from libs/server/src/game/server_arrow.cpp rename to libcockatrice_server/libcockatrice/server/game/server_arrow.cpp index 7b82976e5..e077416bc 100644 --- a/libs/server/src/game/server_arrow.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_arrow.cpp @@ -1,9 +1,10 @@ -#include "../../include/server/game/server_arrow.h" +#include "server_arrow.h" -#include "../../include/server/game/server_card.h" -#include "../../include/server/game/server_cardzone.h" -#include "../../include/server/game/server_player.h" -#include "pb/serverinfo_arrow.pb.h" +#include "server_card.h" +#include "server_cardzone.h" +#include "server_player.h" + +#include Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor) : id(_id), startCard(_startCard), targetItem(_targetItem), arrowColor(_arrowColor) diff --git a/libs/server/include/server/game/server_arrow.h b/libcockatrice_server/libcockatrice/server/game/server_arrow.h similarity index 95% rename from libs/server/include/server/game/server_arrow.h rename to libcockatrice_server/libcockatrice/server/game/server_arrow.h index 13a6ea2d8..0b3e63550 100644 --- a/libs/server/include/server/game/server_arrow.h +++ b/libcockatrice_server/libcockatrice/server/game/server_arrow.h @@ -1,7 +1,7 @@ #ifndef SERVER_ARROW_H #define SERVER_ARROW_H -#include "pb/color.pb.h" +#include class Server_Card; class Server_ArrowTarget; diff --git a/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp b/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp new file mode 100644 index 000000000..1b3385d58 --- /dev/null +++ b/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp @@ -0,0 +1,2 @@ + +#include "server_arrowtarget.h" diff --git a/libs/server/include/server/game/server_arrowtarget.h b/libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h similarity index 100% rename from libs/server/include/server/game/server_arrowtarget.h rename to libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h diff --git a/libs/server/src/game/server_card.cpp b/libcockatrice_server/libcockatrice/server/game/server_card.cpp similarity index 95% rename from libs/server/src/game/server_card.cpp rename to libcockatrice_server/libcockatrice/server/game/server_card.cpp index d050c399e..3f6aaf272 100644 --- a/libs/server/src/game/server_card.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_card.cpp @@ -17,13 +17,13 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "../../include/server/game/server_card.h" +#include "server_card.h" -#include "../../include/server/game/server_cardzone.h" -#include "../../include/server/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 +#include +#include #include diff --git a/libs/server/include/server/game/server_card.h b/libcockatrice_server/libcockatrice/server/game/server_card.h similarity index 97% rename from libs/server/include/server/game/server_card.h rename to libcockatrice_server/libcockatrice/server/game/server_card.h index b612e59bf..bc326bbc4 100644 --- a/libs/server/include/server/game/server_card.h +++ b/libcockatrice_server/libcockatrice/server/game/server_card.h @@ -20,13 +20,13 @@ #ifndef SERVER_CARD_H #define SERVER_CARD_H -#include "pb/card_attributes.pb.h" -#include "pb/serverinfo_card.pb.h" #include "server_arrowtarget.h" -#include "utility/card_ref.h" #include #include +#include +#include +#include class Server_CardZone; class Event_SetCardCounter; diff --git a/libs/server/src/game/server_cardzone.cpp b/libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp similarity index 98% rename from libs/server/src/game/server_cardzone.cpp rename to libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp index f2f7a275a..cd5fd4507 100644 --- a/libs/server/src/game/server_cardzone.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp @@ -17,15 +17,15 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "../../include/server/game/server_cardzone.h" +#include "server_cardzone.h" -#include "../../include/server/game/server_card.h" -#include "../../include/server/game/server_player.h" -#include "pb/command_move_card.pb.h" -#include "rng/rng_abstract.h" +#include "server_card.h" +#include "server_player.h" #include #include +#include +#include Server_CardZone::Server_CardZone(Server_Player *_player, const QString &_name, diff --git a/libs/server/include/server/game/server_cardzone.h b/libcockatrice_server/libcockatrice/server/game/server_cardzone.h similarity index 98% rename from libs/server/include/server/game/server_cardzone.h rename to libcockatrice_server/libcockatrice/server/game/server_cardzone.h index 4c7318f08..0456c6bd7 100644 --- a/libs/server/include/server/game/server_cardzone.h +++ b/libcockatrice_server/libcockatrice/server/game/server_cardzone.h @@ -20,7 +20,7 @@ #ifndef SERVER_CARDZONE_H #define SERVER_CARDZONE_H -#include "pb/serverinfo_zone.pb.h" +#include #include #include diff --git a/libs/server/src/game/server_counter.cpp b/libcockatrice_server/libcockatrice/server/game/server_counter.cpp similarity index 82% rename from libs/server/src/game/server_counter.cpp rename to libcockatrice_server/libcockatrice/server/game/server_counter.cpp index 621c63c8a..b18e11c2b 100644 --- a/libs/server/src/game/server_counter.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_counter.cpp @@ -1,6 +1,6 @@ -#include "../../include/server/game/server_counter.h" +#include "server_counter.h" -#include "pb/serverinfo_counter.pb.h" +#include Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count) : id(_id), name(_name), counterColor(_counterColor), radius(_radius), count(_count) diff --git a/libs/server/include/server/game/server_counter.h b/libcockatrice_server/libcockatrice/server/game/server_counter.h similarity index 97% rename from libs/server/include/server/game/server_counter.h rename to libcockatrice_server/libcockatrice/server/game/server_counter.h index 3a5f837ae..3ed4165ed 100644 --- a/libs/server/include/server/game/server_counter.h +++ b/libcockatrice_server/libcockatrice/server/game/server_counter.h @@ -20,7 +20,7 @@ #ifndef SERVER_COUNTER_H #define SERVER_COUNTER_H -#include "pb/color.pb.h" +#include #include diff --git a/libs/server/src/game/server_game.cpp b/libcockatrice_server/libcockatrice/server/game/server_game.cpp similarity index 95% rename from libs/server/src/game/server_game.cpp rename to libcockatrice_server/libcockatrice/server/game/server_game.cpp index 5e4f4c63b..482bcf662 100644 --- a/libs/server/src/game/server_game.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_game.cpp @@ -17,35 +17,35 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "../../include/server/game/server_game.h" +#include "server_game.h" -#include "../../include/server/game/server_arrow.h" -#include "../../include/server/game/server_card.h" -#include "../../include/server/game/server_cardzone.h" -#include "../../include/server/game/server_player.h" -#include "../../include/server/game/server_spectator.h" -#include "../../include/server/server.h" -#include "../../include/server/server_database_interface.h" -#include "../../include/server/server_protocolhandler.h" -#include "../../include/server/server_room.h" -#include "deck_list/deck_list.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_ping_changed.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_game_closed.pb.h" -#include "pb/event_game_host_changed.pb.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_game_state_changed.pb.h" -#include "pb/event_join.pb.h" -#include "pb/event_kicked.pb.h" -#include "pb/event_leave.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_set_active_phase.pb.h" -#include "pb/event_set_active_player.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/serverinfo_playerping.pb.h" +#include "server_arrow.h" +#include "server_card.h" +#include "server_cardzone.h" +#include "server_player.h" +#include "server_spectator.h" +#include "../server.h" +#include "../server_database_interface.h" +#include "../server_protocolhandler.h" +#include "../server_room.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/libs/server/include/server/game/server_game.h b/libcockatrice_server/libcockatrice/server/game/server_game.h similarity index 97% rename from libs/server/include/server/game/server_game.h rename to libcockatrice_server/libcockatrice/server/game/server_game.h index 6bb162763..1fce1ddbd 100644 --- a/libs/server/include/server/game/server_game.h +++ b/libcockatrice_server/libcockatrice/server/game/server_game.h @@ -21,9 +21,9 @@ #define SERVERGAME_H #include "../server_response_containers.h" -#include "pb/event_leave.pb.h" -#include "pb/response.pb.h" -#include "pb/serverinfo_game.pb.h" +#include +#include +#include #include #include diff --git a/libs/server/src/game/server_player.cpp b/libcockatrice_server/libcockatrice/server/game/server_player.cpp similarity index 94% rename from libs/server/src/game/server_player.cpp rename to libcockatrice_server/libcockatrice/server/game/server_player.cpp index 706526c19..fcc5141b7 100644 --- a/libs/server/src/game/server_player.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_player.cpp @@ -1,90 +1,90 @@ -#include "../../include/server/game/server_player.h" +#include "server_player.h" -#include "../../include/server/game/server_arrow.h" -#include "../../include/server/game/server_card.h" -#include "../../include/server/game/server_cardzone.h" -#include "../../include/server/game/server_counter.h" -#include "../../include/server/game/server_game.h" -#include "../../include/server/get_pb_extension.h" -#include "../../include/server/server.h" -#include "../../include/server/server_database_interface.h" -#include "../../include/server/server_room.h" -#include "../include/server/server_abstractuserinterface.h" -#include "deck_list/deck_list.h" -#include "deck_list/deck_list_card_node.h" -#include "pb/command_attach_card.pb.h" -#include "pb/command_change_zone_properties.pb.h" -#include "pb/command_concede.pb.h" -#include "pb/command_create_arrow.pb.h" -#include "pb/command_create_counter.pb.h" -#include "pb/command_create_token.pb.h" -#include "pb/command_deck_select.pb.h" -#include "pb/command_del_counter.pb.h" -#include "pb/command_delete_arrow.pb.h" -#include "pb/command_draw_cards.pb.h" -#include "pb/command_dump_zone.pb.h" -#include "pb/command_flip_card.pb.h" -#include "pb/command_game_say.pb.h" -#include "pb/command_inc_card_counter.pb.h" -#include "pb/command_inc_counter.pb.h" -#include "pb/command_kick_from_game.pb.h" -#include "pb/command_leave_game.pb.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_mulligan.pb.h" -#include "pb/command_next_turn.pb.h" -#include "pb/command_ready_start.pb.h" -#include "pb/command_reveal_cards.pb.h" -#include "pb/command_reverse_turn.pb.h" -#include "pb/command_roll_die.pb.h" -#include "pb/command_set_active_phase.pb.h" -#include "pb/command_set_card_attr.pb.h" -#include "pb/command_set_card_counter.pb.h" -#include "pb/command_set_counter.pb.h" -#include "pb/command_set_sideboard_lock.pb.h" -#include "pb/command_set_sideboard_plan.pb.h" -#include "pb/command_shuffle.pb.h" -#include "pb/command_undo_draw.pb.h" -#include "pb/context_concede.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/context_ready_start.pb.h" -#include "pb/context_set_sideboard_lock.pb.h" -#include "pb/context_undo_draw.pb.h" -#include "pb/event_attach_card.pb.h" -#include "pb/event_change_zone_properties.pb.h" -#include "pb/event_create_arrow.pb.h" -#include "pb/event_create_counter.pb.h" -#include "pb/event_create_token.pb.h" -#include "pb/event_del_counter.pb.h" -#include "pb/event_delete_arrow.pb.h" -#include "pb/event_destroy_card.pb.h" -#include "pb/event_draw_cards.pb.h" -#include "pb/event_dump_zone.pb.h" -#include "pb/event_flip_card.pb.h" -#include "pb/event_game_say.pb.h" -#include "pb/event_move_card.pb.h" -#include "pb/event_player_properties_changed.pb.h" -#include "pb/event_reveal_cards.pb.h" -#include "pb/event_reverse_turn.pb.h" -#include "pb/event_roll_die.pb.h" -#include "pb/event_set_card_attr.pb.h" -#include "pb/event_set_card_counter.pb.h" -#include "pb/event_set_counter.pb.h" -#include "pb/event_shuffle.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_dump_zone.pb.h" -#include "pb/serverinfo_player.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "rng/rng_abstract.h" -#include "utility/color.h" -#include "utility/trice_limits.h" +#include "../get_pb_extension.h" +#include "../server.h" +#include "../server_abstractuserinterface.h" +#include "../server_database_interface.h" +#include "../server_room.h" +#include "server_arrow.h" +#include "server_card.h" +#include "server_cardzone.h" +#include "server_counter.h" +#include "server_game.h" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct MoveCardStruct { diff --git a/libs/server/include/server/game/server_player.h b/libcockatrice_server/libcockatrice/server/game/server_player.h similarity index 100% rename from libs/server/include/server/game/server_player.h rename to libcockatrice_server/libcockatrice/server/game/server_player.h diff --git a/libs/server/src/game/server_spectator.cpp b/libcockatrice_server/libcockatrice/server/game/server_spectator.cpp similarity index 88% rename from libs/server/src/game/server_spectator.cpp rename to libcockatrice_server/libcockatrice/server/game/server_spectator.cpp index 57ba8de05..bc873e386 100644 --- a/libs/server/src/game/server_spectator.cpp +++ b/libcockatrice_server/libcockatrice/server/game/server_spectator.cpp @@ -1,4 +1,4 @@ -#include "../../include/server/game/server_spectator.h" +#include "server_spectator.h" Server_Spectator::Server_Spectator(Server_Game *_game, int _playerId, diff --git a/libs/server/include/server/game/server_spectator.h b/libcockatrice_server/libcockatrice/server/game/server_spectator.h similarity index 100% rename from libs/server/include/server/game/server_spectator.h rename to libcockatrice_server/libcockatrice/server/game/server_spectator.h diff --git a/libs/server/src/get_pb_extension.cpp b/libcockatrice_server/libcockatrice/server/get_pb_extension.cpp similarity index 90% rename from libs/server/src/get_pb_extension.cpp rename to libcockatrice_server/libcockatrice/server/get_pb_extension.cpp index 9980186a7..d6235858a 100644 --- a/libs/server/src/get_pb_extension.cpp +++ b/libcockatrice_server/libcockatrice/server/get_pb_extension.cpp @@ -1,4 +1,4 @@ -#include "../include/server/get_pb_extension.h" +#include "get_pb_extension.h" #include #include diff --git a/libs/server/include/server/get_pb_extension.h b/libcockatrice_server/libcockatrice/server/get_pb_extension.h similarity index 100% rename from libs/server/include/server/get_pb_extension.h rename to libcockatrice_server/libcockatrice/server/get_pb_extension.h diff --git a/libs/server/include/server/room_message_type.h b/libcockatrice_server/libcockatrice/server/room_message_type.h similarity index 86% rename from libs/server/include/server/room_message_type.h rename to libcockatrice_server/libcockatrice/server/room_message_type.h index 7b7ad9aca..59ee34933 100644 --- a/libs/server/include/server/room_message_type.h +++ b/libcockatrice_server/libcockatrice/server/room_message_type.h @@ -6,7 +6,7 @@ // https://github.com/protocolbuffers/protobuf/issues/119 #undef TYPE_BOOL #endif -#include "pb/event_room_say.pb.h" +#include #include diff --git a/libs/server/src/server.cpp b/libcockatrice_server/libcockatrice/server/server.cpp similarity index 97% rename from libs/server/src/server.cpp rename to libcockatrice_server/libcockatrice/server/server.cpp index d36c4f13c..babcc3554 100644 --- a/libs/server/src/server.cpp +++ b/libcockatrice_server/libcockatrice/server/server.cpp @@ -17,22 +17,22 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "../include/server/server.h" +#include "server.h" -#include "../include/server/debug_pb_message.h" -#include "../include/server/game/server_game.h" -#include "../include/server/game/server_player.h" -#include "../include/server/server_database_interface.h" -#include "../include/server/server_protocolhandler.h" -#include "../include/server/server_remoteuserinterface.h" -#include "../include/server/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 "utility/featureset.h" +#include "debug_pb_message.h" +#include "game/server_game.h" +#include "game/server_player.h" +#include "server_database_interface.h" +#include "server_protocolhandler.h" +#include "server_remoteuserinterface.h" +#include "server_room.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/libs/server/include/server/server.h b/libcockatrice_server/libcockatrice/server/server.h similarity index 96% rename from libs/server/include/server/server.h rename to libcockatrice_server/libcockatrice/server/server.h index 293aeb5b2..462014f49 100644 --- a/libs/server/include/server/server.h +++ b/libcockatrice_server/libcockatrice/server/server.h @@ -1,11 +1,11 @@ #ifndef SERVER_H #define SERVER_H -#include "pb/commands.pb.h" -#include "pb/serverinfo_ban.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "pb/serverinfo_warning.pb.h" +#include +#include +#include +#include +#include #include "server_player_reference.h" #include diff --git a/libs/server/src/server_abstractuserinterface.cpp b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp similarity index 90% rename from libs/server/src/server_abstractuserinterface.cpp rename to libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp index 4c0ed9c68..ceec4fb8c 100644 --- a/libs/server/src/server_abstractuserinterface.cpp +++ b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp @@ -1,13 +1,13 @@ -#include "../include/server/server_abstractuserinterface.h" +#include "server_abstractuserinterface.h" -#include "../include/server/game/server_game.h" -#include "../include/server/game/server_player.h" -#include "../include/server/server.h" -#include "../include/server/server_player_reference.h" -#include "../include/server/server_response_containers.h" -#include "../include/server/server_room.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_game_state_changed.pb.h" +#include "game/server_game.h" +#include "game/server_player.h" +#include "server.h" +#include "server_player_reference.h" +#include "server_response_containers.h" +#include "server_room.h" +#include +#include #include #include diff --git a/libs/server/include/server/server_abstractuserinterface.h b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h similarity index 94% rename from libs/server/include/server/server_abstractuserinterface.h rename to libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h index 763bcc567..ca67b3eea 100644 --- a/libs/server/include/server/server_abstractuserinterface.h +++ b/libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h @@ -1,9 +1,9 @@ #ifndef SERVER_ABSTRACTUSERINTERFACE #define SERVER_ABSTRACTUSERINTERFACE -#include "pb/response.pb.h" -#include "pb/server_message.pb.h" #include "serverinfo_user_container.h" +#include +#include #include #include diff --git a/libcockatrice_server/libcockatrice/server/server_database_interface.cpp b/libcockatrice_server/libcockatrice/server/server_database_interface.cpp new file mode 100644 index 000000000..a375f6031 --- /dev/null +++ b/libcockatrice_server/libcockatrice/server/server_database_interface.cpp @@ -0,0 +1,2 @@ + +#include "server_database_interface.h" diff --git a/libs/server/include/server/server_database_interface.h b/libcockatrice_server/libcockatrice/server/server_database_interface.h similarity index 100% rename from libs/server/include/server/server_database_interface.h rename to libcockatrice_server/libcockatrice/server/server_database_interface.h diff --git a/libs/server/include/server/server_player_reference.h b/libcockatrice_server/libcockatrice/server/server_player_reference.h similarity index 100% rename from libs/server/include/server/server_player_reference.h rename to libcockatrice_server/libcockatrice/server/server_player_reference.h diff --git a/libs/server/src/server_protocolhandler.cpp b/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp similarity index 96% rename from libs/server/src/server_protocolhandler.cpp rename to libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp index a9856b355..c37e5a315 100644 --- a/libs/server/src/server_protocolhandler.cpp +++ b/libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp @@ -1,27 +1,27 @@ -#include "../include/server/server_protocolhandler.h" +#include "server_protocolhandler.h" -#include "../include/server/debug_pb_message.h" -#include "../include/server/game/server_game.h" -#include "../include/server/game/server_player.h" -#include "../include/server/get_pb_extension.h" -#include "../include/server/server_database_interface.h" -#include "../include/server/server_room.h" -#include "pb/commands.pb.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_list_rooms.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/response.pb.h" -#include "pb/response_get_games_of_user.pb.h" -#include "pb/response_get_user_info.pb.h" -#include "pb/response_join_room.pb.h" -#include "pb/response_list_users.pb.h" -#include "pb/response_login.pb.h" -#include "pb/serverinfo_user.pb.h" -#include "utility/featureset.h" -#include "utility/trice_limits.h" +#include "debug_pb_message.h" +#include "game/server_game.h" +#include "game/server_player.h" +#include "get_pb_extension.h" +#include "server_database_interface.h" +#include "server_room.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/libs/server/include/server/server_protocolhandler.h b/libcockatrice_server/libcockatrice/server/server_protocolhandler.h similarity index 97% rename from libs/server/include/server/server_protocolhandler.h rename to libcockatrice_server/libcockatrice/server/server_protocolhandler.h index b80e08c7e..9f09dff91 100644 --- a/libs/server/include/server/server_protocolhandler.h +++ b/libcockatrice_server/libcockatrice/server/server_protocolhandler.h @@ -1,8 +1,8 @@ #ifndef SERVER_PROTOCOLHANDLER_H #define SERVER_PROTOCOLHANDLER_H -#include "pb/response.pb.h" -#include "pb/server_message.pb.h" +#include +#include #include "server.h" #include "server_abstractuserinterface.h" diff --git a/libs/server/src/server_remoteuserinterface.cpp b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp similarity index 83% rename from libs/server/src/server_remoteuserinterface.cpp rename to libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp index fb75d89df..474ceae2b 100644 --- a/libs/server/src/server_remoteuserinterface.cpp +++ b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp @@ -1,7 +1,7 @@ -#include "../include/server/server_remoteuserinterface.h" +#include "server_remoteuserinterface.h" -#include "../include/server/server.h" -#include "pb/serverinfo_user.pb.h" +#include "server.h" +#include void Server_RemoteUserInterface::sendProtocolItem(const Response &item) { diff --git a/libs/server/include/server/server_remoteuserinterface.h b/libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h similarity index 100% rename from libs/server/include/server/server_remoteuserinterface.h rename to libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h diff --git a/libs/server/src/server_response_containers.cpp b/libcockatrice_server/libcockatrice/server/server_response_containers.cpp similarity index 96% rename from libs/server/src/server_response_containers.cpp rename to libcockatrice_server/libcockatrice/server/server_response_containers.cpp index fe76c814a..9b07bdb91 100644 --- a/libs/server/src/server_response_containers.cpp +++ b/libcockatrice_server/libcockatrice/server/server_response_containers.cpp @@ -1,6 +1,6 @@ -#include "../include/server/server_response_containers.h" +#include "server_response_containers.h" -#include "../include/server/game/server_game.h" +#include "game/server_game.h" #include diff --git a/libs/server/include/server/server_response_containers.h b/libcockatrice_server/libcockatrice/server/server_response_containers.h similarity index 98% rename from libs/server/include/server/server_response_containers.h rename to libcockatrice_server/libcockatrice/server/server_response_containers.h index 31e00c54e..446fc6e8f 100644 --- a/libs/server/include/server/server_response_containers.h +++ b/libcockatrice_server/libcockatrice/server/server_response_containers.h @@ -1,7 +1,7 @@ #ifndef SERVER_RESPONSE_CONTAINERS_H #define SERVER_RESPONSE_CONTAINERS_H -#include "pb/server_message.pb.h" +#include #include #include diff --git a/libs/server/src/server_room.cpp b/libcockatrice_server/libcockatrice/server/server_room.cpp similarity index 95% rename from libs/server/src/server_room.cpp rename to libcockatrice_server/libcockatrice/server/server_room.cpp index e015a9a01..e94b255bd 100644 --- a/libs/server/src/server_room.cpp +++ b/libcockatrice_server/libcockatrice/server/server_room.cpp @@ -1,21 +1,21 @@ -#include "../include/server/server_room.h" +#include "server_room.h" -#include "../include/server/game/server_game.h" -#include "../include/server/server_protocolhandler.h" -#include "pb/commands.pb.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "utility/trice_limits.h" +#include "game/server_game.h" +#include "server_protocolhandler.h" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Server_Room::Server_Room(int _id, int _chatHistorySize, diff --git a/libs/server/include/server/server_room.h b/libcockatrice_server/libcockatrice/server/server_room.h similarity index 97% rename from libs/server/include/server/server_room.h rename to libcockatrice_server/libcockatrice/server/server_room.h index 7c804a461..34b9063e9 100644 --- a/libs/server/include/server/server_room.h +++ b/libcockatrice_server/libcockatrice/server/server_room.h @@ -1,8 +1,6 @@ #ifndef SERVER_ROOM_H #define SERVER_ROOM_H -#include "pb/response.pb.h" -#include "pb/serverinfo_chat_message.pb.h" #include "serverinfo_user_container.h" #include @@ -11,6 +9,8 @@ #include #include #include +#include +#include class Server_DatabaseInterface; class Server_ProtocolHandler; diff --git a/libs/server/src/serverinfo_user_container.cpp b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp similarity index 94% rename from libs/server/src/serverinfo_user_container.cpp rename to libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp index 98504cce2..77ff38906 100644 --- a/libs/server/src/serverinfo_user_container.cpp +++ b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp @@ -1,6 +1,6 @@ -#include "../include/server/serverinfo_user_container.h" +#include "serverinfo_user_container.h" -#include "pb/serverinfo_user.pb.h" +#include ServerInfo_User_Container::ServerInfo_User_Container(ServerInfo_User *_userInfo) : userInfo(_userInfo) { diff --git a/libs/server/include/server/serverinfo_user_container.h b/libcockatrice_server/libcockatrice/server/serverinfo_user_container.h similarity index 100% rename from libs/server/include/server/serverinfo_user_container.h rename to libcockatrice_server/libcockatrice/server/serverinfo_user_container.h diff --git a/libs/server/include/server/user_level.h b/libcockatrice_server/libcockatrice/server/user_level.h similarity index 85% rename from libs/server/include/server/user_level.h rename to libcockatrice_server/libcockatrice/server/user_level.h index 5d720c0aa..adc07f7e7 100644 --- a/libs/server/include/server/user_level.h +++ b/libcockatrice_server/libcockatrice/server/user_level.h @@ -6,7 +6,7 @@ // https://github.com/protocolbuffers/protobuf/issues/119 #undef TYPE_BOOL #endif -#include "pb/serverinfo_user.pb.h" +#include #include diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt new file mode 100644 index 000000000..bacb397bf --- /dev/null +++ b/libcockatrice_settings/CMakeLists.txt @@ -0,0 +1,53 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS + libcockatrice/settings/cache_settings.h + libcockatrice/settings/card_counter_settings.h + libcockatrice/settings/card_database_settings.h + libcockatrice/settings/card_override_settings.h + libcockatrice/settings/debug_settings.h + libcockatrice/settings/download_settings.h + libcockatrice/settings/game_filters_settings.h + libcockatrice/settings/layouts_settings.h + libcockatrice/settings/message_settings.h + libcockatrice/settings/recents_settings.h + libcockatrice/settings/servers_settings.h + libcockatrice/settings/settings_manager.h + libcockatrice/settings/shortcut_treeview.h + libcockatrice/settings/shortcuts_settings.h +) + +if(Qt6_FOUND) + qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) +elseif(Qt5_FOUND) + qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) +endif() + +add_library( + libcockatrice_settings STATIC + ${MOC_SOURCES} + libcockatrice/settings/cache_settings.cpp + libcockatrice/settings/card_counter_settings.cpp + libcockatrice/settings/card_database_settings.cpp + libcockatrice/settings/card_override_settings.cpp + libcockatrice/settings/debug_settings.cpp + libcockatrice/settings/download_settings.cpp + libcockatrice/settings/game_filters_settings.cpp + libcockatrice/settings/layouts_settings.cpp + libcockatrice/settings/message_settings.cpp + libcockatrice/settings/recents_settings.cpp + libcockatrice/settings/servers_settings.cpp + libcockatrice/settings/settings_manager.cpp + libcockatrice/settings/shortcut_treeview.cpp + libcockatrice/settings/shortcuts_settings.cpp +) + +target_include_directories( + libcockatrice_settings + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network +) + +target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_utility ${COCKATRICE_QT_MODULES}) diff --git a/libs/settings/src/cache_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp similarity index 99% rename from libs/settings/src/cache_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/cache_settings.cpp index c3e15c530..65b410daf 100644 --- a/libs/settings/src/cache_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp @@ -1,7 +1,7 @@ -#include "../include/settings/cache_settings.h" +#include "cache_settings.h" -#include "../include/settings/card_counter_settings.h" -#include "../include/settings/card_override_settings.h" +#include "card_counter_settings.h" +#include "card_override_settings.h" #include "release_channel.h" #include diff --git a/libs/settings/include/settings/cache_settings.h b/libcockatrice_settings/libcockatrice/settings/cache_settings.h similarity index 99% rename from libs/settings/include/settings/cache_settings.h rename to libcockatrice_settings/libcockatrice/settings/cache_settings.h index 12110a380..90eba0cb1 100644 --- a/libs/settings/include/settings/cache_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/cache_settings.h @@ -17,13 +17,13 @@ #include "recents_settings.h" #include "servers_settings.h" #include "shortcuts_settings.h" -#include "utility/macros.h" #include #include #include #include #include +#include inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache"); diff --git a/libs/settings/src/card_counter_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp similarity index 96% rename from libs/settings/src/card_counter_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp index ae17a605e..d22eb239f 100644 --- a/libs/settings/src/card_counter_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/card_counter_settings.h" +#include "card_counter_settings.h" #include #include diff --git a/libs/settings/include/settings/card_counter_settings.h b/libcockatrice_settings/libcockatrice/settings/card_counter_settings.h similarity index 100% rename from libs/settings/include/settings/card_counter_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_counter_settings.h diff --git a/libs/settings/src/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp similarity index 94% rename from libs/settings/src/card_database_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp index eac8ae11c..f0b8d58b1 100644 --- a/libs/settings/src/card_database_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/card_database_settings.h" +#include "card_database_settings.h" CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardDatabase.ini", parent) diff --git a/libs/settings/include/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h similarity index 100% rename from libs/settings/include/settings/card_database_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_database_settings.h diff --git a/libs/settings/src/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp similarity index 90% rename from libs/settings/src/card_override_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp index a23ab75c5..2e2c7607d 100644 --- a/libs/settings/src/card_override_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/card_override_settings.h" +#include "card_override_settings.h" CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent) diff --git a/libs/settings/include/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h similarity index 93% rename from libs/settings/include/settings/card_override_settings.h rename to libcockatrice_settings/libcockatrice/settings/card_override_settings.h index 6fa640c50..d5ee0287b 100644 --- a/libs/settings/include/settings/card_override_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h @@ -7,10 +7,10 @@ #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H -#include "../../../utility/include/utility/card_ref.h" #include "settings_manager.h" #include +#include class CardOverrideSettings : public SettingsManager { diff --git a/libs/settings/src/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp similarity index 94% rename from libs/settings/src/debug_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/debug_settings.cpp index cb20f3299..f6f12f60e 100644 --- a/libs/settings/src/debug_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/debug_settings.h" +#include "debug_settings.h" #include diff --git a/libs/settings/include/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h similarity index 100% rename from libs/settings/include/settings/debug_settings.h rename to libcockatrice_settings/libcockatrice/settings/debug_settings.h diff --git a/libs/settings/src/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp similarity index 90% rename from libs/settings/src/download_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/download_settings.cpp index 02dcfca00..adbe26363 100644 --- a/libs/settings/src/download_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp @@ -1,6 +1,6 @@ -#include "../include/settings/download_settings.h" +#include "download_settings.h" -#include "../include/settings/settings_manager.h" +#include "settings_manager.h" const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = { "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!", diff --git a/libs/settings/include/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h similarity index 100% rename from libs/settings/include/settings/download_settings.h rename to libcockatrice_settings/libcockatrice/settings/download_settings.h diff --git a/libs/settings/src/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp similarity index 99% rename from libs/settings/src/game_filters_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp index 8131cfda1..e82b18a47 100644 --- a/libs/settings/src/game_filters_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/game_filters_settings.h" +#include "game_filters_settings.h" #include #include diff --git a/libs/settings/include/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h similarity index 100% rename from libs/settings/include/settings/game_filters_settings.h rename to libcockatrice_settings/libcockatrice/settings/game_filters_settings.h diff --git a/libs/settings/src/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp similarity index 99% rename from libs/settings/src/layouts_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp index 15f6fcab1..5791cbfe9 100644 --- a/libs/settings/src/layouts_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/layouts_settings.h" +#include "layouts_settings.h" LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "layouts.ini", parent) diff --git a/libs/settings/include/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h similarity index 100% rename from libs/settings/include/settings/layouts_settings.h rename to libcockatrice_settings/libcockatrice/settings/layouts_settings.h diff --git a/libs/settings/src/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp similarity index 92% rename from libs/settings/src/message_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/message_settings.cpp index c9e211ac8..786ea9cd1 100644 --- a/libs/settings/src/message_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/message_settings.h" +#include "message_settings.h" MessageSettings::MessageSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "messages.ini", parent) diff --git a/libs/settings/include/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h similarity index 100% rename from libs/settings/include/settings/message_settings.h rename to libcockatrice_settings/libcockatrice/settings/message_settings.h diff --git a/libs/settings/src/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp similarity index 95% rename from libs/settings/src/recents_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/recents_settings.cpp index f51d77589..5bbec3c8c 100644 --- a/libs/settings/src/recents_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/recents_settings.h" +#include "recents_settings.h" #define MAX_RECENT_DECK_COUNT 10 diff --git a/libs/settings/include/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h similarity index 100% rename from libs/settings/include/settings/recents_settings.h rename to libcockatrice_settings/libcockatrice/settings/recents_settings.h diff --git a/libs/settings/src/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp similarity index 99% rename from libs/settings/src/servers_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/servers_settings.cpp index a1b0e739c..01a6c795b 100644 --- a/libs/settings/src/servers_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/servers_settings.h" +#include "servers_settings.h" #include #include diff --git a/libs/settings/include/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h similarity index 100% rename from libs/settings/include/settings/servers_settings.h rename to libcockatrice_settings/libcockatrice/settings/servers_settings.h diff --git a/libs/settings/src/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp similarity index 97% rename from libs/settings/src/settings_manager.cpp rename to libcockatrice_settings/libcockatrice/settings/settings_manager.cpp index a76da4ffb..dc2da741e 100644 --- a/libs/settings/src/settings_manager.cpp +++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/settings_manager.h" +#include "settings_manager.h" SettingsManager::SettingsManager(const QString &settingPath, QObject *parent) : QObject(parent), settings(settingPath, QSettings::IniFormat) diff --git a/libs/settings/include/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h similarity index 100% rename from libs/settings/include/settings/settings_manager.h rename to libcockatrice_settings/libcockatrice/settings/settings_manager.h diff --git a/libs/settings/src/shortcut_treeview.cpp b/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp similarity index 97% rename from libs/settings/src/shortcut_treeview.cpp rename to libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp index 4fa64151f..6b329b23d 100644 --- a/libs/settings/src/shortcut_treeview.cpp +++ b/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp @@ -1,7 +1,7 @@ -#include "../include/settings/shortcut_treeview.h" +#include "shortcut_treeview.h" -#include "../include/settings/cache_settings.h" -#include "../include/settings/shortcuts_settings.h" +#include "cache_settings.h" +#include "shortcuts_settings.h" #include diff --git a/libs/settings/include/settings/shortcut_treeview.h b/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h similarity index 100% rename from libs/settings/include/settings/shortcut_treeview.h rename to libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h diff --git a/libs/settings/src/shortcuts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp similarity index 99% rename from libs/settings/src/shortcuts_settings.cpp rename to libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp index 07542d303..53c6f6a23 100644 --- a/libs/settings/src/shortcuts_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp @@ -1,4 +1,4 @@ -#include "../include/settings/shortcuts_settings.h" +#include "shortcuts_settings.h" #include #include diff --git a/libs/settings/include/settings/shortcuts_settings.h b/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h similarity index 100% rename from libs/settings/include/settings/shortcuts_settings.h rename to libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt new file mode 100644 index 000000000..e531b7983 --- /dev/null +++ b/libcockatrice_utility/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.16) +project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(UTILITY_SOURCES + libcockatrice/utility/expression.cpp libcockatrice/utility/featureset.cpp libcockatrice/utility/key_signals.cpp + libcockatrice/utility/levenshtein.cpp libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp +) + +set(UTILITY_HEADERS + libcockatrice/utility/color.h + libcockatrice/utility/expression.h + libcockatrice/utility/featureset.h + libcockatrice/utility/key_signals.h + libcockatrice/utility/levenshtein.h + libcockatrice/utility/logger.h + libcockatrice/utility/macros.h + libcockatrice/utility/passwordhasher.h + libcockatrice/utility/trice_limits.h +) + +add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) + +target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${COCKATRICE_QT_MODULES}) + +set(ORACLE_LIBS) + +include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) diff --git a/libs/utility/include/utility/card_ref.h b/libcockatrice_utility/libcockatrice/utility/card_ref.h similarity index 100% rename from libs/utility/include/utility/card_ref.h rename to libcockatrice_utility/libcockatrice/utility/card_ref.h diff --git a/libs/utility/include/utility/color.h b/libcockatrice_utility/libcockatrice/utility/color.h similarity index 91% rename from libs/utility/include/utility/color.h rename to libcockatrice_utility/libcockatrice/utility/color.h index 1ea3e33df..164c6ffd7 100644 --- a/libs/utility/include/utility/color.h +++ b/libcockatrice_utility/libcockatrice/utility/color.h @@ -5,7 +5,7 @@ #include #endif -#include "pb/color.pb.h" +#include #ifdef QT_GUI_LIB inline QColor convertColorToQColor(const color &c) diff --git a/libs/utility/src/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp similarity index 97% rename from libs/utility/src/expression.cpp rename to libcockatrice_utility/libcockatrice/utility/expression.cpp index 5d76c1eeb..3b2e815d1 100644 --- a/libs/utility/src/expression.cpp +++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp @@ -1,6 +1,6 @@ -#include "../include/utility/expression.h" +#include "expression.h" -#include "../../../common/lib/peglib.h" +#include "peglib.h" #include #include diff --git a/libs/utility/include/utility/expression.h b/libcockatrice_utility/libcockatrice/utility/expression.h similarity index 100% rename from libs/utility/include/utility/expression.h rename to libcockatrice_utility/libcockatrice/utility/expression.h diff --git a/libs/utility/src/featureset.cpp b/libcockatrice_utility/libcockatrice/utility/featureset.cpp similarity index 98% rename from libs/utility/src/featureset.cpp rename to libcockatrice_utility/libcockatrice/utility/featureset.cpp index 0fdc282c5..d9f253ab9 100644 --- a/libs/utility/src/featureset.cpp +++ b/libcockatrice_utility/libcockatrice/utility/featureset.cpp @@ -1,4 +1,4 @@ -#include "../include/utility/featureset.h" +#include "featureset.h" #include #include diff --git a/libs/utility/include/utility/featureset.h b/libcockatrice_utility/libcockatrice/utility/featureset.h similarity index 100% rename from libs/utility/include/utility/featureset.h rename to libcockatrice_utility/libcockatrice/utility/featureset.h diff --git a/libs/utility/src/key_signals.cpp b/libcockatrice_utility/libcockatrice/utility/key_signals.cpp similarity index 98% rename from libs/utility/src/key_signals.cpp rename to libcockatrice_utility/libcockatrice/utility/key_signals.cpp index d9af6dd68..b4a38fad5 100644 --- a/libs/utility/src/key_signals.cpp +++ b/libcockatrice_utility/libcockatrice/utility/key_signals.cpp @@ -1,4 +1,4 @@ -#include "../include/utility/key_signals.h" +#include "key_signals.h" #include diff --git a/libs/utility/include/utility/key_signals.h b/libcockatrice_utility/libcockatrice/utility/key_signals.h similarity index 100% rename from libs/utility/include/utility/key_signals.h rename to libcockatrice_utility/libcockatrice/utility/key_signals.h diff --git a/libs/utility/src/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp similarity index 93% rename from libs/utility/src/levenshtein.cpp rename to libcockatrice_utility/libcockatrice/utility/levenshtein.cpp index a68b1da61..cfb972f91 100644 --- a/libs/utility/src/levenshtein.cpp +++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp @@ -1,4 +1,4 @@ -#include "../include/utility/levenshtein.h" +#include "levenshtein.h" #include #include diff --git a/libs/utility/include/utility/levenshtein.h b/libcockatrice_utility/libcockatrice/utility/levenshtein.h similarity index 100% rename from libs/utility/include/utility/levenshtein.h rename to libcockatrice_utility/libcockatrice/utility/levenshtein.h diff --git a/libs/utility/src/logger.cpp b/libcockatrice_utility/libcockatrice/utility/logger.cpp similarity index 99% rename from libs/utility/src/logger.cpp rename to libcockatrice_utility/libcockatrice/utility/logger.cpp index 55c6d4d2b..0184146ae 100644 --- a/libs/utility/src/logger.cpp +++ b/libcockatrice_utility/libcockatrice/utility/logger.cpp @@ -1,4 +1,4 @@ -#include "../include/utility/logger.h" +#include "logger.h" #include "version_string.h" diff --git a/libs/utility/include/utility/logger.h b/libcockatrice_utility/libcockatrice/utility/logger.h similarity index 100% rename from libs/utility/include/utility/logger.h rename to libcockatrice_utility/libcockatrice/utility/logger.h diff --git a/libs/utility/include/utility/macros.h b/libcockatrice_utility/libcockatrice/utility/macros.h similarity index 100% rename from libs/utility/include/utility/macros.h rename to libcockatrice_utility/libcockatrice/utility/macros.h diff --git a/libs/utility/src/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp similarity index 91% rename from libs/utility/src/passwordhasher.cpp rename to libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp index 51dfecb34..c40c5f94f 100644 --- a/libs/utility/src/passwordhasher.cpp +++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp @@ -1,8 +1,7 @@ -#include "../include/utility/passwordhasher.h" - -#include "../../rng/include/rng/rng_sfmt.h" +#include "passwordhasher.h" #include +#include QString PasswordHasher::computeHash(const QString &password, const QString &salt) { diff --git a/libs/utility/include/utility/passwordhasher.h b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h similarity index 100% rename from libs/utility/include/utility/passwordhasher.h rename to libcockatrice_utility/libcockatrice/utility/passwordhasher.h diff --git a/common/lib/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h similarity index 100% rename from common/lib/peglib.h rename to libcockatrice_utility/libcockatrice/utility/peglib.h diff --git a/libs/utility/include/utility/trice_limits.h b/libcockatrice_utility/libcockatrice/utility/trice_limits.h similarity index 100% rename from libs/utility/include/utility/trice_limits.h rename to libcockatrice_utility/libcockatrice/utility/trice_limits.h diff --git a/libs/card/CMakeLists.txt b/libs/card/CMakeLists.txt deleted file mode 100644 index e6fbfb1ea..000000000 --- a/libs/card/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - -set(HEADERS - include/card/card_info.h - include/card/card_info_comparator.h - include/card/card_database/card_database.h - include/card/card_database/card_database_loader.h - include/card/card_database/card_database_manager.h - include/card/card_database/card_database_querier.h - include/card/card_database/model/card_database_model.h - include/card/card_database/model/card_database_display_model.h - include/card/card_database/model/card/card_completer_proxy_model.h - include/card/card_database/model/card/card_search_model.h - include/card/card_database/model/token/token_display_model.h - include/card/card_database/model/token/token_edit_model.h - include/card/card_database/parser/card_database_parser.h - include/card/card_database/parser/cockatrice_xml_3.h - include/card/card_database/parser/cockatrice_xml_4.h - include/card/card_printing/exact_card.h - include/card/card_printing/printing_info.h - include/card/card_set/card_set.h - include/card/card_relation/card_relation.h -) - -if(Qt6_FOUND) - qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) -elseif(Qt5_FOUND) - qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) -endif() - -add_library( - cockatrice_card STATIC - ${MOC_SOURCES} - src/card_database/card_database.cpp - src/card_database/card_database_loader.cpp - src/card_database/card_database_manager.cpp - src/card_database/card_database_querier.cpp - src/card_database/model/card/card_completer_proxy_model.cpp - src/card_database/model/card/card_search_model.cpp - src/card_database/model/card_database_display_model.cpp - src/card_database/model/card_database_model.cpp - src/card_database/model/token/token_display_model.cpp - src/card_database/model/token/token_edit_model.cpp - src/card_database/parser/card_database_parser.cpp - src/card_database/parser/cockatrice_xml_3.cpp - src/card_database/parser/cockatrice_xml_4.cpp - src/card_info.cpp - src/card_info_comparator.cpp - src/card_printing/exact_card.cpp - src/card_printing/printing_info.cpp - src/card_relation/card_relation.cpp - src/card_set/card_set.cpp - src/card_set/card_set_list.cpp -) - -target_include_directories( - cockatrice_card - PUBLIC include - PUBLIC ${CMAKE_SOURCE_DIR}/common - PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters -) - -target_link_libraries( - cockatrice_card - PUBLIC cockatrice_settings - PUBLIC ${COCKATRICE_QT_MODULES} -) diff --git a/libs/deck_list/CMakeLists.txt b/libs/deck_list/CMakeLists.txt deleted file mode 100644 index 629bf5160..000000000 --- a/libs/deck_list/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -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() - -add_library( - cockatrice_deck_list STATIC ${MOC_SOURCES} 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 -) - -add_dependencies(cockatrice_deck_list cockatrice_protocol_wrapper) - -target_include_directories(cockatrice_deck_list PUBLIC include) - -target_link_libraries(cockatrice_deck_list PUBLIC cockatrice_protocol_wrapper utility ${COCKATRICE_QT_MODULES}) diff --git a/libs/protocol/CMakeLists.txt b/libs/protocol/CMakeLists.txt deleted file mode 100644 index 0cb152f08..000000000 --- a/libs/protocol/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Top-level wrapper for the protobuf library - -add_subdirectory(pb) - -add_library( - cockatrice_protocol_wrapper STATIC - # Optionally, you can add a dummy source if needed -) - -# Link the actual generated protobuf library -target_link_libraries(cockatrice_protocol_wrapper PUBLIC cockatrice_protocol) - -# Expose the pb/ folder so consumers can do #include "pb/header.pb.h" -target_include_directories( - cockatrice_protocol_wrapper PUBLIC ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers -) diff --git a/libs/rng/CMakeLists.txt b/libs/rng/CMakeLists.txt deleted file mode 100644 index 49b3c6378..000000000 --- a/libs/rng/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -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 ${MOC_SOURCES} src/rng_abstract.cpp src/rng_sfmt.cpp src/sfmt/SFMT.c) - -target_include_directories( - cockatrice_rng - PUBLIC include - PUBLIC include/sfmt -) - -target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}) diff --git a/libs/server/CMakeLists.txt b/libs/server/CMakeLists.txt deleted file mode 100644 index 93822ff22..000000000 --- a/libs/server/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - -set(HEADERS - include/server/game/server_abstract_participant.h - include/server/game/server_arrow.h - include/server/game/server_arrowtarget.h - include/server/game/server_card.h - include/server/game/server_cardzone.h - include/server/game/server_counter.h - include/server/game/server_game.h - include/server/game/server_player.h - include/server/game/server_spectator.h - include/server/debug_pb_message.h - include/server/get_pb_extension.h - include/server/server.h - include/server/server_abstractuserinterface.h - include/server/server_database_interface.h - include/server/server_protocolhandler.h - include/server/server_remoteuserinterface.h - include/server/server_response_containers.h - include/server/server_room.h - include/server/serverinfo_user_container.h -) - -if(Qt6_FOUND) - qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) -elseif(Qt5_FOUND) - qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) -endif() - -add_library( - cockatrice_server STATIC - ${MOC_SOURCES} - src/debug_pb_message.cpp - 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/get_pb_extension.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 -) - -add_dependencies(cockatrice_server cockatrice_protocol_wrapper) - -target_include_directories( - cockatrice_server - PUBLIC include - PUBLIC ${CMAKE_SOURCE_DIR}/common -) - -# Make cockatrice_server depend on cockatrice_protocol -target_link_libraries( - cockatrice_server PUBLIC cockatrice_common cockatrice_protocol_wrapper utility cockatrice_rng cockatrice_deck_list - ${COCKATRICE_QT_MODULES} -) diff --git a/libs/server/src/game/server_arrowtarget.cpp b/libs/server/src/game/server_arrowtarget.cpp deleted file mode 100644 index 47af6d338..000000000 --- a/libs/server/src/game/server_arrowtarget.cpp +++ /dev/null @@ -1,2 +0,0 @@ - -#include "../../include/server/game/server_arrowtarget.h" diff --git a/libs/server/src/server_database_interface.cpp b/libs/server/src/server_database_interface.cpp deleted file mode 100644 index 97ce1c710..000000000 --- a/libs/server/src/server_database_interface.cpp +++ /dev/null @@ -1,2 +0,0 @@ - -#include "../include/server/server_database_interface.h" diff --git a/libs/settings/CMakeLists.txt b/libs/settings/CMakeLists.txt deleted file mode 100644 index 915cf4b5a..000000000 --- a/libs/settings/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - -set(HEADERS - include/settings/cache_settings.h - include/settings/card_counter_settings.h - include/settings/card_database_settings.h - include/settings/card_override_settings.h - include/settings/debug_settings.h - include/settings/download_settings.h - include/settings/game_filters_settings.h - include/settings/layouts_settings.h - include/settings/message_settings.h - include/settings/recents_settings.h - include/settings/servers_settings.h - include/settings/settings_manager.h - include/settings/shortcut_treeview.h - include/settings/shortcuts_settings.h -) - -if(Qt6_FOUND) - qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) -elseif(Qt5_FOUND) - qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) -endif() - -add_library( - cockatrice_settings STATIC - ${MOC_SOURCES} - src/cache_settings.cpp - src/card_counter_settings.cpp - src/card_database_settings.cpp - src/card_override_settings.cpp - src/debug_settings.cpp - src/download_settings.cpp - src/game_filters_settings.cpp - src/layouts_settings.cpp - src/message_settings.cpp - src/recents_settings.cpp - src/servers_settings.cpp - src/settings_manager.cpp - src/shortcut_treeview.cpp - src/shortcuts_settings.cpp -) - -target_include_directories( - cockatrice_settings - PUBLIC include - PUBLIC ${CMAKE_SOURCE_DIR}/common - PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network -) - -target_link_libraries(cockatrice_settings PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES}) diff --git a/libs/utility/CMakeLists.txt b/libs/utility/CMakeLists.txt deleted file mode 100644 index ddb92d934..000000000 --- a/libs/utility/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - -set(UTILITY_SOURCES src/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 -) - -add_library(utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) - -target_include_directories(utility PUBLIC include) - -target_link_libraries(utility PUBLIC ${COCKATRICE_QT_MODULES}) - -set(ORACLE_LIBS) - -include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS}) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index e88e057d2..8e45873f1 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -30,6 +30,30 @@ set(oracle_SOURCES ${VERSION_STRING_CPP} ) +# ------------------------ +# Translations +# ------------------------ + +if(UPDATE_TRANSLATIONS) + file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) + set(translate_SRCS ${translate_oracle_SRCS}) + set(oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts") +else() + file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") +endif(UPDATE_TRANSLATIONS) + +if(WIN32) + set(oracle_SOURCES ${oracle_SOURCES} oracle.rc) +endif(WIN32) + +if(APPLE) + set(MACOSX_BUNDLE_ICON_FILE appicon.icns) + set_source_files_properties( + ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources + ) + set(oracle_SOURCES ${oracle_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) +endif(APPLE) + set(oracle_RESOURCES oracle.qrc) # ------------------------ @@ -44,7 +68,10 @@ endif() # ------------------------ # Include directories # ------------------------ -include_directories(../libs/card/include ../libs/settings/include ../cockatrice/src ../common) +include_directories( + ../libcockatrice-card/libcockatrice/card/include ../libcockatrice_settings/libcockatrice/settings/include + ../cockatrice/src ../common +) # ------------------------ # Optional libraries @@ -72,7 +99,13 @@ endif() # ------------------------ # Build executable # ------------------------ + +set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations") +set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations") +set(ORACLE_WIN32_QM_INSTALL_DIR "translations") + if(Qt6_FOUND) + # Qt6 Translations are linked after the executable is created in manual mode qt6_add_executable( oracle WIN32 @@ -83,16 +116,24 @@ if(Qt6_FOUND) MANUAL_FINALIZATION ) elseif(Qt5_FOUND) + # Qt5 Translations need to be linked at executable creation time if(Qt5LinguistTools_FOUND) if(UPDATE_TRANSLATIONS) - file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) - qt5_create_translation(oracle_QM ${translate_oracle_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts) + qt5_create_translation(oracle_QM ${translate_SRCS} ${oracle_TS}) else() - file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") qt5_add_translation(oracle_QM ${oracle_TS}) endif() endif() add_executable(oracle WIN32 MACOSX_BUNDLE ${oracle_MOC_SRCS} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_SOURCES}) + if(UNIX) + if(APPLE) + install(FILES ${oracle_QM} DESTINATION ${ORACLE_MAC_QM_INSTALL_DIR}) + else() + install(FILES ${oracle_QM} DESTINATION ${ORACLE_UNIX_QM_INSTALL_DIR}) + endif() + elseif(WIN32) + install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR}) + endif() endif() # ------------------------ @@ -100,17 +141,17 @@ endif() # ------------------------ target_link_libraries( oracle - PRIVATE cockatrice_card - PRIVATE cockatrice_settings - PRIVATE ${ORACLE_QT_MODULES} + PUBLIC libcockatrice_card + PUBLIC libcockatrice_settings + PUBLIC ${ORACLE_QT_MODULES} ) if(ZLIB_FOUND) - target_link_libraries(oracle PRIVATE ${ZLIB_LIBRARIES}) + target_link_libraries(oracle PUBLIC ${ZLIB_LIBRARIES}) endif() if(LIBLZMA_FOUND) - target_link_libraries(oracle PRIVATE ${LIBLZMA_LIBRARIES}) + target_link_libraries(oracle PUBLIC ${LIBLZMA_LIBRARIES}) endif() # ------------------------ @@ -118,9 +159,17 @@ endif() # ------------------------ if(UNIX) if(APPLE) + set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.cockatrice.${PROJECT_NAME}") + set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME}-${PROJECT_VERSION}") + set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) + set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}) + set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) set_target_properties(oracle PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) + install(TARGETS oracle BUNDLE DESTINATION ./) else() + # Assume linux install(TARGETS oracle RUNTIME DESTINATION bin/) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.png DESTINATION ${ICONDIR}/hicolor/48x48/apps) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps) @@ -131,15 +180,17 @@ endif() if(NOT WIN32 AND NOT APPLE) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) -endif() +endif(NOT WIN32 AND NOT APPLE) # ------------------------ # Qt plugin handling # ------------------------ if(APPLE) + # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir oracle.app/Contents/Plugins) set(qtconf_dest_dir oracle.app/Contents/Resources) + # Qt plugins: iconengines, platforms, styles, tls (Qt6) install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -155,7 +206,7 @@ if(APPLE) install( CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " @@ -164,17 +215,18 @@ Translations = Resources/translations\") install( CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") - " + file(GLOB_RECURSE QTPLUGINS + \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + " COMPONENT Runtime ) endif() if(WIN32) + # these needs to be relative to CMAKE_INSTALL_PREFIX set(plugin_dest_dir Plugins) set(qtconf_dest_dir .) list(APPEND libSearchDirs ${QT_LIBRARY_DIR}) @@ -186,6 +238,7 @@ if(WIN32) PATTERN "*.dll" ) + # Qt plugins: iconengines, platforms, styles, tls (Qt6) install( DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} @@ -207,7 +260,7 @@ if(WIN32) install( CODE " - file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] + file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins Translations = Resources/translations\") " @@ -216,12 +269,12 @@ Translations = Resources/translations\") install( CODE " - file(GLOB_RECURSE QTPLUGINS - \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") - " + file(GLOB_RECURSE QTPLUGINS + \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") + " COMPONENT Runtime ) endif() @@ -230,14 +283,14 @@ endif() # Qt translations # ------------------------ if(Qt6_FOUND AND Qt6LinguistTools_FOUND) + #Qt6 Translations happen after the executable is built up if(UPDATE_TRANSLATIONS) - file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp) qt6_add_translations( oracle TS_FILES ${oracle_TS} SOURCES - ${translate_oracle_SRCS} + ${translate_SRCS} QM_FILES_OUTPUT_VARIABLE oracle_QM ) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index f2930f975..3215f1d44 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -2,7 +2,6 @@ #include "interface/theme_manager.h" #include "oraclewizard.h" -#include "settings/cache_settings.h" #include #include @@ -10,6 +9,7 @@ #include #include #include +#include QTranslator *translator, *qtTranslator; ThemeManager *themeManager; diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 37b817bae..6669238ae 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,14 +1,14 @@ #include "oracleimporter.h" -#include "card/card_database/parser/cockatrice_xml_4.h" #include "parsehelpers.h" #include "qt-json/json.h" #include #include #include -#include #include +#include +#include SplitCardPart::SplitCardPart(const QString &_name, const QString &_text, diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 5f40af9ba..3ec6da6e1 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include // many users prefer not to see these sets with non english arts diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 0fdd4b8f1..eeadfb8be 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -2,7 +2,6 @@ #include "main.h" #include "oracleimporter.h" -#include "settings/cache_settings.h" #include "version_string.h" #include @@ -25,6 +24,7 @@ #include #include #include +#include #ifdef HAS_LZMA #include "lzma/decompress.h" diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index bb8c45662..02a2e1afd 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -107,17 +107,12 @@ add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESO if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") target_link_libraries( - servatrice - cockatrice_common - cockatrice_deck_list - cockatrice_server - Threads::Threads - ${SERVATRICE_QT_MODULES} + servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY} ) else() target_link_libraries( - servatrice cockatrice_common cockatrice_deck_list cockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} + servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES} ) endif() diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index 8967676a3..514df9f87 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -1,25 +1,25 @@ #include "isl_interface.h" -#include "../../libs/server/include/server/debug_pb_message.h" -#include "../../libs/server/include/server/get_pb_extension.h" #include "main.h" -#include "pb/event_game_joined.pb.h" -#include "pb/event_join_room.pb.h" -#include "pb/event_leave_room.pb.h" -#include "pb/event_list_games.pb.h" -#include "pb/event_remove_messages.pb.h" -#include "pb/event_room_say.pb.h" -#include "pb/event_server_complete_list.pb.h" -#include "pb/event_user_joined.pb.h" -#include "pb/event_user_left.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/isl_message.pb.h" -#include "server/server_protocolhandler.h" -#include "server/server_room.h" #include "server_logger.h" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey) { diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h index 19310e07b..27e5b8293 100644 --- a/servatrice/src/isl_interface.h +++ b/servatrice/src/isl_interface.h @@ -1,13 +1,13 @@ #ifndef ISL_INTERFACE_H #define ISL_INTERFACE_H -#include "pb/serverinfo_game.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "pb/serverinfo_user.pb.h" #include "servatrice.h" #include #include +#include +#include +#include class Servatrice; class QSslSocket; diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index 853f89bd0..b1294a04c 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -18,8 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "../../libs/rng/include/rng/rng_sfmt.h" -#include "../../libs/utility/include/utility/passwordhasher.h" #include "servatrice.h" #include "server_logger.h" #include "settingscache.h" @@ -34,6 +32,8 @@ #include #include #include +#include +#include RNG_Abstract *rng; ServerLogger *logger; diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index 72af3056f..65beb0646 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -19,17 +19,11 @@ ***************************************************************************/ #include "servatrice.h" -#include "../../libs/utility/include/utility/featureset.h" -#include "deck_list/deck_list.h" #include "email_parser.h" #include "isl_interface.h" #include "main.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_server_shutdown.pb.h" #include "servatrice_connection_pool.h" #include "servatrice_database_interface.h" -#include "server/server_room.h" #include "server_logger.h" #include "serversocketinterface.h" #include "settingscache.h" @@ -45,6 +39,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, int _numberPools, diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h index c68327c60..4bd2500cf 100644 --- a/servatrice/src/servatrice.h +++ b/servatrice/src/servatrice.h @@ -20,8 +20,6 @@ #ifndef SERVATRICE_H #define SERVATRICE_H -#include "server/server.h" - #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include Q_DECLARE_METATYPE(QSqlDatabase) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 8ccc95120..bad16bec3 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,17 +1,17 @@ #include "servatrice_database_interface.h" -#include "deck_list/deck_list.h" -#include "pb/game_replay.pb.h" #include "servatrice.h" #include "serversocketinterface.h" #include "settingscache.h" -#include "utility/passwordhasher.h" #include #include #include #include #include +#include +#include +#include Servatrice_DatabaseInterface::Servatrice_DatabaseInterface(int _instanceId, Servatrice *_server) : instanceId(_instanceId), sqlDatabase(QSqlDatabase()), server(_server) diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 9eb492953..dc1c8505b 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -1,13 +1,12 @@ #ifndef SERVATRICE_DATABASE_INTERFACE_H #define SERVATRICE_DATABASE_INTERFACE_H -#include "server/server.h" -#include "server/server_database_interface.h" - #include #include #include #include +#include +#include #define DATABASE_SCHEMA_VERSION 34 diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 1396eddda..ea3940a71 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -20,55 +20,10 @@ #include "serversocketinterface.h" -#include "../../libs/utility/include/utility/trice_limits.h" -#include "deck_list/deck_list.h" #include "email_parser.h" #include "main.h" -#include "pb/command_deck_del.pb.h" -#include "pb/command_deck_del_dir.pb.h" -#include "pb/command_deck_download.pb.h" -#include "pb/command_deck_list.pb.h" -#include "pb/command_deck_new_dir.pb.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/command_replay_delete_match.pb.h" -#include "pb/command_replay_download.pb.h" -#include "pb/command_replay_get_code.pb.h" -#include "pb/command_replay_list.pb.h" -#include "pb/command_replay_modify_match.pb.h" -#include "pb/command_replay_submit_code.pb.h" -#include "pb/commands.pb.h" -#include "pb/event_add_to_list.pb.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_remove_from_list.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/event_server_identification.pb.h" -#include "pb/event_server_message.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/response_ban_history.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_deck_list.pb.h" -#include "pb/response_deck_upload.pb.h" -#include "pb/response_forgotpasswordrequest.pb.h" -#include "pb/response_get_admin_notes.pb.h" -#include "pb/response_password_salt.pb.h" -#include "pb/response_register.pb.h" -#include "pb/response_replay_download.pb.h" -#include "pb/response_replay_get_code.pb.h" -#include "pb/response_replay_list.pb.h" -#include "pb/response_viewlog_history.pb.h" -#include "pb/response_warn_history.pb.h" -#include "pb/response_warn_list.pb.h" -#include "pb/serverinfo_ban.pb.h" -#include "pb/serverinfo_chat_message.pb.h" -#include "pb/serverinfo_deckstorage.pb.h" -#include "pb/serverinfo_replay.pb.h" -#include "pb/serverinfo_user.pb.h" #include "servatrice.h" #include "servatrice_database_interface.h" -#include "server/game/server_player.h" -#include "server/server_response_containers.h" -#include "server/server_room.h" #include "server_logger.h" #include "settingscache.h" #include "version_string.h" @@ -81,6 +36,51 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static const int protocolVersion = 14; diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h index 9f15e62b8..ab1f2ca0a 100644 --- a/servatrice/src/serversocketinterface.h +++ b/servatrice/src/serversocketinterface.h @@ -20,12 +20,11 @@ #ifndef SERVERSOCKETINTERFACE_H #define SERVERSOCKETINTERFACE_H -#include "server/server_protocolhandler.h" - #include #include #include #include +#include class Servatrice; class Servatrice_DatabaseInterface; @@ -147,7 +146,7 @@ public: AbstractServerSocketInterface(Servatrice *_server, Servatrice_DatabaseInterface *_databaseInterface, QObject *parent = 0); - ~AbstractServerSocketInterface(){}; + ~AbstractServerSocketInterface() {}; bool initSession(); virtual QHostAddress getPeerAddress() const = 0; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6f91c2965..6a5eacf54 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,9 +45,11 @@ endif() include_directories(${GTEST_INCLUDE_DIRS}) target_link_libraries(dummy_test Threads::Threads ${GTEST_BOTH_LIBRARIES}) -target_link_libraries(expression_test utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries(expression_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) target_link_libraries(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) -target_link_libraries(password_hash_test utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries( + password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} +) add_subdirectory(carddatabase) add_subdirectory(loading_from_clipboard) diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 87a3f1861..4030cb124 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -20,9 +20,8 @@ add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddata target_link_libraries( carddatabase_test - PRIVATE cockatrice_card - PRIVATE cockatrice_settings - PRIVATE cockatrice_common + PRIVATE libcockatrice_card + PRIVATE libcockatrice_settings PRIVATE Threads::Threads PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE ${TEST_QT_MODULES} @@ -46,9 +45,8 @@ add_executable( target_link_libraries( filter_string_test - PRIVATE cockatrice_card - PRIVATE cockatrice_settings - PRIVATE cockatrice_common + PRIVATE libcockatrice_card + PRIVATE libcockatrice_settings PRIVATE Threads::Threads PRIVATE ${GTEST_BOTH_LIBRARIES} PRIVATE ${TEST_QT_MODULES} diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 178d15635..f18e96d0e 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -1,8 +1,8 @@ #include "../../cockatrice/src/filters/filter_string.h" -#include "card/card_database/card_database_manager.h" #include "mocks.h" #include "gtest/gtest.h" +#include #define QUERY(name, card, query, match) \ TEST_F(CardQuery, name) \ diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index f46f37cfa..3a8495fb9 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,9 +10,9 @@ #define PICTURELOADER_H -#include "card/card_database/card_database.h" -#include "settings/cache_settings.h" -#include "utility/macros.h" +#include +#include +#include extern SettingsCache *settingsCache; diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp index 6deac964d..4fbe98cb9 100644 --- a/tests/expression_test.cpp +++ b/tests/expression_test.cpp @@ -1,7 +1,6 @@ -#include "../libs/utility/include/utility/expression.h" - #include "gtest/gtest.h" #include +#include #define TEST_EXPR(name, a, b) \ TEST(ExpressionTest, name) \ diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt index 7d030f088..40e85c66e 100644 --- a/tests/loading_from_clipboard/CMakeLists.txt +++ b/tests/loading_from_clipboard/CMakeLists.txt @@ -10,7 +10,6 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE ) target_link_libraries( - loading_from_clipboard_test cockatrice_common cockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} - ${TEST_QT_MODULES} + loading_from_clipboard_test libcockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test) diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp index a874ffa52..df2806585 100644 --- a/tests/loading_from_clipboard/clipboard_testing.cpp +++ b/tests/loading_from_clipboard/clipboard_testing.cpp @@ -1,8 +1,7 @@ #include "clipboard_testing.h" -#include "deck_list/deck_list_card_node.h" - #include +#include void testEmpty(const QString &clipboard) { diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h index b1233d37c..5e9cff915 100644 --- a/tests/loading_from_clipboard/clipboard_testing.h +++ b/tests/loading_from_clipboard/clipboard_testing.h @@ -1,9 +1,8 @@ #ifndef CLIPBOARD_TESTING_H #define CLIPBOARD_TESTING_H -#include "deck_list/deck_list.h" - #include "gtest/gtest.h" +#include // using std types because qt types aren't understood by gtest (without this you'll get less nice errors) using CardRows = QVector>; diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt index 0c11eb751..b89663d6f 100644 --- a/tests/oracle/CMakeLists.txt +++ b/tests/oracle/CMakeLists.txt @@ -6,6 +6,6 @@ endif() set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Widgets) -target_link_libraries(parse_cipt_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) +target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) add_test(NAME parse_cipt_test COMMAND parse_cipt_test) diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp index fecb7712e..38d9b6315 100644 --- a/tests/password_hash_test.cpp +++ b/tests/password_hash_test.cpp @@ -1,8 +1,7 @@ -#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" +#include +#include +#include RNG_Abstract *rng;