diff options
5 files changed, 92 insertions, 92 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index accff6410..f93f1b49e 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -716,7 +716,7 @@ <extra-includes> <include file-name="pysideqhash.h" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i, %i, %i"/> @@ -725,7 +725,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iiii"/> @@ -746,7 +746,7 @@ </value-type> <value-type name="QLineF"> <enum-type name="IntersectionType"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f, %f"/> @@ -755,7 +755,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dddd"/> @@ -829,7 +829,7 @@ <extra-includes> <include file-name="datetime.h" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i, %i"/> @@ -838,7 +838,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iii"/> @@ -900,7 +900,7 @@ <add-function signature="QDateTime(int,int,int,int,int,int,int,Qt::TimeSpec=Qt::LocalTime)"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdatetime-3"/> </add-function> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i, %i, %i, %i, %i, %i, %i"/> @@ -908,7 +908,7 @@ </insert-template> </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iiiiiiii"/> @@ -947,7 +947,7 @@ </modify-function> <!-- PYSIDE-1499: End of insertion --> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="s"/> @@ -1002,7 +1002,7 @@ </value-type> <value-type name="QPoint"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i"/> @@ -1011,7 +1011,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="ii"/> @@ -1035,7 +1035,7 @@ <!--### --> </value-type> <value-type name="QPointF"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f"/> @@ -1044,7 +1044,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dd"/> @@ -1068,7 +1068,7 @@ <!--### --> </value-type> <value-type name="QRect"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i, %i, %i"/> @@ -1076,7 +1076,7 @@ </insert-template> </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iiii"/> @@ -1131,7 +1131,7 @@ </modify-function> </value-type> <value-type name="QRectF"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f, %f"/> @@ -1144,7 +1144,7 @@ FIXME These functions return qreal. Will convert to double (format string) mess things up in other architectures? --> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dddd"/> @@ -1198,7 +1198,7 @@ </modify-function> </value-type> <value-type name="QSize"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i"/> @@ -1207,7 +1207,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="ii"/> @@ -1231,7 +1231,7 @@ <!--### --> </value-type> <value-type name="QSizeF"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f"/> @@ -1240,7 +1240,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dd"/> @@ -1279,7 +1279,7 @@ <include file-name="datetime.h" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%i, %i, %i, %i"/> @@ -1287,7 +1287,7 @@ </insert-template> </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iiii"/> @@ -1334,7 +1334,7 @@ <enum-type name="StringFormat"/> <enum-type name="Variant"/> <enum-type name="Version"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="'%s'"/> @@ -1342,7 +1342,7 @@ </insert-template> </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="s"/> @@ -1939,7 +1939,7 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="'%s'"/> @@ -1948,7 +1948,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="s"/> @@ -1992,7 +1992,7 @@ </modify-function> <!-- PYSIDE-1499: End of insertion --> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="s"/> @@ -2071,11 +2071,11 @@ </add-function> <!-- ### --> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-repr"/> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="N"/> @@ -2228,7 +2228,7 @@ <insert-template name="fix_bool*"/> </inject-code> </modify-function> - <add-function signature="__str__" return-type="PyObject*"> + <add-function signature="__str__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qbytearray-str"/> </add-function> <add-function signature="__len__"> @@ -2802,7 +2802,7 @@ <object-type name="QEvent" polymorphic-id-expression="%1->type() == QEvent::None" qt-register-metatype="base"> <enum-type name="Type" python-type="IntEnum"/> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="repr-qevent"/> </add-function> @@ -3352,7 +3352,7 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qmetaobject-invokemethod-return-arg"/> </add-function> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qmetaobject-repr"/> </add-function> <modify-function signature="indexOfClassInfo(const char *)"> diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index b208e1201..6a38cd5ee 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -197,7 +197,7 @@ <value-type name="QTransform"> <enum-type name="TransformationType"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f, %f, %f, %f"/> @@ -207,7 +207,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="ddddddddd"/> @@ -330,11 +330,11 @@ <enum-type name="SequenceMatch"/> <enum-type name="StandardKey"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qkeysequence-repr"/> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="iiii"/> @@ -461,7 +461,7 @@ <add-function signature="operator==(const QPolygon&)" return-type="bool"/> <add-function signature="operator!=(const QPolygon&)" return-type="bool"/> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qpolygon-reduce"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="N"/> @@ -787,12 +787,12 @@ <extra-includes> <include file-name="QVariant" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="qcolor_repr"/> </inject-code> </add-function> - <add-function signature="__str__" return-type="PyObject*"> + <add-function signature="__str__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="qcolor_repr"/> </inject-code> @@ -800,7 +800,7 @@ <add-function signature="__setstate__(PyObject*)" return-type="PyObject"> <inject-code file="../glue/qtgui.cpp" snippet="qcolor-setstate"/> </add-function> - <add-function signature="__reduce__" return-type="PyObject"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qcolor-reduce"/> </add-function> @@ -1334,21 +1334,21 @@ <enum-type name="State"/> </value-type> <object-type name="QDragEnterEvent" polymorphic-id-expression="%B->type() == QEvent::DragEnter"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> <object-type name="QDragLeaveEvent" polymorphic-id-expression="%B->type() == QEvent::DragLeave"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> <object-type name="QDragMoveEvent" polymorphic-id-expression="%B->type() == QEvent::DragMove"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1360,7 +1360,7 @@ <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1374,7 +1374,7 @@ <object-type name="QFileOpenEvent" polymorphic-id-expression="%B->type() == QEvent::FileOpen"/> <object-type name="QFocusEvent" polymorphic-id-expression="%B->type() == QEvent::FocusIn || %B->type() == QEvent::FocusOut"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1394,7 +1394,7 @@ <value-type name="Attribute"> <include file-name="QInputMethodEvent" location="global"/> </value-type> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1405,7 +1405,7 @@ polymorphic-id-expression="%B->type() == QEvent::InputMethodQuery"/> <object-type name="QMoveEvent" polymorphic-id-expression="%B->type() == QEvent::Move"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1418,7 +1418,7 @@ <enum-type name="SurfaceEventType"/> </object-type> <object-type name="QResizeEvent" polymorphic-id-expression="%B->type() == QEvent::Resize"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1434,7 +1434,7 @@ polymorphic-id-expression="%B->type() == QEvent::StatusTip"/> <object-type name="QTabletEvent" polymorphic-id-expression="%B->type() == QEvent::TabletMove || %B->type() == QEvent::TabletPress || %B->type() == QEvent::TabletRelease"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1445,7 +1445,7 @@ <object-type name="QWhatsThisClickedEvent" polymorphic-id-expression="%B->type() == QEvent::WhatsThisClicked"/> <object-type name="QWheelEvent" polymorphic-id-expression="%B->type() == QEvent::Wheel"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1454,7 +1454,7 @@ <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%B->type() == QEvent::WindowStateChange"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1466,7 +1466,7 @@ <add-function signature="operator!=(QKeySequence::StandardKey)"> <inject-code class="target" file="../glue/qtgui.cpp" snippet="qkeyevent-operatornotequal"/> </add-function> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1483,7 +1483,7 @@ <modify-function signature="y() const" deprecated="yes"/> <modify-function signature="globalX() const" deprecated="yes"/> <modify-function signature="globalY() const" deprecated="yes"/> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -1494,7 +1494,7 @@ <enum-type name="ScrollState"/> </object-type> <object-type name="QPointerEvent" copyable= "false"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -2020,7 +2020,7 @@ <modify-function signature="QMatrix2x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="4"/> @@ -2029,7 +2029,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2057,7 +2057,7 @@ <modify-function signature="QMatrix2x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="6"/> @@ -2066,7 +2066,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2094,7 +2094,7 @@ <modify-function signature="QMatrix2x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="8"/> @@ -2103,7 +2103,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2131,7 +2131,7 @@ <modify-function signature="QMatrix3x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="6"/> @@ -2140,7 +2140,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2168,7 +2168,7 @@ <modify-function signature="QMatrix3x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="9"/> @@ -2177,7 +2177,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2205,7 +2205,7 @@ <modify-function signature="QMatrix3x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="12"/> @@ -2214,7 +2214,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2242,7 +2242,7 @@ <modify-function signature="QMatrix4x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="8"/> @@ -2251,7 +2251,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2279,7 +2279,7 @@ <modify-function signature="QMatrix4x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> <modify-function signature="constData()const" remove="all"/> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="12"/> @@ -2288,7 +2288,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2336,7 +2336,7 @@ <modify-function signature="__dummy(const QList<float > &)" remove="all"/> <!-- that was the trick ^^^^^^^^^^^^^^^^^^^^^^ --> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> <replace from="%MATRIX_SIZE" to="16"/> @@ -2345,7 +2345,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code_matrix"> <replace from="%MATRIX_TYPE" to="float"/> @@ -2407,7 +2407,7 @@ _______ end of matrix block _______ --> <value-type name="QQuaternion" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f, %f"/> @@ -2416,7 +2416,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dddd"/> @@ -2449,7 +2449,7 @@ </value-type> <object-type name="QTouchEvent" since="4.6"> - <add-function signature="__repr__" return-type="PyObject"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> @@ -2462,7 +2462,7 @@ </object-type> <value-type name="QVector2D" since="4.6"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f"/> @@ -2471,7 +2471,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dd"/> @@ -2494,7 +2494,7 @@ <extra-includes> <include file-name="QMatrix4x4" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f"/> @@ -2503,7 +2503,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="ddd"/> @@ -2526,7 +2526,7 @@ <extra-includes> <include file-name="QMatrix4x4" location="global"/> </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> <replace from="%REPR_FORMAT" to="%f, %f, %f, %f"/> @@ -2535,7 +2535,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> <insert-template name="reduce_code"> <replace from="%REDUCE_FORMAT" to="dddd"/> diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml index f4f75a54b..f2e9707c3 100644 --- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml +++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml @@ -198,7 +198,7 @@ <value-type name="PropertyPair"/> </object-type> <value-type name="QQmlError"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning" file="../glue/qtqml.cpp" snippet="qmlerrror-repr"/> </add-function> </value-type> diff --git a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml index 9d1323659..f2bbaa61a 100644 --- a/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml +++ b/sources/pyside6/tests/pysidetest/typesystem_pysidetest.xml @@ -41,7 +41,7 @@ <namespace-type name="PySideCPP"> <object-type name="TestObjectWithNamespace"/> <object-type name="TestObject2WithNamespace"> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> %PYARG_0 = Shiboken::String::fromCString("TestObject2WithNamespace(injected_repr)"); </inject-code> diff --git a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml index e315e599e..ca646a846 100644 --- a/sources/shiboken6/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken6/tests/samplebinding/typesystem_sample.xml @@ -1733,7 +1733,7 @@ </object-type> <value-type name="Point"> - <add-function signature="__str__" return-type="PyObject*"> + <add-function signature="__str__" return-type="str"> <inject-code class="target" position="beginning"> int x1 = (int) %CPPSELF.x(); int x2 = ((int) (%CPPSELF.x() * 100)) - (x1 * 100); @@ -1742,7 +1742,7 @@ %PYARG_0 = Shiboken::String::fromFormat("Point(%d.%d, %d.%d)", x1, x2, y1, y2); </inject-code> </add-function> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> int x1 = (int) %CPPSELF.x(); int x2 = ((int) (%CPPSELF.x() * 10)) - (x1 * 10); @@ -1752,7 +1752,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> PyObject* type = PyObject_Type(%PYSELF); PyObject* args = NULL; @@ -1796,7 +1796,7 @@ </value-type> <value-type name="PointF"> - <add-function signature="__str__" return-type="PyObject*"> + <add-function signature="__str__" return-type="str"> <inject-code class="target" position="beginning"> int x1 = (int) %CPPSELF.x(); int x2 = ((int) (%CPPSELF.x() * 100)) - (x1 * 100); @@ -1805,7 +1805,7 @@ %PYARG_0 = Shiboken::String::fromFormat("PointF(%d.%d, %d.%d)", x1, x2, y1, y2); </inject-code> </add-function> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> int x1 = (int) %CPPSELF.x(); int x2 = ((int) (%CPPSELF.x() * 10)) - (x1 * 10); @@ -1815,7 +1815,7 @@ </inject-code> </add-function> - <add-function signature="__reduce__" return-type="PyObject*"> + <add-function signature="__reduce__" return-type="str"> <inject-code class="target" position="beginning"> PyObject *type = PyObject_Type(%PYSELF); PyObject *args = NULL; @@ -2018,7 +2018,7 @@ </value-type> <value-type name="Str" hash-function="strHash"> - <add-function signature="__str__" return-type="PyObject*"> + <add-function signature="__str__" return-type="str"> <inject-code class="target" position="beginning"> %PYARG_0 = Shiboken::String::fromCString(%CPPSELF.cstring()); </inject-code> @@ -2161,7 +2161,7 @@ %PYARG_0 = %CONVERTTOPYTHON[ByteArray](ba); </inject-code> </add-function> - <add-function signature="__repr__" return-type="PyObject*"> + <add-function signature="__repr__" return-type="str"> <inject-code class="target" position="beginning"> ByteArray b(Py_TYPE(%PYSELF)->tp_name); PyObject* aux = Shiboken::String::fromStringAndSize(%CPPSELF.data(), %CPPSELF.size()); |