Deck loader is a gui class. (#6294)

* Deck loader is a gui class.

Took 31 minutes

Took 3 minutes

* Deck Loader is responsible for printing.

Took 8 minutes


Took 2 seconds

* Style proxy.

Took 14 minutes

Took 6 minutes

Took 1 minute

* Don't need to include QBrush anymore.

Took 3 minutes

Took 7 seconds

* Includes for printer.

Took 5 minutes

* Nuke getDeckList()

Took 9 minutes

* Adjust to rebase.

Took 35 seconds

* Lint.

Took 3 minutes

* Braces for one line return statements.

Took 13 minutes

Took 50 seconds

* Enum for model columns.

Took 9 minutes

* One more single line if.

Took 1 minute

* Another style lint on a sunday night

Took 5 minutes

* Move enum to namespace.

Took 3 minutes

* Fix a critical blocker.

Took 5 minutes

* Update docs.

Took 3 minutes

* Doxygen and namespace enums.

Took 2 minutes

Took 15 seconds

* Adjust to namespace.

Took 4 minutes

Took 1 minute

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp

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

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp

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

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp

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

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -1,6 +1,8 @@
 #include "deck_editor_deck_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_loader.h"
+#include "deck_list_style_proxy.h"
 
 #include <QComboBox>
 #include <QDockWidget>
@@ -29,9 +31,13 @@ void DeckEditorDeckDockWidget::createDeckDock()
     deckModel = new DeckListModel(this);
     deckModel->setObjectName("deckModel");
     connect(deckModel, &DeckListModel::deckHashChanged, this, &DeckEditorDeckDockWidget::updateHash);
+
+    DeckListStyleProxy *proxy = new DeckListStyleProxy(this);
+    proxy->setSourceModel(deckModel);
+
     deckView = new QTreeView();
     deckView->setObjectName("deckView");
-    deckView->setModel(deckModel);
+    deckView->setModel(proxy);
     deckView->setUniformRowHeights(true);
     deckView->setSortingEnabled(true);
     deckView->sortByColumn(1, Qt::AscendingOrder);
@@ -111,8 +117,8 @@ void DeckEditorDeckDockWidget::createDeckDock()
     activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST);
     activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR);
     connect(activeGroupCriteriaComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() {
-        deckModel->setActiveGroupCriteria(
-            static_cast<DeckListModelGroupCriteria>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
+        deckModel->setActiveGroupCriteria(static_cast<DeckListModelGroupCriteria::Type>(
+            activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
         deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
         deckView->expandAll();
         deckView->expandAll();
@@ -366,7 +372,11 @@ void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
  */
 void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck)
 {
+    deckLoader = _deck;
+
     deckModel->setDeckList(_deck);
+    connect(_deck, &DeckLoader::deckLoaded, deckModel, &DeckListModel::rebuildTree);
+    connect(_deck, &DeckLoader::deckHashChanged, deckModel, &DeckListModel::deckHashChanged);
 
     nameEdit->setText(deckModel->getDeckList()->getName());
     commentsEdit->setText(deckModel->getDeckList()->getComments());
@@ -383,9 +393,9 @@ void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck)
     emit deckChanged();
 }
 
-DeckLoader *DeckEditorDeckDockWidget::getDeckList()
+DeckLoader *DeckEditorDeckDockWidget::getDeckLoader()
 {
-    return deckModel->getDeckList();
+    return deckLoader;
 }
 
 /**

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -27,6 +27,7 @@ class DeckEditorDeckDockWidget : public QDockWidget
     Q_OBJECT
 public:
     explicit DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent);
+    DeckLoader *deckLoader;
     DeckListModel *deckModel;
     QTreeView *deckView;
     QComboBox *bannerCardComboBox;
@@ -50,7 +51,7 @@ public slots:
     void cleanDeck();
     void updateBannerCardComboBox();
     void setDeck(DeckLoader *_deck);
-    DeckLoader *getDeckList();
+    DeckLoader *getDeckLoader();
     void actIncrement();
     bool swapCard(const QModelIndex &idx);
     void actDecrementCard(const ExactCard &card, QString zoneName);

cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp

@@ -0,0 +1,37 @@
+#include "deck_list_style_proxy.h"
+
+#include <QBrush>
+#include <QColor>
+#include <QFont>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+
+QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
+{
+    QVariant value = QIdentityProxyModel::data(index, role);
+
+    const bool isCard = QIdentityProxyModel::data(index, DeckRoles::IsCardRole).toBool();
+
+    if (role == Qt::FontRole && !isCard) {
+        QFont f;
+        f.setBold(true);
+        return f;
+    }
+
+    if (role == Qt::BackgroundRole) {
+        if (isCard) {
+            const bool legal = QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
+            int base = 255 - (index.row() % 2) * 30;
+            return legal ? QBrush(QColor(base, base, base)) : QBrush(QColor(255, base / 3, base / 3));
+        } else {
+            int depth = QIdentityProxyModel::data(index, DeckRoles::DepthRole).toInt();
+            int color = 90 + 60 * depth;
+            return QBrush(QColor(color, 255, color));
+        }
+    }
+
+    if (role == Qt::ForegroundRole) {
+        return QBrush(QColor(0, 0, 0));
+    }
+
+    return value;
+}

cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h

@@ -0,0 +1,15 @@
+#ifndef COCKATRICE_DECK_LIST_STYLE_PROXY_H
+#define COCKATRICE_DECK_LIST_STYLE_PROXY_H
+
+#include <QIdentityProxyModel>
+
+class DeckListStyleProxy : public QIdentityProxyModel
+{
+    Q_OBJECT
+public:
+    using QIdentityProxyModel::QIdentityProxyModel;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+};
+
+#endif // COCKATRICE_DECK_LIST_STYLE_PROXY_H

cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp

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

cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp

@@ -1,6 +1,7 @@
 #include "dlg_load_deck_from_clipboard.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_loader.h"
 #include "dlg_settings.h"
 
 #include <QApplication>
@@ -12,7 +13,6 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <libcockatrice/models/deck_list/deck_loader.h>
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window

cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp

@@ -1,5 +1,6 @@
 #include "dlg_select_set_for_cards.h"
 
+#include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
 #include "dlg_select_set_for_cards.h"
@@ -16,7 +17,6 @@
 #include <QVBoxLayout>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qdrag.h>
 #include <qevent.h>
 
@@ -162,14 +162,14 @@ void DlgSelectSetForCards::actOK()
 
 void DlgSelectSetForCards::actClear()
 {
-    model->getDeckList()->clearSetNamesAndNumbers();
+    qobject_cast<DeckLoader *>(model->getDeckList())->clearSetNamesAndNumbers();
     accept();
 }
 
 void DlgSelectSetForCards::actSetAllToPreferred()
 {
-    model->getDeckList()->clearSetNamesAndNumbers();
-    model->getDeckList()->setProviderIdToPreferredPrinting();
+    qobject_cast<DeckLoader *>(model->getDeckList())->clearSetNamesAndNumbers();
+    qobject_cast<DeckLoader *>(model->getDeckList())->setProviderIdToPreferredPrinting();
     accept();
 }
 

cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h

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

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h

@@ -9,6 +9,7 @@
 #define CARD_AMOUNT_WIDGET_H
 
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../general/display/dynamic_font_size_push_button.h"
 
 #include <QHBoxLayout>
@@ -18,7 +19,6 @@
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class CardAmountWidget : public QWidget
 {

cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp

@@ -209,7 +209,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck)
 void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
 {
     deckDockWidget->setDeck(_deck);
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckLoader()->getCardRefList()));
     setModified(false);
 
     aDeckDockVisible->setChecked(true);
@@ -217,9 +217,9 @@ void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
 }
 
 /** @brief Returns the currently loaded deck. */
-DeckLoader *AbstractTabDeckEditor::getDeckList() const
+DeckLoader *AbstractTabDeckEditor::getDeckLoader() const
 {
-    return deckDockWidget->getDeckList();
+    return deckDockWidget->getDeckLoader();
 }
 
 /**
@@ -237,7 +237,7 @@ void AbstractTabDeckEditor::setModified(bool _modified)
  */
 bool AbstractTabDeckEditor::isBlankNewDeck() const
 {
-    DeckLoader *deck = getDeckList();
+    DeckLoader *deck = deckDockWidget->getDeckLoader();
     return !modified && deck->isBlankDeck() && deck->hasNotBeenLoaded();
 }
 
@@ -377,7 +377,7 @@ void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLo
  */
 bool AbstractTabDeckEditor::actSaveDeck()
 {
-    DeckLoader *const deck = getDeckList();
+    DeckLoader *const deck = getDeckLoader();
     if (deck->getLastRemoteDeckId() != -1) {
         QString deckString = deck->writeToString_Native();
         if (deckString.length() > MAX_FILE_LENGTH) {
@@ -418,7 +418,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
     dialog.setAcceptMode(QFileDialog::AcceptSave);
     dialog.setDefaultSuffix("cod");
     dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
-    dialog.selectFile(getDeckList()->getName().trimmed());
+    dialog.selectFile(getDeckLoader()->getName().trimmed());
 
     if (!dialog.exec())
         return false;
@@ -426,7 +426,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
     QString fileName = dialog.selectedFiles().at(0);
     DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
 
-    if (!getDeckList()->saveToFile(fileName, fmt)) {
+    if (!getDeckLoader()->saveToFile(fileName, fmt)) {
         QMessageBox::critical(
             this, tr("Error"),
             tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
@@ -480,7 +480,7 @@ void AbstractTabDeckEditor::actLoadDeckFromClipboard()
  */
 void AbstractTabDeckEditor::editDeckInClipboard(bool annotated)
 {
-    DlgEditDeckInClipboard dlg(*getDeckList(), annotated, this);
+    DlgEditDeckInClipboard dlg(*getDeckLoader(), annotated, this);
     if (!dlg.exec())
         return;
 
@@ -504,32 +504,32 @@ void AbstractTabDeckEditor::actEditDeckInClipboardRaw()
 /** @brief Saves deck to clipboard with set info and annotation. */
 void AbstractTabDeckEditor::actSaveDeckToClipboard()
 {
-    getDeckList()->saveToClipboard(true, true);
+    getDeckLoader()->saveToClipboard(true, true);
 }
 
 /** @brief Saves deck to clipboard with annotation, without set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardNoSetInfo()
 {
-    getDeckList()->saveToClipboard(true, false);
+    getDeckLoader()->saveToClipboard(true, false);
 }
 
 /** @brief Saves deck to clipboard without annotations, with set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardRaw()
 {
-    getDeckList()->saveToClipboard(false, true);
+    getDeckLoader()->saveToClipboard(false, true);
 }
 
 /** @brief Saves deck to clipboard without annotations or set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardRawNoSetInfo()
 {
-    getDeckList()->saveToClipboard(false, false);
+    getDeckLoader()->saveToClipboard(false, false);
 }
 
 /** @brief Prints the deck using a QPrintPreviewDialog. */
 void AbstractTabDeckEditor::actPrintDeck()
 {
     auto *dlg = new QPrintPreviewDialog(this);
-    connect(dlg, &QPrintPreviewDialog::paintRequested, deckDockWidget->deckModel, &DeckListModel::printDeckList);
+    connect(dlg, &QPrintPreviewDialog::paintRequested, deckDockWidget->getDeckLoader(), &DeckLoader::printDeckList);
     dlg->exec();
 }
 
@@ -562,7 +562,7 @@ void AbstractTabDeckEditor::actLoadDeckFromWebsite()
  */
 void AbstractTabDeckEditor::exportToDecklistWebsite(DeckLoader::DecklistWebsite website)
 {
-    if (DeckLoader *const deck = getDeckList()) {
+    if (DeckLoader *const deck = getDeckLoader()) {
         QString decklistUrlString = deck->exportDeckToDecklist(website);
         // Check to make sure the string isn't empty.
         if (decklistUrlString.isEmpty()) {
@@ -600,14 +600,14 @@ void AbstractTabDeckEditor::actExportDeckDecklistXyz()
 void AbstractTabDeckEditor::actAnalyzeDeckDeckstats()
 {
     auto *interface = new DeckStatsInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this);
-    interface->analyzeDeck(getDeckList());
+    interface->analyzeDeck(getDeckLoader());
 }
 
 /** @brief Analyzes the deck using TappedOut. */
 void AbstractTabDeckEditor::actAnalyzeDeckTappedout()
 {
     auto *interface = new TappedOutInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this);
-    interface->analyzeDeck(getDeckList());
+    interface->analyzeDeck(getDeckLoader());
 }
 
 /** @brief Applies a new filter tree to the database display. */

cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h

@@ -117,7 +117,7 @@ public:
     void openDeck(DeckLoader *deck);
 
     /** @brief Returns the currently active deck. */
-    DeckLoader *getDeckList() const;
+    DeckLoader *getDeckLoader() const;
 
     /** @brief Sets the modified state of the tab.
      *  @param _windowModified Whether the tab is modified.

cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp

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

cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h

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

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -1,6 +1,7 @@
 #include "tab_deck_storage.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 
@@ -19,7 +20,6 @@
 #include <QUrl>
 #include <QVBoxLayout>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/deck_list/deck_loader.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_download.pb.h>

cockatrice/src/interface/widgets/tabs/tab_supervisor.h

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

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -1,10 +1,10 @@
 #include "visual_deck_editor_sample_hand_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../cards/card_info_picture_widget.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <random>
 
 VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp

@@ -1,6 +1,7 @@
 #include "visual_deck_editor_widget.h"
 
 #include "../../../main.h"
+#include "../../deck_loader/deck_loader.h"
 #include "../../layouts/overlap_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/deck_card_zone_display_widget.h"
@@ -22,7 +23,6 @@
 #include <libcockatrice/models/database/card/card_search_model.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qscrollarea.h>
 
 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h

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

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h

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

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h

@@ -7,6 +7,7 @@
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
+#include "../../deck_loader/deck_loader.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../quick_settings/settings_button_widget.h"