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

Doesn't use "return" on typesystem templates, use %PYARG_0 instead.

Browse source 
.
This commit is contained in:
Hugo Lima 2010-02-22 16:18:04 -03:00
commit 3838566c19
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PySide/QtGui/typesystem_gui_common.xml
View file

@ -3977,6 +3977,9 @@
<remove-argument/> <remove-argument/>
<remove-default-expression/> <remove-default-expression/>
</modify-argument> </modify-argument>
<modify-argument index="return">
<replace-type modified-type="QRectF"/>
</modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="fix_args,QRectF*"/> <insert-template name="fix_args,QRectF*"/>
</inject-code> </inject-code>
@ -3986,6 +3989,9 @@
<remove-argument/> <remove-argument/>
<remove-default-expression/> <remove-default-expression/>
</modify-argument> </modify-argument>
<modify-argument index="return">
<replace-type modified-type="QRect"/>
</modify-argument>
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
<insert-template name="fix_args,QRect*"/> <insert-template name="fix_args,QRect*"/>
</inject-code> </inject-code>

10
PySide/typesystem_templates.xml
View file

@ -75,19 +75,19 @@
<template name="fix_args,QRectF*"> <template name="fix_args,QRectF*">
QRectF rect_; QRectF rect_;
%CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_); %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
return %CONVERTTOPYTHON[QRectF](rect_); %PYARG_0 = %CONVERTTOPYTHON[QRectF](rect_);
</template> </template>
<template name="fix_args,QRect*"> <template name="fix_args,QRect*">
QRect rect_; QRect rect_;
%CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_); %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
return %CONVERTTOPYTHON[QRect](rect_); %PYARG_0 = %CONVERTTOPYTHON[QRect](rect_);
</template> </template>
<template name="fix_char*"> <template name="fix_char*">
char val_; char val_;
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
%PYARG_0 = PyTuple_Pack(2, %CONVERTTOPYTHON[%RETURN_TYPE](retval_), %CONVERTTOPYTHON[char](val_)); %PYARG_0 = Shiboken::makeTuple(retval_, val_);
</template> </template>
<template name="fix_int*,int*,int*,int*"> <template name="fix_int*,int*,int*,int*">
@ -115,9 +115,9 @@
char _data[%2]; char _data[%2];
qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2); qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2);
if (_size > 0) if (_size > 0)
return %CONVERTTOPYTHON[QByteArray](QByteArray(_data, _size)); %PYARG_0 = %CONVERTTOPYTHON[QByteArray](QByteArray(_data, _size));
else else
return %CONVERTTOPYTHON[QByteArray](QByteArray()); %PYARG_0 = %CONVERTTOPYTHON[QByteArray](QByteArray());
</template> </template>
<template name="fix_return_args,int*"> <template name="fix_return_args,int*">
RETURNTYPE _ret; RETURNTYPE _ret;