Updated various function removals and modifications.

3 files changed, 51 insertions, 4 deletions

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 7ba6ea4a8..f1af0a58b 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2806,7 +2806,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>
@@ -3549,7 +3548,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 a8746ee54..baf4110a2 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 c985fb24a..afad4bcb5 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