Turn Card, Deck_List, Protocol, RNG, Network (Client, Server), Settings and Utility into libraries and remove cockatrice_common. (#6212)

--------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ebbit1q <ebbit1q@gmail.com>
2026-06-15 11:38:49 -07:00 · 2025-10-09 07:36:12 +02:00 · 2025-10-09 07:36:12 +02:00 · 1ef07309d6
commit 1ef07309d6
parent be1403c920
605 changed files with 3812 additions and 3408 deletions
--- a/cockatrice/src/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/dialogs/dlg_connect.cpp
@ -1,8 +1,5 @@
 #include "dlg_connect.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDebug>
@ -15,6 +12,8 @@
 #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/dialogs/dlg_connect.h
+++ b/cockatrice/src/dialogs/dlg_connect.h
@ -9,10 +9,10 @@

 #include "../server/handle_public_servers.h"
 #include "../server/user/user_info_connection.h"
-#include "../utility/macros.h"

 #include <QDialog>
 #include <QLineEdit>
+#include <libcockatrice/utility/macros.h>

 class QCheckBox;
 class QComboBox;
--- a/cockatrice/src/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@ -1,10 +1,6 @@
 #include "dlg_create_game.h"

-#include "../server/pending_command.h"
-#include "../settings/cache_settings.h"
 #include "../tabs/tab_room.h"
-#include "pb/serverinfo_game.pb.h"
-#include "trice_limits.h"

 #include <QApplication>
 #include <QCheckBox>
@ -19,6 +15,10 @@
 #include <QSet>
 #include <QSpinBox>
 #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/dialogs/dlg_create_game.h
+++ b/cockatrice/src/dialogs/dlg_create_game.h
@ -7,10 +7,9 @@
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H

-#include "../utility/macros.h"
-
 #include <QDialog>
 #include <QMap>
+#include <libcockatrice/utility/macros.h>

 class QCheckBox;
 class QDialogButtonBox;
--- a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp
@ -1,9 +1,8 @@
 #include "dlg_default_tags_editor.h"

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

 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
 {
--- a/cockatrice/src/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_avatar.cpp
@ -1,7 +1,5 @@
 #include "dlg_edit_avatar.h"

-#include "trice_limits.h"
-
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -11,6 +9,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
+#include <libcockatrice/utility/trice_limits.h>

 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {
--- a/cockatrice/src/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_password.cpp
@ -1,13 +1,12 @@
 #include "dlg_edit_password.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.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/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
@ -1,12 +1,7 @@
 #include "dlg_edit_tokens.h"

 #include "../client/get_text_with_max.h"
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
-#include "../database/model/card_database_model.h"
-#include "../database/model/token/token_edit_model.h"
 #include "../main.h"
-#include "trice_limits.h"

 #include <QAction>
 #include <QComboBox>
@ -22,6 +17,11 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/card_database/model/token/token_edit_model.h>
+#include <libcockatrice/utility/trice_limits.h>

 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
--- a/cockatrice/src/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.h
@ -7,9 +7,8 @@
 #ifndef DLG_EDIT_TOKENS_H
 #define DLG_EDIT_TOKENS_H

-#include "../card/card_info.h"
-
 #include <QDialog>
+#include <libcockatrice/card/card_info.h>

 class QModelIndex;
 class CardDatabaseModel;
--- a/cockatrice/src/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_user.cpp
@ -1,13 +1,12 @@
 #include "dlg_edit_user.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.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/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
@ -1,8 +1,5 @@
 #include "dlg_forgot_password_challenge.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -10,6 +7,8 @@
 #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/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp
@ -1,8 +1,5 @@
 #include "dlg_forgot_password_request.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -10,6 +7,8 @@
 #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/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
@ -1,8 +1,5 @@
 #include "dlg_forgot_password_reset.h"

-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -10,6 +7,8 @@
 #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/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/dialogs/dlg_load_deck.cpp
@ -1,7 +1,8 @@
 #include "dlg_load_deck.h"

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

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

 #include "../deck/deck_loader.h"
-#include "../settings/cache_settings.h"
 #include "dlg_settings.h"

 #include <QApplication>
@ -13,6 +12,7 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
+#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/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp
@ -1,11 +1,9 @@
 #include "dlg_manage_sets.h"

 #include "../client/network/sets_model.h"
-#include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../main.h"
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"

 #include <QAction>
 #include <QCheckBox>
@ -22,6 +20,8 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <algorithm>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>

 #define SORT_RESET -1

@ -251,7 +251,7 @@ void WndSets::actSave()
 {
    model->save(CardDatabaseManager::getInstance());
    SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards);
-    PictureLoader::clearPixmapCache();
+    CardPictureLoader::clearPixmapCache();
    close();
 }

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

-#include "../settings/cache_settings.h"
-#include "pb/serverinfo_user.pb.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@ -11,6 +7,9 @@
 #include <QHBoxLayout>
 #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/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
@ -1,6 +1,5 @@
 #include "dlg_select_set_for_cards.h"

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

--- a/cockatrice/src/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/dialogs/dlg_settings.cpp
@ -4,18 +4,13 @@
 #include "../client/network/release_channel.h"
 #include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/theme_manager.h"
+#include "../interface/utility/sequence_edit.h"
 #include "../interface/widgets/general/background_sources.h"
 #include "../main.h"
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"
-#include "../settings/card_counter_settings.h"
-#include "../settings/shortcut_treeview.h"
 #include "../tabs/tab_supervisor.h"
-#include "../utility/sequence_edit.h"

 #include <QAbstractButton>
 #include <QAbstractListModel>
@ -48,6 +43,11 @@
 #include <QToolBar>
 #include <QTranslator>
 #include <QVariant>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/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"
@ -679,8 +679,8 @@ void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_
    if (result == QMessageBox::Yes) {
        SettingsCache::instance().setOverrideAllCardArtWithPersonalPreference(value);
        // Caches are now invalid.
-        PictureLoader::clearPixmapCache();
-        PictureLoader::clearNetworkCache();
+        CardPictureLoader::clearPixmapCache();
+        CardPictureLoader::clearNetworkCache();
    } else {
        // If user cancels, revert the checkbox/state back
        QTimer::singleShot(0, this, [this, enable]() {
@ -1124,7 +1124,7 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()

 void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked()
 {
-    PictureLoader::clearNetworkCache();
+    CardPictureLoader::clearNetworkCache();

    // These are not used anymore, but we don't delete them automatically, so
    // we should do it here lest we leave pictures hanging around on users'
--- a/cockatrice/src/dialogs/dlg_settings.h
+++ b/cockatrice/src/dialogs/dlg_settings.h
@ -7,8 +7,6 @@
 #ifndef DLG_SETTINGS_H
 #define DLG_SETTINGS_H

-#include "../utility/macros.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialog>
@ -17,6 +15,7 @@
 #include <QLoggingCategory>
 #include <QPushButton>
 #include <QSpinBox>
+#include <libcockatrice/utility/macros.h>

 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");

--- a/cockatrice/src/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/dialogs/dlg_startup_card_check.cpp
@ -1,8 +1,7 @@
 #include "dlg_startup_card_check.h"

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

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

-#include "../settings/cache_settings.h"
 #include "tip_of_the_day.h"

 #include <QCheckBox>
@ -10,6 +9,7 @@
 #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/dialogs/dlg_update.cpp
+++ b/cockatrice/src/dialogs/dlg_update.cpp
@ -3,7 +3,6 @@
 #include "../client/network/client_update_checker.h"
 #include "../client/network/release_channel.h"
 #include "../interface/window_main.h"
-#include "../settings/cache_settings.h"

 #include <QApplication>
 #include <QDesktopServices>
@ -14,6 +13,7 @@
 #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/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/dialogs/dlg_view_log.cpp
@ -1,13 +1,12 @@
 #include "dlg_view_log.h"

-#include "../settings/cache_settings.h"
-#include "../utility/logger.h"
-
 #include <QClipboard>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/logger.h>

 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {