diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-02-01 14:39:32 -0300 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-01 14:52:35 -0200 |
| commit | cba0c6c4f3463c2b9e1f15f581e3f7958022864b (patch) | |
| tree | fffe63c2de88fb560c0a84b2d391b0b2e5abc10f | |
| parent | 169580901390052680de2500fdefeb00f9b73a56 (diff) | |
Ported QRect inject code from Boost.PySide bindings.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 33 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 14 |
2 files changed, 40 insertions, 7 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 43fccd880..a26a5844b 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -3579,12 +3579,33 @@ <no-null-pointer/> </modify-argument> </modify-function> - <!-- TODO Replace inject code! --> - <modify-function signature="drawText(QRectF,int,QString,QRectF*)" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="drawText(QRect,int,QString,QRect*)" remove="all" /> - <!-- TODO Replace inject code! --> - <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)" remove="all" /> + <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> + <modify-argument index="4"> + <remove-argument/> + <remove-default-expression/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_args,QRectF*"/> + </inject-code> + </modify-function> + <modify-function signature="drawText(QRect,int,QString,QRect*)"> + <modify-argument index="4"> + <remove-argument/> + <remove-default-expression/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_args,QRect*"/> + </inject-code> + </modify-function> + <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> + <modify-argument index="7"> + <remove-argument/> + <remove-default-expression/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_args,QRect*"/> + </inject-code> + </modify-function> <modify-function signature="redirected(const QPaintDevice*,QPoint*)" remove="all" /> <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index b8f1981f3..c37cc6342 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -1,7 +1,6 @@ <?xml version="1.0"?> <typesystem> <!-- Templates to fix bool* parameters --> - <template name="fix_bool*"> bool ok_; %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&ok_); @@ -47,5 +46,18 @@ return %CONVERTTOPYTHON[%TYPE](*sequence); </template> + + <template name="fix_args,QRectF*"> + QRectF rect_; + %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &rect_); + return %CONVERTTOPYTHON[QRectF](rect_); + </template> + + <template name="fix_args,QRect*"> + QRect rect_; + %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &rect_); + return %CONVERTTOPYTHON[QRectF](rect_); + </template> + </typesystem> |