Turn Card, Settings and Utility into libraries.

Took 4 hours 3 minutes

Took 2 minutes

Took 38 seconds

Took 5 minutes

Took 5 minutes

Took 9 minutes


Took 15 minutes

cockatrice/CMakeLists.txt

@@ -7,12 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/card/card_info.cpp
-    src/card/card_relation.cpp
-    src/card/card_set.cpp
-    src/card/card_set_list.cpp
-    src/card/exact_card.cpp
-    src/card/printing_info.cpp
     src/client/deck_editor_menu.cpp
     src/client/get_text_with_max.cpp
     src/client/network/client_update_checker.cpp
@@ -25,19 +19,6 @@ set(cockatrice_SOURCES
     src/client/sound_engine.cpp
     src/client/tapped_out_interface.cpp
     src/client/update_downloader.cpp
-    src/database/card_database.cpp
-    src/database/card_database_loader.cpp
-    src/database/card_database_manager.cpp
-    src/database/card_database_querier.cpp
-    src/database/model/card_database_model.cpp
-    src/database/model/card_database_display_model.cpp
-    src/database/model/card/card_completer_proxy_model.cpp
-    src/database/model/card/card_search_model.cpp
-    src/database/model/token/token_display_model.cpp
-    src/database/model/token/token_edit_model.cpp
-    src/database/parser/card_database_parser.cpp
-    src/database/parser/cockatrice_xml_3.cpp
-    src/database/parser/cockatrice_xml_4.cpp
     src/deck/custom_line_edit.cpp
     src/deck/deck_list_model.cpp
     src/deck/deck_loader.cpp
@@ -138,6 +119,13 @@ set(cockatrice_SOURCES
     src/game/zones/table_zone.cpp
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader.cpp
+    src/interface/card_picture_loader/card_picture_loader_local.cpp
+    src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+    src/interface/card_picture_loader/card_picture_to_load.cpp
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
     src/interface/line_edit_completer.cpp
@@ -217,13 +205,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/picture_loader/picture_loader.cpp
-    src/picture_loader/picture_loader_local.cpp
-    src/picture_loader/picture_loader_request_status_display_widget.cpp
-    src/picture_loader/picture_loader_status_bar.cpp
-    src/picture_loader/picture_loader_worker.cpp
-    src/picture_loader/picture_loader_worker_work.cpp
-    src/picture_loader/picture_to_load.cpp
     src/server/abstract_client.cpp
     src/server/chat_view/chat_view.cpp
     src/server/game_selector.cpp
@@ -241,20 +222,6 @@ set(cockatrice_SOURCES
     src/server/user/user_info_connection.cpp
     src/server/user/user_list_manager.cpp
     src/server/user/user_list_widget.cpp
-    src/settings/cache_settings.cpp
-    src/settings/card_counter_settings.cpp
-    src/settings/card_database_settings.cpp
-    src/settings/card_override_settings.cpp
-    src/settings/debug_settings.cpp
-    src/settings/download_settings.cpp
-    src/settings/game_filters_settings.cpp
-    src/settings/layouts_settings.cpp
-    src/settings/message_settings.cpp
-    src/settings/recents_settings.cpp
-    src/settings/servers_settings.cpp
-    src/settings/settings_manager.cpp
-    src/settings/shortcut_treeview.cpp
-    src/settings/shortcuts_settings.cpp
     src/tabs/abstract_tab_deck_editor.cpp
     src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@@ -299,14 +266,13 @@ set(cockatrice_SOURCES
     src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
     src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
     src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/utility/card_info_comparator.cpp
-    src/utility/deck_list_sort_filter_proxy_model.cpp
-    src/utility/key_signals.cpp
-    src/utility/levenshtein.cpp
-    src/utility/logger.cpp
-    src/utility/sequence_edit.cpp
+    src/interface/utility/deck_list_sort_filter_proxy_model.cpp
+    src/interface/utility/sequence_edit.cpp
 )
 
+add_subdirectory(libs/settings)
+add_subdirectory(libs/card)
+add_subdirectory(libs/utility)
 add_subdirectory(sounds)
 add_subdirectory(themes)
 configure_file(
@@ -399,9 +365,9 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES})
 else()
-  target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice PUBLIC cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES})
 endif()
 
 if(UNIX)

