Mercurial > projects > qtd

comparison generator/typesystem_core.xml @ 335:1e9092e20a67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge signals branch into default
author eldar1@eldar1-laptop
date Sun, 07 Feb 2010 16:04:36 +0000
parents 7a3c43424dca
children 96a75b1e5b26
comparison
equal deleted inserted replaced
306:70f64e5b5942 335:1e9092e20a67
101 <primitive-type name="float" jni-name="jfloat"/> 101 <primitive-type name="float" jni-name="jfloat"/>
102 102
103 <primitive-type name="__int64" java-name="long" preferred-conversion="no" jni-name="jlong"/> 103 <primitive-type name="__int64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
104 <primitive-type name="unsigned __int64" java-name="long" preferred-conversion="no" jni-name="jlong"/> 104 <primitive-type name="unsigned __int64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
105 <primitive-type name="unsigned long long" java-name="ulong" preferred-conversion="no" jni-name="jlong"/> 105 <primitive-type name="unsigned long long" java-name="ulong" preferred-conversion="no" jni-name="jlong"/>
106 <primitive-type name="long long" java-name="long" preferred-conversion="no" jni-name="jlong"/> 106 <primitive-type name="qint64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
107 <primitive-type name="quintptr" preferred-conversion="no" java-name="quintptr" jni-name="quintptr" /> 107 <primitive-type name="quintptr" preferred-conversion="no" java-name="quintptr" jni-name="quintptr" />
108 108
109 <primitive-type name="short" preferred-conversion="no" java-name="short" jni-name="jchar"/> 109 <primitive-type name="short" preferred-conversion="no" java-name="short" jni-name="jchar"/>
110 <primitive-type name="short" preferred-java-type="no" java-name="short" jni-name="jshort" /> 110 <primitive-type name="short" preferred-java-type="no" java-name="short" jni-name="jshort" />
111 <primitive-type name="signed short" java-name="short" preferred-conversion="no" jni-name="jchar"/> 111 <primitive-type name="signed short" java-name="short" preferred-conversion="no" jni-name="jchar"/>
556 <rejection class="QObject" function-name="connect"/> 556 <rejection class="QObject" function-name="connect"/>
557 <rejection class="QObject" function-name="connectNotify"/> 557 <rejection class="QObject" function-name="connectNotify"/>
558 <rejection class="QObject" function-name="disconnect"/> 558 <rejection class="QObject" function-name="disconnect"/>
559 <rejection class="QObject" function-name="disconnectNotify"/> 559 <rejection class="QObject" function-name="disconnectNotify"/>
560 <rejection class="QObject" function-name="registerUserData"/> 560 <rejection class="QObject" function-name="registerUserData"/>
561 <rejection class="QObject" function-name="sender"/> 561 <!-- <rejection class="QObject" function-name="sender"/> -->
562 <rejection class="QTimer" function-name="singleShot"/>
563 <rejection class="QProcess" function-name="pid"/> 562 <rejection class="QProcess" function-name="pid"/>
564 <rejection class="QRegion" function-name="cleanUp"/> 563 <rejection class="QRegion" function-name="cleanUp"/>
565 <rejection class="QSettings" function-name="registerFormat"/> 564 <rejection class="QSettings" function-name="registerFormat"/>
566 <rejection class="QVector" function-name="back"/> 565 <rejection class="QVector" function-name="back"/>
567 <rejection class="QVector" function-name="begin"/> 566 <rejection class="QVector" function-name="begin"/>
2280 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3--> 2279 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
2281 2280
2282 <modify-function signature="error()const"> 2281 <modify-function signature="error()const">
2283 <rename to="lastError"/> 2282 <rename to="lastError"/>
2284 </modify-function> 2283 </modify-function>
2285 <modify-function signature="finished(int, QProcess::ExitStatus)"> 2284 <!-- <modify-function signature="finished(int, QProcess::ExitStatus)">
2286 <rename to="finishedWithStatusCode"/> 2285 <rename to="finishedWithStatusCode"/>
2287 </modify-function> 2286 </modify-function>
2287 -->
2288 <modify-function signature="setStandardOutputProcess(QProcess*)"> 2288 <modify-function signature="setStandardOutputProcess(QProcess*)">
2289 <modify-argument index="1"> 2289 <modify-argument index="1">
2290 <reference-count action="set" variable-name="__rcStandardOutputProcess"/> 2290 <reference-count action="set" variable-name="__rcStandardOutputProcess"/>
2291 </modify-argument> 2291 </modify-argument>
2292 </modify-function> 2292 </modify-function>
2293 <!-- <modify-function signature="startDetached(QString,QStringList&lt;QString&gt;,QString,long long*)"> 2293 <!-- <modify-function signature="startDetached(QString,QStringList,QString,long long*)">
2294 <access modifier="private"/> 2294 <access modifier="private"/>
2295 <modify-argument index="4"> 2295 <modify-argument index="4">
2296 <remove-default-expression/> 2296 <remove-default-expression/>
2297 </modify-argument> 2297 </modify-argument>
2298 </modify-function> 2298 </modify-function>
2300 <import-file name="typesystem_core-java.java" quote-after-line="class QProcess___" quote-before-line="}// class"/> 2300 <import-file name="typesystem_core-java.java" quote-after-line="class QProcess___" quote-before-line="}// class"/>
2301 </inject-code>--> 2301 </inject-code>-->
2302 </object-type> 2302 </object-type>
2303 2303
2304 <object-type name="QSignalMapper"> 2304 <object-type name="QSignalMapper">
2305 <modify-function signature="mapped(const QString &amp;)"> 2305 <!-- <modify-function signature="mapped(const QString &amp;)">
2306 <rename to="mappedString"/> 2306 <rename to="mappedString"/>
2307 </modify-function> 2307 </modify-function>
2308 <modify-function signature="mapped(int)"> 2308 <modify-function signature="mapped(int)">
2309 <rename to="mappedInteger"/> 2309 <rename to="mappedInteger"/>
2310 </modify-function> 2310 </modify-function>
2311 <modify-function signature="mapped(QObject *)"> 2311 <modify-function signature="mapped(QObject *)">
2312 <rename to="mappedQObject"/> 2312 <rename to="mappedQObject"/>
2313 </modify-function> 2313 </modify-function> -->
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"/>
2475 __gc_managed = false; 2475 __gc_managed = false;
2476 } 2476 }
2477 </inject-code> --> 2477 </inject-code> -->
2478 2478
2479 </modify-function> 2479 </modify-function>
2480 2480 <!--
2481 <modify-function signature="deleteLater()"> 2481 <modify-function signature="deleteLater()">
2482 <rename to="disposeLater"/> 2482 <rename to="disposeLater"/>
2483 </modify-function> 2483 </modify-function>
2484 2484 -->
2485 <modify-function signature="inherits(const char*)const"> 2485 <modify-function signature="inherits(const char*)const">
2486 <remove/> 2486 <remove/>
2487 </modify-function> 2487 </modify-function>
2488 2488
2489 <modify-function signature="property(const char*)const"> 2489 <modify-function signature="property(const char*)const">
2653 </modify-function> 2653 </modify-function>
2654 <modify-function signature="operator&lt;&lt;(int)"> 2654 <modify-function signature="operator&lt;&lt;(int)">
2655 <rename to="writeInt"/> 2655 <rename to="writeInt"/>
2656 <modify-argument index="0" replace-value="this"/> 2656 <modify-argument index="0" replace-value="this"/>
2657 </modify-function> 2657 </modify-function>
2658 <modify-function signature="operator&lt;&lt;(long long)"> 2658 <modify-function signature="operator&lt;&lt;(qint64)">
2659 <rename to="writeLong"/> 2659 <rename to="writeLong"/>
2660 <modify-argument index="0" replace-value="this"/> 2660 <modify-argument index="0" replace-value="this"/>
2661 </modify-function> 2661 </modify-function>
2662 <modify-function signature="operator&lt;&lt;(float)"> 2662 <modify-function signature="operator&lt;&lt;(float)">
2663 <rename to="writeFloat"/> 2663 <rename to="writeFloat"/>
2689 <rename to="operator_shift_right_short"/> 2689 <rename to="operator_shift_right_short"/>
2690 <modify-argument index="0" replace-value="this"/> 2690 <modify-argument index="0" replace-value="this"/>
2691 <access modifier="private"/> 2691 <access modifier="private"/>
2692 </modify-function> 2692 </modify-function>
2693 2693
2694 <modify-function signature="operator&gt;&gt;(long long&amp;)"> 2694 <modify-function signature="operator&gt;&gt;(qint64&amp;)">
2695 <rename to="operator_shift_right_long"/> 2695 <rename to="operator_shift_right_long"/>
2696 <modify-argument index="0" replace-value="this"/> 2696 <modify-argument index="0" replace-value="this"/>
2697 <access modifier="private"/> 2697 <access modifier="private"/>
2698 </modify-function> 2698 </modify-function>
2699 2699