jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add since attribute for classes and enums added on Qt4.6 and Qt4.7.

Browse source
This commit is contained in:
Hugo Parente Lima 2011-05-12 19:00:44 -03:00
commit f4128e89ed
9 changed files with 114 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

92
PySide/QtCore/typesystem_core.xml
View file

@ -22,26 +22,26 @@
<load-typesystem name="typesystem_templates.xml" generate="no"/> <load-typesystem name="typesystem_templates.xml" generate="no"/>
<function signature="qAcos(qreal)" /> <function signature="qAcos(qreal)" />
<function signature="qAsin(qreal)" /> <function signature="qAsin(qreal)" since="4.6" />
<function signature="qAtan(qreal)" /> <function signature="qAtan(qreal)" since="4.6" />
<function signature="qAtan2(qreal,qreal)" /> <function signature="qAtan2(qreal,qreal)" since="4.6" />
<function signature="qChecksum(const char*,uint)" /> <function signature="qChecksum(const char*,uint)" />
<function signature="qCritical(const char*)" /> <function signature="qCritical(const char*)" />
<function signature="qDebug(const char*)" /> <function signature="qDebug(const char*)" />
<function signature="qExp(qreal)" /> <function signature="qExp(qreal)" since="4.6" />
<function signature="qFabs(qreal)" /> <function signature="qFabs(qreal)" since="4.6" />
<function signature="qFastCos(qreal)" /> <function signature="qFastCos(qreal)" since="4.6"/>
<function signature="qFastSin(qreal)" /> <function signature="qFastSin(qreal)" since="4.6" />
<function signature="qFatal(const char*)" /> <function signature="qFatal(const char*)" />
<function signature="qFuzzyCompare(double,double)" /> <function signature="qFuzzyCompare(double,double)" />
<function signature="qFuzzyIsNull(double)" /> <function signature="qFuzzyIsNull(double)" since="4.6" />
<function signature="qIsFinite(double)" /> <function signature="qIsFinite(double)" />
<function signature="qIsInf(double)" /> <function signature="qIsInf(double)" />
<function signature="qIsNaN(double)" /> <function signature="qIsNaN(double)" />
<function signature="qIsNull(double)" /> <function signature="qIsNull(double)" />
<function signature="qRound(qreal)" /> <function signature="qRound(qreal)" />
<function signature="qTan(qreal)" /> <function signature="qTan(qreal)" since="4.6" />
<function signature="qtTrId(const char *, int)" /> <function signature="qtTrId(const char *, int)" since="4.6" />
<function signature="qVersion()" /> <function signature="qVersion()" />
<function signature="qWarning(const char*)" /> <function signature="qWarning(const char*)" />
<function signature="qrand()" /> <function signature="qrand()" />
@ -246,7 +246,7 @@
<namespace-type name="Qt"> <namespace-type name="Qt">
<enum-type name="AlignmentFlag" flags="Alignment" /> <enum-type name="AlignmentFlag" flags="Alignment" />
<enum-type name="AnchorAttribute"/> <enum-type name="AnchorAttribute"/>
<enum-type name="AnchorPoint"/> <enum-type name="AnchorPoint" since="4.6" />
<enum-type name="ApplicationAttribute"/> <enum-type name="ApplicationAttribute"/>
<enum-type name="ArrowType"/> <enum-type name="ArrowType"/>
<enum-type name="AspectRatioMode"/> <enum-type name="AspectRatioMode"/>
@ -258,7 +258,7 @@
<enum-type name="ClipOperation"/> <enum-type name="ClipOperation"/>
<enum-type name="ConnectionType"/> <enum-type name="ConnectionType"/>
<enum-type name="ContextMenuPolicy"/> <enum-type name="ContextMenuPolicy"/>
<enum-type name="CoordinateSystem"/> <enum-type name="CoordinateSystem" since="4.6"/>
<enum-type name="Corner"/> <enum-type name="Corner"/>
<enum-type name="CursorShape" /> <enum-type name="CursorShape" />
<enum-type name="DateFormat" /> <enum-type name="DateFormat" />
@ -270,13 +270,13 @@
<enum-type name="FillRule"/> <enum-type name="FillRule"/>
<enum-type name="FocusPolicy"/> <enum-type name="FocusPolicy"/>
<enum-type name="FocusReason"/> <enum-type name="FocusReason"/>
<enum-type name="GestureFlag" flags="GestureFlags"/> <enum-type name="GestureFlag" flags="GestureFlags" since="4.6"/>
<enum-type name="GestureState"/> <enum-type name="GestureState" since="4.6"/>
<enum-type name="GestureType"/> <enum-type name="GestureType" since="4.6"/>
<enum-type name="GlobalColor"/> <enum-type name="GlobalColor"/>
<enum-type name="HitTestAccuracy"/> <enum-type name="HitTestAccuracy"/>
<enum-type name="ImageConversionFlag" flags="ImageConversionFlags" /> <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" />
<enum-type name="InputMethodHint" flags="InputMethodHints"/> <enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/>
<enum-type name="InputMethodQuery"/> <enum-type name="InputMethodQuery"/>
<enum-type name="ItemDataRole" force-integer="yes" /> <enum-type name="ItemDataRole" force-integer="yes" />
<enum-type name="ItemFlag" flags="ItemFlags"/> <enum-type name="ItemFlag" flags="ItemFlags"/>
@ -288,7 +288,7 @@
<enum-type name="MatchFlag" flags="MatchFlags"/> <enum-type name="MatchFlag" flags="MatchFlags"/>
<enum-type name="Modifier"/> <enum-type name="Modifier"/>
<enum-type name="MouseButton" flags="MouseButtons"/> <enum-type name="MouseButton" flags="MouseButtons"/>
<enum-type name="NavigationMode"/> <enum-type name="NavigationMode" since="4.6"/>
<enum-type name="Orientation" flags="Orientations"/> <enum-type name="Orientation" flags="Orientations"/>
<enum-type name="PenCapStyle"/> <enum-type name="PenCapStyle"/>
<enum-type name="PenJoinStyle"/> <enum-type name="PenJoinStyle"/>
@ -302,12 +302,12 @@
<enum-type name="TextFlag"/> <enum-type name="TextFlag"/>
<enum-type name="TextFormat"/> <enum-type name="TextFormat"/>
<enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/> <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/>
<enum-type name="TileRule"/> <enum-type name="TileRule" since="4.6"/>
<enum-type name="TimeSpec"/> <enum-type name="TimeSpec"/>
<enum-type name="ToolBarArea" flags="ToolBarAreas" /> <enum-type name="ToolBarArea" flags="ToolBarAreas" />
<enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolBarAreaSizes"/>
<enum-type name="ToolButtonStyle"/> <enum-type name="ToolButtonStyle"/>
<enum-type name="TouchPointState"/> <enum-type name="TouchPointState" since="4.6"/>
<enum-type name="TransformationMode"/> <enum-type name="TransformationMode"/>
<enum-type name="UIEffect"/> <enum-type name="UIEffect"/>
<enum-type name="WhiteSpaceMode" /> <enum-type name="WhiteSpaceMode" />
@ -1553,20 +1553,20 @@
<modify-function signature="indexOf(QString,int)const" remove="all" /> <modify-function signature="indexOf(QString,int)const" remove="all" />
<modify-function signature="insert(int,const char*)" remove="all" /> <modify-function signature="insert(int,const char*)" remove="all" />
<modify-function signature="insert(int,char)" remove="all" /> <modify-function signature="insert(int,char)" remove="all" />
<modify-function signature="insert(int,const char*,int)" remove="all" /> <modify-function signature="insert(int,const char*,int)" since="4.6" remove="all" />
<modify-function signature="insert(int,QString)" remove="all" /> <modify-function signature="insert(int,QString)" remove="all" />
<modify-function signature="lastIndexOf(const char*,int)const" remove="all" /> <modify-function signature="lastIndexOf(const char*,int)const" remove="all" />
<modify-function signature="lastIndexOf(QString,int)const" remove="all" /> <modify-function signature="lastIndexOf(QString,int)const" remove="all" />
<modify-function signature="lastIndexOf(char,int)const" remove="all" /> <modify-function signature="lastIndexOf(char,int)const" remove="all" />
<modify-function signature="prepend(const char*)" remove="all" /> <modify-function signature="prepend(const char*)" remove="all" />
<modify-function signature="prepend(const char*,int)" remove="all" /> <modify-function signature="prepend(const char*,int)" since="4.6" remove="all" />
<modify-function signature="replace(QByteArray,const char*)" remove="all" /> <modify-function signature="replace(QByteArray,const char*)" remove="all" />
<modify-function signature="replace(const char*,int,const char*,int)" remove="all"/> <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/>
<modify-function signature="replace(QString,const char*)" remove="all" /> <modify-function signature="replace(QString,const char*)" remove="all" />
<modify-function signature="replace(const char*,QByteArray)" remove="all" /> <modify-function signature="replace(const char*,QByteArray)" remove="all" />
<modify-function signature="replace(const char*,const char*)" remove="all" /> <modify-function signature="replace(const char*,const char*)" remove="all" />
<modify-function signature="replace(int,int,const char*)" remove="all" /> <modify-function signature="replace(int,int,const char*)" remove="all" />
<modify-function signature="replace(int,int,const char*,int)" remove="all" /> <modify-function signature="replace(int,int,const char*,int)" since="4.6" remove="all" />
<modify-function signature="replace(char,const char*)" remove="all" /> <modify-function signature="replace(char,const char*)" remove="all" />
<modify-function signature="replace(char,QString)" remove="all" /> <modify-function signature="replace(char,QString)" remove="all" />
<modify-function signature="startsWith(const char*)const" remove="all" /> <modify-function signature="startsWith(const char*)const" remove="all" />
@ -2391,7 +2391,7 @@
</template> </template>
<object-type name="QDataStream" stream="yes"> <object-type name="QDataStream" stream="yes">
<enum-type name="FloatingPointPrecision"/> <enum-type name="FloatingPointPrecision" since="4.6"/>
<enum-type name="Status"/> <enum-type name="Status"/>
<enum-type name="Version"/> <enum-type name="Version"/>
<enum-type name="ByteOrder"/> <enum-type name="ByteOrder"/>
@ -2712,7 +2712,7 @@
<object-type name="QXmlStreamReader"> <object-type name="QXmlStreamReader">
<enum-type name="Error"/> <enum-type name="Error"/>
<enum-type name="TokenType"/> <enum-type name="TokenType"/>
<enum-type name="ReadElementTextBehaviour"/> <enum-type name="ReadElementTextBehaviour" since="4.6"/>
</object-type> </object-type>
<object-type name="QXmlStreamWriter"> <object-type name="QXmlStreamWriter">
<!-- Removed because it expect QString to be mutable --> <!-- Removed because it expect QString to be mutable -->
@ -2772,15 +2772,15 @@
<modify-function signature="enclosingMetaObject()const" remove="all" /> <modify-function signature="enclosingMetaObject()const" remove="all" />
</value-type> </value-type>
<!-- From Qt4.6 --> <!-- From Qt4.6 -->
<object-type name="QAbstractAnimation"> <object-type name="QAbstractAnimation" since="4.6">
<enum-type name="DeletionPolicy"/> <enum-type name="DeletionPolicy"/>
<enum-type name="Direction"/> <enum-type name="Direction"/>
<enum-type name="State"/> <enum-type name="State"/>
</object-type> </object-type>
<object-type name="QAbstractState"/> <object-type name="QAbstractState" since="4.6" />
<object-type name="QAbstractTransition"> <object-type name="QAbstractTransition" since="4.6">
<modify-function signature="QAbstractTransition(QState*)"> <modify-function signature="QAbstractTransition(QState*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -2827,7 +2827,7 @@
</object-type> </object-type>
<object-type name="QAnimationGroup"> <object-type name="QAnimationGroup" since="4.6">
<modify-function signature="addAnimation(QAbstractAnimation*)"> <modify-function signature="addAnimation(QAbstractAnimation*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -2870,13 +2870,13 @@
Se also bug: Se also bug:
http://bugs.pyside.org/show_bug.cgi?id=725 http://bugs.pyside.org/show_bug.cgi?id=725
--> -->
<rejection class="QEasingCurve" function-name="setCustomType"/> <rejection class="QEasingCurve" function-name="setCustomType" />
<value-type name="QEasingCurve"> <value-type name="QEasingCurve" since="4.6">
<enum-type name="Type"/> <enum-type name="Type" />
<modify-function signature="customType() const" remove="all"/> <modify-function signature="customType() const" remove="all"/>
</value-type> </value-type>
<object-type name="QEventTransition"> <object-type name="QEventTransition" since="4.6">
<modify-function signature="QEventTransition(QState*)"> <modify-function signature="QEventTransition(QState*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -2891,25 +2891,25 @@
</object-type> </object-type>
<object-type name="QFinalState"/> <object-type name="QFinalState" since="4.6" />
<object-type name="QHistoryState"> <object-type name="QHistoryState" since="4.6">
<enum-type name="HistoryType" /> <enum-type name="HistoryType" />
</object-type> </object-type>
<value-type name="QMargins"/> <value-type name="QMargins" since="4.6"/>
<object-type name="QParallelAnimationGroup"/> <object-type name="QParallelAnimationGroup" since="4.6"/>
<object-type name="QPauseAnimation"/> <object-type name="QPauseAnimation" since="4.6"/>
<value-type name="QProcessEnvironment"/> <value-type name="QProcessEnvironment" since="4.6"/>
<object-type name="QPropertyAnimation"/> <object-type name="QPropertyAnimation" since="4.6"/>
<object-type name="QSequentialAnimationGroup"/> <object-type name="QSequentialAnimationGroup" since="4.6"/>
<object-type name="QSignalTransition"> <object-type name="QSignalTransition" since="4.6">
<add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*"> <add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*">
<modify-argument index="2"> <modify-argument index="2">
<replace-default-expression with="0" /> <replace-default-expression with="0" />
@ -2929,7 +2929,7 @@
</add-function> </add-function>
</object-type> </object-type>
<object-type name="QState"> <object-type name="QState" since="4.6">
<enum-type name="ChildMode"/> <enum-type name="ChildMode"/>
<modify-function signature="addTransition(QAbstractTransition*)"> <modify-function signature="addTransition(QAbstractTransition*)">
<modify-argument index="1"> <modify-argument index="1">
@ -2984,13 +2984,13 @@
</modify-function> </modify-function>
</object-type> </object-type>
<object-type name="QStateMachine"> <object-type name="QStateMachine" since="4.6">
<enum-type name="Error"/> <enum-type name="Error"/>
<enum-type name="EventPriority"/> <enum-type name="EventPriority"/>
<enum-type name="RestorePolicy"/> <enum-type name="RestorePolicy"/>
<value-type name="SignalEvent"/> <value-type name="SignalEvent" since="4.6"/>
<value-type name="WrappedEvent"/> <value-type name="WrappedEvent" since="4.6"/>
<modify-function signature="addState(QAbstractState *)"> <modify-function signature="addState(QAbstractState *)">
<modify-argument index="1"> <modify-argument index="1">
@ -3028,7 +3028,7 @@
</add-function> </add-function>
</object-type> </object-type>
<object-type name="QVariantAnimation"/> <object-type name="QVariantAnimation" since="4.6"/>
<!-- From Qt4.6 ^^^ --> <!-- From Qt4.6 ^^^ -->

