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

Turn Card, Settings and Utility into libraries.

Browse source 
Took 4 hours 3 minutes

Took 2 minutes

Took 38 seconds

Took 5 minutes

Took 5 minutes

Took 9 minutes


Took 15 minutes
This commit is contained in:
Lukas Brübach 2025-10-02 17:41:07 +02:00
parent 30e6b52783
commit 53d80efab8
262 changed files with 1025 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,20 +1,20 @@
#include "abstract_tab_deck_editor.h"
#include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h"
#include "../database/model/card_database_model.h"
#include "../deck/deck_stats_interface.h"
#include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../dialogs/dlg_load_deck_from_website.h"
#include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/pixel_map_generator.h"
#include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../picture_loader/picture_loader.h"
#include "../server/abstract_client.h"
#include "../server/pending_command.h"
#include "../settings/cache_settings.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 "trice_limits.h"
@ -161,7 +161,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck)
void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
{
deckDockWidget->setDeck(_deck);
PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
setModified(false);
// If they load a deck, make the deck list appear

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

@ -1,7 +1,6 @@
#ifndef TAB_GENERIC_DECK_EDITOR_H
#define TAB_GENERIC_DECK_EDITOR_H
#include "../card/card_info.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_database_display_widget.h"
@ -9,6 +8,7 @@
#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;
@ -24,6 +24,7 @@ class DeckEditorFilterDockWidget;
class DeckEditorPrintingSelectorDockWidget;
class DeckPreviewDeckTagsDisplayWidget;
class Response;
class FilterTree;
class FilterTreeModel;
class FilterBuilder;

2
cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "edhrec_api_response_card_details_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#include "../../tab_edhrec_main.h"
#include "card/card_database/card_database_manager.h"
EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
QWidget *parent,

2
cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
View file

@ -1,9 +1,9 @@
#include "edhrec_api_response_commander_details_display_widget.h"
#include "../../../../../database/card_database_manager.h"
#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"
EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
QWidget *parent,

2
cockatrice/src/tabs/api/edhrec/tab_edhrec.h
View file

@ -7,9 +7,9 @@
#ifndef TAB_EDHREC_H
#define TAB_EDHREC_H
#include "../../../card/card_info.h"
#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 <QNetworkAccessManager>

6
cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
View file

@ -1,14 +1,14 @@
#include "tab_edhrec_main.h"
#include "../../../database/card_database_manager.h"
#include "../../../database/model/card/card_completer_proxy_model.h"
#include "../../../database/model/card/card_search_model.h"
#include "../../tab_supervisor.h"
#include "api_response/average_deck/edhrec_average_deck_api_response.h"
#include "api_response/commander/edhrec_commander_api_response.h"
#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"

2
cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h
View file

@ -7,11 +7,11 @@
#ifndef TAB_EDHREC_MAIN_H
#define TAB_EDHREC_MAIN_H
#include "../../../database/card_database.h"
#include "../../../interface/widgets/cards/card_size_widget.h"
#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 <QHBoxLayout>

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

@ -2,8 +2,6 @@
#include "../client/deck_editor_menu.h"
#include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h"
#include "../database/model/card_database_model.h"
#include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../filters/filter_builder.h"
@ -13,7 +11,9 @@
#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
#include "../server/abstract_client.h"
#include "../server/pending_command.h"
#include "../settings/cache_settings.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 "trice_limits.h"

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

@ -1,10 +1,10 @@
#ifndef WINDOW_DECKEDITOR_H
#define WINDOW_DECKEDITOR_H
#include "../card/card_info.h"
#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
#include "../utility/key_signals.h"
#include "abstract_tab_deck_editor.h"
#include "card/card_info.h"
#include "utility/key_signals.h"
class CardDatabaseModel;
class CardDatabaseDisplayModel;

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

@ -4,7 +4,6 @@
#include "../deck/deck_loader.h"
#include "../server/pending_command.h"
#include "../server/remote/remote_decklist_tree_widget.h"
#include "../settings/cache_settings.h"
#include "deck_list.h"
#include "pb/command_deck_del.pb.h"
#include "pb/command_deck_del_dir.pb.h"
@ -14,6 +13,7 @@
#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 <QAction>
#include <QApplication>

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

@ -1,8 +1,6 @@
#include "tab_game.h"
#include "../client/network/replay_timeline_widget.h"
#include "../database/card_database.h"
#include "../database/card_database_manager.h"
#include "../dialogs/dlg_create_game.h"
#include "../game/board/arrow_item.h"
#include "../game/board/card_item.h"
@ -17,18 +15,20 @@
#include "../game/player/player_list_widget.h"
#include "../game/replay.h"
#include "../game/zones/card_zone.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/window_main.h"
#include "../main.h"
#include "../picture_loader/picture_loader.h"
#include "../server/abstract_client.h"
#include "../server/user/user_list_manager.h"
#include "../settings/cache_settings.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 "trice_limits.h"
@ -740,7 +740,7 @@ void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerIn
TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
if (playerInfo.has_deck_list()) {
DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list()));
PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
deckViewContainer->playerDeckView->setDeck(newDeck);
localPlayer->setDeck(newDeck);
}

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

@ -7,10 +7,10 @@
#include "../server/chat_view/chat_view.h"
#include "../server/pending_command.h"
#include "../server/user/user_list_manager.h"
#include "../settings/cache_settings.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 "trice_limits.h"
#include <QApplication>

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

@ -3,7 +3,6 @@
#include "../server/abstract_client.h"
#include "../server/pending_command.h"
#include "../server/remote/remote_replay_list_tree_widget.h"
#include "../settings/cache_settings.h"
#include "pb/command_replay_delete_match.pb.h"
#include "pb/command_replay_download.pb.h"
#include "pb/command_replay_get_code.pb.h"
@ -14,6 +13,7 @@
#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 <QAction>

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

@ -8,7 +8,6 @@
#include "../server/pending_command.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"
#include "../settings/cache_settings.h"
#include "get_pb_extension.h"
#include "pb/event_join_room.pb.h"
#include "pb/event_leave_room.pb.h"
@ -17,6 +16,7 @@
#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"
#include "trice_limits.h"

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

@ -5,7 +5,6 @@
#include "../server/abstract_client.h"
#include "../server/user/user_list_manager.h"
#include "../server/user/user_list_widget.h"
#include "../settings/cache_settings.h"
#include "api/edhrec/tab_edhrec_main.h"
#include "pb/event_game_joined.pb.h"
#include "pb/event_notify_user.pb.h"
@ -16,6 +15,7 @@
#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"

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

@ -1,6 +1,5 @@
#include "tab_deck_editor_visual.h"
#include "../../database/model/card_database_model.h"
#include "../../deck/deck_list_model.h"
#include "../../deck/deck_stats_interface.h"
#include "../../filters/filter_builder.h"
@ -9,10 +8,11 @@
#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
#include "../../server/pending_command.h"
#include "../../settings/cache_settings.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 "trice_limits.h"

2
cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
View file

@ -1,9 +1,9 @@
#include "tab_deck_storage_visual.h"
#include "../../database/model/card_database_model.h"
#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 <QMessageBox>