jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 21:40:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Refactor] Move LoadedDeck and DeckFileFormat data types into libcockatrice_deck_list (#7424)

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-10-31 18:44:11 +01:00 • committed by GitHub
parent 85fd052fdb
commit 6f0c5dca12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
View file

@ -1,9 +1,7 @@
#include "deck_preview_deck_tags_display_widget.h"
#include "../../../../client/settings/cache_settings.h"
#include "../../../deck_loader/deck_file_format.h"
#include "../../../deck_loader/deck_loader.h"
#include "../../../deck_loader/loaded_deck.h"
#include "../../general/layout_containers/flow_widget.h"
#include "deck_preview_tag_addition_widget.h"
#include "deck_preview_tag_dialog.h"
@ -16,6 +14,8 @@
#include <QHBoxLayout>
#include <QPointer>
#include <QSizePolicy>
#include <libcockatrice/deck_list/deck_file_format.h>
#include <libcockatrice/deck_list/loaded_deck.h>
#include <libcockatrice/settings/paths_settings.h>
#include <libcockatrice/utility/qt_utils.h>
#include <optional>

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

@ -3,7 +3,6 @@
#include "../../../../client/settings/cache_settings.h"
#include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
#include "../../../deck_loader/deck_loader.h"
#include "../../../deck_loader/loaded_deck.h"
#include "../../cards/additional_info/color_identity_widget.h"
#include "../../cards/deck_preview_card_picture_widget.h"
#include "../visual_deck_storage_model.h"
@ -45,6 +44,7 @@
#include <compare>
#include <functional>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/deck_list/loaded_deck.h>
#include <libcockatrice/settings/visual_deck_storage_settings.h>
#include <qnamespace.h>
#include <utility>

4
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
View file

@ -1,8 +1,6 @@
#include "visual_deck_storage_model.h"
#include "../../deck_loader/deck_file_format.h"
#include "../../deck_loader/deck_loader.h"
#include "../../deck_loader/loaded_deck.h"
#include "../cards/additional_info/deck_color_identity.h"
#include "libcockatrice/deck_list/deck_list.h"
@ -21,6 +19,8 @@
#include <QtConcurrentRun>
#include <compare>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/deck_list/deck_file_format.h>
#include <libcockatrice/deck_list/loaded_deck.h>
#include <libcockatrice/utility/card_ref.h>
#include <optional>
#include <utility>

4
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
View file

@ -13,7 +13,6 @@
#ifndef VISUAL_DECK_STORAGE_MODEL_H
#define VISUAL_DECK_STORAGE_MODEL_H
#include "../../deck_loader/loaded_deck.h"
#include "libcockatrice/utility/card_ref.h"
#include <QAbstractListModel>
@ -24,6 +23,9 @@
#include <QString>
#include <QStringList>
#include <QVector>
#include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/deck_list/loaded_deck.h>
#include <optional>
#include <qnamespace.h>
#include <qtmetamacros.h>

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
View file

@ -1,7 +1,6 @@
#include "visual_deck_storage_sort_filter_proxy_model.h"
#include "../../../client/settings/cache_settings.h"
#include "../../deck_loader/loaded_deck.h"
#include "../../filters/deck_filter_string.h"
#include "visual_deck_storage_model.h"
@ -16,6 +15,7 @@
#include <algorithm>
#include <compare>
#include <libcockatrice/card/card_localization.h>
#include <libcockatrice/deck_list/loaded_deck.h>
#include <libcockatrice/settings/cards_display_settings.h>
VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent)