Remove some C++ primitive types from the typesystem files

Remove the basic C++ primitive types from the typesystem files. Leave
the Qt typedef'ed types in place as otherwise the function
modifications would no longer match.

Task-number: PYSIDE-1660
Change-Id: Ic64634633640a4b358221fc9f64180df94af02de
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 0 insertions, 50 deletions

diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index abb8f8794..f5b1db6a7 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -153,36 +153,16 @@
   <primitive-type name="quint16"/>
   <primitive-type name="quint32"/>
   <primitive-type name="quint64"/>
-  <primitive-type name="double"/>
   <primitive-type name="qreal"/>
-  <primitive-type name="float"/>
   <primitive-type name="qint64"/>
-  <primitive-type name="unsigned long long"/>
-  <primitive-type name="long long"/>
   <primitive-type name="qlonglong" target-lang-api-name="PyLong"/>
   <primitive-type name="qulonglong" target-lang-api-name="PyLong"/>
   <primitive-type name="qsizetype" target-lang-api-name="PyLong"/>
   <primitive-type name="size_t" target-lang-api-name="PyLong"/>
-  <primitive-type name="short"/>
-  <primitive-type name="signed short"/>
-  <primitive-type name="signed short int"/>
   <primitive-type name="ushort" target-lang-api-name="PyLong"/>
-  <primitive-type name="unsigned short int"/>
-  <primitive-type name="unsigned short"/>
-  <primitive-type name="char"/>
-  <primitive-type name="signed char"/>
   <primitive-type name="uchar"/>
-  <primitive-type name="unsigned char"/>
-  <primitive-type name="int"/>
-  <primitive-type name="signed int"/>
   <primitive-type name="uint"/>
   <primitive-type name="ulong"/>
-  <primitive-type name="unsigned int"/>
-  <primitive-type name="signed long"/>
-  <primitive-type name="signed long int"/>
-  <primitive-type name="long"/>
-  <primitive-type name="unsigned long int"/>
-  <primitive-type name="unsigned long"/>
   <primitive-type name="int8_t"/>
   <primitive-type name="uint8_t"/>
   <primitive-type name="int16_t"/>
@@ -201,15 +181,6 @@
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong"/>
   <?endif?>
 
-  <primitive-type name="bool" target-lang-api-name="PyBool">
-    <conversion-rule>
-        <native-to-target file="../glue/qtcore.cpp" snippet="return-pybool"/>
-        <target-to-native>
-            <add-conversion type="PyBool" file="../glue/qtcore.cpp" snippet="conversion-pybool"/>
-        </target-to-native>
-    </conversion-rule>
-  </primitive-type>
-
   <!-- Qt5: add the new pointer-ish types -->
   <primitive-type name="qintptr" target-lang-api-name="PyLong">
     <conversion-rule>
diff --git a/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml b/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml
index 2b9cbc89f..40973fa5f 100644
--- a/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml
+++ b/sources/shiboken6/tests/minimalbinding/typesystem_minimal.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <typesystem package="minimal">
-    <primitive-type name="bool"/>
-    <primitive-type name="int"/>
 
     <primitive-type name="MinBool" target-lang-api-name="PyBool" default-constructor="MinBool(false)">
         <include file-name="minbool.h" location="global"/>
diff --git a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml
index 47608e834..839333374 100644
--- a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml
+++ b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml
@@ -3,21 +3,6 @@
     <suppress-warning text="Duplicate type entry: 'sample'" />
     <suppress-warning text="Duplicate type entry: 'SampleNamespace'" />
 
-    <primitive-type name="bool"/>
-    <primitive-type name="double"/>
-    <primitive-type name="real"/>
-    <primitive-type name="int"/>
-    <primitive-type name="short"/>
-    <primitive-type name="unsigned short"/>
-    <primitive-type name="ushort"/>
-    <primitive-type name="unsigned int" />
-    <primitive-type name="signed int" />
-    <primitive-type name="char"/>
-    <primitive-type name="unsigned char"/>
-    <primitive-type name="long"/>
-    <primitive-type name="unsigned long"/>
-    <primitive-type name="long long"/>
-    <primitive-type name="unsigned long long"/>
     <primitive-type name="std::string"/>
     <primitive-type name="std::string_view" view-on="std::string"/>
     <primitive-type name="std::wstring"/>
diff --git a/sources/shiboken6/tests/smartbinding/typesystem_smart.xml b/sources/shiboken6/tests/smartbinding/typesystem_smart.xml
index 46cb08267..f651161c5 100644
--- a/sources/shiboken6/tests/smartbinding/typesystem_smart.xml
+++ b/sources/shiboken6/tests/smartbinding/typesystem_smart.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <typesystem package="smart">
-    <primitive-type name="int" />
-    <primitive-type name="char" />
-    <primitive-type name="float" />
-    <primitive-type name="bool" />
 
     <template name="cpplist_to_pylist_convertion">
         PyObject *%out = PyList_New(int(%in.size()));