89
PySide/QtGui/typesystem_gui_common.xml
View file

@ -1222,7 +1222,7 @@
<insert-template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"/> <insert-template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"/>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getHsl(int*,int*,int*,int*)const"> <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6">
<modify-argument index="0"> <modify-argument index="0">
<replace-type modified-type="PyObject *" /> <replace-type modified-type="PyObject *" />
</modify-argument> </modify-argument>
@ -1245,7 +1245,7 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</modify-function> </modify-function>
<modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const"> <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6">
<modify-argument index="0"> <modify-argument index="0">
<replace-type modified-type="PyObject *" /> <replace-type modified-type="PyObject *" />
</modify-argument> </modify-argument>
@ -1582,7 +1582,7 @@
<enum-type name="Extension"/> <enum-type name="Extension"/>
<enum-type name="GraphicsItemChange"/> <enum-type name="GraphicsItemChange"/>
<enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/> <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/>
<enum-type name="PanelModality"/> <enum-type name="PanelModality" since="4.6"/>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType);
PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant); PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant);
@ -1658,7 +1658,7 @@
<modify-function signature="inputMethodEvent(QInputMethodEvent*)"> <modify-function signature="inputMethodEvent(QInputMethodEvent*)">
<modify-argument index="1" invalidate-after-use="yes"/> <modify-argument index="1" invalidate-after-use="yes"/>
</modify-function> </modify-function>
<modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const"> <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" since="4.6">
<modify-argument index="1"> <modify-argument index="1">
<remove-argument/> <remove-argument/>
</modify-argument> </modify-argument>
@ -2846,7 +2846,7 @@
<object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/> <object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>
<object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/> <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
<object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/> <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
<object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride"> <object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride" since="4.6">
<modify-function signature="activeGestures()const"> <modify-function signature="activeGestures()const">
<modify-argument index="return"> <modify-argument index="return">
<define-ownership owner="default"/> <define-ownership owner="default"/>
@ -2880,7 +2880,7 @@
<enum-type name="ControlElement" extensible="yes"/> <enum-type name="ControlElement" extensible="yes"/>
<enum-type name="PixelMetric" extensible="yes" /> <enum-type name="PixelMetric" extensible="yes" />
<enum-type name="PrimitiveElement" extensible="yes" /> <enum-type name="PrimitiveElement" extensible="yes" />
<enum-type name="RequestSoftwareInputPanel"/> <enum-type name="RequestSoftwareInputPanel" since="4.6"/>
<enum-type name="StandardPixmap" extensible="yes"/> <enum-type name="StandardPixmap" extensible="yes"/>
<enum-type name="StateFlag" flags="State"/> <enum-type name="StateFlag" flags="State"/>
<enum-type name="StyleHint" extensible="yes" /> <enum-type name="StyleHint" extensible="yes" />
@ -5103,8 +5103,8 @@
<object-type name="QAction"> <object-type name="QAction">
<enum-type name="ActionEvent"/> <enum-type name="ActionEvent"/>
<enum-type name="MenuRole"/> <enum-type name="MenuRole"/>
<enum-type name="Priority"/> <enum-type name="Priority" since="4.6"/>
<enum-type name="SoftKeyRole"/> <enum-type name="SoftKeyRole" since="4.6"/>
<modify-function signature="setMenu(QMenu*)"> <modify-function signature="setMenu(QMenu*)">
<modify-argument index="1"> <modify-argument index="1">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -5786,7 +5786,7 @@
</modify-function> </modify-function>
</object-type> </object-type>
<value-type name="QMatrix2x2"> <value-type name="QMatrix2x2" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -5856,7 +5856,7 @@
<add-function signature="operator==(const QMatrix2x2&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix2x2&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix2x3"> <value-type name="QMatrix2x3" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -5926,7 +5926,7 @@
<add-function signature="operator==(const QMatrix2x3&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix2x3&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix2x4"> <value-type name="QMatrix2x4" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -5996,7 +5996,7 @@
<add-function signature="operator==(const QMatrix2x4&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix2x4&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix3x2"> <value-type name="QMatrix3x2" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6066,7 +6066,7 @@
<add-function signature="operator==(const QMatrix3x2&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix3x2&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix3x3"> <value-type name="QMatrix3x3" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6136,7 +6136,7 @@
<add-function signature="operator==(const QMatrix3x3&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix3x3&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix3x4"> <value-type name="QMatrix3x4" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6206,7 +6206,7 @@
<add-function signature="operator==(const QMatrix3x4&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix3x4&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix4x2"> <value-type name="QMatrix4x2" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6276,7 +6276,7 @@
<add-function signature="operator==(const QMatrix4x2&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix4x2&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix4x3"> <value-type name="QMatrix4x3" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6346,8 +6346,7 @@
<add-function signature="operator==(const QMatrix4x3&amp;)" return-type="bool" /> <add-function signature="operator==(const QMatrix4x3&amp;)" return-type="bool" />
</value-type> </value-type>
<value-type name="QMatrix4x4" since="4.6">
<value-type name="QMatrix4x4">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code_matrix"> <insert-template name="repr_code_matrix">
@ -6437,23 +6436,23 @@
</add-function> </add-function>
</value-type> </value-type>
<object-type name="QGesture"> <object-type name="QGesture" since="4.6">
<enum-type name="GestureCancelPolicy"/> <enum-type name="GestureCancelPolicy"/>
</object-type> </object-type>
<object-type name="QGestureRecognizer"> <object-type name="QGestureRecognizer" since="4.6">
<enum-type name="ResultFlag" flags="Result"/> <enum-type name="ResultFlag" flags="Result"/>
</object-type> </object-type>
<object-type name="QTapAndHoldGesture"/> <object-type name="QTapAndHoldGesture" since="4.6"/>
<object-type name="QTapGesture"/> <object-type name="QTapGesture" since="4.6"/>
<object-type name="QGraphicsAnchor"/> <object-type name="QGraphicsAnchor" since="4.6"/>
<object-type name="QGraphicsAnchorLayout"/> <object-type name="QGraphicsAnchorLayout" since="4.6"/>
<object-type name="QGraphicsBlurEffect"> <object-type name="QGraphicsBlurEffect" since="4.6">
<enum-type name="BlurHint" flags="BlurHints"/> <enum-type name="BlurHint" flags="BlurHints"/>
</object-type> </object-type>
<object-type name="QGraphicsColorizeEffect"/> <object-type name="QGraphicsColorizeEffect" since="4.6"/>
<object-type name="QGraphicsDropShadowEffect"/> <object-type name="QGraphicsDropShadowEffect" since="4.6"/>
<object-type name="QGraphicsEffect"> <object-type name="QGraphicsEffect" since="4.6">
<enum-type name="ChangeFlag" flags="ChangeFlags"/> <enum-type name="ChangeFlag" flags="ChangeFlags"/>
<enum-type name="PixmapPadMode"/> <enum-type name="PixmapPadMode"/>
</object-type> </object-type>
@ -6462,18 +6461,18 @@
<object-type name="QGraphicsEffectSource"/> <object-type name="QGraphicsEffectSource"/>
--> -->
<object-type name="QGraphicsObject" /> <object-type name="QGraphicsObject" since="4.6" />
<object-type name="QGraphicsOpacityEffect"/> <object-type name="QGraphicsOpacityEffect" since="4.6"/>
<object-type name="QGraphicsRotation"/> <object-type name="QGraphicsRotation" since="4.6"/>
<object-type name="QGraphicsScale"/> <object-type name="QGraphicsScale" since="4.6"/>
<object-type name="QGraphicsTransform"/> <object-type name="QGraphicsTransform" since="4.6"/>
<object-type name="QKeyEventTransition"/> <object-type name="QKeyEventTransition" since="4.6"/>
<object-type name="QMouseEventTransition"/> <object-type name="QMouseEventTransition" since="4.6"/>
<object-type name="QPanGesture"/> <object-type name="QPanGesture" since="4.6"/>
<object-type name="QPinchGesture"> <object-type name="QPinchGesture" since="4.6">
<enum-type name="ChangeFlag" flags="ChangeFlags"/> <enum-type name="ChangeFlag" flags="ChangeFlags"/>
</object-type> </object-type>
<value-type name="QQuaternion"> <value-type name="QQuaternion" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code"> <insert-template name="repr_code">
@ -6505,18 +6504,18 @@
</object-type> </object-type>
--> -->
<object-type name="QSwipeGesture"> <object-type name="QSwipeGesture" since="4.6">
<enum-type name="SwipeDirection"/> <enum-type name="SwipeDirection"/>
</object-type> </object-type>
<value-type name="QTileRules"/> <value-type name="QTileRules" since="4.6"/>
<object-type name="QTouchEvent"> <object-type name="QTouchEvent" since="4.6">
<enum-type name="DeviceType"/> <enum-type name="DeviceType"/>
<value-type name="TouchPoint"/> <value-type name="TouchPoint" since="4.6"/>
</object-type> </object-type>
<value-type name="QVector2D"> <value-type name="QVector2D" since="4.6">
<add-function signature="__repr__" return-type="PyObject*"> <add-function signature="__repr__" return-type="PyObject*">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="repr_code"> <insert-template name="repr_code">
@ -6535,7 +6534,7 @@
</inject-code> </inject-code>
</add-function> </add-function>
</value-type> </value-type>
<value-type name="QVector3D"> <value-type name="QVector3D" since="4.6">
<extra-includes> <extra-includes>
<include file-name="QMatrix4x4" location="global"/> <include file-name="QMatrix4x4" location="global"/>
</extra-includes> </extra-includes>
@ -6557,7 +6556,7 @@
</inject-code> </inject-code>
</add-function> </add-function>
</value-type> </value-type>
<value-type name="QVector4D"> <value-type name="QVector4D" since="4.6">
<extra-includes> <extra-includes>
<include file-name="QMatrix4x4" location="global"/> <include file-name="QMatrix4x4" location="global"/>
</extra-includes> </extra-includes>

