squash #6158 (#6160)

* move message_log_widget to game

* move files

* update headers

* fix cmakelists

* oracle fixes

* split implementation out to cpp

* fix recursive import

* fix main file

* format

cockatrice/src/card/card_info.cpp

@@ -1,6 +1,6 @@
 #include "card_info.h"
 
-#include "../client/ui/picture_loader/picture_loader.h"
+#include "../picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 #include "game_specific_terms.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/deck_editor_menu.h

@@ -1,7 +1,7 @@
 #ifndef DECK_EDITOR_MENU_H
 #define DECK_EDITOR_MENU_H
 
-#include "../../tabs/abstract_tab_deck_editor.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 
 #include <QMenu>
 

cockatrice/src/client/network/spoiler_background_updater.cpp

@@ -2,9 +2,9 @@
 
 #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 "../ui/window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>

cockatrice/src/client/replay_manager.cpp

@@ -1,6 +1,6 @@
 #include "replay_manager.h"
 
-#include "tabs/tab_game.h"
+#include "../tabs/tab_game.h"
 
 #include <QHBoxLayout>
 #include <QToolButton>

cockatrice/src/client/replay_manager.h

@@ -1,11 +1,14 @@
 #ifndef REPLAY_MANAGER_H
 #define REPLAY_MANAGER_H
+
 #include "network/replay_timeline_widget.h"
 #include "pb/game_replay.pb.h"
-#include "tabs/tab_game.h"
 
+#include <QToolButton>
 #include <QWidget>
 
