diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2011-04-18 14:49:33 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:12 -0300 |
| commit | dab522fe31c1fdae817f93d8d3621086e4e959e1 (patch) | |
| tree | 588e6e2514053b792bc5306443d9ec8565c1c810 | |
| parent | bba3918943835e941a8eb3beaa89d1d452518c66 (diff) | |
Implemented function ObjectDescription.fromIndex.
Fixes bug #787.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
| -rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 69 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 4 |
2 files changed, 52 insertions, 21 deletions
diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index fb4041d1d..3636e9614 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -173,49 +173,71 @@ <!-- ### See bug 786 --> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> - <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="EffectDescription"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> <value-type name="AudioOutputDevice"> <!-- ### See bug 786 --> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="AudioOutputDevice"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> <value-type name="AudioCaptureDevice"> <!-- ### See bug 786 --> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="AudioCaptureDevice"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> <value-type name="AudioChannelDescription"> <!-- ### See bug 786 --> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="AudioChannelDescription"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> <value-type name="SubtitleDescription"> <!-- ### See bug 786 --> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="SubtitleDescription"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> - - <object-type name="ObjectDescriptionModel" generate="no"/> <object-type name="EffectDescriptionModel" /> <object-type name="AudioOutputDeviceModel" /> @@ -258,9 +280,14 @@ <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <!-- ### --> - <!-- ### See bug 787 --> - <modify-function signature="fromIndex(int)" remove="all"/> - <!-- ### --> + <modify-function signature="fromIndex(int)"> + <modify-argument index="return"> + <replace-type modified-type="VideoCaptureDevice"/> + </modify-argument> + <inject-code> + <insert-template name="ObjectDescription.fromIndex" /> + </inject-code> + </modify-function> </value-type> <!-- ### --> </namespace-type> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 0f0e934bd..613a2b9ae 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -343,5 +343,9 @@ %PYARG_0 = %CONVERTTOPYTHON[%CPPSELF_TYPE]((*%CPPSELF)++); </template> + <template name="ObjectDescription.fromIndex"> + %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%RETURN_TYPE::fromIndex(%1)); + </template> + </typesystem> |