comparison generator/typesystem_core.xml @ 252:37eed70de029

More things broken than fixed. Rolling back to 263
author maxter
date Sat, 22 Aug 2009 12:50:58 +0000
parents 7664de4a55e5
children 073b9153ed8a
comparison
equal deleted inserted replaced
251:739d0ee5bd91 252:37eed70de029
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <typesystem package="qt.core" default-superclass="QtdObject"> 2 <typesystem package="qt.core" default-superclass="QtDObject">
3 <inject-code> 3 <inject-code>
4 qt.Utilities.loadQtLibrary("QtCore"); 4 qt.Utilities.loadQtLibrary("QtCore");
5 </inject-code> 5 </inject-code>
6 <template name="core.return_string_instead_of_char*"> 6 <template name="core.return_string_instead_of_char*">
7 public final string %FUNCTION_NAME() { 7 public final string %FUNCTION_NAME() {
785 <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)"> 785 <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)">
786 <remove/> 786 <remove/>
787 </modify-function> 787 </modify-function>
788 788
789 <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3--> 789 <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
790 790
791 <inject-code> 791 <inject-code>
792 <import-file name="typesystem_core-java.java" quote-after-line="class QDate___" quote-before-line="}// class"/> 792 <import-file name="typesystem_core-java.java" quote-after-line="class QDate___" quote-before-line="}// class"/>
793 </inject-code> 793 </inject-code>
794 794
795 <modify-function signature="weekNumber(int*)const"> 795 <modify-function signature="weekNumber(int*)const">
812 </modify-argument> 812 </modify-argument>
813 </modify-function> 813 </modify-function>
814 <modify-function signature="operator=(QDir)" remove="all"/> 814 <modify-function signature="operator=(QDir)" remove="all"/>
815 <modify-function signature="operator=(QString)" remove="all"/> 815 <modify-function signature="operator=(QString)" remove="all"/>
816 <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3--> 816 <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
817 817
818 <inject-code> 818 <inject-code>
819 <import-file name="typesystem_core-java.java" quote-after-line="class QDir___" quote-before-line="}// class"/> 819 <import-file name="typesystem_core-java.java" quote-after-line="class QDir___" quote-before-line="}// class"/>
820 </inject-code> 820 </inject-code>
821 <modify-function signature="operator[](int)const" access="private"/> 821 <modify-function signature="operator[](int)const" access="private"/>
822 822
880 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function> 880 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
881 <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function> 881 <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
882 <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function> 882 <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
883 <modify-function signature="rheight()"> <remove/> </modify-function> 883 <modify-function signature="rheight()"> <remove/> </modify-function>
884 <modify-function signature="rwidth()"> <remove/> </modify-function> 884 <modify-function signature="rwidth()"> <remove/> </modify-function>
885 885
886 <inject-code> 886 <inject-code>
887 <insert-template name="core.multiply-devide-add-subtract"> 887 <insert-template name="core.multiply-devide-add-subtract">
888 <replace from="%TYPE" to="QSize"/> 888 <replace from="%TYPE" to="QSize"/>
889 </insert-template> 889 </insert-template>
890 </inject-code> 890 </inject-code>
895 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function> 895 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
896 <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function> 896 <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
897 <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function> 897 <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
898 <modify-function signature="rheight()"> <remove/> </modify-function> 898 <modify-function signature="rheight()"> <remove/> </modify-function>
899 <modify-function signature="rwidth()"> <remove/> </modify-function> 899 <modify-function signature="rwidth()"> <remove/> </modify-function>
900 900
901 <inject-code> 901 <inject-code>
902 <insert-template name="core.multiply-devide-add-subtract"> 902 <insert-template name="core.multiply-devide-add-subtract">
903 <replace from="%TYPE" to="QSizeF"/> 903 <replace from="%TYPE" to="QSizeF"/>
904 </insert-template> 904 </insert-template>
905 </inject-code> 905 </inject-code>
1065 <modify-function signature="operator&amp;=(QBitArray)" access="private"/> 1065 <modify-function signature="operator&amp;=(QBitArray)" access="private"/>
1066 <modify-function signature="operator=(QBitArray)" access="private"/> 1066 <modify-function signature="operator=(QBitArray)" access="private"/>
1067 <modify-function signature="operator^=(QBitArray)" access="private"/> 1067 <modify-function signature="operator^=(QBitArray)" access="private"/>
1068 <modify-function signature="operator|=(QBitArray)" access="private"/> 1068 <modify-function signature="operator|=(QBitArray)" access="private"/>
1069 <modify-function signature="operator~()const" access="private"/> 1069 <modify-function signature="operator~()const" access="private"/>
1070 1070
1071 <inject-code> 1071 <inject-code>
1072 <import-file name="typesystem_core-java.java" quote-after-line="class QBitArray___" quote-before-line="}// class"/> 1072 <import-file name="typesystem_core-java.java" quote-after-line="class QBitArray___" quote-before-line="}// class"/>
1073 </inject-code> 1073 </inject-code>
1074 </value-type> 1074 </value-type>
1075 1075
1089 <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/> 1089 <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
1090 <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/> 1090 <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/>
1091 1091
1092 <modify-function signature="modelAboutToBeReset()" private-signal="yes"/> 1092 <modify-function signature="modelAboutToBeReset()" private-signal="yes"/>
1093 <modify-function signature="modelReset()" private-signal="yes"/> 1093 <modify-function signature="modelReset()" private-signal="yes"/>
1094 1094
1095 <modify-function signature="parent()const" remove="java"/> 1095 <modify-function signature="parent()const" remove="java"/>
1096 <extra-includes> 1096 <extra-includes>
1097 <include file-name="QStringList" location="global"/> 1097 <include file-name="QStringList" location="global"/>
1098 <include file-name="QSize" location="global"/> 1098 <include file-name="QSize" location="global"/>
1099 </extra-includes> 1099 </extra-includes>
1192 </value-type> 1192 </value-type>
1193 1193
1194 <interface-type name="QFactoryInterface" java-name="QAbstractFactory"/> 1194 <interface-type name="QFactoryInterface" java-name="QAbstractFactory"/>
1195 1195
1196 <value-type name="QByteArray"> 1196 <value-type name="QByteArray">
1197 1197
1198 <modify-function signature="at(int)const"> 1198 <modify-function signature="at(int)const">
1199 <modify-argument index="return"> 1199 <modify-argument index="return">
1200 <replace-type modified-type="ubyte"/> 1200 <replace-type modified-type="ubyte"/>
1201 </modify-argument> 1201 </modify-argument>
1202 </modify-function> 1202 </modify-function>
1203 1203
1204 <extra-includes> 1204 <extra-includes>
1205 <include file-name="QNoImplicitBoolCast" location="global"/> 1205 <include file-name="QNoImplicitBoolCast" location="global"/>
1206 </extra-includes> 1206 </extra-includes>
1207 1207
1208 <!-- removed functions --> 1208 <!-- removed functions -->
1736 <object-type name="QFile"> 1736 <object-type name="QFile">
1737 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3--> 1737 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
1738 <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3--> 1738 <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
1739 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance --> 1739 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance -->
1740 <modify-function signature="unmap(unsigned char*)" remove="all"/> <!-- Can't provide same API and performance --> 1740 <modify-function signature="unmap(unsigned char*)" remove="all"/> <!-- Can't provide same API and performance -->
1741 1741
1742 <inject-code> 1742 <inject-code>
1743 <import-file name="typesystem_core-java.java" quote-after-line="class QFile___" quote-before-line="}// class"/> 1743 <import-file name="typesystem_core-java.java" quote-after-line="class QFile___" quote-before-line="}// class"/>
1744 </inject-code> 1744 </inject-code>
1745 <modify-function signature="decodeName(const char*)"> 1745 <modify-function signature="decodeName(const char*)">
1746 <access modifier="private"/> 1746 <access modifier="private"/>
1757 <modify-function signature="ungetChar(char)" rename="ungetByte"/> 1757 <modify-function signature="ungetChar(char)" rename="ungetByte"/>
1758 <modify-function signature="getChar(char*)"> 1758 <modify-function signature="getChar(char*)">
1759 <access modifier="private"/> 1759 <access modifier="private"/>
1760 <rename to="getByte"/> 1760 <rename to="getByte"/>
1761 </modify-function> 1761 </modify-function>
1762 1762
1763 <modify-function signature="write(const char*)"> 1763 <modify-function signature="write(const char*)">
1764 <access modifier="private"/> 1764 <access modifier="private"/>
1765 </modify-function> 1765 </modify-function>
1766 1766
1767 <modify-function signature="write(const char*,long long)"> 1767 <modify-function signature="write(const char*,long long)">
1768 <access modifier="private"/> 1768 <access modifier="private"/>
1769 </modify-function> 1769 </modify-function>
1770 1770
1771 <!-- 1771 <!--
2023 </modify-function> 2023 </modify-function>
2024 2024
2025 <modify-function signature="toUnicode(const char*)const"> 2025 <modify-function signature="toUnicode(const char*)const">
2026 <remove/> 2026 <remove/>
2027 </modify-function> 2027 </modify-function>
2028 2028
2029 <inject-code> 2029 <inject-code>
2030 <import-file name="typesystem_core-java.java" quote-after-line="class QTextCodec___" quote-before-line="}// class"/> 2030 <import-file name="typesystem_core-java.java" quote-after-line="class QTextCodec___" quote-before-line="}// class"/>
2031 </inject-code> 2031 </inject-code>
2032 2032
2033 <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"> 2033 <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const">
2114 <object-type name="QTimeLine"/> 2114 <object-type name="QTimeLine"/>
2115 <object-type name="QTranslator"> 2115 <object-type name="QTranslator">
2116 <modify-function signature="translate(const char*,const char*,const char*,int)const"> 2116 <modify-function signature="translate(const char*,const char*,const char*,int)const">
2117 <remove/> 2117 <remove/>
2118 </modify-function> 2118 </modify-function>
2119 2119
2120 <extra-includes> 2120 <extra-includes>
2121 <include file-name="QTextCodec" location="global"/> 2121 <include file-name="QTextCodec" location="global"/>
2122 </extra-includes> 2122 </extra-includes>
2123 <modify-function signature="load(const unsigned char*,int)"> 2123 <modify-function signature="load(const unsigned char*,int)">
2124 <access modifier="private"/> 2124 <access modifier="private"/>
2198 2198
2199 <object-type name="QBuffer"> 2199 <object-type name="QBuffer">
2200 <modify-function signature="buffer()const"> 2200 <modify-function signature="buffer()const">
2201 <remove/> 2201 <remove/>
2202 </modify-function> 2202 </modify-function>
2203 2203
2204 2204
2205 <inject-code> 2205 <inject-code>
2206 <import-file name="typesystem_core-java.java" quote-after-line="class QBuffer___" quote-before-line="}// class"/> 2206 <import-file name="typesystem_core-java.java" quote-after-line="class QBuffer___" quote-before-line="}// class"/>
2207 </inject-code> 2207 </inject-code>
2208 <!-- <extra-includes> 2208 <!-- <extra-includes>
2267 <extra-includes> 2267 <extra-includes>
2268 <include file-name="QDateTime" location="global"/> 2268 <include file-name="QDateTime" location="global"/>
2269 </extra-includes> 2269 </extra-includes>
2270 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> 2270 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
2271 <modify-function signature="unmap(unsigned char*)" remove="all"/> 2271 <modify-function signature="unmap(unsigned char*)" remove="all"/>
2272 2272
2273 <inject-code> 2273 <inject-code>
2274 <import-file name="typesystem_core-java.java" quote-after-line="class QAbstractFileEngine___" quote-before-line="}// class"/> 2274 <import-file name="typesystem_core-java.java" quote-after-line="class QAbstractFileEngine___" quote-before-line="}// class"/>
2275 </inject-code> 2275 </inject-code>
2276 </object-type> 2276 </object-type>
2277 2277
2314 <modify-function signature="mapped(QWidget *)" remove="all"/> 2314 <modify-function signature="mapped(QWidget *)" remove="all"/>
2315 2315
2316 <modify-function signature="mapping(QWidget*)const" remove="all"/> 2316 <modify-function signature="mapping(QWidget*)const" remove="all"/>
2317 2317
2318 <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/> 2318 <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/>
2319 2319
2320 <inject-code> 2320 <inject-code>
2321 <import-file name="typesystem_core-java.java" quote-after-line="class QSignalMapper___" quote-before-line="}// class"/> 2321 <import-file name="typesystem_core-java.java" quote-after-line="class QSignalMapper___" quote-before-line="}// class"/>
2322 </inject-code> 2322 </inject-code>
2323 2323
2324 2324
2359 </modify-argument> 2359 </modify-argument>
2360 </modify-function> 2360 </modify-function>
2361 </object-type> 2361 </object-type>
2362 2362
2363 <object-type name="QObject"> 2363 <object-type name="QObject">
2364 <inject-code class="native">
2365
2366 #ifdef CPP_SHARED
2367 QTD_EXPORT_VAR(qtd_delete_d_qobject);
2368
2369 extern "C" DLL_PUBLIC void qtd_QObjectEntity_initCallBacks(pfunc_abstr del_d_qobj)
2370 {
2371 QTD_EXPORT_VAR_SET(qtd_delete_d_qobject, del_d_qobj);
2372 }
2373 #endif
2374
2375
2376 extern "C" DLL_PUBLIC void* qtd_get_d_qobject(void *nativeId)
2377 {
2378 QtD_QObjectEntity *entity = QtD_QObjectEntity::getQObjectEntity((QObject*)nativeId);
2379 return entity ? entity-&gt;dId : NULL;
2380 }
2381
2382 extern "C" DLL_PUBLIC void qtd_delete_qobject(void *nativeId)
2383 {
2384 delete (QObject*)nativeId;
2385 }
2386
2387 extern "C" DLL_PUBLIC void qtd_create_qobject_entity(void* nativeId, void *dId)
2388 {
2389 new QtD_QObjectEntity((QObject*)nativeId, dId);
2390 }
2391
2392 extern "C" DLL_PUBLIC void* qtd_QObject_metaObject(void* nativeId)
2393 {
2394 return (void*)((QObject*)nativeId)->metaObject();
2395 }
2396 </inject-code>
2397
2398 <inject-code class="java-free">
2399 extern(C) void* qtd_get_d_qobject(void* nativeId);
2400 extern(C) void qtd_delete_qobject(void* nativeId);
2401 extern(C) void* qtd_create_qobject_entity(void* nativeId, void* dId);
2402 extern(C) void* qtd_QObject_metaObject(void* nativeId);
2403
2404 extern(C) void qtd_delete_d_qobject(void* dId)
2405 {
2406 auto obj = cast(QObject)dId;
2407
2408 if (!(obj.__flags &amp; QtdObjectFlags.dOwnership))
2409 {
2410 // Avoid deleting native object twice
2411 obj.__setFlags(QtdObjectFlags.nativeOwnership, true);
2412 delete obj;
2413 }
2414 }
2415 </inject-code>
2416
2417 <modify-function signature="childEvent(QChildEvent*)"> 2364 <modify-function signature="childEvent(QChildEvent*)">
2418 <modify-argument index="1" invalidate-after-use="yes"/> 2365 <modify-argument index="1" invalidate-after-use="yes"/>
2419 </modify-function> 2366 </modify-function>
2420 <modify-function signature="customEvent(QEvent*)"> 2367 <modify-function signature="customEvent(QEvent*)">
2421 <modify-argument index="1" invalidate-after-use="yes"/> 2368 <modify-argument index="1" invalidate-after-use="yes"/>
2452 } else if (%1 !is null &amp;&amp; __gc_managed) { 2399 } else if (%1 !is null &amp;&amp; __gc_managed) {
2453 __gc_ref_list ~= this; 2400 __gc_ref_list ~= this;
2454 __gc_managed = false; 2401 __gc_managed = false;
2455 } 2402 }
2456 </inject-code> --> 2403 </inject-code> -->
2457
2458 </modify-function> 2404 </modify-function>
2459 2405
2460 <modify-function signature="deleteLater()"> 2406 <modify-function signature="deleteLater()">
2461 <rename to="disposeLater"/> 2407 <rename to="disposeLater"/>
2462 </modify-function> 2408 </modify-function>
2476 2422
2477 <extra-includes> 2423 <extra-includes>
2478 <include file-name="QVarLengthArray" location="global"/> 2424 <include file-name="QVarLengthArray" location="global"/>
2479 </extra-includes> 2425 </extra-includes>
2480 2426
2481 <inject-code class="java"> 2427
2482 <import-file name="typesystem_core-java.java" quote-after-line="class QObject___" quote-before-line="}// class"/> 2428
2483 </inject-code> 2429 <inject-code class="java">
2430 <import-file name="typesystem_core-java.java" quote-after-line="class QObject___" quote-before-line="}// class"/>
2431 </inject-code>
2484 </object-type> 2432 </object-type>
2485 2433
2486 <object-type name="QCoreApplication"> 2434 <object-type name="QCoreApplication">
2487 <extra-includes> 2435 <extra-includes>
2488 <include file-name="QStringList" location="global"/> 2436 <include file-name="QStringList" location="global"/>
2530 <modify-function signature="postEvent(QObject*,QEvent*)"> 2478 <modify-function signature="postEvent(QObject*,QEvent*)">
2531 <modify-argument index="2"> 2479 <modify-argument index="2">
2532 <define-ownership class="java" owner="c++"/> 2480 <define-ownership class="java" owner="c++"/>
2533 </modify-argument> 2481 </modify-argument>
2534 </modify-function> 2482 </modify-function>
2535 2483
2536 <modify-function signature="QCoreApplication(int &amp;, char **)"> 2484 <modify-function signature="QCoreApplication(int &amp;, char **)">
2537 <inject-code class="shell"> 2485 <inject-code class="shell">
2538 // qtjambi_register_variant_handler(); 2486 // qtjambi_register_variant_handler();
2539 </inject-code> 2487 </inject-code>
2540 </modify-function> 2488 </modify-function>
2577 <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/> 2525 <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>
2578 2526
2579 <object-type name="QDataStream"> 2527 <object-type name="QDataStream">
2580 <!-- qtd2 --> 2528 <!-- qtd2 -->
2581 <modify-function signature="device() const" remove="all"/> 2529 <modify-function signature="device() const" remove="all"/>
2582 2530
2583 <modify-function signature="setDevice(QIODevice*)"> 2531 <modify-function signature="setDevice(QIODevice*)">
2584 <modify-argument index="1"> 2532 <modify-argument index="1">
2585 <reference-count action="set" variable-name="__rcDevice"/> 2533 <reference-count action="set" variable-name="__rcDevice"/>
2586 </modify-argument> 2534 </modify-argument>
2587 </modify-function> 2535 </modify-function>
2607 2555
2608 <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function> 2556 <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
2609 <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function> 2557 <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
2610 <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function> 2558 <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
2611 <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function> 2559 <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
2612 2560
2613 <template name="core.datastream_operator_shift_right"> 2561 <template name="core.datastream_operator_shift_right">
2614 <insert-template name="core.stream_operator_shift_right"> 2562 <insert-template name="core.stream_operator_shift_right">
2615 <replace from="%STREAM_TYPE" to="QDataStream"/> 2563 <replace from="%STREAM_TYPE" to="QDataStream"/>
2616 </insert-template> 2564 </insert-template>
2617 </template> 2565 </template>
2792 <include file-name="QDateTime" location="global"/> 2740 <include file-name="QDateTime" location="global"/>
2793 </extra-includes> 2741 </extra-includes>
2794 </object-type> 2742 </object-type>
2795 2743
2796 <object-type name="QTextStream"> 2744 <object-type name="QTextStream">
2797 2745
2798 <modify-function signature="setCodec(QTextCodec *)" remove="all"/> 2746 <modify-function signature="setCodec(QTextCodec *)" remove="all"/>
2799 <modify-function signature="codec() const" remove="all"/> 2747 <modify-function signature="codec() const" remove="all"/>
2800 2748
2801 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function> 2749 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
2802 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function> 2750 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
2803 <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function> 2751 <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
2804 <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function> 2752 <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
2805 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function> 2753 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
2882 </modify-function> 2830 </modify-function>
2883 <modify-function signature="operator&lt;&lt;(const QString&amp;)"> 2831 <modify-function signature="operator&lt;&lt;(const QString&amp;)">
2884 <rename to="writeString"/> 2832 <rename to="writeString"/>
2885 <modify-argument index="0" replace-value="this"/> 2833 <modify-argument index="0" replace-value="this"/>
2886 </modify-function> 2834 </modify-function>
2887 2835
2888 <modify-function signature="operator&gt;&gt;(char&amp;)"> 2836 <modify-function signature="operator&gt;&gt;(char&amp;)">
2889 <access modifier="private"/> 2837 <access modifier="private"/>
2890 <modify-argument index="0" replace-value="this"/> 2838 <modify-argument index="0" replace-value="this"/>
2891 <rename to="operator_shift_right_byte"/> 2839 <rename to="operator_shift_right_byte"/>
2892 </modify-function> 2840 </modify-function>
2957 </namespace-type> 2905 </namespace-type>
2958 2906
2959 <value-type name="QFuture" generate="no"> 2907 <value-type name="QFuture" generate="no">
2960 <modify-function signature="operator T() const" remove="all"/> 2908 <modify-function signature="operator T() const" remove="all"/>
2961 <modify-function signature="operator=(const QFuture &amp;)" remove="all"/> 2909 <modify-function signature="operator=(const QFuture &amp;)" remove="all"/>
2962 2910
2963 <modify-function signature="operator==(const QFuture &amp;)const"> 2911 <modify-function signature="operator==(const QFuture &amp;)const">
2964 <modify-argument index="1"> 2912 <modify-argument index="1">
2965 <replace-type modified-type="qt.core.QFuture"/> 2913 <replace-type modified-type="qt.core.QFuture"/>
2966 <conversion-rule class="native"> 2914 <conversion-rule class="native">
2967 <insert-template name="convert_qtjambifuture_to_native"/> 2915 <insert-template name="convert_qtjambifuture_to_native"/>
2970 </modify-function> 2918 </modify-function>
2971 </value-type> 2919 </value-type>
2972 <value-type name="QtJambiVoidFuture" java-name="QFutureVoid"> 2920 <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
2973 <modify-function signature="resultCount()const" remove="all"/> 2921 <modify-function signature="resultCount()const" remove="all"/>
2974 <modify-function signature="isResultReadyAt(int)const" remove="all"/> 2922 <modify-function signature="isResultReadyAt(int)const" remove="all"/>
2975 2923
2976 <modify-function signature="QFuture(const QFuture &amp;)"> 2924 <modify-function signature="QFuture(const QFuture &amp;)">
2977 <modify-argument index="1"> 2925 <modify-argument index="1">
2978 <replace-type modified-type="qt.core.QFutureVoid"/> 2926 <replace-type modified-type="qt.core.QFutureVoid"/>
2979 <conversion-rule class="native"> 2927 <conversion-rule class="native">
2980 <insert-template name="convert_futurevoid_to_native"/> 2928 <insert-template name="convert_futurevoid_to_native"/>
2994 </value-type> 2942 </value-type>
2995 2943
2996 <object-type name="QFutureWatcherBase"> 2944 <object-type name="QFutureWatcherBase">
2997 <modify-function signature="connectNotify(const char *)" remove="all"/> 2945 <modify-function signature="connectNotify(const char *)" remove="all"/>
2998 <modify-function signature="disconnectNotify(const char *)" remove="all"/> 2946 <modify-function signature="disconnectNotify(const char *)" remove="all"/>
2999 2947
3000 <inject-code class="shell-declaration"> 2948 <inject-code class="shell-declaration">
3001 2949
3002 // private, pure virtual and considered internal 2950 // private, pure virtual and considered internal
3003 // we need to reimplement them so it will compile 2951 // we need to reimplement them so it will compile
3004 QFutureInterfaceBase dummyBase; 2952 QFutureInterfaceBase dummyBase;
3027 </inject-code> 2975 </inject-code>
3028 </object-type> 2976 </object-type>
3029 2977
3030 <object-type name="QFutureWatcher" generate="no"> 2978 <object-type name="QFutureWatcher" generate="no">
3031 <modify-function signature="future()const" remove="all"/> 2979 <modify-function signature="future()const" remove="all"/>
3032 2980
3033 <modify-function signature="setFuture(const QFuture &amp;)"> 2981 <modify-function signature="setFuture(const QFuture &amp;)">
3034 <modify-argument index="1"> 2982 <modify-argument index="1">
3035 <replace-type modified-type="qt.core.QFuture&lt;T&gt;"/> 2983 <replace-type modified-type="qt.core.QFuture&lt;T&gt;"/>
3036 <conversion-rule class="native"> 2984 <conversion-rule class="native">
3037 <insert-template name="convert_qtjambifuture_to_native"/> 2985 <insert-template name="convert_qtjambifuture_to_native"/>