jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Include adjustments after move.

Browse source 
Took 14 minutes
This commit is contained in:
Lukas Brübach 2025-10-09 09:22:46 +02:00
parent 4df670a6d7
commit 1ded0f0dbb
83 changed files with 158 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

53
cockatrice/CMakeLists.txt
View file

@ -7,22 +7,19 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
set(cockatrice_SOURCES set(cockatrice_SOURCES
${VERSION_STRING_CPP} ${VERSION_STRING_CPP}
# sort by alphabetical order, so that there is no debate about where to add new sources to the list # sort by alphabetical order, so that there is no debate about where to add new sources to the list
src/client/deck_editor_menu.cpp src/interface/widgets/menus/deck_editor_menu.cpp
src/client/get_text_with_max.cpp src/interface/widgets/utility/get_text_with_max.cpp
src/client/network/client_update_checker.cpp src/client/network/update/client/client_update_checker.cpp
src/client/network/parsers/deck_link_to_api_transformer.cpp src/client/network/parsers/deck_link_to_api_transformer.cpp
src/client/network/release_channel.cpp src/client/network/update/client/release_channel.cpp
src/client/network/replay_timeline_widget.cpp src/interface/widgets/replay/replay_timeline_widget.cpp
src/client/network/sets_model.cpp src/client/network/update/card_spoiler/spoiler_background_updater.cpp
src/client/network/spoiler_background_updater.cpp src/interface/widgets/replay/replay_manager.cpp
src/client/replay_manager.cpp
src/client/sound_engine.cpp src/client/sound_engine.cpp
src/client/tapped_out_interface.cpp src/client/network/interfaces/tapped_out_interface.cpp
src/client/update_downloader.cpp src/client/network/update/client/update_downloader.cpp
src/deck/custom_line_edit.cpp src/interface/widgets/utility/custom_line_edit.cpp
src/deck/deck_list_model.cpp src/client/network/interfaces/deck_stats_interface.cpp
src/deck/deck_loader.cpp
src/deck/deck_stats_interface.cpp
src/dialogs/dlg_connect.cpp src/dialogs/dlg_connect.cpp
src/dialogs/dlg_convert_deck_to_cod_format.cpp src/dialogs/dlg_convert_deck_to_cod_format.cpp
src/dialogs/dlg_create_game.cpp src/dialogs/dlg_create_game.cpp
@ -128,7 +125,7 @@ set(cockatrice_SOURCES
src/interface/card_picture_loader/card_picture_to_load.cpp src/interface/card_picture_loader/card_picture_to_load.cpp
src/interface/layouts/flow_layout.cpp src/interface/layouts/flow_layout.cpp
src/interface/layouts/overlap_layout.cpp src/interface/layouts/overlap_layout.cpp
src/interface/line_edit_completer.cpp src/interface/widgets/utility/line_edit_completer.cpp
src/interface/pixel_map_generator.cpp src/interface/pixel_map_generator.cpp
src/interface/theme_manager.cpp src/interface/theme_manager.cpp
src/interface/widgets/cards/additional_info/color_identity_widget.cpp src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@ -205,17 +202,17 @@ set(cockatrice_SOURCES
src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
src/interface/window_main.cpp src/interface/window_main.cpp
src/main.cpp src/main.cpp
src/server/chat_view/chat_view.cpp src/interface/widgets/server/chat_view/chat_view.cpp
src/server/game_selector.cpp src/interface/widgets/server/game_selector.cpp
src/server/games_model.cpp src/interface/widgets/server/games_model.cpp
src/server/handle_public_servers.cpp src/interface/widgets/server/handle_public_servers.cpp
src/server/remote/remote_decklist_tree_widget.cpp src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
src/server/remote/remote_replay_list_tree_widget.cpp src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
src/server/user/user_context_menu.cpp src/interface/widgets/server/user/user_context_menu.cpp
src/server/user/user_info_box.cpp src/interface/widgets/server/user/user_info_box.cpp
src/server/user/user_info_connection.cpp src/interface/widgets/server/user/user_info_connection.cpp
src/server/user/user_list_manager.cpp src/interface/widgets/server/user/user_list_manager.cpp
src/server/user/user_list_widget.cpp src/interface/widgets/server/user/user_list_widget.cpp
src/tabs/abstract_tab_deck_editor.cpp src/tabs/abstract_tab_deck_editor.cpp
src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@ -260,8 +257,8 @@ set(cockatrice_SOURCES
src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
src/interface/utility/deck_list_sort_filter_proxy_model.cpp ../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp
src/interface/utility/sequence_edit.cpp src/interface/widgets/utility/sequence_edit.cpp
) )
add_subdirectory(sounds) add_subdirectory(sounds)

3
cockatrice/src/client/network/parsers/interface_json_deck_parser.h
View file

@ -6,10 +6,9 @@
#ifndef INTERFACE_JSON_DECK_PARSER_H #ifndef INTERFACE_JSON_DECK_PARSER_H
#define INTERFACE_JSON_DECK_PARSER_H #define INTERFACE_JSON_DECK_PARSER_H
#include "../../../deck/deck_loader.h"
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <libcockatrice/deck_list/deck_loader.h>
class IJsonDeckParser class IJsonDeckParser
{ {

4
cockatrice/src/dialogs/dlg_connect.h
View file

@ -7,8 +7,8 @@
#ifndef DLG_CONNECT_H #ifndef DLG_CONNECT_H
#define DLG_CONNECT_H #define DLG_CONNECT_H
#include "../server/handle_public_servers.h" #include "../interface/widgets/server/handle_public_servers.h"
#include "../server/user/user_info_connection.h" #include "../interface/widgets/server/user/user_info_connection.h"
#include <QDialog> #include <QDialog>
#include <QLineEdit> #include <QLineEdit>

2
cockatrice/src/dialogs/dlg_edit_tokens.cpp
View file

@ -1,6 +1,6 @@
#include "dlg_edit_tokens.h" #include "dlg_edit_tokens.h"
#include "../client/get_text_with_max.h" #include "../interface/widgets/utility/get_text_with_max.h"
#include "../main.h" #include "../main.h"
#include <QAction> #include <QAction>

2
cockatrice/src/dialogs/dlg_filter_games.h
View file

@ -7,7 +7,7 @@
#ifndef DLG_FILTER_GAMES_H #ifndef DLG_FILTER_GAMES_H
#define DLG_FILTER_GAMES_H #define DLG_FILTER_GAMES_H
#include "../server/games_model.h" #include "../interface/widgets/server/games_model.h"
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>

3
cockatrice/src/dialogs/dlg_load_deck.cpp
View file

@ -1,7 +1,6 @@
#include "dlg_load_deck.h" #include "dlg_load_deck.h"
#include "../deck/deck_loader.h" #include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))

2
cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
View file

@ -1,6 +1,5 @@
#include "dlg_load_deck_from_clipboard.h" #include "dlg_load_deck_from_clipboard.h"
#include "../deck/deck_loader.h"
#include "dlg_settings.h" #include "dlg_settings.h"
#include <QApplication> #include <QApplication>
@ -12,6 +11,7 @@
#include <QPushButton> #include <QPushButton>
#include <QTextStream> #include <QTextStream>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
/** /**

2
cockatrice/src/dialogs/dlg_load_remote_deck.cpp
View file

@ -1,7 +1,7 @@
#include "dlg_load_remote_deck.h" #include "dlg_load_remote_deck.h"
#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
#include "../main.h" #include "../main.h"
#include "../server/remote/remote_decklist_tree_widget.h"
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QHBoxLayout> #include <QHBoxLayout>

4
cockatrice/src/dialogs/dlg_manage_sets.cpp
View file

@ -1,8 +1,7 @@
#include "dlg_manage_sets.h" #include "dlg_manage_sets.h"
#include "../client/network/sets_model.h"
#include "../deck/custom_line_edit.h"
#include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/widgets/utility/custom_line_edit.h"
#include "../main.h" #include "../main.h"
#include <QAction> #include <QAction>
@ -21,6 +20,7 @@
#include <QTreeView> #include <QTreeView>
#include <algorithm> #include <algorithm>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card_set/card_sets_model.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#define SORT_RESET -1 #define SORT_RESET -1

2
cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
View file

@ -1,6 +1,5 @@
#include "dlg_select_set_for_cards.h" #include "dlg_select_set_for_cards.h"
#include "../deck/deck_loader.h"
#include "../interface/widgets/cards/card_info_picture_widget.h" #include "../interface/widgets/cards/card_info_picture_widget.h"
#include "../interface/widgets/general/layout_containers/flow_widget.h" #include "../interface/widgets/general/layout_containers/flow_widget.h"
#include "dlg_select_set_for_cards.h" #include "dlg_select_set_for_cards.h"
@ -17,6 +16,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <algorithm> #include <algorithm>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <qdrag.h> #include <qdrag.h>
#include <qevent.h> #include <qevent.h>

2
cockatrice/src/dialogs/dlg_select_set_for_cards.h
View file

@ -7,7 +7,6 @@
#ifndef DLG_SELECT_SET_FOR_CARDS_H #ifndef DLG_SELECT_SET_FOR_CARDS_H
#define DLG_SELECT_SET_FOR_CARDS_H #define DLG_SELECT_SET_FOR_CARDS_H
#include "../deck/deck_list_model.h"
#include "../interface/widgets/general/layout_containers/flow_widget.h" #include "../interface/widgets/general/layout_containers/flow_widget.h"
#include <QCheckBox> #include <QCheckBox>
@ -17,6 +16,7 @@
#include <QMap> #include <QMap>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/deck_list/deck_list_model.h>
class SetEntryWidget; // Forward declaration class SetEntryWidget; // Forward declaration

10
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -1,14 +1,14 @@
#include "dlg_settings.h" #include "dlg_settings.h"
#include "../client/get_text_with_max.h" #include "../client/network/update/card_spoiler/spoiler_background_updater.h"
#include "../client/network/release_channel.h" #include "../client/network/update/client/release_channel.h"
#include "../client/network/spoiler_background_updater.h"
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h"
#include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/theme_manager.h" #include "../interface/theme_manager.h"
#include "../interface/utility/sequence_edit.h"
#include "../interface/widgets/general/background_sources.h" #include "../interface/widgets/general/background_sources.h"
#include "../interface/widgets/utility/custom_line_edit.h"
#include "../interface/widgets/utility/get_text_with_max.h"
#include "../interface/widgets/utility/sequence_edit.h"
#include "../main.h" #include "../main.h"
#include "../tabs/tab_supervisor.h" #include "../tabs/tab_supervisor.h"

4
cockatrice/src/dialogs/dlg_update.cpp
View file

@ -1,7 +1,7 @@
#include "dlg_update.h" #include "dlg_update.h"
#include "../client/network/client_update_checker.h" #include "../client/network/update/client/client_update_checker.h"
#include "../client/network/release_channel.h" #include "../client/network/update/client/release_channel.h"
#include "../interface/window_main.h" #include "../interface/window_main.h"
#include <QApplication> #include <QApplication>

2
cockatrice/src/dialogs/dlg_update.h
View file

@ -7,7 +7,7 @@
#ifndef DLG_UPDATE_H #ifndef DLG_UPDATE_H
#define DLG_UPDATE_H #define DLG_UPDATE_H
#include "../client/update_downloader.h" #include "../client/network/update/client/update_downloader.h"
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QLoggingCategory> #include <QLoggingCategory>

2
cockatrice/src/filters/filter_builder.cpp
View file

@ -1,6 +1,6 @@
#include "filter_builder.h" #include "filter_builder.h"
#include "../deck/custom_line_edit.h" #include "../interface/widgets/utility/custom_line_edit.h"
#include "filter_card.h" #include "filter_card.h"
#include <QComboBox> #include <QComboBox>

2
cockatrice/src/game/board/abstract_counter.h
View file

@ -7,7 +7,7 @@
#ifndef COUNTER_H #ifndef COUNTER_H
#define COUNTER_H #define COUNTER_H
#include "../../interface/tearoff_menu.h" #include "../../interface/widgets/menus/tearoff_menu.h"
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QInputDialog> #include <QInputDialog>

2
cockatrice/src/game/deckview/deck_view_container.cpp
View file

@ -1,6 +1,5 @@
#include "deck_view_container.h" #include "deck_view_container.h"
#include "../../deck/deck_loader.h"
#include "../../dialogs/dlg_load_deck.h" #include "../../dialogs/dlg_load_deck.h"
#include "../../dialogs/dlg_load_deck_from_clipboard.h" #include "../../dialogs/dlg_load_deck_from_clipboard.h"
#include "../../dialogs/dlg_load_deck_from_website.h" #include "../../dialogs/dlg_load_deck_from_website.h"
@ -16,6 +15,7 @@
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/protocol/pb/command_deck_select.pb.h> #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
#include <libcockatrice/protocol/pb/command_ready_start.pb.h> #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h> #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>

3
cockatrice/src/game/deckview/deck_view_container.h
View file

@ -7,9 +7,8 @@
#ifndef DECK_VIEW_CONTAINER_H #ifndef DECK_VIEW_CONTAINER_H
#define DECK_VIEW_CONTAINER_H #define DECK_VIEW_CONTAINER_H
#include "../../deck/deck_loader.h"
#include <QPushButton> #include <QPushButton>
#include <libcockatrice/deck_list/deck_loader.h>
class QVBoxLayout; class QVBoxLayout;
class AbstractCardItem; class AbstractCardItem;

2
cockatrice/src/game/log/message_log_widget.h
View file

@ -8,7 +8,7 @@
#define MESSAGELOGWIDGET_H #define MESSAGELOGWIDGET_H
#include "../../client/translation.h" #include "../../client/translation.h"
#include "../../server/chat_view/chat_view.h" #include "../../interface/widgets/server/chat_view/chat_view.h"
#include "../zones/logic/card_zone_logic.h" #include "../zones/logic/card_zone_logic.h"
#include <libcockatrice/network/server/remote/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>

2
cockatrice/src/game/player/menu/grave_menu.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_GRAVE_MENU_H #ifndef COCKATRICE_GRAVE_MENU_H
#define COCKATRICE_GRAVE_MENU_H #define COCKATRICE_GRAVE_MENU_H
#include "../../../interface/tearoff_menu.h" #include "../../../interface/widgets/menus/tearoff_menu.h"
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>

2
cockatrice/src/game/player/menu/hand_menu.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_HAND_MENU_H #ifndef COCKATRICE_HAND_MENU_H
#define COCKATRICE_HAND_MENU_H #define COCKATRICE_HAND_MENU_H
#include "../../../interface/tearoff_menu.h" #include "../../../interface/widgets/menus/tearoff_menu.h"
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>

2
cockatrice/src/game/player/menu/library_menu.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_LIBRARY_MENU_H #ifndef COCKATRICE_LIBRARY_MENU_H
#define COCKATRICE_LIBRARY_MENU_H #define COCKATRICE_LIBRARY_MENU_H
#include "../../../interface/tearoff_menu.h" #include "../../../interface/widgets/menus/tearoff_menu.h"
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>

2
cockatrice/src/game/player/menu/player_menu.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_PLAYER_MENU_H #ifndef COCKATRICE_PLAYER_MENU_H
#define COCKATRICE_PLAYER_MENU_H #define COCKATRICE_PLAYER_MENU_H
#include "../../../interface/tearoff_menu.h" #include "../../../interface/widgets/menus/tearoff_menu.h"
#include "../player.h" #include "../player.h"
#include "custom_zone_menu.h" #include "custom_zone_menu.h"
#include "grave_menu.h" #include "grave_menu.h"

2
cockatrice/src/game/player/menu/rfg_menu.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_RFG_MENU_H #ifndef COCKATRICE_RFG_MENU_H
#define COCKATRICE_RFG_MENU_H #define COCKATRICE_RFG_MENU_H
#include "../../../interface/tearoff_menu.h" #include "../../../interface/widgets/menus/tearoff_menu.h"
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>

2
cockatrice/src/game/player/player.h
View file

@ -8,7 +8,7 @@
#define PLAYER_H #define PLAYER_H
#include "../../filters/filter_string.h" #include "../../filters/filter_string.h"
#include "../../interface/tearoff_menu.h" #include "../../interface/widgets/menus/tearoff_menu.h"
#include "../board/abstract_graphics_item.h" #include "../board/abstract_graphics_item.h"
#include "../dialogs/dlg_create_token.h" #include "../dialogs/dlg_create_token.h"
#include "menu/player_menu.h" #include "menu/player_menu.h"

2
cockatrice/src/game/player/player_actions.cpp
View file

@ -1,6 +1,6 @@
#include "player_actions.h" #include "player_actions.h"
#include "../../client/get_text_with_max.h" #include "../../interface/widgets/utility/get_text_with_max.h"
#include "../../tabs/tab_game.h" #include "../../tabs/tab_game.h"
#include "../board/card_item.h" #include "../board/card_item.h"
#include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_move_top_cards_until.h"

2
cockatrice/src/game/player/player_info.h
View file

@ -7,7 +7,6 @@
#ifndef COCKATRICE_PLAYER_INFO_H #ifndef COCKATRICE_PLAYER_INFO_H
#define COCKATRICE_PLAYER_INFO_H #define COCKATRICE_PLAYER_INFO_H
#include "../../deck/deck_loader.h"
#include "../zones/hand_zone.h" #include "../zones/hand_zone.h"
#include "../zones/pile_zone.h" #include "../zones/pile_zone.h"
#include "../zones/stack_zone.h" #include "../zones/stack_zone.h"
@ -15,6 +14,7 @@
#include "player_target.h" #include "player_target.h"
#include <QObject> #include <QObject>
#include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h> #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
class PlayerInfo : public QObject class PlayerInfo : public QObject

6
cockatrice/src/game/player/player_list_widget.cpp
View file

@ -1,9 +1,9 @@
#include "player_list_widget.h" #include "player_list_widget.h"
#include "../../interface/pixel_map_generator.h" #include "../../interface/pixel_map_generator.h"
#include "../../server/user/user_context_menu.h" #include "../../interface/widgets/server/user/user_context_menu.h"
#include "../../server/user/user_list_manager.h" #include "../../interface/widgets/server/user/user_list_manager.h"
#include "../../server/user/user_list_widget.h" #include "../../interface/widgets/server/user/user_list_widget.h"
#include "../../tabs/tab_account.h" #include "../../tabs/tab_account.h"
#include "../../tabs/tab_game.h" #include "../../tabs/tab_game.h"
#include "../../tabs/tab_supervisor.h" #include "../../tabs/tab_supervisor.h"

4
cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -1,8 +1,8 @@
#include "card_group_display_widget.h" #include "card_group_display_widget.h"
#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_info_picture_with_text_overlay_widget.h"
#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h"
#include <QResizeEvent> #include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>

2
cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
View file

@ -7,7 +7,6 @@
#ifndef CARD_GROUP_DISPLAY_WIDGET_H #ifndef CARD_GROUP_DISPLAY_WIDGET_H
#define CARD_GROUP_DISPLAY_WIDGET_H #define CARD_GROUP_DISPLAY_WIDGET_H
#include "../../../../deck/deck_list_model.h"
#include "../../general/display/banner_widget.h" #include "../../general/display/banner_widget.h"
#include "../card_info_picture_with_text_overlay_widget.h" #include "../card_info_picture_with_text_overlay_widget.h"
#include "../card_size_widget.h" #include "../card_size_widget.h"
@ -16,6 +15,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
class CardGroupDisplayWidget : public QWidget class CardGroupDisplayWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "flat_card_group_display_widget.h" #include "flat_card_group_display_widget.h"
#include "../../../../deck/deck_list_model.h"
#include "../card_info_picture_with_text_overlay_widget.h" #include "../card_info_picture_with_text_overlay_widget.h"
#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
#include <QResizeEvent> #include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>

2
cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
View file

@ -1,11 +1,11 @@
#include "overlapped_card_group_display_widget.h" #include "overlapped_card_group_display_widget.h"
#include "../../../../deck/deck_list_model.h"
#include "../card_info_picture_with_text_overlay_widget.h" #include "../card_info_picture_with_text_overlay_widget.h"
#include <QResizeEvent> #include <QResizeEvent>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_info_comparator.h> #include <libcockatrice/card/card_info_comparator.h>
#include <libcockatrice/deck_list/deck_list_model.h>
OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent, OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel, DeckListModel *_deckListModel,

2
cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -1,11 +1,11 @@
#include "deck_card_zone_display_widget.h" #include "deck_card_zone_display_widget.h"
#include "../../../deck/deck_list_model.h"
#include "card_group_display_widgets/flat_card_group_display_widget.h" #include "card_group_display_widgets/flat_card_group_display_widget.h"
#include "card_group_display_widgets/overlapped_card_group_display_widget.h" #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
#include <QResizeEvent> #include <QResizeEvent>
#include <libcockatrice/card/card_info_comparator.h> #include <libcockatrice/card/card_info_comparator.h>
#include <libcockatrice/deck_list/deck_list_model.h>
DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel, DeckListModel *_deckListModel,

2
cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
View file

@ -7,7 +7,6 @@
#ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
#define DECK_CARD_ZONE_DISPLAY_WIDGET_H #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include "../general/layout_containers/overlap_widget.h" #include "../general/layout_containers/overlap_widget.h"
#include "../visual_deck_editor/visual_deck_editor_widget.h" #include "../visual_deck_editor/visual_deck_editor_widget.h"
@ -18,6 +17,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
class DeckCardZoneDisplayWidget : public QWidget class DeckCardZoneDisplayWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
View file

@ -7,7 +7,6 @@
#ifndef DECK_ANALYTICS_WIDGET_H #ifndef DECK_ANALYTICS_WIDGET_H
#define DECK_ANALYTICS_WIDGET_H #define DECK_ANALYTICS_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "mana_base_widget.h" #include "mana_base_widget.h"
#include "mana_curve_widget.h" #include "mana_curve_widget.h"
@ -18,6 +17,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_list_model.h>
class DeckAnalyticsWidget : public QWidget class DeckAnalyticsWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -1,6 +1,5 @@
#include "mana_base_widget.h" #include "mana_base_widget.h"
#include "../../../deck/deck_loader.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include "../general/display/bar_widget.h" #include "../general/display/bar_widget.h"
@ -9,6 +8,7 @@
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_loader.h>
ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
: QWidget(parent), deckListModel(_deckListModel) : QWidget(parent), deckListModel(_deckListModel)

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
View file

@ -7,12 +7,12 @@
#ifndef MANA_BASE_WIDGET_H #ifndef MANA_BASE_WIDGET_H
#define MANA_BASE_WIDGET_H #define MANA_BASE_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <utility> #include <utility>
class ManaBaseWidget : public QWidget class ManaBaseWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
View file

@ -1,6 +1,5 @@
#include "mana_curve_widget.h" #include "mana_curve_widget.h"
#include "../../../deck/deck_loader.h"
#include "../../../main.h" #include "../../../main.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include "../general/display/bar_widget.h" #include "../general/display/bar_widget.h"
@ -8,6 +7,7 @@
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <unordered_map> #include <unordered_map>
ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)

2
cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
View file

@ -7,11 +7,11 @@
#ifndef MANA_CURVE_WIDGET_H #ifndef MANA_CURVE_WIDGET_H
#define MANA_CURVE_WIDGET_H #define MANA_CURVE_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <unordered_map> #include <unordered_map>
class ManaCurveWidget : public QWidget class ManaCurveWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
View file

@ -1,6 +1,5 @@
#include "mana_devotion_widget.h" #include "mana_devotion_widget.h"
#include "../../../deck/deck_loader.h"
#include "../../../main.h" #include "../../../main.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include "../general/display/bar_widget.h" #include "../general/display/bar_widget.h"
@ -9,6 +8,7 @@
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <regex> #include <regex>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
View file

@ -7,12 +7,12 @@
#ifndef MANA_DEVOTION_WIDGET_H #ifndef MANA_DEVOTION_WIDGET_H
#define MANA_DEVOTION_WIDGET_H #define MANA_DEVOTION_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../general/display/banner_widget.h" #include "../general/display/banner_widget.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <utility> #include <utility>
class ManaDevotionWidget : public QWidget class ManaDevotionWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -8,8 +8,8 @@
#ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#include "../../../deck/custom_line_edit.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../utility/custom_line_edit.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
View file

@ -8,8 +8,8 @@
#ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
#define DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H
#include "../../../deck/custom_line_edit.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../utility/custom_line_edit.h"
#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
#include <QComboBox> #include <QComboBox>

2
cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
View file

@ -1,9 +1,9 @@
#include "overlap_widget.h" #include "overlap_widget.h"
#include "../../../../deck/deck_list_model.h"
#include "../../../layouts/flow_layout.h" #include "../../../layouts/flow_layout.h"
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list_model.h>
/** /**
* @class OverlapWidget * @class OverlapWidget

4
cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
View file

@ -7,12 +7,12 @@
#ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
#define ALL_ZONES_CARD_AMOUNT_WIDGET_H #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../../../deck/deck_loader.h"
#include "card_amount_widget.h" #include "card_amount_widget.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <libcockatrice/deck_list/deck_loader.h>
class AllZonesCardAmountWidget : public QWidget class AllZonesCardAmountWidget : public QWidget
{ {

4
cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
View file

@ -8,8 +8,6 @@
#ifndef CARD_AMOUNT_WIDGET_H #ifndef CARD_AMOUNT_WIDGET_H
#define CARD_AMOUNT_WIDGET_H #define CARD_AMOUNT_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../../../deck/deck_loader.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../general/display/dynamic_font_size_push_button.h" #include "../general/display/dynamic_font_size_push_button.h"
@ -19,6 +17,8 @@
#include <QTreeView> #include <QTreeView>
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <libcockatrice/deck_list/deck_loader.h>
class CardAmountWidget : public QWidget class CardAmountWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/printing_selector/printing_selector.h
View file

@ -7,7 +7,6 @@
#ifndef PRINTING_SELECTOR_H #ifndef PRINTING_SELECTOR_H
#define PRINTING_SELECTOR_H #define PRINTING_SELECTOR_H
#include "../../../deck/deck_list_model.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "../quick_settings/settings_button_widget.h" #include "../quick_settings/settings_button_widget.h"
@ -19,6 +18,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#define BATCH_SIZE 10 #define BATCH_SIZE 10

2
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
View file

@ -7,7 +7,6 @@
#ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
#define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "printing_selector_card_overlay_widget.h" #include "printing_selector_card_overlay_widget.h"
#include "set_name_and_collectors_number_display_widget.h" #include "set_name_and_collectors_number_display_widget.h"
@ -15,6 +14,7 @@
#include <QPainter> #include <QPainter>
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
class PrintingSelectorCardDisplayWidget : public QWidget class PrintingSelectorCardDisplayWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
View file

@ -7,7 +7,6 @@
#ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
#define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../cards/card_info_picture_widget.h" #include "../cards/card_info_picture_widget.h"
#include "all_zones_card_amount_widget.h" #include "all_zones_card_amount_widget.h"
@ -15,6 +14,7 @@
#include "set_name_and_collectors_number_display_widget.h" #include "set_name_and_collectors_number_display_widget.h"
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/deck_list/deck_list_model.h>
class PrintingSelectorCardOverlayWidget : public QWidget class PrintingSelectorCardOverlayWidget : public QWidget
{ {

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -1,11 +1,11 @@
#include "visual_database_display_widget.h" #include "visual_database_display_widget.h"
#include "../../../deck/custom_line_edit.h"
#include "../../../filters/filter_tree_model.h" #include "../../../filters/filter_tree_model.h"
#include "../../../filters/syntax_help.h" #include "../../../filters/syntax_help.h"
#include "../../pixel_map_generator.h" #include "../../pixel_map_generator.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../quick_settings/settings_button_widget.h" #include "../quick_settings/settings_button_widget.h"
#include "../utility/custom_line_edit.h"
#include "visual_database_display_color_filter_widget.h" #include "visual_database_display_color_filter_widget.h"
#include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_filter_save_load_widget.h"
#include "visual_database_display_main_type_filter_widget.h" #include "visual_database_display_main_type_filter_widget.h"

4
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
View file

@ -7,8 +7,6 @@
#ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
#define VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H
#include "../../../deck/custom_line_edit.h"
#include "../../../deck/deck_list_model.h"
#include "../../../filters/filter_tree_model.h" #include "../../../filters/filter_tree_model.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../../layouts/flow_layout.h" #include "../../layouts/flow_layout.h"
@ -16,6 +14,7 @@
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "../general/layout_containers/overlap_control_widget.h" #include "../general/layout_containers/overlap_control_widget.h"
#include "../utility/custom_line_edit.h"
#include "visual_database_display_color_filter_widget.h" #include "visual_database_display_color_filter_widget.h"
#include "visual_database_display_filter_save_load_widget.h" #include "visual_database_display_filter_save_load_widget.h"
#include "visual_database_display_main_type_filter_widget.h" #include "visual_database_display_main_type_filter_widget.h"
@ -30,6 +29,7 @@
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <libcockatrice/utility/key_signals.h> #include <libcockatrice/utility/key_signals.h>
#include <qscrollarea.h> #include <qscrollarea.h>

2
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
View file

@ -1,9 +1,9 @@
#include "visual_deck_editor_sample_hand_widget.h" #include "visual_deck_editor_sample_hand_widget.h"
#include "../../../deck/deck_loader.h"
#include "../cards/card_info_picture_widget.h" #include "../cards/card_info_picture_widget.h"
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <random> #include <random>

2
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
View file

@ -7,13 +7,13 @@
#ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
#define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_list_model.h>
class VisualDeckEditorSampleHandWidget : public QWidget class VisualDeckEditorSampleHandWidget : public QWidget
{ {

4
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -1,7 +1,5 @@
#include "visual_deck_editor_widget.h" #include "visual_deck_editor_widget.h"
#include "../../../deck/deck_list_model.h"
#include "../../../deck/deck_loader.h"
#include "../../../main.h" #include "../../../main.h"
#include "../../layouts/overlap_layout.h" #include "../../layouts/overlap_layout.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
@ -21,6 +19,8 @@
#include <libcockatrice/card/card_database/model/card/card_search_model.h> #include <libcockatrice/card/card_database/model/card/card_search_model.h>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/card/card_info_comparator.h> #include <libcockatrice/card/card_info_comparator.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <qscrollarea.h> #include <qscrollarea.h>
VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel) VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel)

2
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -7,7 +7,6 @@
#ifndef VISUAL_DECK_EDITOR_H #ifndef VISUAL_DECK_EDITOR_H
#define VISUAL_DECK_EDITOR_H #define VISUAL_DECK_EDITOR_H
#include "../../../deck/deck_list_model.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
@ -22,6 +21,7 @@
#include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h> #include <libcockatrice/card/card_database/model/card/card_completer_proxy_model.h>
#include <libcockatrice/card/card_database/model/card_database_display_model.h> #include <libcockatrice/card/card_database/model/card_database_display_model.h>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <qscrollarea.h> #include <qscrollarea.h>
class DeckCardZoneDisplayWidget; class DeckCardZoneDisplayWidget;

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
View file

@ -7,10 +7,10 @@
#ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
#define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
#include "../../../../deck/deck_loader.h"
#include "deck_preview_widget.h" #include "deck_preview_widget.h"
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_loader.h>
inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath); inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
View file

@ -7,7 +7,6 @@
#ifndef DECK_PREVIEW_WIDGET_H #ifndef DECK_PREVIEW_WIDGET_H
#define DECK_PREVIEW_WIDGET_H #define DECK_PREVIEW_WIDGET_H
#include "../../../../deck/deck_loader.h"
#include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/additional_info/color_identity_widget.h"
#include "../../cards/deck_preview_card_picture_widget.h" #include "../../cards/deck_preview_card_picture_widget.h"
#include "../visual_deck_storage_widget.h" #include "../visual_deck_storage_widget.h"
@ -19,6 +18,7 @@
#include <QEvent> #include <QEvent>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/deck_list/deck_loader.h>
class QMenu; class QMenu;
class VisualDeckStorageWidget; class VisualDeckStorageWidget;

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
View file

@ -7,7 +7,6 @@
#ifndef VISUAL_DECK_STORAGE_WIDGET_H #ifndef VISUAL_DECK_STORAGE_WIDGET_H
#define VISUAL_DECK_STORAGE_WIDGET_H #define VISUAL_DECK_STORAGE_WIDGET_H
#include "../../../deck/deck_list_model.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "../quick_settings/settings_button_widget.h" #include "../quick_settings/settings_button_widget.h"
@ -21,6 +20,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <QFileSystemModel> #include <QFileSystemModel>
#include <libcockatrice/deck_list/deck_list_model.h>
class QSpinBox; class QSpinBox;
class VisualDeckStorageSearchWidget; class VisualDeckStorageSearchWidget;

6
cockatrice/src/interface/window_main.cpp
View file

@ -19,9 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "window_main.h" #include "window_main.h"
#include "../client/get_text_with_max.h" #include "../client/network/update/client/client_update_checker.h"
#include "../client/network/client_update_checker.h" #include "../client/network/update/client/release_channel.h"
#include "../client/network/release_channel.h"
#include "../dialogs/dlg_connect.h" #include "../dialogs/dlg_connect.h"
#include "../dialogs/dlg_edit_tokens.h" #include "../dialogs/dlg_edit_tokens.h"
#include "../dialogs/dlg_forgot_password_challenge.h" #include "../dialogs/dlg_forgot_password_challenge.h"
@ -38,6 +37,7 @@
#include "../tabs/tab_game.h" #include "../tabs/tab_game.h"
#include "../tabs/tab_supervisor.h" #include "../tabs/tab_supervisor.h"
#include "version_string.h" #include "version_string.h"
#include "widgets/utility/get_text_with_max.h"
#include <QAction> #include <QAction>
#include <QApplication> #include <QApplication>

2
cockatrice/src/main.cpp
View file

@ -21,7 +21,7 @@
#include "main.h" #include "main.h"
#include "QtNetwork/QNetworkInterface" #include "QtNetwork/QNetworkInterface"
#include "client/network/spoiler_background_updater.h" #include "client/network/update/card_spoiler/spoiler_background_updater.h"
#include "client/sound_engine.h" #include "client/sound_engine.h"
#include "dialogs/dlg_settings.h" #include "dialogs/dlg_settings.h"
#include "interface/pixel_map_generator.h" #include "interface/pixel_map_generator.h"

4
cockatrice/src/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,7 +1,7 @@
#include "abstract_tab_deck_editor.h" #include "abstract_tab_deck_editor.h"
#include "../client/tapped_out_interface.h" #include "../client/network/interfaces/deck_stats_interface.h"
#include "../deck/deck_stats_interface.h" #include "../client/network/interfaces/tapped_out_interface.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../dialogs/dlg_load_deck_from_website.h" #include "../dialogs/dlg_load_deck_from_website.h"

2
cockatrice/src/tabs/abstract_tab_deck_editor.h
View file

@ -1,12 +1,12 @@
#ifndef TAB_GENERIC_DECK_EDITOR_H #ifndef TAB_GENERIC_DECK_EDITOR_H
#define TAB_GENERIC_DECK_EDITOR_H #define TAB_GENERIC_DECK_EDITOR_H
#include "../client/deck_editor_menu.h"
#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h" #include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #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/deck_editor/deck_editor_printing_selector_dock_widget.h"
#include "../interface/widgets/menus/deck_editor_menu.h"
#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
#include "tab.h" #include "tab.h"

3
cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
View file

@ -1,12 +1,11 @@
#include "edhrec_deck_api_response.h" #include "edhrec_deck_api_response.h"
#include "../../../../../deck/deck_loader.h"
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QDebug>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QMainWindow> #include <QMainWindow>
#include <libcockatrice/deck_list/deck_loader.h>
void EdhrecDeckApiResponse::fromJson(const QJsonArray &json) void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
{ {

3
cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
View file

@ -7,13 +7,12 @@
#ifndef EDHREC_DECK_API_RESPONSE_H #ifndef EDHREC_DECK_API_RESPONSE_H
#define EDHREC_DECK_API_RESPONSE_H #define EDHREC_DECK_API_RESPONSE_H
#include "../../../../../deck/deck_loader.h"
#include <QDebug> #include <QDebug>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QString> #include <QString>
#include <QVector> #include <QVector>
#include <libcockatrice/deck_list/deck_loader.h>
class EdhrecDeckApiResponse class EdhrecDeckApiResponse
{ {

8
cockatrice/src/tabs/tab_account.cpp
View file

@ -1,10 +1,10 @@
#include "tab_account.h" #include "tab_account.h"
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h" #include "../interface/widgets/server/user/user_info_box.h"
#include "../server/user/user_info_box.h" #include "../interface/widgets/server/user/user_list_manager.h"
#include "../server/user/user_list_manager.h" #include "../interface/widgets/server/user/user_list_widget.h"
#include "../server/user/user_list_widget.h" #include "../interface/widgets/utility/custom_line_edit.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include <QPushButton> #include <QPushButton>

4
cockatrice/src/tabs/tab_deck_editor.cpp
View file

@ -1,7 +1,6 @@
#include "tab_deck_editor.h" #include "tab_deck_editor.h"
#include "../client/deck_editor_menu.h" #include "../client/network/interfaces/tapped_out_interface.h"
#include "../client/tapped_out_interface.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../filters/filter_builder.h" #include "../filters/filter_builder.h"
@ -9,6 +8,7 @@
#include "../interface/pixel_map_generator.h" #include "../interface/pixel_map_generator.h"
#include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h" #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
#include "../interface/widgets/menus/deck_editor_menu.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include <QAction> #include <QAction>

6
cockatrice/src/tabs/tab_deck_storage.cpp
View file

@ -1,8 +1,7 @@
#include "tab_deck_storage.h" #include "tab_deck_storage.h"
#include "../client/get_text_with_max.h" #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
#include "../deck/deck_loader.h" #include "../interface/widgets/utility/get_text_with_max.h"
#include "../server/remote/remote_decklist_tree_widget.h"
#include <QAction> #include <QAction>
#include <QApplication> #include <QApplication>
@ -19,6 +18,7 @@
#include <QUrl> #include <QUrl>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/deck_loader.h>
#include <libcockatrice/protocol/pb/command_deck_del.pb.h> #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
#include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h> #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
#include <libcockatrice/protocol/pb/command_deck_download.pb.h> #include <libcockatrice/protocol/pb/command_deck_download.pb.h>

2
cockatrice/src/tabs/tab_deck_storage.h
View file

@ -8,7 +8,7 @@
#ifndef TAB_DECK_STORAGE_H #ifndef TAB_DECK_STORAGE_H
#define TAB_DECK_STORAGE_H #define TAB_DECK_STORAGE_H
#include "../server/remote/remote_decklist_tree_widget.h" #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
#include "tab.h" #include "tab.h"
#include <libcockatrice/network/client/abstract/abstract_client.h> #include <libcockatrice/network/client/abstract/abstract_client.h>

6
cockatrice/src/tabs/tab_game.cpp
View file

@ -1,6 +1,5 @@
#include "tab_game.h" #include "tab_game.h"
#include "../client/network/replay_timeline_widget.h"
#include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_create_game.h"
#include "../game/board/arrow_item.h" #include "../game/board/arrow_item.h"
#include "../game/board/card_item.h" #include "../game/board/card_item.h"
@ -16,11 +15,12 @@
#include "../game/replay.h" #include "../game/replay.h"
#include "../game/zones/card_zone.h" #include "../game/zones/card_zone.h"
#include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/line_edit_completer.h"
#include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../interface/widgets/replay/replay_timeline_widget.h"
#include "../interface/widgets/server/user/user_list_manager.h"
#include "../interface/widgets/utility/line_edit_completer.h"
#include "../interface/window_main.h" #include "../interface/window_main.h"
#include "../main.h" #include "../main.h"
#include "../server/user/user_list_manager.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include <QAction> #include <QAction>

4
cockatrice/src/tabs/tab_game.h
View file

@ -9,11 +9,11 @@
#ifndef TAB_GAME_H #ifndef TAB_GAME_H
#define TAB_GAME_H #define TAB_GAME_H
#include "../client/replay_manager.h"
#include "../game/abstract_game.h" #include "../game/abstract_game.h"
#include "../game/log/message_log_widget.h" #include "../game/log/message_log_widget.h"
#include "../game/player/player.h" #include "../game/player/player.h"
#include "../interface/tearoff_menu.h" #include "../interface/widgets/menus/tearoff_menu.h"
#include "../interface/widgets/replay/replay_manager.h"
#include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
#include "tab.h" #include "tab.h"

2
cockatrice/src/tabs/tab_logs.cpp
View file

@ -1,7 +1,7 @@
#include "tab_logs.h" #include "tab_logs.h"
#include "../deck/custom_line_edit.h"
#include "../dialogs/dlg_manage_sets.h" #include "../dialogs/dlg_manage_sets.h"
#include "../interface/widgets/utility/custom_line_edit.h"
#include <QCheckBox> #include <QCheckBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>

6
cockatrice/src/tabs/tab_message.cpp
View file

@ -1,10 +1,10 @@
#include "tab_message.h" #include "tab_message.h"
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h" #include "../interface/widgets/server/chat_view/chat_view.h"
#include "../interface/widgets/server/user/user_list_manager.h"
#include "../interface/widgets/utility/custom_line_edit.h"
#include "../main.h" #include "../main.h"
#include "../server/chat_view/chat_view.h"
#include "../server/user/user_list_manager.h"
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QDebug>

2
cockatrice/src/tabs/tab_replays.cpp
View file

@ -1,6 +1,6 @@
#include "tab_replays.h" #include "tab_replays.h"
#include "../server/remote/remote_replay_list_tree_widget.h" #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
#include "tab_game.h" #include "tab_game.h"
#include <QAction> #include <QAction>

8
cockatrice/src/tabs/tab_room.cpp
View file

@ -1,11 +1,11 @@
#include "tab_room.h" #include "tab_room.h"
#include "../dialogs/dlg_settings.h" #include "../dialogs/dlg_settings.h"
#include "../interface/widgets/server/chat_view/chat_view.h"
#include "../interface/widgets/server/game_selector.h"
#include "../interface/widgets/server/user/user_list_manager.h"
#include "../interface/widgets/server/user/user_list_widget.h"
#include "../main.h" #include "../main.h"
#include "../server/chat_view/chat_view.h"
#include "../server/game_selector.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"
#include "tab_account.h" #include "tab_account.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"

2
cockatrice/src/tabs/tab_room.h
View file

@ -8,7 +8,7 @@
#ifndef TAB_ROOM_H #ifndef TAB_ROOM_H
#define TAB_ROOM_H #define TAB_ROOM_H
#include "../interface/line_edit_completer.h" #include "../interface/widgets/utility/line_edit_completer.h"
#include "tab.h" #include "tab.h"
#include <QFocusEvent> #include <QFocusEvent>

2
cockatrice/src/tabs/tab_server.cpp
View file

@ -1,6 +1,6 @@
#include "tab_server.h" #include "tab_server.h"
#include "../server/user/user_list_widget.h" #include "../interface/widgets/server/user/user_list_widget.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include <QCheckBox> #include <QCheckBox>

4
cockatrice/src/tabs/tab_supervisor.cpp
View file

@ -1,9 +1,9 @@
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include "../interface/pixel_map_generator.h" #include "../interface/pixel_map_generator.h"
#include "../interface/widgets/server/user/user_list_manager.h"
#include "../interface/widgets/server/user/user_list_widget.h"
#include "../main.h" #include "../main.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"
#include "api/edhrec/tab_edhrec_main.h" #include "api/edhrec/tab_edhrec_main.h"
#include "tab_account.h" #include "tab_account.h"
#include "tab_admin.h" #include "tab_admin.h"

4
cockatrice/src/tabs/tab_supervisor.h
View file

@ -8,8 +8,7 @@
#ifndef TAB_SUPERVISOR_H #ifndef TAB_SUPERVISOR_H
#define TAB_SUPERVISOR_H #define TAB_SUPERVISOR_H
#include "../deck/deck_loader.h" #include "../interface/widgets/server/user/user_list_proxy.h"
#include "../server/user/user_list_proxy.h"
#include "abstract_tab_deck_editor.h" #include "abstract_tab_deck_editor.h"
#include "api/edhrec/tab_edhrec.h" #include "api/edhrec/tab_edhrec.h"
#include "api/edhrec/tab_edhrec_main.h" #include "api/edhrec/tab_edhrec_main.h"
@ -24,6 +23,7 @@
#include <QMap> #include <QMap>
#include <QProxyStyle> #include <QProxyStyle>
#include <QTabWidget> #include <QTabWidget>
#include <libcockatrice/deck_list/deck_loader.h>
inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor"); inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");

4
cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -1,7 +1,6 @@
#include "tab_deck_editor_visual.h" #include "tab_deck_editor_visual.h"
#include "../../deck/deck_list_model.h" #include "../../client/network/interfaces/deck_stats_interface.h"
#include "../../deck/deck_stats_interface.h"
#include "../../filters/filter_builder.h" #include "../../filters/filter_builder.h"
#include "../../interface/pixel_map_generator.h" #include "../../interface/pixel_map_generator.h"
#include "../../interface/widgets/cards/card_info_frame_widget.h" #include "../../interface/widgets/cards/card_info_frame_widget.h"
@ -29,6 +28,7 @@
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/deck_list/deck_list_model.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h> #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pending_command.h> #include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>

2
libcockatrice_card/CMakeLists.txt
View file

@ -13,6 +13,7 @@ set(HEADERS
libcockatrice/card/card_database/model/card_database_display_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_completer_proxy_model.h
libcockatrice/card/card_database/model/card/card_search_model.h libcockatrice/card/card_database/model/card/card_search_model.h
libcockatrice/card/card_database/model/card_set/card_sets_model.h
libcockatrice/card/card_database/model/token/token_display_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/model/token/token_edit_model.h
libcockatrice/card/card_database/parser/card_database_parser.h libcockatrice/card/card_database/parser/card_database_parser.h
@ -39,6 +40,7 @@ add_library(
libcockatrice/card/card_database/card_database_querier.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_completer_proxy_model.cpp
libcockatrice/card/card_database/model/card/card_search_model.cpp libcockatrice/card/card_database/model/card/card_search_model.cpp
libcockatrice/card/card_database/model/card_set/card_sets_model.cpp
libcockatrice/card/card_database/model/card_database_display_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/card_database_model.cpp
libcockatrice/card/card_database/model/token/token_display_model.cpp libcockatrice/card/card_database/model/token/token_display_model.cpp

23
libcockatrice_deck_list/CMakeLists.txt
View file

@ -3,8 +3,13 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(HEADERS set(HEADERS
libcockatrice/deck_list/abstract_deck_list_card_node.h libcockatrice/deck_list/abstract_deck_list_node.h libcockatrice/deck_list/abstract_deck_list_card_node.h
libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/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/deck_list_model.h
libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h
libcockatrice/deck_list/deck_loader.h
libcockatrice/deck_list/inner_deck_list_node.h libcockatrice/deck_list/inner_deck_list_node.h
) )
@ -16,9 +21,15 @@ endif()
add_library( add_library(
libcockatrice_deck_list STATIC libcockatrice_deck_list STATIC
${MOC_SOURCES} libcockatrice/deck_list/abstract_deck_list_card_node.cpp ${MOC_SOURCES}
libcockatrice/deck_list/abstract_deck_list_node.cpp libcockatrice/deck_list/deck_list.cpp libcockatrice/deck_list/abstract_deck_list_card_node.cpp
libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_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/deck_list_model.cpp
libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp
libcockatrice/deck_list/deck_loader.cpp
libcockatrice/deck_list/inner_deck_list_node.cpp
) )
add_dependencies(libcockatrice_deck_list libcockatrice_protocol) add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
@ -26,5 +37,5 @@ add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES} libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_card libcockatrice_utility ${COCKATRICE_QT_MODULES}
) )

2
libcockatrice_settings/libcockatrice/settings/cache_settings.cpp
View file

@ -1,8 +1,8 @@
#include "cache_settings.h" #include "cache_settings.h"
#include "../../../cockatrice/src/client/network/update/client/release_channel.h"
#include "card_counter_settings.h" #include "card_counter_settings.h"
#include "card_override_settings.h" #include "card_override_settings.h"
#include "release_channel.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QApplication> #include <QApplication>

2
oracle/CMakeLists.txt
View file

@ -23,7 +23,7 @@ set(oracle_SOURCES
src/pagetemplates.cpp src/pagetemplates.cpp
src/parsehelpers.cpp src/parsehelpers.cpp
src/qt-json/json.cpp src/qt-json/json.cpp
../cockatrice/src/client/network/release_channel.cpp ../cockatrice/src/client/network/update/client/release_channel.cpp
../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/theme_manager.cpp
../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp