--- a/generator/typesystem_core.xml	Sun Nov 08 19:20:53 2009 +0000
+++ b/generator/typesystem_core.xml	Sun Nov 08 19:28:01 2009 +0000
@@ -103,7 +103,7 @@
     <primitive-type name="__int64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
     <primitive-type name="unsigned __int64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
     <primitive-type name="unsigned long long" java-name="ulong" preferred-conversion="no" jni-name="jlong"/>
-    <primitive-type name="long long" java-name="long" preferred-conversion="no" jni-name="jlong"/>
+    <primitive-type name="qint64" java-name="long" preferred-conversion="no" jni-name="jlong"/>
     <primitive-type name="quintptr" preferred-conversion="no" java-name="quintptr" jni-name="quintptr" />
 
     <primitive-type name="short" preferred-conversion="no" java-name="short" jni-name="jchar"/>
@@ -2282,9 +2282,10 @@
         <modify-function signature="error()const">
             <rename to="lastError"/>
         </modify-function>
-        <modify-function signature="finished(int, QProcess::ExitStatus)">
+<!--        <modify-function signature="finished(int, QProcess::ExitStatus)">
             <rename to="finishedWithStatusCode"/>
         </modify-function>
+        -->
         <modify-function signature="setStandardOutputProcess(QProcess*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcStandardOutputProcess"/>
@@ -2302,7 +2303,7 @@
   </object-type>
 
   <object-type name="QSignalMapper">
-    <modify-function signature="mapped(const QString &amp;)">
+<!--    <modify-function signature="mapped(const QString &amp;)">
         <rename to="mappedString"/>
     </modify-function>
     <modify-function signature="mapped(int)">
@@ -2310,7 +2311,7 @@
     </modify-function>
     <modify-function signature="mapped(QObject *)">
         <rename to="mappedQObject"/>
-    </modify-function>
+    </modify-function> -->
     <modify-function signature="mapped(QWidget *)" remove="all"/>
 
     <modify-function signature="mapping(QWidget*)const" remove="all"/>
@@ -2477,11 +2478,11 @@
         </inject-code> -->
 
     </modify-function>
-
+<!--
     <modify-function signature="deleteLater()">
         <rename to="disposeLater"/>
     </modify-function>
-
+-->
     <modify-function signature="inherits(const char*)const">
         <remove/>
     </modify-function>
@@ -2655,7 +2656,7 @@
           <rename to="writeInt"/>
           <modify-argument index="0" replace-value="this"/>
       </modify-function>
-      <modify-function signature="operator&lt;&lt;(long long)">
+      <modify-function signature="operator&lt;&lt;(qint64)">
           <rename to="writeLong"/>
           <modify-argument index="0" replace-value="this"/>
       </modify-function>
@@ -2691,7 +2692,7 @@
           <access modifier="private"/>
       </modify-function>
 
-      <modify-function signature="operator&gt;&gt;(long long&amp;)">
+      <modify-function signature="operator&gt;&gt;(qint64&amp;)">
           <rename to="operator_shift_right_long"/>
           <modify-argument index="0" replace-value="this"/>
           <access modifier="private"/>