[DeckList] Move decklist node classes into new folder (#6381)

* [DeckList] Move decklist node classes into new folder

* reformat

* fix

cockatrice/src/client/network/interfaces/deck_stats_interface.cpp

@@ -7,7 +7,7 @@
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -7,7 +7,7 @@
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)

cockatrice/src/game/deckview/deck_view.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,

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

@@ -3,9 +3,10 @@
 #include "../../../interface/deck_loader/deck_loader.h"
 #include "../player.h"
 #include "../player_actions.h"
-#include "libcockatrice/deck_list/inner_deck_list_node.h"
 #include "player_menu.h"
 
+#include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+
 UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
     PlayerActions *playerActions = player->getPlayerActions();

cockatrice/src/interface/deck_loader/deck_loader.cpp

@@ -18,7 +18,7 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
 

libcockatrice_deck_list/CMakeLists.txt

@@ -3,13 +3,13 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    libcockatrice/deck_list/abstract_deck_list_card_node.h
+    libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
-    libcockatrice/deck_list/abstract_deck_list_node.h
+    libcockatrice/deck_list/tree/abstract_deck_list_node.h
+    libcockatrice/deck_list/tree/deck_list_card_node.h
+    libcockatrice/deck_list/tree/inner_deck_list_node.h
     libcockatrice/deck_list/deck_list.h
-    libcockatrice/deck_list/deck_list_card_node.h
     libcockatrice/deck_list/deck_list_history_manager.h
     libcockatrice/deck_list/deck_list_memento.h
-    libcockatrice/deck_list/inner_deck_list_node.h
 )
 
 if(Qt6_FOUND)
@@ -21,12 +21,12 @@ endif()
 add_library(
   libcockatrice_deck_list STATIC
   ${MOC_SOURCES}
-  libcockatrice/deck_list/abstract_deck_list_card_node.cpp
+  libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
-  libcockatrice/deck_list/abstract_deck_list_node.cpp
+  libcockatrice/deck_list/tree/abstract_deck_list_node.cpp
+  libcockatrice/deck_list/tree/deck_list_card_node.cpp
+  libcockatrice/deck_list/tree/inner_deck_list_node.cpp
   libcockatrice/deck_list/deck_list.cpp
-  libcockatrice/deck_list/deck_list_card_node.cpp
   libcockatrice/deck_list/deck_list_history_manager.cpp
-  libcockatrice/deck_list/inner_deck_list_node.cpp
 )
 
 add_dependencies(libcockatrice_deck_list libcockatrice_protocol)

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp

@@ -1,9 +1,9 @@
 #include "deck_list.h"
 
-#include "abstract_deck_list_node.h"
-#include "deck_list_card_node.h"
 #include "deck_list_memento.h"
-#include "inner_deck_list_node.h"
+#include "tree/abstract_deck_list_node.h"
+#include "tree/deck_list_card_node.h"
+#include "tree/inner_deck_list_node.h"
 
 #include <QCryptographicHash>
 #include <QDebug>

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h

@@ -11,7 +11,7 @@
 #define DECKLIST_H
 
 #include "deck_list_memento.h"
-#include "inner_deck_list_node.h"
+#include "tree/inner_deck_list_node.h"
 
 #include <QMap>
 #include <QVector>

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h

@@ -1,12 +1,12 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
+#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h>
+#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <QAbstractItemModel>
 #include <QList>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/deck_list/abstract_deck_list_card_node.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 class CardDatabase;
 class QPrinter;

libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp

@@ -14,7 +14,7 @@
 #include <QRegularExpression>
 #include <algorithm>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>

tests/loading_from_clipboard/clipboard_testing.cpp

@@ -1,7 +1,7 @@
 #include "clipboard_testing.h"
 
 #include <QTextStream>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 void testEmpty(const QString &clipboard)
 {