From dab4037f9872aa996843e46a6d690d59f1fb58d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 16 Apr 2025 21:08:25 +0200 Subject: [PATCH] Refactor display widgets to their own folder, optimize some imports. --- cockatrice/CMakeLists.txt | 14 +++++++------- .../edhrec_top_commanders_api_response.h | 2 +- ...er_api_response_card_details_display_widget.cpp | 4 ++-- ...nder_api_response_card_details_display_widget.h | 4 ++-- ...ander_api_response_card_list_display_widget.cpp | 2 +- ...mmander_api_response_card_list_display_widget.h | 6 +++--- ...i_response_commander_details_display_widget.cpp | 4 ++-- ...api_response_commander_details_display_widget.h | 4 ++-- ...dhrec_commander_api_response_display_widget.cpp | 4 ++-- .../edhrec_commander_api_response_display_widget.h | 2 +- ...dhrec_top_cards_api_response_display_widget.cpp | 9 +-------- .../edhrec_top_cards_api_response_display_widget.h | 3 ++- ..._top_commanders_api_response_display_widget.cpp | 10 +--------- ...ec_top_commanders_api_response_display_widget.h | 3 ++- ...edhrec_top_tags_api_response_display_widget.cpp | 10 +--------- .../edhrec_top_tags_api_response_display_widget.h | 3 ++- .../src/client/tabs/api/edhrec/tab_edhrec.cpp | 2 +- cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h | 3 +-- .../src/client/tabs/api/edhrec/tab_edhrec_main.cpp | 8 ++++---- .../src/client/tabs/api/edhrec/tab_edhrec_main.h | 2 +- cockatrice/src/client/tabs/tab_supervisor.h | 6 +++--- 21 files changed, 42 insertions(+), 63 deletions(-) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_card_details_display_widget.cpp (95%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_card_details_display_widget.h (83%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_card_list_display_widget.cpp (93%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_card_list_display_widget.h (77%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_commander_details_display_widget.cpp (88%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_commander_details_display_widget.h (82%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_display_widget.cpp (96%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/commander/edhrec_commander_api_response_display_widget.h (89%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_cards/edhrec_top_cards_api_response_display_widget.cpp (86%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_cards/edhrec_top_cards_api_response_display_widget.h (85%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_commander/edhrec_top_commanders_api_response_display_widget.cpp (82%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_commander/edhrec_top_commanders_api_response_display_widget.h (85%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_tags/edhrec_top_tags_api_response_display_widget.cpp (82%) rename cockatrice/src/client/tabs/api/edhrec/{ => display}/top_tags/edhrec_top_tags_api_response_display_widget.h (85%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 3323eef37..a0e5ab36c 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -20,13 +20,13 @@ set(cockatrice_SOURCES src/client/tabs/abstract_tab_deck_editor.cpp src/client/tabs/api/edhrec/tab_edhrec.cpp src/client/tabs/api/edhrec/tab_edhrec_main.cpp - src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp - src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp - src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp - src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp - src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp - src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.cpp - src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.cpp + src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp + src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp + src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp + src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp + src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp + src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp + src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_archidekt_links.cpp src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp src/client/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_card_details.cpp diff --git a/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h index e9c62bcca..9aa2b80df 100644 --- a/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h +++ b/cockatrice/src/client/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h @@ -19,4 +19,4 @@ public: void debugPrint() const; }; -#endif //EDHREC_TOP_COMMANDERS_API_RESPONSE_H +#endif // EDHREC_TOP_COMMANDERS_API_RESPONSE_H diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp similarity index 95% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp index 834014714..9573cbcbd 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.cpp @@ -1,7 +1,7 @@ #include "edhrec_commander_api_response_card_details_display_widget.h" -#include "../../../../../game/cards/card_database_manager.h" -#include "../tab_edhrec_main.h" +#include "../../../../../../game/cards/card_database_manager.h" +#include "../../tab_edhrec_main.h" EdhrecCommanderApiResponseCardDetailsDisplayWidget::EdhrecCommanderApiResponseCardDetailsDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.h similarity index 83% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.h index 0260a83b3..313f73c55 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_details_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_details_display_widget.h @@ -1,8 +1,8 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/commander/edhrec_commander_api_response_card_details.h" +#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../api_response/commander/edhrec_commander_api_response_card_details.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp similarity index 93% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp index 098be9447..7b1ae1488 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.cpp @@ -1,6 +1,6 @@ #include "edhrec_commander_api_response_card_list_display_widget.h" -#include "../../../../ui/widgets/general/display/banner_widget.h" +#include "../../../../../ui/widgets/general/display/banner_widget.h" #include "edhrec_commander_api_response_card_details_display_widget.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.h similarity index 77% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.h index 0c5d72a2a..63428c2c1 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_card_list_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_card_list_display_widget.h @@ -1,9 +1,9 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H -#include "../../../../ui/widgets/general/display/banner_widget.h" -#include "../../../../ui/widgets/general/layout_containers/flow_widget.h" -#include "../api_response/commander/edhrec_commander_api_response_card_list.h" +#include "../../../../../ui/widgets/general/display/banner_widget.h" +#include "../../../../../ui/widgets/general/layout_containers/flow_widget.h" +#include "../../api_response/commander/edhrec_commander_api_response_card_list.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp similarity index 88% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp index f11636e90..eb51bf954 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.cpp @@ -1,7 +1,7 @@ #include "edhrec_commander_api_response_commander_details_display_widget.h" -#include "../../../../../game/cards/card_database_manager.h" -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../../../../../game/cards/card_database_manager.h" +#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" #include diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.h similarity index 82% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.h index 1e91adc59..06dcc195e 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_commander_details_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_commander_details_display_widget.h @@ -1,8 +1,8 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/commander/edhrec_commander_api_response_commander_details.h" +#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../api_response/commander/edhrec_commander_api_response_commander_details.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp similarity index 96% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp index 59c35abba..199608e8b 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp @@ -1,7 +1,7 @@ #include "edhrec_commander_api_response_display_widget.h" -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/commander/edhrec_commander_api_response.h" +#include "../../../../../ui/widgets/cards/card_info_picture_widget.h" +#include "../../api_response/commander/edhrec_commander_api_response.h" #include "edhrec_commander_api_response_card_list_display_widget.h" #include "edhrec_commander_api_response_commander_details_display_widget.h" diff --git a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h similarity index 89% rename from cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h index a90f2904e..e98841613 100644 --- a/cockatrice/src/client/tabs/api/edhrec/commander/edhrec_commander_api_response_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h @@ -1,7 +1,7 @@ #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H -#include "../api_response/commander/edhrec_commander_api_response.h" +#include "../../api_response/commander/edhrec_commander_api_response.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp similarity index 86% rename from cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp index 7b6e5b2d6..958594554 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp @@ -1,15 +1,8 @@ #include "edhrec_top_cards_api_response_display_widget.h" -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/top_cards/edhrec_top_cards_api_response.h" +#include "../../api_response/top_cards/edhrec_top_cards_api_response.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h" -#include -#include -#include -#include -#include - EdhrecTopCardsApiResponseDisplayWidget::EdhrecTopCardsApiResponseDisplayWidget(QWidget *parent, EdhrecTopCardsApiResponse response) : QWidget(parent) diff --git a/cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h similarity index 85% rename from cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h index c16dbfe04..4b7a34d6a 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_cards/edhrec_top_cards_api_response_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h @@ -1,8 +1,9 @@ #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H -#include "../api_response/top_cards/edhrec_top_cards_api_response.h" +#include "../../api_response/top_cards/edhrec_top_cards_api_response.h" +#include #include #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp similarity index 82% rename from cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp index 703259097..8419ddad0 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp @@ -1,15 +1,7 @@ #include "edhrec_top_commanders_api_response_display_widget.h" -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h" +#include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h" -#include "../commander/edhrec_commander_api_response_commander_details_display_widget.h" - -#include -#include -#include -#include -#include EdhrecTopCommandersApiResponseDisplayWidget::EdhrecTopCommandersApiResponseDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h similarity index 85% rename from cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h index bb1e9fe5f..e8774d38b 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_commander/edhrec_top_commanders_api_response_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h @@ -1,8 +1,9 @@ #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H -#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h" +#include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h" +#include #include #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp similarity index 82% rename from cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.cpp rename to cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp index 255dbae27..fe727027d 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp @@ -1,15 +1,7 @@ #include "edhrec_top_tags_api_response_display_widget.h" -#include "../../../../ui/widgets/cards/card_info_picture_widget.h" -#include "../api_response/top_commanders/edhrec_top_commanders_api_response.h" +#include "../../api_response/top_tags/edhrec_top_tags_api_response.h" #include "../commander/edhrec_commander_api_response_card_list_display_widget.h" -#include "../commander/edhrec_commander_api_response_commander_details_display_widget.h" - -#include -#include -#include -#include -#include EdhrecTopTagsApiResponseDisplayWidget::EdhrecTopTagsApiResponseDisplayWidget(QWidget *parent, EdhrecTopTagsApiResponse response) diff --git a/cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h similarity index 85% rename from cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.h rename to cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h index 3c9e750bd..d67875058 100644 --- a/cockatrice/src/client/tabs/api/edhrec/top_tags/edhrec_top_tags_api_response_display_widget.h +++ b/cockatrice/src/client/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h @@ -1,8 +1,9 @@ #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H -#include "../api_response/top_tags/edhrec_top_tags_api_response.h" +#include "../../api_response/top_tags/edhrec_top_tags_api_response.h" +#include #include #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp index 6b545a228..251469ee0 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp @@ -1,7 +1,7 @@ #include "tab_edhrec.h" #include "api_response/commander/edhrec_commander_api_response.h" -#include "commander/edhrec_commander_api_response_display_widget.h" +#include "display/commander/edhrec_commander_api_response_display_widget.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h index 78e7f4b93..8d4b1b4a6 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h @@ -4,9 +4,8 @@ #include "../../../../game/cards/card_database.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" -#include "commander/edhrec_commander_api_response_display_widget.h" +#include "display/commander/edhrec_commander_api_response_display_widget.h" -#include #include class TabEdhRec : public Tab diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp index ef1c77b3b..112e9fcf6 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.cpp @@ -7,10 +7,10 @@ #include "api_response/top_cards/edhrec_top_cards_api_response.h" #include "api_response/top_commanders/edhrec_top_commanders_api_response.h" #include "api_response/top_tags/edhrec_top_tags_api_response.h" -#include "commander/edhrec_commander_api_response_display_widget.h" -#include "top_cards/edhrec_top_cards_api_response_display_widget.h" -#include "top_commander/edhrec_top_commanders_api_response_display_widget.h" -#include "top_tags/edhrec_top_tags_api_response_display_widget.h" +#include "display/commander/edhrec_commander_api_response_display_widget.h" +#include "display/top_cards/edhrec_top_cards_api_response_display_widget.h" +#include "display/top_commander/edhrec_top_commanders_api_response_display_widget.h" +#include "display/top_tags/edhrec_top_tags_api_response_display_widget.h" #include #include diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h index 1d1653e83..01d0bb936 100644 --- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec_main.h @@ -4,7 +4,7 @@ #include "../../../../game/cards/card_database.h" #include "../../../ui/widgets/general/layout_containers/flow_widget.h" #include "../../tab.h" -#include "commander/edhrec_commander_api_response_display_widget.h" +#include "display/commander/edhrec_commander_api_response_display_widget.h" #include #include diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index 2101e238b..0ca13ac41 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -5,10 +5,10 @@ #include "../../server/user/user_list_proxy.h" #include "abstract_tab_deck_editor.h" #include "api/edhrec/tab_edhrec.h" +#include "api/edhrec/tab_edhrec_main.h" #include "tab_visual_database_display.h" #include "visual_deck_editor/tab_deck_editor_visual.h" #include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h" -#include "api/edhrec/tab_edhrec_main.h" #include "visual_deck_storage/tab_deck_storage_visual.h" #include @@ -95,8 +95,8 @@ private: QList deckEditorTabs; bool isLocalGame; - QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabVisualDeckStorage, *aTabVisualDatabaseDisplay, *aTabServer, - *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog; + QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabVisualDeckStorage, *aTabVisualDatabaseDisplay, + *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog; int myAddTab(Tab *tab, QAction *manager = nullptr); void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager);