Ticket #47204: remove-QtScriptFutureIterator.diff

File remove-QtScriptFutureIterator.diff, 2.8 KB (added by RJVB (René Bertin), 8 years ago)

  • generator/typesystem_core-common.xml

    old new  
    13871387  <object-type name="QFutureIterator" generate="no">
    13881388    <modify-function signature="operator=(const QFuture&amp;)" remove="all" />
    13891389  </object-type>
    1390   <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator" />
    13911390  <object-type name="QRunnable" />
    13921391
    13931392

  • generator/typesystem_core-qtscript.xml

    old new  
    11151115      <modify-function signature="futures()const" remove="all" />
    11161116  </object-type>
    11171117 
    1118   <object-type name="QtScriptFutureIterator">
    1119     <modify-function signature="QFutureIterator(const QFuture &amp;)">
    1120         <modify-argument index="1">
    1121             <replace-type modified-type="QtScriptFuture" />
    1122         </modify-argument>
    1123     </modify-function>       
    1124   </object-type>
    11251118
    11261119
    11271120  <!-- QXMLStream stream stuff. This was moved from QtXml to QtCore in 4.4 -->

  • generator/typesystem_core.xml

    old new  
    24522452  <object-type name="QFutureIterator" generate="no">
    24532453    <modify-function signature="operator=(const QFuture&amp;)" remove="all"/>
    24542454  </object-type>
    2455   <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator">
    2456     <modify-function signature="QFutureIterator(const QFuture &amp;)">
    2457         <modify-argument index="1">
    2458             <replace-type modified-type="QtScriptFuture"/>
    2459         </modify-argument>
    2460     </modify-function>       
    2461   </object-type>
    24622455  <object-type name="QRunnable"/>
    24632456
    24642457

  • generator/typesystem_phonon.xml

    old new  
    130130        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
    131131        <modify-function signature="fromIndex(int)" remove="all"/>
    132132    </value-type>
     133    <value-type name="Phonon::DeviceAccessList" java-name="DeviceAccessList" />
    133134
    134135    <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput"/>
    135136    <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream"/>

  • qtbindings/qtscript_core/qtscriptconcurrent.h

    old new  
    5555typedef QFuture<QScriptValue> QtScriptFuture;
    5656typedef QFutureWatcher<QScriptValue> QtScriptFutureWatcher;
    5757typedef QFutureSynchronizer<QScriptValue> QtScriptFutureSynchronizer;
    58 typedef QFutureIterator<QScriptValue> QtScriptFutureIterator;
    5958
    6059#endif // QT_NO_CONCURRENT
    6160