--- a/generator/typesystem_xml-java.xml	Sat May 16 18:06:25 2009 +0000
+++ b/generator/typesystem_xml-java.xml	Sat May 16 20:47:44 2009 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<typesystem package="qt.xml" default-superclass="qt.QtJambiObject">
+<typesystem package="com.trolltech.qt.xml" default-superclass="com.trolltech.qt.QtJambiObject">
     <inject-code>
-        qt.Utilities.loadQtLibrary("QtXml");
+        com.trolltech.qt.Utilities.loadQtLibrary("QtXml");
     </inject-code>
 
 
@@ -10,9 +10,9 @@
             <import-file name="typesystem_xml-java.java" quote-after-line="class QDomDocument___" quote-before-line="}// class"/>
         </inject-code>
         <extra-includes>
-            <include file-name="qt.QNativePointer.Type" location="java"/>
-            <include file-name="qt.core.QIODevice" location="java"/>
-            <include file-name="qt.core.QByteArray" location="java"/>
+            <include file-name="com.trolltech.qt.QNativePointer.Type" location="java"/>
+            <include file-name="com.trolltech.qt.core.QIODevice" location="java"/>
+            <include file-name="com.trolltech.qt.core.QByteArray" location="java"/>
         </extra-includes>
 
 
@@ -28,6 +28,20 @@
             }
         </template>
 
+
+        <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)">
+            <access modifier="private" />
+            <modify-argument index="3">
+                <remove-default-expression />
+            </modify-argument>
+            <modify-argument index="4">
+                <remove-default-expression />
+            </modify-argument>
+            <modify-argument index="5">
+                <remove-default-expression />
+            </modify-argument>
+        </modify-function>
+
         <!--bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 ); -->
         <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)">
             <access modifier="private"/>
@@ -174,7 +188,7 @@
             <import-file name="typesystem_xml-java.java" quote-after-line="class QXmlNamespaceSupport___" quote-before-line="}// class"/>
         </inject-code>
         <extra-includes>
-            <include file-name="qt.QNativePointer" location="java"/>
+            <include file-name="com.trolltech.qt.QNativePointer" location="java"/>
         </extra-includes>
         <modify-function signature="processName(QString,bool,QString&amp;,QString&amp;)const">
             <access modifier="private"/>
@@ -329,7 +343,7 @@
                 </conversion-rule>
             </modify-argument>
             <modify-argument index="return">
-                <replace-type modified-type="qt.xml.QXmlEntityResolver$ResolvedEntity" />
+                <replace-type modified-type="com.trolltech.qt.xml.QXmlEntityResolver$ResolvedEntity" />
                 <conversion-rule class="native">
                     jobject %out = qtjambi_to_resolvedentity(__jni_env, %in, inputSourceHolder);
                 </conversion-rule>