aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-10-06 14:48:25 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-10-07 11:42:48 -0300
commit6b8d262b4067bffd4e5a9611c07b862aa64d2538 (patch)
tree19b15ca4337958bf82cd1e90ab1484a69e579f0c
parent673c0d26757526a068e758195d235c047150d789 (diff)
Workaround to change the documentation about the return value of some functions.
Reviewer: Renato Ara├║jo <renato.filho@openbossa.org> Luciano Wolf <luciano.wolf@openbossa.org>
-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.xml24
6 files changed, 45 insertions, 9 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 704e8d46..37decba1 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1867,6 +1867,9 @@
<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);
@@ -2531,7 +2534,7 @@
<modify-function signature="defaultAnimations() const" remove="all"/>
- <add-function signature="configuration()" return-type="PySequence*" >
+ <add-function signature="configuration()" return-type="list of QAbstractState" >
<inject-code class="target" position="beginning">
%PYARG_0 = PySet_New(0);
foreach(QAbstractState* abs_state, %CPPSELF.configuration()) {
@@ -2542,7 +2545,7 @@
</inject-code>
</add-function>
- <add-function signature="defaultAnimations()" return-type="PySequence*" >
+ <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" >
<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 29b16571..68d5c0d8 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1156,6 +1156,9 @@
<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_);
@@ -3664,7 +3667,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="PyObject"/>
+ <replace-type modified-type="(fileNames, selectedFilter)"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3675,7 +3678,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="PyObject"/>
+ <replace-type modified-type="(fileName, selectedFilter)"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3686,7 +3689,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="PyObject"/>
+ <replace-type modified-type="(fileName, selectedFilter)"/>
</modify-argument>
<inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/>
@@ -3892,7 +3895,7 @@
<replace-default-expression with="QClipboard::Clipboard"/>
</modify-argument>
<modify-argument index="return">
- <replace-type modified-type="PyObject"/>
+ <replace-type modified-type="(retval, subtype)"/>
</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 5e09ab7b..0321a651 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="PyTuple*"/>
+ <replace-type modified-type="(retval, timeOut)"/>
</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="PyTuple*"/>
+ <replace-type modified-type="(data, address, port)"/>
</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="PyTuple*"/>
+ <replace-type modified-type="(retval, timeOut)"/>
</modify-argument>
</modify-function>
diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml
index 2a7557e6..b94e8af3 100644
--- a/PySide/QtOpenGL/typesystem_opengl.xml
+++ b/PySide/QtOpenGL/typesystem_opengl.xml
@@ -136,6 +136,9 @@
<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 1c391112..f11c6e30 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -76,6 +76,9 @@
<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 4cccb8a1..f5d6f2c0 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -68,6 +68,9 @@
<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>
@@ -85,6 +88,9 @@
<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>
@@ -102,6 +108,9 @@
<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>
@@ -119,6 +128,9 @@
<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>
@@ -136,6 +148,9 @@
<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>
@@ -153,6 +168,9 @@
<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>
@@ -170,6 +188,9 @@
<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>
@@ -187,6 +208,9 @@
<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>