cockatrice/libs/card/CMakeLists.txt

@@ -0,0 +1,67 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(HEADERS
+    include/card/card_info.h
+    include/card/card_info_comparator.h
+    include/card/card_database/card_database.h
+    include/card/card_database/card_database_loader.h
+    include/card/card_database/card_database_manager.h
+    include/card/card_database/card_database_querier.h
+    include/card/card_database/model/card_database_model.h
+    include/card/card_database/model/card_database_display_model.h
+    include/card/card_database/model/card/card_completer_proxy_model.h
+    include/card/card_database/model/card/card_search_model.h
+    include/card/card_database/model/token/token_display_model.h
+    include/card/card_database/model/token/token_edit_model.h
+    include/card/card_database/parser/card_database_parser.h
+    include/card/card_database/parser/cockatrice_xml_3.h
+    include/card/card_database/parser/cockatrice_xml_4.h
+    include/card/card_printing/exact_card.h
+    include/card/card_printing/printing_info.h
+    include/card/card_set/card_set.h
+    include/card/card_relation/card_relation.h
+)
+
+if (Qt6_FOUND)
+    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+elseif (Qt5_FOUND)
+    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
+endif ()
+
+qt_add_library(cardlib STATIC
+    src/card_info.cpp
+    src/card_info_comparator.cpp
+    src/card_database/card_database.cpp
+    src/card_database/card_database_loader.cpp
+    src/card_database/card_database_manager.cpp
+    src/card_database/card_database_querier.cpp
+    src/card_database/model/card_database_model.cpp
+    src/card_database/model/card_database_display_model.cpp
+    src/card_database/model/card/card_completer_proxy_model.cpp
+    src/card_database/model/card/card_search_model.cpp
+    src/card_database/model/token/token_display_model.cpp
+    src/card_database/model/token/token_edit_model.cpp
+    src/card_database/parser/card_database_parser.cpp
+    src/card_database/parser/cockatrice_xml_3.cpp
+    src/card_database/parser/cockatrice_xml_4.cpp
+    src/card_printing/exact_card.cpp
+    src/card_printing/printing_info.cpp
+    src/card_set/card_set.cpp
+    src/card_set/card_set_list.cpp
+    src/card_relation/card_relation.cpp
+    ${MOC_SOURCES}
+)
+
+target_include_directories(cardlib
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+    PUBLIC ${CMAKE_SOURCE_DIR}/common
+    PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/settings/include
+    PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
+)
+
+target_link_libraries(cardlib
+    PUBLIC settingslib
+    PUBLIC ${COCKATRICE_QT_MODULES}
+)

cockatrice/libs/card/include/card/card_database/card_database.h

@@ -7,10 +7,9 @@
 #ifndef CARDDATABASE_H
 #define CARDDATABASE_H
 
-#include "../card/card_set_list.h"
-#include "../card/exact_card.h"
-#include "../common/card_ref.h"
-#include "card_database_loader.h"
+#include "../../common/card_ref.h"
+#include "card/card_database/card_database_loader.h"
+#include "card/card_set/card_set_list.h"
 #include "card_database_querier.h"
 
 #include <QBasicMutex>

cockatrice/libs/card/include/card/card_database/card_database_querier.h

@@ -7,8 +7,9 @@
 #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
 #define COCKATRICE_CARD_DATABASE_QUERIER_H
 
-#include "../card/exact_card.h"
-#include "../common/card_ref.h"
+#include "../../common/card_ref.h"
+#include "card/card_info.h"
+#include "card/card_printing/exact_card.h"
 
 #include <QObject>
 

cockatrice/libs/card/include/card/card_database/model/card/card_search_model.h