+class TabGame;
+
 class ReplayManager : public QWidget
 {
     Q_OBJECT

cockatrice/src/database/card_database.cpp

@@ -1,10 +1,10 @@
 #include "card_database.h"
 
-#include "../client/ui/picture_loader/picture_loader.h"
+#include "../picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 #include "../utility/card_set_comparator.h"
-#include "./parser/cockatrice_xml_3.h"
-#include "./parser/cockatrice_xml_4.h"
+#include "parser/cockatrice_xml_3.h"
+#include "parser/cockatrice_xml_4.h"
 
 #include <QCryptographicHash>
 #include <QDebug>

cockatrice/src/dialogs/dlg_create_game.cpp

@@ -1,8 +1,8 @@
 #include "dlg_create_game.h"
 
-#include "../client/tabs/tab_room.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"
 

cockatrice/src/dialogs/dlg_filter_games.h

@@ -1,7 +1,7 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../game/games_model.h"
+#include "../server/games_model.h"
 
 #include <QCheckBox>
 #include <QComboBox>

cockatrice/src/dialogs/dlg_manage_sets.cpp

@@ -1,10 +1,10 @@
 #include "dlg_manage_sets.h"
 
 #include "../client/network/sets_model.h"
-#include "../client/ui/picture_loader/picture_loader.h"
 #include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
+#include "../picture_loader/picture_loader.h"
 #include "../settings/cache_settings.h"
 
 #include <QAction>

cockatrice/src/dialogs/dlg_select_set_for_cards.cpp

@@ -1,9 +1,9 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../client/ui/widgets/cards/card_info_picture_widget.h"
-#include "../client/ui/widgets/general/layout_containers/flow_widget.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"
 #include "dlg_select_set_for_cards.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_select_set_for_cards.h

@@ -1,8 +1,8 @@
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
-#include "../client/ui/widgets/general/layout_containers/flow_widget.h"
 #include "../deck/deck_list_model.h"
+#include "../interface/widgets/general/layout_containers/flow_widget.h"
 
 #include <QCheckBox>
 #include <QDialog>

cockatrice/src/dialogs/dlg_settings.cpp

@@ -4,17 +4,17 @@
 #include "../client/network/release_channel.h"
 #include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
-#include "../client/tabs/tab_supervisor.h"
-#include "../client/ui/picture_loader/picture_loader.h"
-#include "../client/ui/theme_manager.h"
-#include "../client/ui/widgets/general/background_sources.h"
 #include "../database/card_database.h"
 #include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/theme_manager.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>

cockatrice/src/dialogs/dlg_tip_of_the_day.cpp

@@ -1,7 +1,7 @@
 #include "dlg_tip_of_the_day.h"
 
-#include "../client/ui/tip_of_the_day.h"
 #include "../settings/cache_settings.h"
+#include "tip_of_the_day.h"
 
 #include <QCheckBox>
 #include <QDate>

cockatrice/src/dialogs/dlg_update.cpp

@@ -2,7 +2,7 @@
 
 #include "../client/network/client_update_checker.h"
 #include "../client/network/release_channel.h"
-#include "../client/ui/window_main.h"
+#include "../interface/window_main.h"
 #include "../settings/cache_settings.h"
 
 #include <QApplication>

cockatrice/src/filters/deck_filter_string.h

@@ -1,7 +1,7 @@
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
-#include "../client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
 
 #include <QLoggingCategory>
 #include <QMap>

cockatrice/src/game/board/abstract_card_item.cpp

@@ -1,8 +1,8 @@
 #include "abstract_card_item.h"
 
-#include "../../client/ui/picture_loader/picture_loader.h"
 #include "../../database/card_database.h"
 #include "../../database/card_database_manager.h"
+#include "../../picture_loader/picture_loader.h"
 #include "../../settings/cache_settings.h"
 #include "../game_scene.h"
 

cockatrice/src/game/board/abstract_counter.cpp

@@ -1,12 +1,12 @@
 #include "abstract_counter.h"
 
-#include "../../client/tabs/tab_game.h"
-#include "../../client/translate_counter_name.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 "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>

cockatrice/src/game/board/abstract_counter.h

@@ -1,7 +1,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../client/tearoff_menu.h"
+#include "../../interface/tearoff_menu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>

cockatrice/src/game/board/card_item.cpp

@@ -1,9 +1,9 @@
 #include "card_item.h"
 
 #include "../../card/card_info.h"
-#include "../../client/tabs/tab_game.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"
 #include "../zones/card_zone.h"

cockatrice/src/game/board/counter_general.cpp

@@ -1,6 +1,6 @@
 #include "counter_general.h"
 
-#include "../../client/ui/pixel_map_generator.h"
+#include "../../interface/pixel_map_generator.h"
 #include "abstract_graphics_item.h"
 
 #include <QPainter>

cockatrice/src/game/deckview/deck_view.cpp

@@ -1,7 +1,7 @@
 #include "deck_view.h"
 
 #include "../../card/card_info.h"
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
 #include "../../settings/cache_settings.h"
 #include "deck_list.h"
 #include "deck_list_card_node.h"

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,7 +1,5 @@
 #include "deck_view_container.h"
 
-#include "../../client/tabs/tab_game.h"
-#include "../../client/ui/picture_loader/picture_loader.h"
 #include "../../database/card_database.h"
 #include "../../database/card_database_manager.h"
 #include "../../deck/deck_loader.h"
@@ -9,8 +7,10 @@
 #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 "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "deck_view.h"
 #include "pb/command_deck_select.pb.h"

cockatrice/src/game/deckview/tabbed_deck_view_container.cpp

@@ -1,6 +1,6 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../../client/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "deck_view.h"
 
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -1,10 +1,10 @@
 #include "dlg_create_token.h"
 
-#include "../client/ui/widgets/cards/card_info_picture_widget.h"
-#include "../database/card_database_manager.h"
-#include "../database/card_database_model.h"
-#include "../main.h"
-#include "../settings/cache_settings.h"
+#include "../../database/card_database_manager.h"
+#include "../../database/card_database_model.h"
+#include "../../interface/widgets/cards/card_info_picture_widget.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
 #include "deck_list.h"
 #include "trice_limits.h"
 

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 "../../database/card_database.h"
+#include "../../database/card_database_manager.h"
+#include "../../filters/filter_string.h"
 
 #include <QDialogButtonBox>
 #include <QLabel>

cockatrice/src/game/game.cpp

@@ -1,6 +1,6 @@
 #include "game.h"
 
-#include "../client/tabs/tab_game.h"
+#include "../tabs/tab_game.h"
 #include "pb/event_game_joined.pb.h"
 
 Game::Game(TabGame *_tab,

cockatrice/src/game/game_event_handler.cpp

@@ -1,11 +1,11 @@
 #include "game_event_handler.h"
 
-#include "../client/tabs/tab_game.h"
 #include "../server/abstract_client.h"
-#include "../server/message_log_widget.h"
 #include "../server/pending_command.h"
+#include "../tabs/tab_game.h"
 #include "abstract_game.h"
 #include "get_pb_extension.h"
+#include "log/message_log_widget.h"
 #include "pb/command_concede.pb.h"
 #include "pb/command_delete_arrow.pb.h"
 #include "pb/command_game_say.pb.h"
@@ -501,4 +501,4 @@ void GameEventHandler::eventSetActivePhase(const Event_SetActivePhase &event,
     }
     game->getGameState()->setCurrentPhase(phase);
     emitUserEvent();
-}
+}

