shiboken6: Reorder headers containing typedefs

- Split out Modifications/CustomConversions-related typedefs
  to separate headers customconversion_typedefs.h,
  modifications_typedefs.h
- Move forward declarations of TypeEntries from
  typedatabase_typedefs.h to typesystem_typedefs.h
- Rename TypeEntries to TypeEntryCList and add "C" to other lists
  containing const pointers following the shiboken convention.

Pick-to: 6.4
Change-Id: Ic31872405778d794d85694386990b50edf42beec
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>

8 files changed, 12 insertions, 11 deletions

diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp
index b95161c36..14fa50014 100644
--- a/sources/shiboken6/generator/generator.cpp
+++ b/sources/shiboken6/generator/generator.cpp
@@ -126,12 +126,12 @@ const AbstractMetaClassCList &Generator::invisibleTopNamespaces() const
     return m_d->m_invisibleTopNamespaces;
 }
 
-PrimitiveTypeEntryList Generator::primitiveTypes()
+PrimitiveTypeEntryCList Generator::primitiveTypes()
 {
     return TypeDatabase::instance()->primitiveTypes();
 }
 
-ContainerTypeEntryList Generator::containerTypes()
+ContainerTypeEntryCList Generator::containerTypes()
 {
     return TypeDatabase::instance()->containerTypes();
 }
diff --git a/sources/shiboken6/generator/generator.h b/sources/shiboken6/generator/generator.h
index fbb4c7091..34ab84a37 100644
--- a/sources/shiboken6/generator/generator.h
+++ b/sources/shiboken6/generator/generator.h
@@ -113,10 +113,10 @@ protected:
                                             FileNameFlags flags = {});
 
     /// Returns all primitive types found by APIExtractor
-    static PrimitiveTypeEntryList primitiveTypes();
+    static PrimitiveTypeEntryCList primitiveTypes();
 
     /// Returns all container types found by APIExtractor
-    static ContainerTypeEntryList containerTypes();
+    static ContainerTypeEntryCList containerTypes();
 
     virtual GeneratorContext contextForClass(const AbstractMetaClass *c) const;
     static GeneratorContext contextForSmartPointer(const AbstractMetaClass *c,
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
index 25b4f4509..0ca665251 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h
@@ -10,7 +10,7 @@
 #include "generator.h"
 #include "documentation.h"
 #include "typesystem_enums.h"
-#include "typesystem_typedefs.h"
+#include "modifications_typedefs.h"
 #include "qtxmltosphinxinterface.h"
 
 class DocParser;
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index d259ce82c..ce4f8a74c 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -6944,7 +6944,7 @@ bool CppGenerator::finishGeneration()
     writeEnumsInitialization(s, globalEnums, ErrorReturn::Default);
 
     s << "// Register primitive types converters.\n";
-    const PrimitiveTypeEntryList &primitiveTypeList = primitiveTypes();
+    const PrimitiveTypeEntryCList &primitiveTypeList = primitiveTypes();
     for (const PrimitiveTypeEntry *pte : primitiveTypeList) {
         if (!pte->generateCode() || !pte->isCppPrimitive())
             continue;
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index de602870f..99ad16722 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
@@ -7,7 +7,7 @@
 #include "shibokengenerator.h"
 #include "abstractmetalang_enums.h"
 #include "include.h"
-#include "typesystem_typedefs.h"
+#include "modifications_typedefs.h"
 
 #include <QtCore/QFlags>
 #include <QtCore/QHash>
diff --git a/sources/shiboken6/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp
index 3a198c77e..d24a3b12b 100644
--- a/sources/shiboken6/generator/shiboken/headergenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp
@@ -584,7 +584,7 @@ bool HeaderGenerator::finishGeneration()
     // TODO-CONVERTER ------------------------------------------------------------------------------
     // Using a counter would not do, a fix must be made to APIExtractor's getTypeIndex().
     macrosStream << "// Converter indices\nenum : int {\n";
-    const PrimitiveTypeEntryList &primitives = primitiveTypes();
+    const auto &primitives = primitiveTypes();
     int pCount = 0;
     for (const PrimitiveTypeEntry *ptype : primitives) {
         /* Note: do not generate indices for typedef'd primitive types
@@ -707,7 +707,7 @@ bool HeaderGenerator::finishGeneration()
     } else {
         if (!primitiveTypes().isEmpty()) {
             s << "// Conversion Includes - Primitive Types\n";
-            const PrimitiveTypeEntryList &primitiveTypeList = primitiveTypes();
+            const auto &primitiveTypeList = primitiveTypes();
             for (const PrimitiveTypeEntry *ptype : primitiveTypeList)
                 s << ptype->include();
             s<< '\n';
@@ -715,7 +715,7 @@ bool HeaderGenerator::finishGeneration()
 
         if (!containerTypes().isEmpty()) {
             s << "// Conversion Includes - Container Types\n";
-            const ContainerTypeEntryList &containerTypeList = containerTypes();
+            const ContainerTypeEntryCList &containerTypeList = containerTypes();
             for (const ContainerTypeEntry *ctype : containerTypeList)
                 s << ctype->include();
             s<< '\n';
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
index 24a782879..e549ef982 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
@@ -1176,7 +1176,7 @@ ShibokenGenerator::ExtendedConverterData ShibokenGenerator::getExtendedConverter
 QList<CustomConversionPtr> ShibokenGenerator::getPrimitiveCustomConversions()
 {
     QList<CustomConversionPtr> conversions;
-    const PrimitiveTypeEntryList &primitiveTypeList = primitiveTypes();
+    const auto &primitiveTypeList = primitiveTypes();
     for (const PrimitiveTypeEntry *type : primitiveTypeList) {
         if (type->shouldGenerate() && type->isUserPrimitive() && type->hasCustomConversion())
             conversions << type->customConversion();
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.h b/sources/shiboken6/generator/shiboken/shibokengenerator.h
index af18d2f17..1b7168e31 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.h
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.h
@@ -6,6 +6,7 @@
 
 #include <generator.h>
 
+#include "customconversion_typedefs.h"
 #include "typesystem_typedefs.h"
 #include "typesystem_enums.h"