diff options
Diffstat (limited to 'sources/pyside6')
-rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 1 | ||||
-rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 19 | ||||
-rw-r--r-- | sources/pyside6/libpyside/feature_select.cpp | 2 |
3 files changed, 0 insertions, 22 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index c2031abaa..84048bda3 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -292,7 +292,6 @@ </conversion-rule> </primitive-type> <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qvariant-conversion"/> - <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qvariantmap-check"/> <primitive-type name="QStringList"> <include file-name="QStringList" location="global"/> <conversion-rule> diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 1ce41d003..3e3d0238e 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -249,25 +249,6 @@ static QVariant QVariant_convertToVariantList(PyObject *list) } // @snippet qvariant-conversion -// @snippet qvariantmap-check -static bool QVariantType_isStringList(PyObject *list) -{ - Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList")); - const Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object()); - for (Py_ssize_t i=0; i < size; i++) { - PyObject *item = PySequence_Fast_GET_ITEM(fast.object(), i); - if (!%CHECKTYPE[QString](item)) - return false; - } - return true; -} -static bool QVariantType_checkAllStringKeys(PyObject *dict) -{ - Shiboken::AutoDecRef keys(PyDict_Keys(dict)); - return QVariantType_isStringList(keys); -} -// @snippet qvariantmap-check - // @snippet qt-qabs double _abs = qAbs(%1); %PYARG_0 = %CONVERTTOPYTHON[double](_abs); diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp index 23a39ed34..47a7472e1 100644 --- a/sources/pyside6/libpyside/feature_select.cpp +++ b/sources/pyside6/libpyside/feature_select.cpp @@ -583,14 +583,12 @@ static PyObject *modifyStaticToClassMethod(PyTypeObject *type, PyObject *sm) static PyObject *createProperty(PyTypeObject *type, PyObject *getter, PyObject *setter) { - bool chassprop = false; assert(getter != nullptr); if (setter == nullptr) setter = Py_None; auto ptype = &PyProperty_Type; if (Py_TYPE(getter) == PepStaticMethod_TypePtr) { ptype = PyClassPropertyTypeF(); - chassprop = true; getter = modifyStaticToClassMethod(type, getter); if (setter != Py_None) setter = modifyStaticToClassMethod(type, setter); |