cockatrice/src/game/game_scene.cpp

@@ -1,8 +1,8 @@
 #include "game_scene.h"
 
-#include "../client/ui/phases_toolbar.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 "zones/view_zone.h"

cockatrice/src/game/hand_counter.h

@@ -1,7 +1,7 @@
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "../game/board/abstract_graphics_item.h"
+#include "board/abstract_graphics_item.h"
 #include "board/graphics_item_type.h"
 
 #include <QString>

cockatrice/src/game/log/message_log_widget.cpp

@@ -1,13 +1,13 @@
 #include "message_log_widget.h"
 
-#include "../client/sound_engine.h"
-#include "../client/tabs/tab_game.h"
-#include "../client/translate_counter_name.h"
-#include "../game/board/card_item.h"
-#include "../game/phase.h"
-#include "../game/player/player.h"
-#include "../game/zones/card_zone.h"
-#include "../settings/card_counter_settings.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"
+#include "../phase.h"
+#include "../player/player.h"
+#include "../zones/card_zone.h"
 #include "pb/context_move_card.pb.h"
 #include "pb/context_mulligan.pb.h"
 #include "pb/serverinfo_user.pb.h"

cockatrice/src/game/log/message_log_widget.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
-#include "../client/translation.h"
-#include "../game/zones/logic/card_zone_logic.h"
-#include "chat_view/chat_view.h"
+#include "../../client/translation.h"
+#include "../../server/chat_view/chat_view.h"
+#include "../zones/logic/card_zone_logic.h"
 #include "user_level.h"
 
 class AbstractGame;

cockatrice/src/game/phases_toolbar.cpp

@@ -1,10 +1,10 @@
 #include "phases_toolbar.h"
 
+#include "../interface/pixel_map_generator.h"
 #include "pb/command_draw_cards.pb.h"
 #include "pb/command_next_turn.pb.h"
 #include "pb/command_set_active_phase.pb.h"
 #include "pb/command_set_card_attr.pb.h"
-#include "pixel_map_generator.h"
 
 #include <QAction>
 #include <QDebug>

cockatrice/src/game/phases_toolbar.h

@@ -1,7 +1,7 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "../../game/board/abstract_graphics_item.h"
+#include "board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>

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

@@ -1,8 +1,8 @@
 #include "card_menu.h"
 
-#include "../../../client/tabs/tab_game.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"

cockatrice/src/game/player/menu/grave_menu.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_GRAVE_MENU_H
 #define COCKATRICE_GRAVE_MENU_H
 
-#include "../../../client/tearoff_menu.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/hand_menu.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_HAND_MENU_H
 #define COCKATRICE_HAND_MENU_H
 
-#include "../../../client/tearoff_menu.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/library_menu.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_LIBRARY_MENU_H
 #define COCKATRICE_LIBRARY_MENU_H
 
-#include "../../../client/tearoff_menu.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

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

@@ -1,8 +1,8 @@
 #include "player_menu.h"
 
-#include "../../../client/tabs/tab_game.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"

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

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_PLAYER_MENU_H
 #define COCKATRICE_PLAYER_MENU_H
 
-#include "../../../client/tearoff_menu.h"
+#include "../../../interface/tearoff_menu.h"
 #include "../player.h"
 #include "custom_zone_menu.h"
 #include "grave_menu.h"

cockatrice/src/game/player/menu/rfg_menu.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_RFG_MENU_H
 #define COCKATRICE_RFG_MENU_H
 
-#include "../../../client/tearoff_menu.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/player.cpp

@@ -1,7 +1,7 @@
 #include "player.h"
 
-#include "../../client/tabs/tab_game.h"
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
+#include "../../tabs/tab_game.h"
 #include "../board/arrow_item.h"
 #include "../board/card_item.h"
 #include "../board/card_list.h"

cockatrice/src/game/player/player.h

@@ -2,10 +2,10 @@
 #define PLAYER_H
 
 #include "../../card/card_info.h"
-#include "../../client/tearoff_menu.h"
-#include "../../dialogs/dlg_create_token.h"
 #include "../../filters/filter_string.h"
+#include "../../interface/tearoff_menu.h"
 #include "../board/abstract_graphics_item.h"
+#include "../dialogs/dlg_create_token.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

@@ -2,11 +2,11 @@
 
 #include "../../../common/pb/context_move_card.pb.h"
 #include "../../client/get_text_with_max.h"