@@ -7,7 +7,7 @@
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
-#include "../card_database_display_model.h"
+#include "card/card_database/model/card_database_display_model.h"
 
 #include <QAbstractListModel>
 

cockatrice/libs/card/include/card/card_database/model/card_database_display_model.h

@@ -8,7 +8,7 @@
 #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 
-#include "../../filters/filter_string.h"
+#include "filter_string.h"
 
 #include <QList>
 #include <QSet>

cockatrice/libs/card/include/card/card_database/model/card_database_model.h

@@ -7,7 +7,7 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "../card_database.h"
+#include "card/card_database/card_database.h"
 
 #include <QAbstractListModel>
 #include <QList>

cockatrice/libs/card/include/card/card_database/model/token/token_display_model.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H
 #define COCKATRICE_TOKEN_DISPLAY_MODEL_H
 
-#include "../card_database_display_model.h"
+#include "card/card_database/model/card_database_display_model.h"
 
 class TokenDisplayModel : public CardDatabaseDisplayModel
 {

cockatrice/libs/card/include/card/card_database/model/token/token_edit_model.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H
 #define COCKATRICE_TOKEN_EDIT_MODEL_H
 
-#include "../card_database_display_model.h"
+#include "card/card_database/model/card_database_display_model.h"
 
 class TokenEditModel : public CardDatabaseDisplayModel
 {

cockatrice/libs/card/include/card/card_database/parser/card_database_parser.h

@@ -7,7 +7,7 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H
 
-#include "../../card/card_info.h"
+#include "card/card_info.h"
 
 #include <QIODevice>
 #include <QString>

cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_3.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_XML3_H
 #define COCKATRICE_XML3_H
 
-#include "card_database_parser.h"
+#include "card/card_database/parser/card_database_parser.h"
 
 #include <QLoggingCategory>
 #include <QXmlStreamReader>
@@ -17,7 +17,6 @@ inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
 class CockatriceXml3Parser : public ICardDatabaseParser
 {
     Q_OBJECT
-    Q_INTERFACES(ICardDatabaseParser)
 public:
     CockatriceXml3Parser() = default;
     ~CockatriceXml3Parser() override = default;

cockatrice/libs/card/include/card/card_database/parser/cockatrice_xml_4.h

@@ -7,7 +7,7 @@
 #ifndef COCKATRICE_XML4_H
 #define COCKATRICE_XML4_H
 
-#include "card_database_parser.h"
+#include "card/card_database/parser/card_database_parser.h"
 
 #include <QLoggingCategory>
 #include <QXmlStreamReader>
@@ -17,7 +17,6 @@ inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
 class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT
-    Q_INTERFACES(ICardDatabaseParser)
 public:
     CockatriceXml4Parser() = default;
     ~CockatriceXml4Parser() override = default;

cockatrice/libs/card/include/card/card_info.h

@@ -7,7 +7,7 @@
 #ifndef CARD_INFO_H
 #define CARD_INFO_H
 
-#include "printing_info.h"
+#include "card_printing/printing_info.h"
 
 #include <QDate>
 #include <QHash>

cockatrice/libs/card/include/card/card_info_comparator.h

@@ -7,7 +7,7 @@
 #ifndef CARD_INFO_COMPARATOR_H
 #define CARD_INFO_COMPARATOR_H
 
-#include "../card/card_info.h"
+#include "card_info.h"
 
 #include <QStringList>
 #include <QVariant>

cockatrice/libs/card/include/card/card_printing/exact_card.h

@@ -1,7 +1,7 @@
 #ifndef EXACT_CARD_H
 #define EXACT_CARD_H
 
-#include "card_info.h"
+#include "card/card_info.h"
 
 /**
  * @class ExactCard

cockatrice/libs/card/include/card/card_printing/printing_info.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_PRINTING_INFO_H
 #define COCKATRICE_PRINTING_INFO_H
 
-#include "card_set.h"
+#include "card/card_set/card_set.h"
 
 #include <QList>
 #include <QMap>

cockatrice/libs/card/include/card/card_relation/card_relation.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_CARD_RELATION_H
 #define COCKATRICE_CARD_RELATION_H
 
-#include "card_relation_type.h"
+#include "card/card_relation/card_relation_type.h"
 
 #include <QObject>
 #include <QString>

cockatrice/libs/card/include/card/card_set/card_set_comparator.h

@@ -7,7 +7,7 @@
 #ifndef SET_PRIORITY_COMPARATOR_H
 #define SET_PRIORITY_COMPARATOR_H
 
-#include "../card/card_info.h"
+#include "card/card_info.h"
 
 class SetPriorityComparator
 {

cockatrice/libs/card/src/card_database/card_database.cpp

@@ -1,10 +1,9 @@
-#include "card_database.h"
+#include "card/card_database/card_database.h"
 
-#include "../card/card_relation.h"
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"
-#include "parser/cockatrice_xml_3.h"
-#include "parser/cockatrice_xml_4.h"
+#include "card/card_database/parser/cockatrice_xml_3.h"
+#include "card/card_database/parser/cockatrice_xml_4.h"
+#include "card/card_relation/card_relation.h"
+#include "settings/cache_settings.h"
 
 #include <QCryptographicHash>
 #include <QDebug>

cockatrice/libs/card/src/card_database/card_database_loader.cpp

@@ -1,9 +1,9 @@
-#include "card_database_loader.h"
+#include "card/card_database/card_database_loader.h"
 
-#include "../settings/cache_settings.h"
-#include "card_database.h"
-#include "parser/cockatrice_xml_3.h"
-#include "parser/cockatrice_xml_4.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/parser/cockatrice_xml_3.h"
+#include "card/card_database/parser/cockatrice_xml_4.h"
+#include "settings/cache_settings.h"
 
 #include <QDebug>
 #include <QDirIterator>

cockatrice/libs/card/src/card_database/card_database_manager.cpp

@@ -1,4 +1,4 @@
-#include "card_database_manager.h"
+#include "card/card_database/card_database_manager.h"
 
 CardDatabase *CardDatabaseManager::getInstance()
 {

cockatrice/libs/card/src/card_database/card_database_querier.cpp

@@ -1,7 +1,9 @@
-#include "card_database_querier.h"
+#include "card/card_database/card_database_querier.h"
 
-#include "../utility/card_set_comparator.h"
-#include "card_database.h"
+#include "card/card_database/card_database.h"
+#include "card/card_info.h"
+#include "card/card_printing/exact_card.h"
+#include "card/card_set/card_set_comparator.h"
 
 #include <qrandom.h>
 

cockatrice/libs/card/src/card_database/model/card/card_completer_proxy_model.cpp

@@ -1,4 +1,4 @@
-#include "card_completer_proxy_model.h"
+#include "card/card_database/model/card/card_completer_proxy_model.h"
 
 CardCompleterProxyModel::CardCompleterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {

cockatrice/libs/card/src/card_database/model/card/card_search_model.cpp

@@ -1,7 +1,8 @@
-#include "card_search_model.h"
+#include "card/card_database/model/card/card_search_model.h"
 
-#include "../../../utility/levenshtein.h"
-#include "../card_database_model.h"
+#include "card/card_database/model/card_database_display_model.h"
+#include "card/card_database/model/card_database_model.h"
+#include "utility/levenshtein.h"
 
 #include <algorithm>
 

cockatrice/libs/card/src/card_database/model/card_database_display_model.cpp

@@ -1,6 +1,6 @@
-#include "card_database_display_model.h"
+#include "card/card_database/model/card_database_display_model.h"
 
-#include "card_database_model.h"
+#include "card/card_database/model/card_database_model.h"
 
 CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr)

cockatrice/libs/card/src/card_database/model/card_database_model.cpp

@@ -1,4 +1,6 @@
-#include "card_database_model.h"
+#include "card/card_database/model/card_database_model.h"
+
+#include "card/card_database/card_database.h"
 
 #include <QMap>
 

cockatrice/libs/card/src/card_database/model/token/token_display_model.cpp

@@ -1,6 +1,6 @@
-#include "token_display_model.h"
+#include "card/card_database/model/token/token_display_model.h"
 
-#include "../card_database_model.h"
+#include "card/card_database/model/card_database_model.h"
 
 TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {

cockatrice/libs/card/src/card_database/model/token/token_edit_model.cpp

@@ -1,6 +1,8 @@
-#include "token_edit_model.h"
+#include "card/card_database/model/token/token_edit_model.h"
 
-#include "../card_database_model.h"
+#include "card/card_database/model/card_database_display_model.h"
+#include "card/card_database/model/card_database_model.h"
+#include "card/card_info.h"
 
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {

cockatrice/libs/card/src/card_database/parser/card_database_parser.cpp

@@ -1,4 +1,4 @@
-#include "card_database_parser.h"
+#include "card/card_database/parser/card_database_parser.h"
 
 SetNameMap ICardDatabaseParser::sets;
 

cockatrice/libs/card/src/card_database/parser/cockatrice_xml_3.cpp

@@ -1,7 +1,7 @@
-#include "cockatrice_xml_3.h"
+#include "card/card_database/parser/cockatrice_xml_3.h"
 
-#include "../../card/card_relation.h"
-#include "../../card/card_relation_type.h"
+#include "card/card_relation/card_relation.h"
+#include "card/card_relation/card_relation_type.h"
 
 #include <QCoreApplication>
 #include <QDebug>

cockatrice/libs/card/src/card_database/parser/cockatrice_xml_4.cpp

@@ -1,7 +1,7 @@
-#include "cockatrice_xml_4.h"
+#include "card/card_database/parser/cockatrice_xml_4.h"
 
-#include "../../card/card_relation.h"
-#include "../../settings/cache_settings.h"
+#include "card/card_relation/card_relation.h"
+#include "settings/cache_settings.h"
 
 #include <QCoreApplication>
 #include <QDebug>

cockatrice/libs/card/src/card_info.cpp

@@ -1,10 +1,10 @@
-#include "card_info.h"
+#include "card/card_info.h"
 
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"
-#include "card_relation.h"
-#include "game_specific_terms.h"
-#include "printing_info.h"
+#include "card/card_printing/printing_info.h"
+#include "card/card_relation/card_relation.h"
+#include "card/card_set/card_set.h"
+#include "card/game_specific_terms.h"
+#include "settings/cache_settings.h"
 
 #include <QDir>
 #include <QRegularExpression>

cockatrice/libs/card/src/card_info_comparator.cpp

@@ -1,4 +1,4 @@
-#include "card_info_comparator.h"
+#include "card/card_info_comparator.h"
 
 CardInfoComparator::CardInfoComparator(const QStringList &properties, Qt::SortOrder order)
     : m_properties(properties), m_order(order)

cockatrice/libs/card/src/card_printing/exact_card.cpp

@@ -1,4 +1,7 @@
-#include "exact_card.h"
+#include "card/card_printing/exact_card.h"
+
+#include "card/card_info.h"
+#include "card/card_printing/printing_info.h"
 
 /**
  * Default constructor.

cockatrice/libs/card/src/card_printing/printing_info.cpp

@@ -1,4 +1,6 @@
-#include "printing_info.h"
+#include "card/card_printing/printing_info.h"
+
+#include "card/card_set/card_set.h"
 
 PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
 {

cockatrice/libs/card/src/card_relation/card_relation.cpp

@@ -1,4 +1,6 @@
-#include "card_relation.h"
+#include "card/card_relation/card_relation.h"
+
+#include "card/card_relation/card_relation_type.h"
 
 CardRelation::CardRelation(const QString &_name,
                            CardRelationType _attachType,

cockatrice/libs/card/src/card_set/card_set.cpp

@@ -1,6 +1,6 @@
-#include "card_set.h"
+#include "card/card_set/card_set.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 const char *CardSet::TOKENS_SETNAME = "TK";
 

cockatrice/libs/card/src/card_set/card_set_list.cpp

@@ -1,4 +1,4 @@
-#include "card_set_list.h"
+#include "card/card_set/card_set_list.h"
 
 class CardSetList::KeyCompareFunctor
 {

cockatrice/libs/settings/CMakeLists.txt

@@ -0,0 +1,55 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(HEADERS
+    include/settings/cache_settings.h
+    include/settings/card_counter_settings.h
+    include/settings/card_database_settings.h
+    include/settings/card_override_settings.h
+    include/settings/debug_settings.h
+    include/settings/download_settings.h
+    include/settings/game_filters_settings.h
+    include/settings/layouts_settings.h
+    include/settings/message_settings.h
+    include/settings/recents_settings.h
+    include/settings/servers_settings.h
+    include/settings/settings_manager.h
+    include/settings/shortcut_treeview.h
+    include/settings/shortcuts_settings.h
+)
+
+if (Qt6_FOUND)
+    qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+elseif (Qt5_FOUND)
+    qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
+endif ()
+
+add_library(settingslib STATIC
+    src/cache_settings.cpp
+    src/card_counter_settings.cpp
+    src/card_database_settings.cpp
+    src/card_override_settings.cpp
+    src/debug_settings.cpp
+    src/download_settings.cpp
+    src/game_filters_settings.cpp
+    src/layouts_settings.cpp
+    src/message_settings.cpp
+    src/recents_settings.cpp
+    src/servers_settings.cpp
+    src/settings_manager.cpp
+    src/shortcut_treeview.cpp
+    src/shortcuts_settings.cpp
+    ${MOC_SOURCES}
+)
+
+target_include_directories(settingslib
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+    PUBLIC ${CMAKE_SOURCE_DIR}/common
+    PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/utility/include
+    PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
+)
+
+target_link_libraries(settingslib
+    PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}
+)

cockatrice/libs/settings/include/settings/cache_settings.h

@@ -7,7 +7,6 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "../utility/macros.h"
 #include "card_database_settings.h"
 #include "card_override_settings.h"
 #include "debug_settings.h"
@@ -24,6 +23,7 @@
 #include <QObject>
 #include <QSize>
 #include <QStringList>
+#include <utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 

cockatrice/libs/settings/src/cache_settings.cpp

@@ -1,8 +1,8 @@
-#include "cache_settings.h"
+#include "../include/settings/cache_settings.h"
 
-#include "../client/network/release_channel.h"
-#include "card_counter_settings.h"
-#include "card_override_settings.h"
+#include "../include/settings/card_counter_settings.h"
+#include "../include/settings/card_override_settings.h"
+#include "release_channel.h"
 
 #include <QAbstractListModel>
 #include <QApplication>

cockatrice/libs/settings/src/card_counter_settings.cpp

@@ -1,4 +1,4 @@
-#include "card_counter_settings.h"
+#include "../include/settings/card_counter_settings.h"
 
 #include <QColor>
 #include <QSettings>

cockatrice/libs/settings/src/card_database_settings.cpp

@@ -1,4 +1,4 @@
-#include "card_database_settings.h"
+#include "../include/settings/card_database_settings.h"
 
 CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardDatabase.ini", parent)

cockatrice/libs/settings/src/card_override_settings.cpp

@@ -1,4 +1,4 @@
-#include "card_override_settings.h"
+#include "../include/settings/card_override_settings.h"
 
 CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent)

cockatrice/libs/settings/src/debug_settings.cpp

@@ -1,4 +1,4 @@
-#include "debug_settings.h"
+#include "../include/settings/debug_settings.h"
 
 #include <QtCore/QFile>
 

cockatrice/libs/settings/src/download_settings.cpp

@@ -1,6 +1,6 @@
-#include "download_settings.h"
+#include "../include/settings/download_settings.h"
 
-#include "settings_manager.h"
+#include "../include/settings/settings_manager.h"
 
 const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
     "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!",

cockatrice/libs/settings/src/game_filters_settings.cpp

@@ -1,4 +1,4 @@
-#include "game_filters_settings.h"
+#include "../include/settings/game_filters_settings.h"
 
 #include <QCryptographicHash>
 #include <QTime>

cockatrice/libs/settings/src/layouts_settings.cpp

@@ -1,4 +1,4 @@
-#include "layouts_settings.h"
+#include "../include/settings/layouts_settings.h"
 
 LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "layouts.ini", parent)

cockatrice/libs/settings/src/message_settings.cpp

@@ -1,4 +1,4 @@
-#include "message_settings.h"
+#include "../include/settings/message_settings.h"
 
 MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "messages.ini", parent)

cockatrice/libs/settings/src/recents_settings.cpp

@@ -1,4 +1,4 @@
-#include "recents_settings.h"
+#include "../include/settings/recents_settings.h"
 
 #define MAX_RECENT_DECK_COUNT 10
 

cockatrice/libs/settings/src/servers_settings.cpp

@@ -1,4 +1,4 @@
-#include "servers_settings.h"
+#include "../include/settings/servers_settings.h"
 
 #include <QDebug>
 #include <utility>

cockatrice/libs/settings/src/settings_manager.cpp

@@ -1,4 +1,4 @@
-#include "settings_manager.h"
+#include "../include/settings/settings_manager.h"
 
 SettingsManager::SettingsManager(const QString &settingPath, QObject *parent)
     : QObject(parent), settings(settingPath, QSettings::IniFormat)

cockatrice/libs/settings/src/shortcut_treeview.cpp

@@ -1,7 +1,7 @@
-#include "shortcut_treeview.h"
+#include "../include/settings/shortcut_treeview.h"
 
-#include "cache_settings.h"
-#include "shortcuts_settings.h"
+#include "../include/settings/cache_settings.h"
+#include "../include/settings/shortcuts_settings.h"
 
 #include <QHeaderView>
 

cockatrice/libs/settings/src/shortcuts_settings.cpp

@@ -1,4 +1,4 @@
-#include "shortcuts_settings.h"
+#include "../include/settings/shortcuts_settings.h"
 
 #include <QDebug>
 #include <QFile>

cockatrice/libs/utility/CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.16)
+project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(UTILITY_SOURCES
+    src/key_signals.cpp
+    src/levenshtein.cpp
+    src/logger.cpp
+)
+
+set(UTILITY_HEADERS
+    include/utility/key_signals.h
+    include/utility/levenshtein.h
+    include/utility/logger.h
+    include/utility/macros.h
+)
+
+qt_add_library(utility STATIC
+    ${UTILITY_SOURCES}
+    ${UTILITY_HEADERS}
+)
+
+target_include_directories(utility
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+target_link_libraries(utility
+    PUBLIC ${COCKATRICE_QT_MODULES}
+)

cockatrice/libs/utility/src/key_signals.cpp

@@ -1,4 +1,4 @@
-#include "key_signals.h"
+#include "../include/utility/key_signals.h"
 
 #include <QKeyEvent>
 

cockatrice/libs/utility/src/levenshtein.cpp

@@ -1,4 +1,4 @@
-#include "levenshtein.h"
+#include "../include/utility/levenshtein.h"
 
 #include <algorithm>
 #include <vector>

cockatrice/libs/utility/src/logger.cpp

@@ -1,4 +1,4 @@
-#include "logger.h"
+#include "../include/utility/logger.h"
 
 #include "version_string.h"
 

cockatrice/src/client/deck_editor_menu.cpp

@@ -1,7 +1,7 @@
 #include "deck_editor_menu.h"
 
-#include "../settings/cache_settings.h"
-#include "../settings/shortcuts_settings.h"
+#include "settings/cache_settings.h"
+#include "settings/shortcuts_settings.h"
 
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {

cockatrice/src/client/network/client_update_checker.cpp

@@ -1,7 +1,7 @@
 #include "client_update_checker.h"
 
-#include "../../settings/cache_settings.h"
 #include "release_channel.h"
+#include "settings/cache_settings.h"
 
 ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)
 {

cockatrice/src/client/network/replay_timeline_widget.cpp

@@ -1,6 +1,6 @@
 #include "replay_timeline_widget.h"
 
-#include "../../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 #include <QPainter>
 #include <QPainterPath>

cockatrice/src/client/network/sets_model.h

@@ -7,7 +7,7 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "../../database/card_database.h"
+#include "card/card_database/card_database.h"
 
 #include <QAbstractTableModel>
 #include <QMimeData>

cockatrice/src/client/network/spoiler_background_updater.cpp

@@ -1,10 +1,10 @@
 #include "spoiler_background_updater.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../interface/window_main.h"
 #include "../../main.h"
-#include "../../settings/cache_settings.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/card_database_manager.h"
+#include "settings/cache_settings.h"
 
 #include <QApplication>
 #include <QCryptographicHash>

cockatrice/src/client/sound_engine.cpp

@@ -1,6 +1,6 @@
 #include "sound_engine.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 #include <QDir>
 #include <QMediaPlayer>

cockatrice/src/client/tapped_out_interface.h

@@ -7,7 +7,7 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "../database/card_database.h"
+#include "card/card_database/card_database.h"
 #include "deck_list.h"
 
 #include <QLoggingCategory>

cockatrice/src/deck/custom_line_edit.cpp

@@ -1,7 +1,7 @@
 #include "custom_line_edit.h"
 
-#include "../settings/cache_settings.h"
-#include "../settings/shortcuts_settings.h"
+#include "settings/cache_settings.h"
+#include "settings/shortcuts_settings.h"
 
 #include <QKeyEvent>
 #include <QLineEdit>

cockatrice/src/deck/deck_list_model.cpp

@@ -1,9 +1,9 @@
 #include "deck_list_model.h"
 
-#include "../database/card_database_manager.h"
 #include "../main.h"
-#include "../settings/cache_settings.h"
+#include "card/card_database/card_database_manager.h"
 #include "deck_loader.h"
+#include "settings/cache_settings.h"
 
 #include <QBrush>
 #include <QFont>

cockatrice/src/deck/deck_list_model.h

@@ -1,8 +1,8 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "../card/exact_card.h"
 #include "abstract_deck_list_card_node.h"
+#include "card/card_printing/exact_card.h"
 #include "deck_list.h"
 #include "deck_list_card_node.h"
 

cockatrice/src/deck/deck_loader.cpp

@@ -1,8 +1,8 @@
 #include "deck_loader.h"
 
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
 #include "../main.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/card_database_manager.h"
 #include "deck_list.h"
 #include "deck_list_card_node.h"
 

cockatrice/src/deck/deck_stats_interface.h

@@ -7,7 +7,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "../database/card_database.h"
+#include "card/card_database/card_database.h"
 #include "deck_list.h"
 
 #include <QObject>

cockatrice/src/dialogs/dlg_connect.cpp

@@ -1,6 +1,6 @@
 #include "dlg_connect.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_connect.h

@@ -9,7 +9,7 @@
 
 #include "../server/handle_public_servers.h"
 #include "../server/user/user_info_connection.h"
-#include "../utility/macros.h"
+#include "utility/macros.h"
 
 #include <QDialog>
 #include <QLineEdit>

cockatrice/src/dialogs/dlg_create_game.cpp

@@ -1,9 +1,9 @@
 #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 "settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QApplication>

cockatrice/src/dialogs/dlg_create_game.h

@@ -7,7 +7,7 @@
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H
 
-#include "../utility/macros.h"
+#include "utility/macros.h"
 
 #include <QDialog>
 #include <QMap>

cockatrice/src/dialogs/dlg_default_tags_editor.cpp

@@ -1,6 +1,6 @@
 #include "dlg_default_tags_editor.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 #include <QMessageBox>
 #include <QVBoxLayout>

cockatrice/src/dialogs/dlg_edit_password.cpp

@@ -1,6 +1,6 @@
 #include "dlg_edit_password.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QDialogButtonBox>