Mercurial > projects > qtd

comparison generator/typesystem_phonon.xml @ 309:8a0cf14e3419 signals

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wrong merge
author eldar_ins@eldar-laptop
date Wed, 23 Dec 2009 04:48:11 +0500
parents 2485419c5c63
children
comparison
equal deleted inserted replaced
308:2485419c5c63 309:8a0cf14e3419
73 <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect"/> 73 <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect"/>
74 <interface-type name="Phonon::MediaNode" java-name="MediaNode"/> 74 <interface-type name="Phonon::MediaNode" java-name="MediaNode"/>
75 75
76 <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject"/> 76 <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject"/>
77 <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin"> 77 <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin">
78 <modify-function signature="notification(const char *, const QString &amp;, const QStringList&lt;QString&gt; &amp;, QObject *, const char *)const"> 78 <modify-function signature="notification(const char *, const QString &amp;, const QStringList &amp;, QObject *, const char *)const">
79 <modify-argument index="3"> 79 <modify-argument index="3">
80 <replace-default-expression with="null"/> 80 <replace-default-expression with="null"/>
81 </modify-argument> 81 </modify-argument>
82 <modify-argument index="1"> 82 <modify-argument index="1">
83 <replace-type modified-type="java.lang.String"/> 83 <replace-type modified-type="java.lang.String"/>