Modified the type system files to make use of nested type declarations.

Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>

1 files changed, 174 insertions, 169 deletions

diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml
index e326436ec..4c700bc37 100644
--- a/PySide/phonon/typesystem_phonon.xml
+++ b/PySide/phonon/typesystem_phonon.xml
@@ -37,175 +37,180 @@
         <extra-includes>
           <include file-name="phononnamespace.h" location="global"/>
         </extra-includes>
-    </namespace-type>
-    <namespace-type name="Phonon::BackendCapabilities" >
-       <inject-code class="native">
-        Phonon::BackendCapabilities::NotifierWrapper* Phonon::BackendCapabilities::NotifierWrapper::m_instance = 0;
-        Phonon::BackendCapabilities::Notifier* Phonon::BackendCapabilities::NotifierWrapper::m_notifier = 0;
-       </inject-code>
-
-       <add-function signature="notifier()" return-type="Phonon::BackendCapabilities::NotifierWrapper">
-          <inject-code class="target">
-            Phonon::BackendCapabilities::NotifierWrapper *_notifierWrapper =  Phonon::BackendCapabilities::NotifierWrapper::notifier();
-            %PYARG_0 = %CONVERTTOPYTHON[Phonon::BackendCapabilities::NotifierWrapper*](_notifierWrapper);
-          </inject-code>
-       </add-function>
-    </namespace-type>
 
