aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/glue
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-27 09:28:47 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-27 15:31:43 +0000
commitfe36e455be3572b3690426fe7e2d8276bb99e65d (patch)
tree9a07a6ecc3b515cde547df425c51d721122f388a /sources/pyside2/PySide2/glue
parenteb195561ef4daa3e2a35c5fb6a144369b7b82471 (diff)
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>
Diffstat (limited to 'sources/pyside2/PySide2/glue')
-rw-r--r--sources/pyside2/PySide2/glue/qtcore.cpp34
1 files changed, 0 insertions, 34 deletions
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);