summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-10-05 16:42:40 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-10-05 16:42:40 -0300
commit829ffd3dfd31eef3b98678adfcba1609445305b3 (patch)
tree952af11c1faf6de20b02d7aebcd6a61114b3f727
parentbebede17c03c5f6180262a4031c53998142564ad (diff)
downloadpyside-829ffd3dfd31eef3b98678adfcba1609445305b3.tar.gz
pyside-829ffd3dfd31eef3b98678adfcba1609445305b3.tar.xz
pyside-829ffd3dfd31eef3b98678adfcba1609445305b3.zip
Revert "Fixed doc of return values."
This reverts commit bebede17c03c5f6180262a4031c53998142564ad.
Diffstat
-rw-r--r--PySide/QtCore/typesystem_core.xml7
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml11
-rw-r--r--PySide/QtNetwork/typesystem_network.xml6
-rw-r--r--PySide/QtOpenGL/typesystem_opengl.xml3
-rw-r--r--PySide/QtWebKit/typesystem_webkit.xml3
-rw-r--r--PySide/QtXml/typesystem_xml.xml36
6 files changed, 15 insertions, 51 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 37decba..704e8d4 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1867,9 +1867,6 @@
<modify-argument index="4">
<remove-argument />
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, pid)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
qint64 pid;
%RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &amp;pid);
@@ -2534,7 +2531,7 @@
<modify-function signature="defaultAnimations() const" remove="all"/>
- <add-function signature="configuration()" return-type="list of QAbstractState" >
+ <add-function signature="configuration()" return-type="PySequence*" >
<inject-code class="target" position="beginning">
%PYARG_0 = PySet_New(0);
foreach(QAbstractState* abs_state, %CPPSELF.configuration()) {
@@ -2545,7 +2542,7 @@
</inject-code>
</add-function>
- <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" >
+ <add-function signature="defaultAnimations()" return-type="PySequence*" >
<inject-code class="target" position="beginning">
%PYARG_0 = PyList_New(0);
foreach(QAbstractAnimation* abs_anim, %CPPSELF.defaultAnimations()) {
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 68d5c0d..29b1657 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1156,9 +1156,6 @@
<modify-argument index="1">
<remove-argument/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, blockingPanel)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
QGraphicsItem *item_ = NULL;
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;item_);
@@ -3667,7 +3664,7 @@
<modify-function signature="getOpenFileNames(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
<modify-argument index="return">
- <replace-type modified-type="(fileNames, selectedFilter)"/>
+ <replace-type modified-type="PyObject"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3678,7 +3675,7 @@
</modify-function>
<modify-function signature="getOpenFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
<modify-argument index="return">
- <replace-type modified-type="(fileName, selectedFilter)"/>
+ <replace-type modified-type="PyObject"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3689,7 +3686,7 @@
</modify-function>
<modify-function signature="getSaveFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
<modify-argument index="return">
- <replace-type modified-type="(fileName, selectedFilter)"/>
+ <replace-type modified-type="PyObject"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3895,7 +3892,7 @@
<replace-default-expression with="QClipboard::Clipboard"/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, subtype)"/>
+ <replace-type modified-type="PyObject"/>
</modify-argument>
<inject-code class="target" position="end">
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2);
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index 0321a65..5e09ab7 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -118,7 +118,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, timeOut)"/>
+ <replace-type modified-type="PyTuple*"/>
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="fix_args,bool*"/>
@@ -145,7 +145,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(data, address, port)"/>
+ <replace-type modified-type="PyTuple*"/>
</modify-argument>
<inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/>
</modify-function>
@@ -170,7 +170,7 @@
<insert-template name="fix_args,bool*"/>
</inject-code>
<modify-argument index="return">
- <replace-type modified-type="(retval, timeOut)"/>
+ <replace-type modified-type="PyTuple*"/>
</modify-argument>
</modify-function>
diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml
index b94e8af..2a7557e 100644
--- a/PySide/QtOpenGL/typesystem_opengl.xml
+++ b/PySide/QtOpenGL/typesystem_opengl.xml
@@ -136,9 +136,6 @@
<modify-argument index="2">
<remove-argument/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, data)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
char *data = new char[%3];
bool result = %CPPSELF.read(%1, data, %3);
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index f11c6e3..1c39111 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -76,9 +76,6 @@
<modify-argument index="4">
<remove-argument />
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, result)"/>
- </modify-argument>
<inject-code class="target" position="end">
QString str;
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, &amp;str);
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index dac7b56..4cccb8a 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -68,9 +68,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -88,9 +85,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -108,9 +102,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -128,9 +119,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -148,9 +136,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -168,9 +153,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -188,9 +170,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -208,9 +187,6 @@
<remove-argument/>
<remove-default-expression/>
</modify-argument>
- <modify-argument index="return">
- <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
- </modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="qdomdocument_setcontent" />
</inject-code>
@@ -302,7 +278,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ret)"/>
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="QXmlEntityResolver_resolveEntity_return_conversion_native"/>
</conversion-rule>
@@ -325,7 +301,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ret)"/>
+ <replace-type modified-type="PySequence"/>
<conversion-rule class="native">
<insert-template name="QXmlEntityResolver_resolveEntity_return_conversion_native"/>
</conversion-rule>
@@ -360,7 +336,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ok)" />
+ <replace-type modified-type="PySequence" />
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -375,7 +351,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ok)" />
+ <replace-type modified-type="PySequence" />
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -427,7 +403,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ok)" />
+ <replace-type modified-type="PySequence" />
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
@@ -442,7 +418,7 @@
<remove-argument/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="(retval, ok)" />
+ <replace-type modified-type="PySequence" />
<conversion-rule class="native">
<insert-template name="fix_virtual_method_return_value_and_bool*"/>
</conversion-rule>
generated by cgit (git 2.34.1) at 2023-09-25 23:37:39 +0000