summaryrefslogtreecommitdiffstats
path: root/PySide
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-05-03 19:10:01 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2011-05-04 14:08:15 -0300
commit06051ca647627e4c158ae5745867093926d512a8 (patch)
tree87561b8388ac1eb03c03e35931799830a973d00d /PySide
parent3590ad14d5659bee2ec62d14d7f7c5bbd51adf70 (diff)
downloadpyside-06051ca647627e4c158ae5745867093926d512a8.tar.gz
pyside-06051ca647627e4c158ae5745867093926d512a8.tar.xz
pyside-06051ca647627e4c158ae5745867093926d512a8.zip
Fix bug 786 - "There's no __eq__ for all classes inherited from ObjectDescription<T> due to an Apiextractor bug."
Reviewer: Lauro Moura <lauro.neto@openbossa.org> Renato Ara├║jo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide')
-rw-r--r--PySide/phonon/typesystem_phonon.xml101
-rw-r--r--PySide/typesystem_templates.xml3
2 files changed, 60 insertions, 44 deletions
diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml
index a76b003..5a2fcc1 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 5c0f1ef..a027e65 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()) {