-#include "../../client/tabs/tab_game.h"
 #include "../../database/card_database_manager.h"
-#include "../../dialogs/dlg_move_top_cards_until.h"
-#include "../../dialogs/dlg_roll_dice.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_menu_action_type.h"
 #include "pb/command_attach_card.pb.h"

cockatrice/src/game/player/player_area.cpp

@@ -1,6 +1,6 @@
 #include "player_area.h"
 
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
 
 #include <QPainter>
 

cockatrice/src/game/player/player_event_handler.cpp

@@ -1,6 +1,6 @@
 #include "player_event_handler.h"
 
-#include "../../client/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "../board/arrow_item.h"
 #include "../board/card_item.h"
 #include "../board/card_list.h"

cockatrice/src/game/player/player_graphics_item.cpp

@@ -1,6 +1,6 @@
 #include "player_graphics_item.h"
 
-#include "../../client/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "../hand_counter.h"
 
 PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)

cockatrice/src/game/player/player_list_widget.cpp

@@ -1,13 +1,13 @@
 #include "player_list_widget.h"
 
-#include "../../client/tabs/tab_account.h"
-#include "../../client/tabs/tab_game.h"
-#include "../../client/tabs/tab_supervisor.h"
-#include "../../client/ui/pixel_map_generator.h"
+#include "../../interface/pixel_map_generator.h"
 #include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
+#include "../../tabs/tab_account.h"
+#include "../../tabs/tab_game.h"
+#include "../../tabs/tab_supervisor.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/serverinfo_playerproperties.pb.h"
 #include "pb/session_commands.pb.h"

cockatrice/src/game/player/player_target.cpp

@@ -1,6 +1,6 @@
 #include "player_target.h"
 
-#include "../../client/ui/pixel_map_generator.h"
+#include "../../interface/pixel_map_generator.h"
 #include "pb/serverinfo_user.pb.h"
 #include "player.h"
 

cockatrice/src/game/replay.cpp

@@ -1,6 +1,6 @@
 #include "replay.h"
 
