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/src/game/board/abstract_card_drag_item.cpp

@@ -1,6 +1,6 @@
 #include "abstract_card_drag_item.h"
 
-#include "../../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 #include <QCursor>
 #include <QDebug>

cockatrice/src/game/board/abstract_card_item.cpp

@@ -1,10 +1,10 @@
 #include "abstract_card_item.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
-#include "../../picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../game_scene.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/card_database_manager.h"
+#include "settings/cache_settings.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
@@ -119,11 +119,11 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
 
     if (facedown || cardRef.name.isEmpty()) {
         // never reveal card color, always paint the card back
-        PictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
+        CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
     } else {
         // don't even spend time trying to load the picture if our size is too small
         if (translatedSize.width() > 10) {
-            PictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
+            CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
             if (translatedPixmap.isNull())
                 paintImage = false;
         } else {

cockatrice/src/game/board/abstract_card_item.h

@@ -7,8 +7,8 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../card/exact_card.h"
 #include "arrow_target.h"
+#include "card/card_printing/exact_card.h"
 #include "card_ref.h"
 #include "graphics_item_type.h"
 

cockatrice/src/game/board/abstract_counter.cpp

@@ -1,11 +1,11 @@
 #include "abstract_counter.h"
 
-#include "../../settings/cache_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../player/player.h"
 #include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
+#include "settings/cache_settings.h"
 #include "translate_counter_name.h"
 
 #include <QAction>

cockatrice/src/game/board/arrow_item.cpp

@@ -1,16 +1,16 @@
 #define _USE_MATH_DEFINES
 #include "arrow_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
 #include "../player/player.h"
 #include "../player/player_target.h"
 #include "../zones/card_zone.h"
+#include "card/card_info.h"
 #include "card_item.h"
 #include "color.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_create_arrow.pb.h"
 #include "pb/command_delete_arrow.pb.h"
+#include "settings/cache_settings.h"
 
 #include <QDebug>
 #include <QGraphicsScene>

cockatrice/src/game/board/card_item.cpp

@@ -1,8 +1,5 @@
 #include "card_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
-#include "../../settings/card_counter_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "../player/player.h"
@@ -11,8 +8,11 @@
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
 #include "arrow_item.h"
+#include "card/card_info.h"
 #include "card_drag_item.h"
 #include "pb/serverinfo_card.pb.h"
+#include "settings/cache_settings.h"
+#include "settings/card_counter_settings.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>

cockatrice/src/game/board/card_list.cpp

@@ -1,6 +1,6 @@
 #include "card_list.h"
 
-#include "../../card/card_info.h"
+#include "card/card_info.h"
 #include "card_item.h"
 
 #include <QDebug>

cockatrice/src/game/deckview/deck_view.cpp

@@ -1,10 +1,10 @@
 #include "deck_view.h"
 
-#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
+#include "card/card_info.h"
 #include "deck_list.h"
 #include "deck_list_card_node.h"
+#include "settings/cache_settings.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,23 +1,23 @@
 #include "deck_view_container.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../deck/deck_loader.h"
 #include "../../dialogs/dlg_load_deck.h"
 #include "../../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../dialogs/dlg_load_deck_from_website.h"
 #include "../../dialogs/dlg_load_remote_deck.h"
-#include "../../picture_loader/picture_loader.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../server/pending_command.h"
-#include "../../settings/cache_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../game_scene.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/card_database_manager.h"
 #include "deck_view.h"
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_ready_start.pb.h"
 #include "pb/command_set_sideboard_lock.pb.h"
 #include "pb/command_set_sideboard_plan.pb.h"
 #include "pb/response_deck_download.pb.h"
+#include "settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QMessageBox>
@@ -332,7 +332,7 @@ void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
     DeckLoader newDeck(QString::fromStdString(resp.deck()));
-    PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -1,12 +1,12 @@
 #include "dlg_create_token.h"
 
-#include "../../database/card_database_manager.h"
-#include "../../database/model/card_database_model.h"
-#include "../../database/model/token/token_display_model.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
-#include "../../settings/cache_settings.h"
+#include "card/card_database/card_database_manager.h"
+#include "card/card_database/model/card_database_model.h"
+#include "card/card_database/model/token/token_display_model.h"
 #include "deck_list.h"
+#include "settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp

@@ -1,8 +1,8 @@
 #include "dlg_move_top_cards_until.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../filters/filter_string.h"
+#include "card/card_database/card_database.h"
+#include "card/card_database/card_database_manager.h"
 
 #include <QDialogButtonBox>
 #include <QLabel>

cockatrice/src/game/game_scene.cpp

@@ -1,10 +1,10 @@
 #include "game_scene.h"
 
-#include "../settings/cache_settings.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/player.h"
 #include "player/player_graphics_item.h"
+#include "settings/cache_settings.h"
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 

cockatrice/src/game/game_view.cpp

@@ -1,7 +1,7 @@
 #include "game_view.h"
 
-#include "../settings/cache_settings.h"
 #include "game_scene.h"
+#include "settings/cache_settings.h"
 
 #include <QAction>
 #include <QResizeEvent>

cockatrice/src/game/log/message_log_widget.cpp

@@ -1,7 +1,6 @@
 #include "message_log_widget.h"
 
 #include "../../client/sound_engine.h"
-#include "../../settings/card_counter_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
@@ -11,6 +10,7 @@
 #include "pb/context_move_card.pb.h"
 #include "pb/context_mulligan.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "settings/card_counter_settings.h"
 
 #include <utility>
 

cockatrice/src/game/player/menu/card_menu.cpp

@@ -1,16 +1,16 @@
 #include "card_menu.h"
 
-#include "../../../card/card_relation.h"
-#include "../../../database/card_database_manager.h"
-#include "../../../settings/card_counter_settings.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/logic/view_zone_logic.h"
 #include "../card_menu_action_type.h"
 #include "../player.h"
 #include "../player_actions.h"
+#include "card/card_database/card_database_manager.h"
+#include "card/card_relation/card_relation.h"
 #include "move_menu.h"
 #include "pt_menu.h"
+#include "settings/card_counter_settings.h"
 
 CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)

cockatrice/src/game/player/menu/player_menu.cpp

@@ -1,12 +1,12 @@
 #include "player_menu.h"
 
 #include "../../../common/pb/command_reveal_cards.pb.h"
-#include "../../../database/card_database_manager.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
 #include "../card_menu_action_type.h"
 #include "../player_actions.h"
+#include "card/card_database/card_database_manager.h"
 #include "card_menu.h"
 #include "hand_menu.h"
 

cockatrice/src/game/player/menu/say_menu.cpp

@@ -1,8 +1,8 @@
 #include "say_menu.h"
 
-#include "../../../settings/cache_settings.h"
 #include "../player.h"
 #include "../player_actions.h"
+#include "settings/cache_settings.h"
 
 SayMenu::SayMenu(Player *_player) : player(_player)
 {

cockatrice/src/game/player/player.h

@@ -7,11 +7,11 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../../card/card_info.h"
 #include "../../filters/filter_string.h"
 #include "../../interface/tearoff_menu.h"
 #include "../board/abstract_graphics_item.h"
 #include "../dialogs/dlg_create_token.h"
+#include "card/card_info.h"
 #include "menu/player_menu.h"
 #include "pb/card_attributes.pb.h"
 #include "pb/game_event.pb.h"

cockatrice/src/game/player/player_actions.cpp

@@ -1,14 +1,14 @@
 #include "player_actions.h"
 
 #include "../../../common/pb/context_move_card.pb.h"
-#include "../../card/card_relation.h"
 #include "../../client/get_text_with_max.h"
-#include "../../database/card_database_manager.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
 #include "../zones/logic/view_zone_logic.h"
+#include "card/card_database/card_database_manager.h"
+#include "card/card_relation/card_relation.h"
 #include "card_menu_action_type.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"

cockatrice/src/game/player/player_actions.h

@@ -7,7 +7,7 @@
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../../card/card_relation_type.h"
+#include "card/card_relation/card_relation_type.h"
 #include "event_processing_options.h"
 #include "player.h"
 

cockatrice/src/game/zones/hand_zone.cpp

@@ -1,11 +1,11 @@
 #include "hand_zone.h"
 
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "pb/command_move_card.pb.h"
+#include "settings/cache_settings.h"
 
 #include <QPainter>
 

cockatrice/src/game/zones/logic/card_zone_logic.cpp

@@ -1,10 +1,10 @@
 #include "card_zone_logic.h"
 
-#include "../../../database/card_database_manager.h"
 #include "../../board/card_item.h"
 #include "../../player/player.h"
 #include "../pile_zone.h"
 #include "../view_zone.h"
+#include "card/card_database/card_database_manager.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "view_zone_logic.h"

cockatrice/src/game/zones/logic/view_zone_logic.cpp

@@ -1,7 +1,7 @@
 #include "view_zone_logic.h"
 
-#include "../../../settings/cache_settings.h"
 #include "../../board/card_item.h"
+#include "settings/cache_settings.h"
 
 /**
  * @param _player the player that the cards are revealed to.

cockatrice/src/game/zones/select_zone.cpp

@@ -1,8 +1,8 @@
 #include "select_zone.h"
 
-#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
+#include "settings/cache_settings.h"
 
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>

cockatrice/src/game/zones/stack_zone.cpp

@@ -1,13 +1,13 @@
 #include "stack_zone.h"
 
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "logic/stack_zone_logic.h"
 #include "pb/command_move_card.pb.h"
+#include "settings/cache_settings.h"
 
 #include <QPainter>
 #include <QSet>

cockatrice/src/game/zones/table_zone.cpp

@@ -1,15 +1,15 @@
 #include "table_zone.h"
 
-#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
+#include "card/card_info.h"
 #include "logic/table_zone_logic.h"
 #include "pb/command_move_card.pb.h"
 #include "pb/command_set_card_attr.pb.h"
+#include "settings/cache_settings.h"
 
 #include <QGraphicsScene>
 #include <QPainter>

cockatrice/src/game/zones/view_zone.cpp

@@ -1,10 +1,10 @@
 #include "view_zone.h"
 
-#include "../../card/card_info.h"
 #include "../../server/pending_command.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
+#include "card/card_info.h"
 #include "logic/view_zone_logic.h"
 #include "pb/command_dump_zone.pb.h"
 #include "pb/command_move_card.pb.h"
@@ -112,7 +112,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
 
     qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
     reorganizeCards();
-    emit getLogic()->cardCountChanged();
+    emit getLogic() -> cardCountChanged();
 }
 
 // Because of boundingRect(), this function must not be called before the zone was added to a scene.

cockatrice/src/game/zones/view_zone_widget.cpp

@@ -2,11 +2,11 @@
 
 #include "../../filters/syntax_help.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 #include "../player/player.h"
 #include "pb/command_shuffle.pb.h"
+#include "settings/cache_settings.h"
 #include "view_zone.h"
 
 #include <QCheckBox>

cockatrice/src/game/zones/view_zone_widget.h

@@ -7,8 +7,8 @@
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
-#include "../../utility/macros.h"
 #include "logic/card_zone_logic.h"
+#include "utility/macros.h"
 
 #include <QCheckBox>
 #include <QComboBox>