-    <!-- ### causes moc-related linker error -->
-    <!-- <object-type name="Phonon::BackendCapabilities::Notifier"/> -->
-    <object-type name="Phonon::BackendCapabilities::NotifierWrapper" target-lang-name="Notifier">
-        <include file-name="backendcapabilities.h" location="global"/>
-        <include file-name="pyside_phonon.h" location="local"/>
-
-        <modify-function signature="notifier()" remove="all"/>
-        <modify-function signature="Phonon::BackendCapabilities::NotifierWrapper(Phonon::BackendCapabilities::Notifier*)">
-          <access modifier="private"/>
-      </modify-function>
-      <inject-code class="target" position="end">
-           PyObject* signal_item;
-
-           signal_item = PySide::signalNew("capabilitiesChanged", "void", NULL);
-           PyDict_SetItemString(SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "capabilitiesChanged", signal_item);
-           Py_DECREF(signal_item);
-
-           signal_item = PySide::signalNew("availableAudioOutputDevicesChanged", "void", NULL);
-           PyDict_SetItemString( SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "availableAudioOutputDevicesChanged", signal_item);
-           Py_DECREF(signal_item);
-      </inject-code>
-    </object-type>
-
-    <enum-type name="Phonon::Category" />
-    <enum-type name="Phonon::DiscType"/>
-    <enum-type name="Phonon::ErrorType"/>
-    <enum-type name="Phonon::MetaData"/>
-    <enum-type name="Phonon::ObjectDescriptionType"/>
-    <enum-type name="Phonon::State"/>
-
-    <enum-type name="Phonon::AddonInterface::AngleCommand"/>
-    <enum-type name="Phonon::AddonInterface::ChapterCommand"/>
-    <enum-type name="Phonon::AddonInterface::Interface"/>
-    <enum-type name="Phonon::AddonInterface::NavigationCommand"/>
-    <enum-type name="Phonon::AddonInterface::TitleCommand"/>
-    <enum-type name="Phonon::AddonInterface::SubtitleCommand"/>
-    <enum-type name="Phonon::AddonInterface::AudioChannelCommand"/>
-    <enum-type name="Phonon::BackendInterface::Class"/>
-    <enum-type name="Phonon::EffectParameter::Hint" flags="Phonon::EffectParameter::Hints"/>
-    <enum-type name="Phonon::MediaController::Feature" flags="Phonon::MediaController::Features"/>
-    <enum-type name="Phonon::MediaSource::Type"/>
-    <enum-type name="Phonon::VideoWidget::AspectRatio"/>
-    <enum-type name="Phonon::VideoWidget::ScaleMode"/>
-    <enum-type name="Phonon::VolumeFaderEffect::FadeCurve"/>
-
-    <object-type name="Phonon::AbstractVideoOutput"/>
-    <object-type name="Phonon::AddonInterface"/>
-    <object-type name="Phonon::BackendInterface"/>
-    <object-type name="Phonon::EffectInterface"/>
-    <object-type name="Phonon::MediaNode"/>
-
-    <object-type name="Phonon::MediaObjectInterface"/>
-    <object-type name="Phonon::PlatformPlugin"/>
-    <object-type name="Phonon::StreamInterface"/>
-    <object-type name="Phonon::VideoWidgetInterface"/>
-    <object-type name="Phonon::VolumeFaderInterface"/>
-
-    <value-type name="Phonon::EffectParameter">
-        <modify-function signature="EffectParameter()" remove="all"/> <!-- internal -->
-        <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-        <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-        <modify-function signature="id()const" remove="all"/> <!-- internal -->
-        <modify-function signature="operator=(Phonon::EffectParameter)" remove="all"/> <!-- Covered by copy constructor -->
-        <modify-function signature="EffectParameter(Phonon::EffectParameter)" remove="all"/>
-        <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all"/>
-    </value-type>
-    <value-type name="Phonon::MediaSource">
-        <modify-function signature="operator=(Phonon::MediaSource)" remove="all"/> <!-- Covered by copy constructor -->
-    </value-type>
-    <value-type name="Phonon::Path">
-        <modify-function signature="disconnect()" rename="disconnectPath"/>
-        <modify-function signature="operator=(Phonon::Path)" remove="all"/> <!-- Covered by copy constructor -->
-        <modify-function signature="insertEffect(Phonon::EffectDescription,Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="insertEffect(Phonon::Effect*,Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="removeEffect(Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="remove"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="sink() const">
-            <modify-argument index="return">
-                <define-ownership class="target" owner="default"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="source() const">
-            <modify-argument index="return">
-                <define-ownership class="target" owner="default"/>
-            </modify-argument>
-        </modify-function>
-    </value-type>
-    <value-type name="Phonon::ObjectDescription" generate="no"/>
-    <value-type name="Phonon::EffectDescription">
-        <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"/>
-        <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::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">
-        <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::ObjectDescriptionModel" generate="no"/>
-    <object-type name="Phonon::EffectDescriptionModel" />
-    <object-type name="Phonon::AudioOutputDeviceModel" />
-
-    <object-type name="Phonon::AbstractAudioOutput"/>
-    <object-type name="Phonon::AbstractMediaStream"/>
-    <object-type name="Phonon::AudioOutput"/>
-    <object-type name="Phonon::Effect"/>
-    <object-type name="Phonon::EffectWidget"/>
-    <object-type name="Phonon::MediaController"/>
-    <object-type name="Phonon::MediaObject" />
-    <object-type name="Phonon::SeekSlider">
-        <modify-function signature="setMediaObject(Phonon::MediaObject*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
-    <object-type name="Phonon::VideoPlayer"/>
-    <object-type name="Phonon::VideoWidget"/>
-    <object-type name="Phonon::VolumeFaderEffect"/>
-    <object-type name="Phonon::VolumeSlider">
-        <modify-function signature="setAudioOutput(Phonon::AudioOutput*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
+        <namespace-type name="BackendCapabilities" >
+           <inject-code class="native">
+            Phonon::BackendCapabilities::NotifierWrapper* Phonon::BackendCapabilities::NotifierWrapper::m_instance = 0;
+            Phonon::BackendCapabilities::Notifier* Phonon::BackendCapabilities::NotifierWrapper::m_notifier = 0;
+           </inject-code>
+
+           <add-function signature="notifier()" return-type="Phonon::BackendCapabilities::NotifierWrapper">
+              <inject-code class="target">
+                Phonon::BackendCapabilities::NotifierWrapper *_notifierWrapper =  Phonon::BackendCapabilities::NotifierWrapper::notifier();
+                %PYARG_0 = %CONVERTTOPYTHON[Phonon::BackendCapabilities::NotifierWrapper*](_notifierWrapper);
+              </inject-code>
+           </add-function>
+
+            <!-- ### causes moc-related linker error -->
+            <!-- <object-type name="Notifier"/> -->
+            <object-type name="NotifierWrapper" target-lang-name="Notifier">
+                <include file-name="backendcapabilities.h" location="global"/>
+                <include file-name="pyside_phonon.h" location="local"/>
+
+                <modify-function signature="notifier()" remove="all"/>
+                <modify-function signature="Phonon::BackendCapabilities::NotifierWrapper(Phonon::BackendCapabilities::Notifier*)">
+                  <access modifier="private"/>
+              </modify-function>
+              <inject-code class="target" position="end">
+                   PyObject* signal_item;
+
+                   signal_item = PySide::signalNew("capabilitiesChanged", "void", NULL);
+                   PyDict_SetItemString(SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "capabilitiesChanged", signal_item);
+                   Py_DECREF(signal_item);
+
+                   signal_item = PySide::signalNew("availableAudioOutputDevicesChanged", "void", NULL);
+                   PyDict_SetItemString( SbkPhonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "availableAudioOutputDevicesChanged", signal_item);
+                   Py_DECREF(signal_item);
+              </inject-code>
+            </object-type>
+        </namespace-type>
+
+        <enum-type name="Category" />
+        <enum-type name="DiscType"/>
+        <enum-type name="ErrorType"/>
+        <enum-type name="MetaData"/>
+        <enum-type name="ObjectDescriptionType"/>
+        <enum-type name="State"/>
+
+        <object-type name="AbstractVideoOutput"/>
+        <object-type name="AddonInterface">
+            <enum-type name="AngleCommand"/>
+            <enum-type name="AudioChannelCommand"/>
+            <enum-type name="ChapterCommand"/>
+            <enum-type name="Interface"/>
+            <enum-type name="NavigationCommand"/>
+            <enum-type name="SubtitleCommand"/>
+            <enum-type name="TitleCommand"/>
+        </object-type>
+        <object-type name="BackendInterface">
+            <enum-type name="Class"/>
+        </object-type>
+        <object-type name="EffectInterface"/>
+        <object-type name="MediaNode"/>
+
+        <object-type name="MediaObjectInterface"/>
+        <object-type name="PlatformPlugin"/>
+        <object-type name="StreamInterface"/>
+        <object-type name="VideoWidgetInterface"/>
+        <object-type name="VolumeFaderInterface"/>
+
+        <value-type name="EffectParameter">
+            <enum-type name="Hint" flags="Phonon::EffectParameter::Hints"/>
+            <modify-function signature="EffectParameter()" remove="all"/> <!-- internal -->
+            <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
+            <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
+            <modify-function signature="id()const" remove="all"/> <!-- internal -->
+            <modify-function signature="operator=(Phonon::EffectParameter)" remove="all"/> <!-- Covered by copy constructor -->
+            <modify-function signature="EffectParameter(Phonon::EffectParameter)" remove="all"/>
+            <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all"/>
+        </value-type>
+        <value-type name="MediaSource">
+            <enum-type name="Type"/>
+            <modify-function signature="operator=(Phonon::MediaSource)" remove="all"/> <!-- Covered by copy constructor -->
+        </value-type>
+        <value-type name="Path">
+            <modify-function signature="disconnect()" rename="disconnectPath"/>
+            <modify-function signature="operator=(Phonon::Path)" remove="all"/> <!-- Covered by copy constructor -->
+            <modify-function signature="insertEffect(Phonon::EffectDescription,Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="insertEffect(Phonon::Effect*,Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="removeEffect(Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="remove"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="sink() const">
+                <modify-argument index="return">
+                    <define-ownership class="target" owner="default"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="source() const">
+                <modify-argument index="return">
+                    <define-ownership class="target" owner="default"/>
+                </modify-argument>
+            </modify-function>
+        </value-type>
+        <value-type name="ObjectDescription" generate="no"/>
+        <value-type name="EffectDescription">
+            <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="AudioOutputDevice">
+            <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="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="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="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>
+
+
+        <object-type name="ObjectDescriptionModel" generate="no"/>
+        <object-type name="EffectDescriptionModel" />
+        <object-type name="AudioOutputDeviceModel" />
+
+        <object-type name="AbstractAudioOutput"/>
+        <object-type name="AbstractMediaStream"/>
+        <object-type name="AudioOutput"/>
+        <object-type name="Effect"/>
+        <object-type name="EffectWidget"/>
+        <object-type name="MediaController">
+            <enum-type name="Feature" flags="Phonon::MediaController::Features"/>
+        </object-type>
+        <object-type name="MediaObject" />
+        <object-type name="SeekSlider">
+            <modify-function signature="setMediaObject(Phonon::MediaObject*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+        </object-type>
+        <object-type name="VideoPlayer"/>
+        <object-type name="VideoWidget">
+            <enum-type name="AspectRatio"/>
+            <enum-type name="ScaleMode"/>
+        </object-type>
+        <object-type name="VolumeFaderEffect">
+            <enum-type name="FadeCurve"/>
+        </object-type>
+        <object-type name="VolumeSlider">
+            <modify-function signature="setAudioOutput(Phonon::AudioOutput*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+        </object-type>
+    </namespace-type>
 
 </typesystem>