-#include "../client/tabs/tab_game.h"
+#include "../tabs/tab_game.h"
 
 Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
 {

cockatrice/src/game/zones/hand_zone.cpp

@@ -1,6 +1,6 @@
 #include "hand_zone.h"
 
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
 #include "../../settings/cache_settings.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"

cockatrice/src/game/zones/stack_zone.cpp

@@ -1,6 +1,6 @@
 #include "stack_zone.h"
 
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
 #include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"

cockatrice/src/game/zones/table_zone.cpp

@@ -1,7 +1,7 @@
 #include "table_zone.h"
 
 #include "../../card/card_info.h"
-#include "../../client/ui/theme_manager.h"
+#include "../../interface/theme_manager.h"
 #include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"

cockatrice/src/game/zones/view_zone_widget.cpp

@@ -1,7 +1,7 @@
 #include "view_zone_widget.h"
 
-#include "../../client/ui/pixel_map_generator.h"
 #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"

cockatrice/src/interface/line_edit_completer.h

@@ -1,7 +1,7 @@
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
-#include "../../deck/custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
 
 #include <QFocusEvent>
 #include <QKeyEvent>

cockatrice/src/interface/theme_manager.cpp

@@ -1,6 +1,6 @@
 #include "theme_manager.h"
 
-#include "../../settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QColor>

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp

@@ -1,6 +1,6 @@
 #include "color_identity_widget.h"
 
-#include "../../../../../settings/cache_settings.h"
+#include "../../../../settings/cache_settings.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h

@@ -1,7 +1,7 @@
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
-#include "../../../../../card/card_info.h"
+#include "../../../../card/card_info.h"
 
 #include <QHBoxLayout>
 #include <QWidget>

cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h

@@ -1,7 +1,7 @@
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
-#include "../../../../../card/card_info.h"
+#include "../../../../card/card_info.h"
 
 #include <QHBoxLayout>
 #include <QWidget>

cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp

@@ -1,6 +1,6 @@
 #include "mana_symbol_widget.h"
 
-#include "../../../../../settings/cache_settings.h"
+#include "../../../../settings/cache_settings.h"
 
 #include <QResizeEvent>
 

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -1,9 +1,9 @@
 #include "card_group_display_widget.h"
 
-#include "../../../../../database/card_database_manager.h"
-#include "../../../../../deck/deck_list_model.h"
-#include "../../../../../utility/card_info_comparator.h"
-#include "../../../../../utility/deck_list_sort_filter_proxy_model.h"
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
+#include "../../../../utility/deck_list_sort_filter_proxy_model.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -1,8 +1,8 @@
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include "../../../../../card/card_info.h"
-#include "../../../../../deck/deck_list_model.h"
+#include "../../../../card/card_info.h"
+#include "../../../../deck/deck_list_model.h"
 #include "../../general/display/banner_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 #include "../card_size_widget.h"

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp

@@ -1,8 +1,8 @@
 #include "flat_card_group_display_widget.h"
 
-#include "../../../../../database/card_database_manager.h"
-#include "../../../../../deck/deck_list_model.h"
-#include "../../../../../utility/card_info_comparator.h"
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp

@@ -1,8 +1,8 @@
 #include "overlapped_card_group_display_widget.h"
 
-#include "../../../../../database/card_database_manager.h"
-#include "../../../../../deck/deck_list_model.h"
-#include "../../../../../utility/card_info_comparator.h"
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>

cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp

@@ -1,8 +1,8 @@
 #include "card_info_display_widget.h"
 
-#include "../../../../database/card_database_manager.h"
-#include "../../../../game/board/card_item.h"
-#include "../../../../main.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../game/board/card_item.h"
+#include "../../../main.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
 

cockatrice/src/interface/widgets/cards/card_info_display_widget.h

@@ -1,7 +1,7 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
-#include "../../../../card/exact_card.h"
+#include "../../../card/exact_card.h"
 #include "card_ref.h"
 
 #include <QComboBox>

cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp

@@ -1,8 +1,8 @@
 #include "card_info_frame_widget.h"
 
-#include "../../../../database/card_database_manager.h"
-#include "../../../../game/board/card_item.h"
-#include "../../../../settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../game/board/card_item.h"
+#include "../../../settings/cache_settings.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"

cockatrice/src/interface/widgets/cards/card_info_frame_widget.h

@@ -1,7 +1,7 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include "../../../../card/exact_card.h"
+#include "../../../card/exact_card.h"
 #include "card_ref.h"
 
 #include <QPushButton>

cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp

@@ -1,6 +1,6 @@
 #include "card_info_picture_art_crop_widget.h"
 
-#include "../../picture_loader/picture_loader.h"
+#include "../../../picture_loader/picture_loader.h"
 
 CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     : CardInfoPictureWidget(parent, false, false)

cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp

@@ -1,7 +1,7 @@
 #include "card_info_picture_enlarged_widget.h"
 
-#include "../../../../settings/cache_settings.h"
-#include "../../picture_loader/picture_loader.h"
+#include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QPainterPath>
 #include <QStylePainter>

cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h

@@ -1,7 +1,7 @@
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H
 
-#include "../../../../card/exact_card.h"
+#include "../../../card/exact_card.h"
 
 #include <QPixmap>
 #include <QWidget>

cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp

@@ -1,10 +1,10 @@
 #include "card_info_picture_widget.h"
 
-#include "../../../../database/card_database_manager.h"
-#include "../../../../game/board/card_item.h"
-#include "../../../../settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../game/board/card_item.h"
+#include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 #include "../../../tabs/tab_supervisor.h"
-#include "../../picture_loader/picture_loader.h"
 #include "../../window_main.h"
 
 #include <QMenu>

cockatrice/src/interface/widgets/cards/card_info_picture_widget.h

@@ -1,7 +1,7 @@
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
-#include "../../../../card/exact_card.h"
+#include "../../../card/exact_card.h"
 #include "card_info_picture_enlarged_widget.h"
 
 #include <QPropertyAnimation>

cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp

@@ -1,7 +1,7 @@
 #include "card_info_text_widget.h"
 
-#include "../../../../card/game_specific_terms.h"
-#include "../../../../game/board/card_item.h"
+#include "../../../card/game_specific_terms.h"
+#include "../../../game/board/card_item.h"
 
 #include <QGridLayout>
 #include <QLabel>

cockatrice/src/interface/widgets/cards/card_info_text_widget.h

@@ -1,7 +1,7 @@
 #ifndef CARDINFOTEXT_H
 #define CARDINFOTEXT_H
 
-#include "../../../../card/card_info.h"
+#include "../../../card/card_info.h"
 
 #include <QFrame>
 class QLabel;

cockatrice/src/interface/widgets/cards/card_size_widget.cpp

@@ -1,6 +1,6 @@
 #include "card_size_widget.h"
 
-#include "../../../../settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "../printing_selector/printing_selector.h"
 #include "../visual_deck_storage/visual_deck_storage_widget.h"