4
PySide/QtNetwork/typesystem_network.xml
View file

@ -37,7 +37,7 @@
<object-type name="QAbstractSocket"> <object-type name="QAbstractSocket">
<enum-type name="NetworkLayerProtocol"/> <enum-type name="NetworkLayerProtocol"/>
<enum-type name="SocketError"/> <enum-type name="SocketError"/>
<enum-type name="SocketOption"/> <enum-type name="SocketOption" since="4.6"/>
<enum-type name="SocketState"/> <enum-type name="SocketState"/>
<enum-type name="SocketType"/> <enum-type name="SocketType"/>
<modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" /> <modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
@ -191,7 +191,7 @@
<modify-function signature="post(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/> <modify-function signature="post(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
<modify-function signature="put(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/> <modify-function signature="put(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/>
<modify-function signature="put(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/> <modify-function signature="put(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
<modify-function signature="sendCustomRequest(const QNetworkRequest &amp;, const QByteArray &amp;, QIODevice *)" allow-thread="yes"/> <modify-function signature="sendCustomRequest(const QNetworkRequest &amp;, const QByteArray &amp;, QIODevice *)" allow-thread="yes" since="4.7" />
<modify-function signature="setCookieJar(QNetworkCookieJar*)"> <modify-function signature="setCookieJar(QNetworkCookieJar*)">
<modify-argument index="1"> <modify-argument index="1">
<define-ownership class="target" owner="c++"/> <define-ownership class="target" owner="c++"/>

8
PySide/QtOpenGL/typesystem_opengl.xml
View file

@ -44,7 +44,7 @@
<rejection class="QGLContext" field-name="currentCtx" /> <rejection class="QGLContext" field-name="currentCtx" />
<object-type name="QGLContext"> <object-type name="QGLContext">
<enum-type name="BindOption" flags="BindOptions"/> <enum-type name="BindOption" flags="BindOptions" since="4.6"/>
<modify-function signature="chooseContext(const QGLContext*)"> <modify-function signature="chooseContext(const QGLContext*)">
<modify-argument index="1" invalidate-after-use="yes"/> <modify-argument index="1" invalidate-after-use="yes"/>
</modify-function> </modify-function>
@ -87,11 +87,11 @@
<!-- ### --> <!-- ### -->
</object-type> </object-type>
<value-type name="QGLFramebufferObjectFormat"/> <value-type name="QGLFramebufferObjectFormat" since="4.6"/>
<object-type name="QGLShader"> <object-type name="QGLShader" since="4.6">
<enum-type name="ShaderTypeBit" flags="ShaderType"/> <enum-type name="ShaderTypeBit" flags="ShaderType"/>
</object-type> </object-type>
<object-type name="QGLShaderProgram"> <object-type name="QGLShaderProgram" since="4.6">
<!-- ### Use QMatrixZxY overloads --> <!-- ### Use QMatrixZxY overloads -->
<modify-function signature="setUniformValue(int, Array)" remove="all" /> <modify-function signature="setUniformValue(int, Array)" remove="all" />
<modify-function signature="setUniformValue(const char*, Array)" remove="all" /> <modify-function signature="setUniformValue(const char*, Array)" remove="all" />

2
PySide/QtScript/typesystem_script.xml
View file

@ -43,7 +43,7 @@
</object-type> </object-type>
<object-type name="QScriptExtensionInterface"/> <object-type name="QScriptExtensionInterface"/>
<object-type name="QScriptExtensionPlugin"/> <object-type name="QScriptExtensionPlugin"/>
<value-type name="QScriptProgram"/> <value-type name="QScriptProgram" since="4.7"/>
<value-type name="QScriptString"/> <value-type name="QScriptString"/>
<value-type name="QScriptValue"> <value-type name="QScriptValue">
<enum-type name="PropertyFlag" flags="PropertyFlags"/> <enum-type name="PropertyFlag" flags="PropertyFlags"/>

2
PySide/QtScriptTools/typesystem_scripttools.xml
View file

@ -24,7 +24,7 @@
<object-type name="QScriptEngineDebugger"> <object-type name="QScriptEngineDebugger">
<enum-type name="DebuggerAction"/> <enum-type name="DebuggerAction"/>
<enum-type name="DebuggerState"/> <enum-type name="DebuggerState" since="4.6"/>
<enum-type name="DebuggerWidget"/> <enum-type name="DebuggerWidget"/>
<extra-includes> <extra-includes>
<include file-name="QScriptEngine" location="global"/> <include file-name="QScriptEngine" location="global"/>

8
PySide/QtTest/typesystem_test.xml
View file

@ -54,9 +54,9 @@
<rejection class="QTest" function-name="touchEvent"/> <rejection class="QTest" function-name="touchEvent"/>
<namespace-type name="QTest"> <namespace-type name="QTest">
<enum-type name="AttributeIndex"/> <enum-type name="AttributeIndex" since="4.6"/>
<enum-type name="KeyAction"/> <enum-type name="KeyAction"/>
<enum-type name="LogElementType"/> <enum-type name="LogElementType" since="4.6"/>
<enum-type name="MouseAction"/> <enum-type name="MouseAction"/>
<enum-type name="QBenchmarkMetric" since="4.7"/> <enum-type name="QBenchmarkMetric" since="4.7"/>
<enum-type name="SkipMode"/> <enum-type name="SkipMode"/>
@ -66,7 +66,7 @@
</extra-includes> </extra-includes>
<!--<modify-function signature="qCompare<char>(char">--> <!--<modify-function signature="qCompare<char>(char">-->
<rejection class="QTouchEventSequence"/> <rejection class="QTouchEventSequence"/>
<object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" > <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" since="4.6" >
<modify-function signature="press(int, const QPoint&amp;, QWidget*)"> <modify-function signature="press(int, const QPoint&amp;, QWidget*)">
<modify-argument index="return"> <modify-argument index="return">
<define-ownership class="target" owner="default"/> <define-ownership class="target" owner="default"/>
@ -88,7 +88,7 @@
</modify-argument> </modify-argument>
</modify-function> </modify-function>
</object-type> </object-type>
<modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent"> <modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent" since="4.6">
<modify-argument index="return"> <modify-argument index="return">
<define-ownership class="target" owner="target"/> <define-ownership class="target" owner="target"/>
</modify-argument> </modify-argument>

16
PySide/QtWebKit/typesystem_webkit.xml
View file

@ -47,7 +47,7 @@
<modify-function signature="print(QPrinter*)const" rename="print_" /> <modify-function signature="print(QPrinter*)const" rename="print_" />
</object-type> </object-type>
<object-type name="QWebFrame"> <object-type name="QWebFrame">
<enum-type name="RenderLayer"/> <enum-type name="RenderLayer" since="4.6"/>
<modify-function signature="addToJavaScriptWindowObject(QString,QObject*)"> <modify-function signature="addToJavaScriptWindowObject(QString,QObject*)">
<modify-argument index="2"> <modify-argument index="2">
<parent index="this" action="add"/> <parent index="this" action="add"/>
@ -82,7 +82,7 @@
<enum-type name="WebAction"/> <enum-type name="WebAction"/>
<enum-type name="WebWindowType"/> <enum-type name="WebWindowType"/>
<!-- Qt 4.6 --> <!-- Qt 4.6 -->
<enum-type name="ErrorDomain"/> <enum-type name="ErrorDomain" since="4.6"/>
<enum-type name="Extension"/> <enum-type name="Extension"/>
<value-type name="ChooseMultipleFilesExtensionOption" /> <value-type name="ChooseMultipleFilesExtensionOption" />
@ -99,8 +99,10 @@
// Cast the parameters according to the extension type // Cast the parameters according to the extension type
if (extension == QWebPage::ChooseMultipleFilesExtension) if (extension == QWebPage::ChooseMultipleFilesExtension)
%out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionOption*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionOption*>(option)); %out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionOption*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionOption*>(option));
#if QT_VERSION >= 0x040600
else if (extension == QWebPage::ErrorPageExtension) else if (extension == QWebPage::ErrorPageExtension)
%out = %CONVERTTOPYTHON[ErrorPageExtensionOption*](reinterpret_cast&lt;const ErrorPageExtensionOption*>(option)); %out = %CONVERTTOPYTHON[ErrorPageExtensionOption*](reinterpret_cast&lt;const ErrorPageExtensionOption*>(option));
#endif
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
<modify-argument index="3" invalidate-after-use="yes"> <modify-argument index="3" invalidate-after-use="yes">
@ -109,8 +111,10 @@
// Cast the parameters according to the extension type // Cast the parameters according to the extension type
if (extension == QWebPage::ChooseMultipleFilesExtension) if (extension == QWebPage::ChooseMultipleFilesExtension)
%out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionReturn*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionReturn*>(output)); %out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionReturn*](reinterpret_cast&lt;const ChooseMultipleFilesExtensionReturn*>(output));
#if QT_VERSION >= 0x040600
else if (extension == QWebPage::ErrorPageExtension) else if (extension == QWebPage::ErrorPageExtension)
%out = %CONVERTTOPYTHON[ErrorPageExtensionReturn*](reinterpret_cast&lt;const ErrorPageExtensionReturn*>(output)); %out = %CONVERTTOPYTHON[ErrorPageExtensionReturn*](reinterpret_cast&lt;const ErrorPageExtensionReturn*>(output));
#endif
</conversion-rule> </conversion-rule>
</modify-argument> </modify-argument>
</modify-function> </modify-function>
@ -166,10 +170,10 @@
<value-type name="QWebSecurityOrigin"/> <value-type name="QWebSecurityOrigin"/>
<!-- Qt 4.6 --> <!-- Qt 4.6 -->
<object-type name="QGraphicsWebView"/> <object-type name="QGraphicsWebView" since="4.6"/>
<object-type name="QWebInspector"/> <object-type name="QWebInspector" since="4.6"/>
<value-type name="QWebElement"> <value-type name="QWebElement" since="4.6">
<enum-type name="StyleResolveStrategy"/> <enum-type name="StyleResolveStrategy"/>
</value-type> </value-type>
<value-type name="QWebElementCollection"/> <value-type name="QWebElementCollection" since="4.6"/>
</typesystem> </typesystem>

4
PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
View file

@ -21,8 +21,8 @@
<typesystem package="PySide.QtXmlPatterns"> <typesystem package="PySide.QtXmlPatterns">
<load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_core.xml" generate="no"/>
<object-type name="QXmlSchema"/> <!-- Qt scoped pointer does not allow declare this as value type --> <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type -->
<object-type name="QXmlSchemaValidator"> <object-type name="QXmlSchemaValidator" since="4.6">
<modify-function signature="schema() const"> <modify-function signature="schema() const">
<modify-argument index="return"> <modify-argument index="return">
<replace-type modified-type="QXmlSchema*"/> <replace-type modified-type="QXmlSchema*"/>