Remove redundant prefix from libcockatrice_card folders (#6237)

Took 28 minutes

libcockatrice_card/CMakeLists.txt

@@ -5,24 +5,24 @@ set(CMAKE_AUTORCC ON)
 set(HEADERS
     libcockatrice/card/card_info.h
     libcockatrice/card/card_info_comparator.h
-    libcockatrice/card/card_database/card_database.h
-    libcockatrice/card/card_database/card_database_loader.h
-    libcockatrice/card/card_database/card_database_manager.h
-    libcockatrice/card/card_database/card_database_querier.h
-    libcockatrice/card/card_database/model/card_database_model.h
-    libcockatrice/card/card_database/model/card_database_display_model.h
-    libcockatrice/card/card_database/model/card/card_completer_proxy_model.h
-    libcockatrice/card/card_database/model/card/card_search_model.h
-    libcockatrice/card/card_database/model/card_set/card_sets_model.h
-    libcockatrice/card/card_database/model/token/token_display_model.h
-    libcockatrice/card/card_database/model/token/token_edit_model.h
-    libcockatrice/card/card_database/parser/card_database_parser.h
-    libcockatrice/card/card_database/parser/cockatrice_xml_3.h
-    libcockatrice/card/card_database/parser/cockatrice_xml_4.h
-    libcockatrice/card/card_printing/exact_card.h
-    libcockatrice/card/card_printing/printing_info.h
-    libcockatrice/card/card_set/card_set.h
-    libcockatrice/card/card_relation/card_relation.h
+    libcockatrice/card/database/card_database.h
+    libcockatrice/card/database/card_database_loader.h
+    libcockatrice/card/database/card_database_manager.h
+    libcockatrice/card/database/card_database_querier.h
+    libcockatrice/card/database/model/card_database_model.h
+    libcockatrice/card/database/model/card_database_display_model.h
+    libcockatrice/card/database/model/card/card_completer_proxy_model.h
+    libcockatrice/card/database/model/card/card_search_model.h
+    libcockatrice/card/database/model/card_set/card_sets_model.h
+    libcockatrice/card/database/model/token/token_display_model.h
+    libcockatrice/card/database/model/token/token_edit_model.h
+    libcockatrice/card/database/parser/card_database_parser.h
+    libcockatrice/card/database/parser/cockatrice_xml_3.h
+    libcockatrice/card/database/parser/cockatrice_xml_4.h
+    libcockatrice/card/printing/exact_card.h
+    libcockatrice/card/printing/printing_info.h
+    libcockatrice/card/set/card_set.h
+    libcockatrice/card/relation/card_relation.h
 )
 
 if(Qt6_FOUND)
@@ -34,27 +34,27 @@ endif()
 add_library(
   libcockatrice_card STATIC
   ${MOC_SOURCES}
-  libcockatrice/card/card_database/card_database.cpp
-  libcockatrice/card/card_database/card_database_loader.cpp
-  libcockatrice/card/card_database/card_database_manager.cpp
-  libcockatrice/card/card_database/card_database_querier.cpp
-  libcockatrice/card/card_database/model/card/card_completer_proxy_model.cpp
-  libcockatrice/card/card_database/model/card/card_search_model.cpp
-  libcockatrice/card/card_database/model/card_set/card_sets_model.cpp
-  libcockatrice/card/card_database/model/card_database_display_model.cpp
-  libcockatrice/card/card_database/model/card_database_model.cpp
-  libcockatrice/card/card_database/model/token/token_display_model.cpp
-  libcockatrice/card/card_database/model/token/token_edit_model.cpp
-  libcockatrice/card/card_database/parser/card_database_parser.cpp
-  libcockatrice/card/card_database/parser/cockatrice_xml_3.cpp
-  libcockatrice/card/card_database/parser/cockatrice_xml_4.cpp
   libcockatrice/card/card_info.cpp
   libcockatrice/card/card_info_comparator.cpp
-  libcockatrice/card/card_printing/exact_card.cpp
-  libcockatrice/card/card_printing/printing_info.cpp
-  libcockatrice/card/card_relation/card_relation.cpp
-  libcockatrice/card/card_set/card_set.cpp
-  libcockatrice/card/card_set/card_set_list.cpp
+  libcockatrice/card/database/card_database.cpp
+  libcockatrice/card/database/card_database_loader.cpp
+  libcockatrice/card/database/card_database_manager.cpp
+  libcockatrice/card/database/card_database_querier.cpp
+  libcockatrice/card/database/model/card/card_completer_proxy_model.cpp
+  libcockatrice/card/database/model/card/card_search_model.cpp
+  libcockatrice/card/database/model/card_set/card_sets_model.cpp
+  libcockatrice/card/database/model/card_database_display_model.cpp
+  libcockatrice/card/database/model/card_database_model.cpp
+  libcockatrice/card/database/model/token/token_display_model.cpp
+  libcockatrice/card/database/model/token/token_edit_model.cpp
+  libcockatrice/card/database/parser/card_database_parser.cpp
+  libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+  libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+  libcockatrice/card/printing/exact_card.cpp
+  libcockatrice/card/printing/printing_info.cpp
+  libcockatrice/card/relation/card_relation.cpp
+  libcockatrice/card/set/card_set.cpp
+  libcockatrice/card/set/card_set_list.cpp
 )
 
 target_include_directories(

libcockatrice_card/libcockatrice/card/card_info.cpp

@@ -1,9 +1,9 @@
 #include "card_info.h"
 
-#include "card_printing/printing_info.h"
-#include "card_relation/card_relation.h"
-#include "card_set/card_set.h"
 #include "game_specific_terms.h"
+#include "printing/printing_info.h"
+#include "relation/card_relation.h"
+#include "set/card_set.h"
 
 #include <QDir>
 #include <QRegularExpression>

libcockatrice_card/libcockatrice/card/card_info.h

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

libcockatrice_card/libcockatrice/card/database/card_database.cpp

@@ -1,6 +1,6 @@
 #include "card_database.h"
 
-#include "../card_relation/card_relation.h"
+#include "../relation/card_relation.h"
 #include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
 

libcockatrice_card/libcockatrice/card/database/card_database.h

@@ -7,7 +7,7 @@
 #ifndef CARDDATABASE_H
 #define CARDDATABASE_H
 
-#include "../card_set/card_set_list.h"
+#include "../set/card_set_list.h"
 #include "card_database_loader.h"
 #include "card_database_querier.h"
 

libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp

@@ -1,8 +1,8 @@
 #include "card_database_querier.h"
 
 #include "../card_info.h"
-#include "../card_printing/exact_card.h"
-#include "../card_set/card_set_comparator.h"
+#include "../printing/exact_card.h"
+#include "../set/card_set_comparator.h"
 #include "card_database.h"
 
 #include <qrandom.h>

libcockatrice_card/libcockatrice/card/database/card_database_querier.h

@@ -8,7 +8,7 @@
 #define COCKATRICE_CARD_DATABASE_QUERIER_H
 
 #include "../card_info.h"
-#include "../card_printing/exact_card.h"
+#include "../printing/exact_card.h"
 
 #include <QObject>
 #include <libcockatrice/utility/card_ref.h>

libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h

@@ -11,7 +11,7 @@
 #include <QMimeData>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/database/card_database.h>
 
 class SetsProxyModel;
 

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp

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

libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp

@@ -1,6 +1,6 @@
 #include "cockatrice_xml_4.h"
 
-#include "../../card_relation/card_relation.h"
+#include "../../relation/card_relation.h"
 
 #include <QCoreApplication>
 #include <QDebug>

libcockatrice_card/libcockatrice/card/printing/printing_info.cpp

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

libcockatrice_card/libcockatrice/card/printing/printing_info.h

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