summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-09-16 19:52:40 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-12-09 19:25:36 -0300
commit8ea0365f36a74ac684246841c558b0592fae9bc7 (patch)
tree2aa009ad950fc5fb0c0f4a62e6ddab60aa80c97d
parent04732769c9af54b68b9697f23dcd1d0a76047297 (diff)
downloadpyside-8ea0365f36a74ac684246841c558b0592fae9bc7.tar.gz
pyside-8ea0365f36a74ac684246841c558b0592fae9bc7.tar.xz
pyside-8ea0365f36a74ac684246841c558b0592fae9bc7.zip
Updated various function removals and modifications.
-rw-r--r--PySide/QtCore/typesystem_core.xml3
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml45
-rw-r--r--PySide/typesystem_templates.xml7
3 files changed, 51 insertions, 4 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 224be87..0555547 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2814,7 +2814,6 @@
</modify-argument>
</modify-function>
<!-- fromUnicode(QString) does the job -->
- <modify-function signature="fromUnicode(const QChar*,int)" remove="all" />
<modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all" />
<modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all" />
</object-type>
@@ -3557,7 +3556,7 @@
<modify-function signature="pop_front()" remove="all"/>
<modify-function signature="toList() const" remove="all"/>
<modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
- <modify-function signature="operator+=(QVector)" remove="all" />
+ <modify-function signature="operator+=(QVector&lt;QXmlStreamAttribute&gt;)" remove="all" />
</value-type>
<value-type name="QXmlStreamNamespaceDeclaration"/>
<value-type name="QXmlStreamNotationDeclaration"/>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index a8746ee..baf4110 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -688,7 +688,7 @@
<!-- ### "QPolygon(int, const int*)" is an internal constructor. -->
<modify-function signature="QPolygon(int, const int *)" remove="all"/>
<!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
- <modify-function signature="operator+=(QVector)" remove="all"/>
+ <modify-function signature="operator+=(QVector&lt;QPoint&gt;)" remove="all"/>
<modify-function signature="operator&lt;&lt;(QPoint)">
<inject-code>
// %FUNCTION_NAME()
@@ -711,7 +711,7 @@
<include file-name="QTransform" location="global"/>
</extra-includes>
<!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
- <modify-function signature="operator+=(QVector)" remove="all"/>
+ <modify-function signature="operator+=(QVector&lt;QPointF&gt;)" remove="all"/>
<!-- ### See bug 776 -->
<modify-function signature="operator&lt;&lt;(QPointF)" remove="all"/>
<!-- ### See bug 777 -->
@@ -1068,11 +1068,17 @@
<inject-code>
%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine());
</inject-code>
+ <modify-argument index="return">
+ <replace-type modified-type="PyObject" />
+ </modify-argument>
</modify-function>
<modify-function signature="scanLine(int)">
<inject-code>
%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine(), Shiboken::Buffer::ReadWrite);
</inject-code>
+ <modify-argument index="return">
+ <replace-type modified-type="PyObject" />
+ </modify-argument>
</modify-function>
<!--
Only the non-const version of bits() and scanLine() is exported to Python
@@ -1774,6 +1780,18 @@
%PYARG_0 = Shiboken::makeTuple(retval_, item_);
</inject-code>
</modify-function>
+ <modify-function signature="itemTransform(const QGraphicsItem*,bool*)const">
+ <modify-argument index="2">
+ <remove-argument />
+ <remove-default-expression />
+ </modify-argument>
+ <modify-argument index="return">
+ <replace-type modified-type="(QTransform, bool ok)"/>
+ </modify-argument>
+ <inject-code class="target" position="beginning">
+ <insert-template name="fix_args,bool*" />
+ </inject-code>
+ </modify-function>
<modify-function signature="isObscuredBy(const QGraphicsItem*)const">
<modify-argument index="1" invalidate-after-use="yes"/>
</modify-function>
@@ -2065,6 +2083,17 @@
<insert-template name="fix_bool*,arg,arg,arg"/>
</inject-code>
</modify-function>
+ <modify-function signature="getFont(bool*,QFont,QWidget*,QString,QFlags&lt;QFontDialog::FontDialogOption&gt;)">
+ <modify-argument index="1">
+ <remove-argument />
+ </modify-argument>
+ <modify-argument index="return">
+ <replace-type modified-type="PyTuple" />
+ </modify-argument>
+ <inject-code class="target" position="beginning">
+ <insert-template name="fix_bool*,arg,arg,arg,arg"/>
+ </inject-code>
+ </modify-function>
</object-type>
<object-type name="QGraphicsEllipseItem">
</object-type>
@@ -6707,6 +6736,18 @@
</inject-code>
</modify-function>
+ <modify-function signature="inverted(bool*)const">
+ <modify-argument index="1">
+ <remove-argument/>
+ </modify-argument>
+ <modify-argument index="return">
+ <replace-type modified-type="PyTuple"/>
+ </modify-argument>
+ <inject-code class="target" position="beginning">
+ <insert-template name="fix_bool*"/>
+ </inject-code>
+ </modify-function>
+
<!-- ### "constData() const" and "data() const" are unnecessary in Python and their function is performed by "data()". -->
<modify-function signature="data() const" remove="all"/>
<modify-function signature="constData() const" remove="all"/>
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index c985fb2..afad4bc 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -72,6 +72,13 @@
%END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, ok_);
</template>
+ <template name="fix_bool*,arg,arg,arg,arg">
+ bool ok_;
+ %BEGIN_ALLOW_THREADS
+ %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4, %5);
+ %END_ALLOW_THREADS
+ %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+ </template>
<template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg">
bool ok_;
%BEGIN_ALLOW_THREADS