From fe36e455be3572b3690426fe7e2d8276bb99e65d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 27 Oct 2020 09:28:47 +0100
Subject: Remove deprecated QVariant::Type

Usage of the enum causes deprecation warnings. In addition,
it is not clear why the type was there given that QVariant
is not exposed. Remove the converters.

Change-Id: I5b1f12ee0f869a63e6b7d82afdcb58a5d7062ce6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 .../PySide2/QtCore/typesystem_core_common.xml      | 13 ---------
 sources/pyside2/PySide2/glue/qtcore.cpp            | 34 ----------------------
 2 files changed, 47 deletions(-)

(limited to 'sources/pyside2/PySide2')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index d20949a10..0ca853a5e 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -292,19 +292,6 @@
     </conversion-rule>
   </primitive-type>
     <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qvariant-conversion"/>
-  <primitive-type name="QVariant::Type" default-constructor="QVariant::Invalid">
-    <conversion-rule>
-        <native-to-target file="../glue/qtcore.cpp" snippet="return-qvariant-type"/>
-        <target-to-native>
-            <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-qvariant-invalid"/>
-            <add-conversion type="PyTypeObject" file="../glue/qtcore.cpp" snippet="conversion-qvariant-pytypeobject"/>
-            <add-conversion type="PyString" check="Shiboken::String::check(%in)" file="../glue/qtcore.cpp" snippet="conversion-qvariant-pystring"/>
-            <add-conversion type="PyDict" check="PyDict_Check(%in) &amp;&amp; QVariantType_checkAllStringKeys(%in)" file="../glue/qtcore.cpp" snippet="conversion-qvariant-pydict"/>
-            <add-conversion type="PySequence" file="../glue/qtcore.cpp" snippet="conversion-qvariant-pysequence"/>
-        </target-to-native>
-    </conversion-rule>
-  </primitive-type>
-
   <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qvariantmap-check"/>
   <primitive-type name="QStringList">
     <include file-name="QStringList" location="global"/>
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index aa56333f2..5d466b3f7 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -1731,40 +1731,6 @@ QVariant ret = QVariant_convertToVariantList(%in);
 %out = QVariant::fromValue(PySide::PyObjectWrapper(%in));
 // @snippet conversion-pyobject
 
-// @snippet conversion-qvariant-invalid
-%out = QVariant::Invalid;
-// @snippet conversion-qvariant-invalid
-
-// @snippet conversion-qvariant-pytypeobject
-const char *typeName;
-if (Shiboken::String::checkType(reinterpret_cast<PyTypeObject *>(%in)))
-    typeName = "QString";
-else if (%in == reinterpret_cast<PyObject *>(&PyFloat_Type))
-    typeName = "double"; // float is a UserType in QVariant.
-else if (%in == reinterpret_cast<PyObject *>(&PyLong_Type))
-    typeName = "int";    // long is a UserType in QVariant.
-else if (Py_TYPE(%in) == SbkObjectType_TypeF())
-    typeName = Shiboken::ObjectType::getOriginalName((SbkObjectType *)%in);
-else
-    typeName = reinterpret_cast<PyTypeObject *>(%in)->tp_name;
-const int id = QMetaType::fromName(typeName).id();
-%out = QVariant::Type(id);
-// @snippet conversion-qvariant-pytypeobject
-
-// @snippet conversion-qvariant-pystring
-const int id = QMetaType::fromName(Shiboken::String::toCString(%in)).id();
-%out = QVariant::Type(id);
-// @snippet conversion-qvariant-pystring
-
-// @snippet conversion-qvariant-pydict
-const int id = QMetaType::fromName("QVariantMap").id();
-%out = QVariant::Type(id);
-// @snippet conversion-qvariant-pydict
-
-// @snippet conversion-qvariant-pysequence
-%out = QVariantType_isStringList(%in) ? QVariant::StringList : QVariant::List;
-// @snippet conversion-qvariant-pysequence
-
 // @snippet conversion-qjsonobject-pydict
 QVariant dict = QVariant_convertToVariantMap(%in);
 QJsonValue val = QJsonValue::fromVariant(dict);
-- 
cgit v1.2.3