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

Fixed QFileDialog functions which used QString as pointer to return values

Browse source 
Fixes bug #819

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2011-04-28 14:50:25 -03:00 • committed by Hugo Parente Lima
commit 8d6761b93d
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PySide/QtGui/typesystem_gui_common.xml
View file

@ -4344,34 +4344,37 @@
<modify-argument index="return"> <modify-argument index="return">
<replace-type modified-type="(fileNames, selectedFilter)"/> <replace-type modified-type="(fileNames, selectedFilter)"/>
</modify-argument> </modify-argument>
<modify-argument index="5">
<replace-type modified-type="QString"/>
<replace-default-expression with="QString()"/>
</modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/> <insert-template name="return_for_QFileDialog"/>
</inject-code> </inject-code>
<modify-argument index="5">
<remove-argument/>
</modify-argument>
</modify-function> </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-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"> <modify-argument index="return">
<replace-type modified-type="(fileName, selectedFilter)"/> <replace-type modified-type="(fileName, selectedFilter)"/>
</modify-argument> </modify-argument>
<modify-argument index="5">
<replace-type modified-type="QString"/>
<replace-default-expression with="QString()"/>
</modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/> <insert-template name="return_for_QFileDialog"/>
</inject-code> </inject-code>
<modify-argument index="5">
<remove-argument/>
</modify-argument>
</modify-function> </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-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"> <modify-argument index="return">
<replace-type modified-type="(fileName, selectedFilter)"/> <replace-type modified-type="(fileName, selectedFilter)"/>
</modify-argument> </modify-argument>
<modify-argument index="5">
<replace-type modified-type="QString"/>
<replace-default-expression with="QString()"/>
</modify-argument>
<inject-code class="target" position="end"> <inject-code class="target" position="end">
<insert-template name="return_for_QFileDialog"/> <insert-template name="return_for_QFileDialog"/>
</inject-code> </inject-code>
<modify-argument index="5">
<remove-argument/>
</modify-argument>
</modify-function> </modify-function>
<modify-function signature="getExistingDirectory(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QFileDialog::Option>)" allow-thread="yes" /> <modify-function signature="getExistingDirectory(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QFileDialog::Option>)" allow-thread="yes" />
</object-type> </object-type>

4
PySide/typesystem_templates.xml
View file

@ -241,9 +241,9 @@
<template name="return_for_QFileDialog"> <template name="return_for_QFileDialog">
%BEGIN_ALLOW_THREADS %BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, &amp;%5, %6);
%END_ALLOW_THREADS %END_ALLOW_THREADS
%PYARG_0 = Shiboken::makeTuple(retval_, %4); %PYARG_0 = Shiboken::makeTuple(retval_, %5);
</template> </template>
<template name="set_qapp_parent_for_orphan"> <template name="set_qapp_parent_for_orphan">
SbkObject* _pySelf = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0); SbkObject* _pySelf = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);