diff options
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 101 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 3 |
2 files changed, 60 insertions, 44 deletions
diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index a76b0030e..5a2fcc1a5 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -171,72 +171,88 @@ </value-type> <value-type name="ObjectDescription" generate="no"/> <value-type name="EffectDescription"> - <!-- ### See bug 786 --> - <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> - <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::EffectDescription"/> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::EffectDescription"/> + </modify-argument> + </modify-function> <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"/> - <!-- ### --> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioOutputDevice"/> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioOutputDevice"/> + </modify-argument> + </modify-function> <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"/> - <!-- ### --> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioCaptureDevice"/> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioCaptureDevice"/> + </modify-argument> + </modify-function> <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"/> - <!-- ### --> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioChannelDescription"/> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::AudioChannelDescription"/> + </modify-argument> + </modify-function> <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"/> - <!-- ### --> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::SubtitleDescription"/> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::SubtitleDescription"/> + </modify-argument> + </modify-function> <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"/> @@ -278,17 +294,20 @@ <!-- ### The following entries may be present in the system or not. Keep this section organized. --> <value-type name="VideoCaptureDevice"> - <!-- ### See bug 786 --> - <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> - <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> - <!-- ### --> + <modify-function signature="operator==(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::VideoCaptureDevice" /> + </modify-argument> + </modify-function> + <modify-function signature="operator!=(Phonon::ObjectDescription)const"> + <modify-argument index="1"> + <replace-type modified-type="Phonon::VideoCaptureDevice"/> + </modify-argument> + </modify-function> <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> <!-- ### --> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 5c0f1ef3d..a027e6567 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -343,9 +343,6 @@ %PYARG_0 = %CONVERTTOPYTHON[%CPPSELF_TYPE]((*%CPPSELF)++); </template> - <template name="ObjectDescription.fromIndex"> - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%RETURN_TYPE::fromIndex(%1)); - </template> <template name="convertFromMultiMap"> %RETURN_NAME = PyDict_New(); foreach(%KEY_TYPE _key, %MAP_NAME.keys()) { |