Fixes: make phonon bindings compile when the generator is used with qt 4.5

3 files changed, 52 insertions, 2 deletions

diff --git a/generator/typesystem_phonon-common.xml b/generator/typesystem_phonon-common.xml
index 35e40f7..431b572 100644
--- a/generator/typesystem_phonon-common.xml
+++ b/generator/typesystem_phonon-common.xml
@@ -12,6 +12,10 @@
     <rejection class="AudioOutputAdaptor" />    
     <rejection class="*" field-name="k_ptr" />
     
+    <rejection class="Phonon::AudioOutputInterface40" />
+    <rejection class="Phonon::AudioOutputInterface42" />
+    <rejection class="Phonon::AudioOutputInterface" />
+
     <namespace-type name="Phonon" />
     <namespace-type name="Phonon::BackendCapabilities" java-name="BackendCapabilities" />
 
@@ -21,6 +25,8 @@
     <enum-type name="Phonon::Category">
         <reject-enum-value name="LastCategory" />
     </enum-type>
+    <enum-type name="Phonon::AddonInterface::SubtitleCommand" />
+    <enum-type name="Phonon::AddonInterface::AudioChannelCommand" />
     <enum-type name="Phonon::DiscType" />
     <enum-type name="Phonon::ErrorType" />
     <enum-type name="Phonon::MetaData" />
@@ -42,7 +48,8 @@
 
     <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput" />
     <interface-type name="Phonon::AddonInterface" java-name="AbstractAddon" />
-    <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" />
+    <!-- ### causes compile error with Qt 4.5, the functions in the class aren't picked up by the typesystem -->
+<!--    <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" /> -->
     <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" />
     <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" />
     <interface-type name="Phonon::MediaNode" java-name="MediaNode" />
@@ -91,6 +98,9 @@
     <value-type name="Phonon::ObjectDescription" generate="no" />
     <value-type name="Phonon::EffectDescription" java-name="EffectDescription" />
     <value-type name="Phonon::AudioOutputDevice" java-name="AudioOutputDevice" />
+    <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription" />
+    <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription" />
+    <value-type name="Phonon::AudioCaptureDevice"  java-name="AudioCaptureDevice" />
 
     <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" />
     <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" />
diff --git a/generator/typesystem_phonon-qtscript.xml b/generator/typesystem_phonon-qtscript.xml
index da9b411..3bfdcce 100644
--- a/generator/typesystem_phonon-qtscript.xml
+++ b/generator/typesystem_phonon-qtscript.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0"?>
 <typesystem package="com.trolltech.qt.phonon">
     
+    <value-type name="Phonon::AudioChannelDescription">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="fromIndex(int)" remove="all" />
+    </value-type>
+
+    <value-type name="Phonon::AudioCaptureDevice">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="fromIndex(int)" remove="all" /> 
+    </value-type>
+
     <value-type name="Phonon::AudioOutputDevice">
         <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all" />
         <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all" />
@@ -18,6 +30,12 @@
         <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all" />
     </value-type>
 
+    <value-type name="Phonon::SubtitleDescription">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all" />
+        <modify-function signature="fromIndex(int)" remove="all" />
+    </value-type>
+
   <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an enum" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::AudioChannelCommand' does not have a type entry or is not an enum" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'AudioOutputInterface' inherits from unknown base class 'Phonon::AudioOutputInterface40'" />
diff --git a/generator/typesystem_phonon.xml b/generator/typesystem_phonon.xml
index e2d7361..ca4f1a8 100644
--- a/generator/typesystem_phonon.xml
+++ b/generator/typesystem_phonon.xml
@@ -12,6 +12,10 @@
     <rejection class="AudioOutputAdaptor"/>    
     <rejection class="*" field-name="k_ptr"/>
     
+    <rejection class="Phonon::AudioOutputInterface40"/>
+    <rejection class="Phonon::AudioOutputInterface42"/>
+    <rejection class="Phonon::AudioOutputInterface"/>
+
     <namespace-type name="Phonon"/>
     <namespace-type name="Phonon::BackendCapabilities" java-name="BackendCapabilities"/>
 
@@ -21,6 +25,8 @@
     <enum-type name="Phonon::Category">
         <reject-enum-value name="LastCategory"/>
     </enum-type>
+    <enum-type name="Phonon::AddonInterface::SubtitleCommand"/>
+    <enum-type name="Phonon::AddonInterface::AudioChannelCommand"/>
     <enum-type name="Phonon::DiscType"/>
     <enum-type name="Phonon::ErrorType"/>
     <enum-type name="Phonon::MetaData"/>
@@ -42,7 +48,8 @@
 
     <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput"/>
     <interface-type name="Phonon::AddonInterface" java-name="AbstractAddon"/>
-    <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface"/>
+    <!-- ### causes compile error with Qt 4.5, the functions in the class aren't picked up by the typesystem -->
+<!--    <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" /> -->
     <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend"/>
     <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect"/>
     <interface-type name="Phonon::MediaNode" java-name="MediaNode"/>
@@ -102,6 +109,21 @@
         <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
         <modify-function signature="fromIndex(int)" remove="all"/>
     </value-type>
+    <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="fromIndex(int)" remove="all"/>
+    </value-type>
+    <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="fromIndex(int)" remove="all"/>
+    </value-type>
+    <value-type name="Phonon::AudioCaptureDevice" java-name="AudioCaptureDevice">
+        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+        <modify-function signature="fromIndex(int)" remove="all"/> 
+    </value-type>
 
     <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput"/>
     <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream"/>