Clean up inter-library dependencies with interfaces (#6280)

* Have CardDatabase::getPreferredPrintingInfo respect card provider ID overrides (pinned printings) Took 13 minutes Took 37 seconds Took 10 seconds Took 10 seconds # Commit time for manual adjustment: # Took 30 seconds Took 15 seconds Took 8 minutes Took 21 seconds * Move settings cache and settings card preference provider out of libcockatrice_settings and into cockatrice Took 52 minutes Took 9 minutes Took 1 minute * Temp cache. Took 16 minutes * Dependency Injection for SettingsCache * Turn SettingsCache into a QSharedPointer. * Implement interfaces for settings that need it Took 2 hours 38 minutes * Adjust oracle. Took 5 minutes * Move abstract/noop interfaces to libcockatrice_interfaces so they can be linked against independently. Took 52 minutes * Clean up some links. Took 3 minutes * Cleanup two includes. Took 3 minutes * More fixes. Took 7 minutes * More includes that slipped past. Took 3 minutes * Stop mocking and start injecting for tests. Took 15 minutes * I don't know why remote_client was including main. Took 4 minutes * Include. Took 3 minutes * Lint. Took 2 minutes * Don't use Qt pointers. Took 1 hour 7 minutes * Make parser use CardSettingsInterface Took 13 minutes * Also adjust constructor lol. Took 8 minutes * Lint. Took 32 minutes * Revert "Lint." This reverts commit ecb596c39e. Took 3 minutes * Test. Took 3 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-27 07:48:01 -07:00 · 2025-11-08 22:19:40 +01:00 · 2025-11-08 22:19:40 +01:00 · a8a3fca8c9
commit a8a3fca8c9
parent fb30515f72
152 changed files with 609 additions and 750 deletions
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@ -1,5 +1,6 @@
 #include "color_identity_widget.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "mana_symbol_widget.h"

 #include <QHBoxLayout>
@ -8,7 +9,6 @@
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <QSize>
-#include <libcockatrice/settings/cache_settings.h>

 ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
 {
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
@ -1,7 +1,8 @@
 #include "mana_symbol_widget.h"

+#include "../../../../client/settings/cache_settings.h"
+
 #include <QResizeEvent>
-#include <libcockatrice/settings/cache_settings.h>

 ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
    : QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled)
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@ -1,5 +1,6 @@
 #include "card_info_frame_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../game/board/card_item.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
@ -9,7 +10,6 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@ -1,10 +1,10 @@
 #include "card_info_picture_enlarged_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"

 #include <QPainterPath>
 #include <QStylePainter>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 /**
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@ -1,5 +1,6 @@
 #include "card_info_picture_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../game/board/card_item.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
@ -12,7 +13,6 @@
 #include <QWidget>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 /**
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@ -1,10 +1,9 @@
 #include "card_size_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../printing_selector/printing_selector.h"
 #include "../visual_deck_storage/visual_deck_storage_widget.h"

-#include <libcockatrice/settings/cache_settings.h>
-
 /**
 * @class CardSizeWidget
 * @brief A widget for adjusting card sizes using a slider.
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@ -1,5 +1,7 @@
 #include "deck_preview_card_picture_widget.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QApplication>
 #include <QFileInfo>
 #include <QFontMetrics>
@ -7,7 +9,6 @@
 #include <QPainterPath>
 #include <QStylePainter>
 #include <QTextOption>
-#include <libcockatrice/settings/cache_settings.h>

 /**
 * @brief Constructs a CardPictureWithTextOverlay widget.
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@ -1,5 +1,6 @@
 #include "deck_editor_database_display_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
@ -14,7 +15,6 @@
 #include <QTreeView>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <libcockatrice/settings/cache_settings.h>

 static bool canBeCommander(const CardInfo &cardInfo)
 {
@ -143,7 +143,7 @@ void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, con
    }

    if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
-        emit cardChanged(getCardOrPinnedPrinting(cardName));
+        emit cardChanged(CardDatabaseManager::query()->getPreferredCard(cardName));
    }
 }

@ -176,21 +176,7 @@ ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const

    const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();

-    return getCardOrPinnedPrinting(cardName);
-}
-
-ExactCard DeckEditorDatabaseDisplayWidget::getCardOrPinnedPrinting(QString cardName) const
-{
-    const auto &cardProviderId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
-
-    ExactCard card = CardDatabaseManager::query()->getCard({cardName});
-
-    if (cardProviderId != "") {
-        return ExactCard(card.getCardPtr(),
-                         CardDatabaseManager::query()->getSpecificPrinting({cardName, cardProviderId}));
-    }
-
-    return card;
+    return CardDatabaseManager::query()->getPreferredCard(cardName);
 }

 void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@ -31,7 +31,6 @@ public:

 public slots:
    ExactCard currentCard() const;
-    ExactCard getCardOrPinnedPrinting(QString cardName) const;
    void setFilterTree(FilterTree *filterTree);
    void clearAllDatabaseFilters();

--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@ -1,5 +1,7 @@
 #include "deck_editor_deck_dock_widget.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QComboBox>
 #include <QDockWidget>
 #include <QHeaderView>
@ -7,7 +9,6 @@
 #include <QSplitter>
 #include <QTextEdit>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@ -1,5 +1,6 @@
 #include "deck_editor_filter_dock_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"

@ -7,7 +8,6 @@
 #include <QMenu>
 #include <QToolButton>
 #include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/settings/cache_settings.h>

 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
    : QDockWidget(parent), deckEditor(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@ -1,5 +1,7 @@
 #include "dlg_connect.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDebug>
@ -12,7 +14,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@ -1,5 +1,6 @@
 #include "dlg_create_game.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/tabs/tab_room.h"

 #include <QApplication>
@ -17,7 +18,6 @@
 #include <QWizard>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 void DlgCreateGame::sharedCtor()
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@ -1,8 +1,9 @@
 #include "dlg_default_tags_editor.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QMessageBox>
 #include <QVBoxLayout>
-#include <libcockatrice/settings/cache_settings.h>

 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
 {
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@ -1,11 +1,12 @@
 #include "dlg_edit_password.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@ -1,11 +1,12 @@
 #include "dlg_edit_user.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
@ -1,5 +1,7 @@
 #include "dlg_forgot_password_challenge.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -7,7 +9,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
@ -1,5 +1,7 @@
 #include "dlg_forgot_password_request.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -7,7 +9,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@ -1,5 +1,7 @@
 #include "dlg_forgot_password_reset.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -7,7 +9,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@ -1,7 +1,8 @@
 #include "dlg_load_deck.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <libcockatrice/models/deck_list/deck_loader.h>
-#include <libcockatrice/settings/cache_settings.h>

 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
@ -1,5 +1,6 @@
 #include "dlg_load_deck_from_clipboard.h"

+#include "../../../client/settings/cache_settings.h"
 #include "dlg_settings.h"

 #include <QApplication>
@ -12,7 +13,6 @@
 #include <QTextStream>
 #include <QVBoxLayout>
 #include <libcockatrice/models/deck_list/deck_loader.h>
-#include <libcockatrice/settings/cache_settings.h>

 /**
 * Creates the main layout and connects the signals that are common to all versions of this window
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@ -1,5 +1,6 @@
 #include "dlg_manage_sets.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "../main.h"
@ -21,7 +22,6 @@
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
-#include <libcockatrice/settings/cache_settings.h>

 #define SORT_RESET -1

--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@ -1,5 +1,7 @@
 #include "dlg_register.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -8,7 +10,6 @@
 #include <QLabel>
 #include <QMessageBox>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@ -1,5 +1,7 @@
 #include "dlg_settings.h"

+#include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcut_treeview.h"
 #include "../client/network/update/card_spoiler/spoiler_background_updater.h"
 #include "../client/network/update/client/release_channel.h"
 #include "../client/sound_engine.h"
@ -12,6 +14,7 @@
 #include "../interface/widgets/utility/sequence_edit.h"
 #include "../main.h"

+#include <../../client/settings/card_counter_settings.h>
 #include <QAbstractButton>
 #include <QAbstractListModel>
 #include <QAction>
@ -45,9 +48,6 @@
 #include <QVariant>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>
-#include <libcockatrice/settings/card_counter_settings.h>
-#include <libcockatrice/settings/shortcut_treeview.h>

 #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs"
 #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
@ -1,7 +1,8 @@
 #include "dlg_startup_card_check.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QDate>
-#include <libcockatrice/settings/cache_settings.h>

 DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 {
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@ -1,5 +1,6 @@
 #include "dlg_tip_of_the_day.h"

+#include "../../../client/settings/cache_settings.h"
 #include "tip_of_the_day.h"

 #include <QCheckBox>
@ -9,7 +10,6 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <libcockatrice/settings/cache_settings.h>

 #define MIN_TIP_IMAGE_HEIGHT 200
 #define MIN_TIP_IMAGE_WIDTH 200
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@ -1,5 +1,6 @@
 #include "dlg_update.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../client/network/update/client/client_update_checker.h"
 #include "../client/network/update/client/release_channel.h"
 #include "../interface/window_main.h"
@ -13,7 +14,6 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QtNetwork>
-#include <libcockatrice/settings/cache_settings.h>
 #include <version_string.h>

 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@ -1,5 +1,6 @@
 #include "dlg_view_log.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../logger.h"

 #include <QClipboard>
@ -7,7 +8,6 @@
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
-#include <libcockatrice/settings/cache_settings.h>

 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@ -1,5 +1,6 @@
 #include "home_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../window_main.h"
 #include "background_sources.h"
@ -11,7 +12,6 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
-#include <libcockatrice/settings/cache_settings.h>

 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
    : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice")
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@ -1,7 +1,7 @@
 #include "../../../interface/widgets/menus/deck_editor_menu.h"

-#include <libcockatrice/settings/cache_settings.h>
-#include <libcockatrice/settings/shortcuts_settings.h>
+#include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"

 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
--- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h
+++ b/cockatrice/src/interface/widgets/menus/tearoff_menu.h
@ -6,8 +6,9 @@

 #pragma once

+#include "../../../client/settings/cache_settings.h"
+
 #include <QMenu>
-#include <libcockatrice/settings/cache_settings.h>

 class TearOffMenu : public QMenu
 {
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@ -1,5 +1,6 @@
 #include "printing_selector.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
 #include "printing_selector_card_display_widget.h"
@ -9,7 +10,6 @@

 #include <QFrame>
 #include <QScrollBar>
-#include <libcockatrice/settings/cache_settings.h>
 #include <qboxlayout.h>

 /**
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@ -1,5 +1,6 @@
 #include "printing_selector_card_overlay_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "printing_selector_card_display_widget.h"

 #include <QMenu>
@ -7,7 +8,6 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 /**
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@ -1,7 +1,8 @@
 #include "printing_selector_card_sorting_widget.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <libcockatrice/card/set/card_set_comparator.h>
-#include <libcockatrice/settings/cache_settings.h>

 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
@ -88,7 +89,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::sortSets(const SetToPrint
    }

    if (sortedSets.empty()) {
-        sortedSets << CardSet::newInstance("", "", "", QDate());
+        sortedSets << CardSet::newInstance(SettingsCache::instance().cardDatabase(), "", "", "", QDate());
    }

    if (sortOptionsSelector->currentText() == SORT_OPTIONS_PREFERENCE) {
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@ -1,10 +1,11 @@
 #include "replay_timeline_widget.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QPainter>
 #include <QPainterPath>
 #include <QPalette>
 #include <QTimer>
-#include <libcockatrice/settings/cache_settings.h>

 ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
    : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@ -1,5 +1,6 @@
 #include "chat_view.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../client/sound_engine.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/tabs/tab_account.h"
@ -13,7 +14,6 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 #include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/settings/cache_settings.h>

 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);

--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@ -1,5 +1,6 @@
 #include "games_model.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/tabs/tab_account.h"
 #include "user/user_list_manager.h"
@ -12,7 +13,6 @@
 #include <QTime>
 #include <QTimeZone>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <libcockatrice/settings/cache_settings.h>

 enum GameListColumn
 {
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@ -1,11 +1,12 @@
 #include "handle_public_servers.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QJsonDocument>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QUrl>
-#include <libcockatrice/settings/cache_settings.h>

 #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json"

--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@ -1,7 +1,8 @@
 #include "user_info_connection.h"

+#include "../../../../client/settings/cache_settings.h"
+
 #include <QDebug>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 UserConnection_Information::UserConnection_Information() = default;
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@ -1,5 +1,6 @@
 #include "abstract_tab_deck_editor.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
@ -37,7 +38,6 @@
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@ -1,5 +1,6 @@
 #include "tab_deck_editor.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
 #include "../filters/filter_builder.h"
 #include "../filters/filter_tree_model.h"
@ -36,7 +37,6 @@
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@ -1,5 +1,6 @@
 #include "tab_deck_storage.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../interface/widgets/utility/get_text_with_max.h"

@ -28,7 +29,6 @@
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>

 TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
                               AbstractClient *_client,
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@ -1,5 +1,6 @@
 #include "tab_game.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../game/board/arrow_item.h"
 #include "../game/board/card_item.h"
 #include "../game/deckview/deck_view_container.h"
@ -44,7 +45,6 @@
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
@ -1,5 +1,6 @@
 #include "tab_message.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../client/sound_engine.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
@ -16,7 +17,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@ -1,5 +1,6 @@
 #include "tab_replays.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
 #include "tab_game.h"

@ -29,7 +30,6 @@
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>

 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
    : Tab(_tabSupervisor), client(_client)
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@ -1,5 +1,6 @@
 #include "tab_room.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
 #include "../interface/widgets/server/game_selector.h"
@ -30,7 +31,6 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@ -1,5 +1,6 @@
 #include "tab_supervisor.h"

+#include "../../../client/settings/cache_settings.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"
@ -35,7 +36,6 @@
 #include <libcockatrice/protocol/pb/room_event.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/settings/cache_settings.h>

 QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
 {
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@ -1,5 +1,6 @@
 #include "tab_deck_editor_visual.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../client/network/interfaces/deck_stats_interface.h"
 #include "../../filters/filter_builder.h"
 #include "../../interface/pixel_map_generator.h"
@ -31,7 +32,6 @@
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>

 /**
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@ -1,12 +1,13 @@
 #include "custom_line_edit.h"

+#include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
+
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QObject>
 #include <QTreeView>
 #include <QWidget>
-#include <libcockatrice/settings/cache_settings.h>
-#include <libcockatrice/settings/shortcuts_settings.h>

 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
@ -1,9 +1,10 @@
 #include "sequence_edit.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QToolTip>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent)
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
@ -1,5 +1,6 @@
 #include "visual_database_display_filter_save_load_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree.h"
 #include "visual_database_filter_display_widget.h"

@ -7,7 +8,6 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>

 VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent,
                                                                                     FilterTreeModel *_filterModel)
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@ -1,5 +1,6 @@
 #include "visual_database_display_set_filter_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree.h"
 #include "../../../filters/filter_tree_model.h"

@ -8,7 +9,6 @@
 #include <QTimer>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>

 VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
    : QWidget(parent)
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
@ -1,5 +1,6 @@
 #include "visual_database_display_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../../filters/syntax_help.h"
 #include "../../pixel_map_generator.h"
@ -18,7 +19,6 @@
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>
 #include <qpropertyanimation.h>
 #include <utility>

--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
@ -1,12 +1,13 @@
 #include "visual_database_filter_display_widget.h"

+#include "../../../client/settings/cache_settings.h"
+
 #include <QDir>
 #include <QFile>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMessageBox>
 #include <QPushButton>
-#include <libcockatrice/settings/cache_settings.h>

 FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel)
    : QWidget(parent), filterFilename(filename), filterModel(_filterModel)
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
@ -1,10 +1,10 @@
 #include "visual_deck_editor_sample_hand_widget.h"

+#include "../../../client/settings/cache_settings.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 <libcockatrice/settings/cache_settings.h>
 #include <random>

 VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel)
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@ -1,5 +1,6 @@
 #include "deck_preview_deck_tags_display_widget.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
 #include "../../../../interface/widgets/tabs/tab_deck_editor.h"
 #include "../../general/layout_containers/flow_widget.h"
@ -12,7 +13,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/settings/cache_settings.h>

 DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList)
    : QWidget(_parent), deckList(nullptr)
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@ -1,5 +1,6 @@
 #include "deck_preview_tag_addition_widget.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "deck_preview_tag_dialog.h"

@ -7,7 +8,6 @@
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QPainter>
-#include <libcockatrice/settings/cache_settings.h>
 #include <utility>

 DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName)
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
@ -1,5 +1,6 @@
 #include "deck_preview_tag_dialog.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_default_tags_editor.h"
 #include "deck_preview_tag_item_widget.h"

@ -11,7 +12,6 @@
 #include <QPushButton>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <libcockatrice/settings/cache_settings.h>

 DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
                                           const QStringList &_activeTags,
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@ -1,5 +1,6 @@
 #include "deck_preview_widget.h"

+#include "../../../../client/settings/cache_settings.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "deck_preview_deck_tags_display_widget.h"
@ -14,7 +15,6 @@
 #include <QStandardItemModel>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>

 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
                                     VisualDeckStorageWidget *_visualDeckStorageWidget,
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@ -1,10 +1,10 @@
 #include "visual_deck_storage_folder_display_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "deck_preview/deck_preview_widget.h"

 #include <QDirIterator>
 #include <QMouseEvent>
-#include <libcockatrice/settings/cache_settings.h>

 VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
    QWidget *parent,
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
@ -1,11 +1,11 @@
 #include "visual_deck_storage_quick_settings_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "visual_deck_storage_widget.h"

 #include <QCheckBox>
 #include <QComboBox>
 #include <QSpinBox>
-#include <libcockatrice/settings/cache_settings.h>

 VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent)
    : SettingsButtonWidget(parent)
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
@ -1,11 +1,11 @@
 #include "visual_deck_storage_search_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/deck_filter_string.h"
 #include "../../../filters/syntax_help.h"
 #include "../../pixel_map_generator.h"

 #include <QAction>
-#include <libcockatrice/settings/cache_settings.h>

 /**
 * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
@ -1,6 +1,6 @@
 #include "visual_deck_storage_sort_widget.h"

-#include <libcockatrice/settings/cache_settings.h>
+#include "../../../client/settings/cache_settings.h"

 /**
 * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code.
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@ -1,5 +1,6 @@
 #include "visual_deck_storage_widget.h"

+#include "../../../client/settings/cache_settings.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
@ -13,7 +14,6 @@
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/cache_settings.h>

 VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr)
 {