--- a/generator/typesystem_network.xml	Sat May 16 21:34:54 2009 +0000
+++ b/generator/typesystem_network.xml	Sun May 17 01:44:06 2009 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<typesystem package="qt.network" default-superclass="qt.QtJambiObject">
+<typesystem package="qt.network" default-superclass="QtDObject">
 <inject-code>
         qt.Utilities.loadQtLibrary("QtNetwork");
     </inject-code>
@@ -18,7 +18,9 @@
     <include file-name="qssl.h" location="global"/>
   </namespace-type>
 
+  <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
   <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
+  <enum-type name="QNetworkProxyQuery::QueryType"/>
   <enum-type name="QAbstractSocket::SocketError"/>
   <enum-type name="QAbstractSocket::SocketState"/>
   <enum-type name="QAbstractSocket::SocketType"/>
@@ -50,8 +52,31 @@
   <enum-type name="QNetworkRequest::CacheLoadControl"/>
   <enum-type name="QNetworkRequest::KnownHeaders"/>
 
+  <object-type name="QAbstractNetworkCache"/>
+  <object-type name="QNetworkDiskCache">
+    <modify-function signature="insert(QIODevice*)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/> <!-- function only has effect on devices retrieved using prepare() -->
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <value-type name="QNetworkCacheMetaData">
+    <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/>
+  </value-type>
+
+  <object-type name="QNetworkProxyFactory">
+    <modify-function signature="setApplicationProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++"/>
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <value-type name="QNetworkProxyQuery">
+    <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/>
+  </value-type>
+
   <object-type name="QAbstractSocket">
-        <inject-code>
+<!--        <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QAbstractSocket___" quote-before-line="}// class"/>
         </inject-code>
         <inject-code class="constructors">
@@ -62,35 +87,39 @@
             <access modifier="private"/>
             <rename to="proxyAuthenticationRequiredPrivate"/>
         </modify-function>
-        <modify-function signature="connectToHostImplementation(QString, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="private"/>
+        <modify-function signature="connectToHostImplementation(QString, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="private"/>virtual-slot="yes"
         <modify-function signature="localPort()const" access="private" rename="localPort_private"/>
         <modify-function signature="peerPort()const" access="private" rename="peerPort_private"/>
         <modify-function signature="setLocalPort(unsigned short)" access="private"/>
         <modify-function signature="setPeerPort(unsigned short)" access="private"/>
         <modify-function signature="connectToHost(QString, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="private"/>
         <modify-function signature="connectToHost(QHostAddress, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="private"/>
-
+-->
+        <modify-function signature="connectToHostImplementation(QString, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" virtual-slot="yes"/>
+        <modify-function signature="error()const">
+            <rename to="error_"/>
+        </modify-function>
         <modify-function signature="abort()" access="non-final"/>
         <modify-function signature="disconnectFromHostImplementation()" access="non-final"/>
         <modify-function signature="flush()" access="non-final"/>
         <modify-function signature="setReadBufferSize(long long)" access="non-final"/>
-    <modify-function signature="setSocketDescriptor(int,QAbstractSocket::SocketState,QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="non-final"/>
+        <modify-function signature="setSocketDescriptor(int,QAbstractSocket::SocketState,QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="non-final"/>
         <modify-function signature="waitForConnected(int)" access="non-final"/>
         <modify-function signature="waitForDisconnected(int)" access="non-final"/>
 
     </object-type>
   <object-type name="QFtp">
-        <modify-function signature="read(char*,long long)">
+<!--        <modify-function signature="read(char*,long long)">
             <access modifier="private"/>
         </modify-function>
         <inject-code>
             <insert-template name="network.read_char*_long_long"/>
-        </inject-code>
+        </inject-code> -->
     </object-type>
 
   <object-type name="QHttp">
       <modify-function signature="closeConnection()" remove="all"/>
-  
+  <!--
         <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QHttp___" quote-before-line="}// class"/>
         </inject-code>
@@ -127,13 +156,13 @@
         </modify-function>
         <inject-code>
             <insert-template name="network.read_char*_long_long"/>
-        </inject-code>
+        </inject-code> -->
         <modify-function signature="setSocket(QTcpSocket*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcSocket"/>
             </modify-argument>
         </modify-function>
-
+<!--
         <modify-function signature="setHost(QString, unsigned short)" access="private">
             <modify-argument index="2">
                 <remove-default-expression/>
@@ -144,15 +173,13 @@
                 <remove-default-expression/>
             </modify-argument>
         </modify-function>
-
+-->
     </object-type>
   <object-type name="QTcpServer">
-        <inject-code>
+<!--        <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QTcpServer___" quote-before-line="}// class"/>
         </inject-code>
-        <extra-includes>
-            <include file-name="qt.QNativePointer" location="java"/>
-        </extra-includes>
+
         <modify-function signature="listen(QHostAddress,unsigned short)" access="private">
             <modify-argument index="1">
                 <remove-default-expression/>
@@ -175,17 +202,17 @@
                 <remove-default-expression/>
             </modify-argument>
         </modify-function>
-
+-->
     </object-type>
   <object-type name="QTcpSocket">
-        <inject-code class="constructors">
+<!--        <inject-code class="constructors">
             proxyAuthenticationRequired.connect(this, "emitProxyAuthenticationRequiredPrivate(QNetworkProxy, QAuthenticator)", qt.core.Qt.ConnectionType.DirectConnection);
             AbstractSignal sig = (AbstractSignal) qt.GeneratorUtilities.fetchField(this, QAbstractSocket.class, "proxyAuthenticationRequiredPrivate");
             sig.connect(this, "emitProxyAuthenticationRequired(QNetworkProxy,QNativePointer)", qt.core.Qt.ConnectionType.DirectConnection);
-        </inject-code>
+        </inject-code> -->
     </object-type>
   <object-type name="QUdpSocket">
-        <inject-code>
+<!--        <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QUdpSocket___" quote-before-line="}// class"/>
         </inject-code>
         <inject-code class="constructors">
@@ -220,14 +247,14 @@
             <access modifier="private"/>
         </modify-function>
 
-        <modify-function signature="writeDatagram(QByteArray, QHostAddress, unsigned short)" access="private"/>
+        <modify-function signature="writeDatagram(QByteArray, QHostAddress, unsigned short)" access="private"/>-->
     </object-type>
 
   <object-type name="QHttpHeader">
     <modify-function signature="operator=(QHttpHeader)" remove="all"/>
   </object-type>
   <object-type name="QLocalServer">
-        <inject-code>
+<!--        <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QLocalServer___" quote-before-line="}// class"/>
         </inject-code>
         <modify-function signature="waitForNewConnection(int,bool*)">
@@ -239,15 +266,30 @@
                 <remove-default-expression/>
             </modify-argument>
         </modify-function>
+        -->
     </object-type>
-  <object-type name="QLocalSocket"/>
+  <object-type name="QLocalSocket">
+        <modify-function signature="error()const">
+            <rename to="error_"/>
+        </modify-function>
+  </object-type>
   <object-type name="QNetworkAccessManager">
     <modify-function signature="setCookieJar(QNetworkCookieJar*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
     </modify-function>
-  
+    <modify-function signature="setCache(QAbstractNetworkCache*)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++"/>
+        </modify-argument>
+    </modify-function>
+  <!--
         <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QNetworkAccessManager___" quote-before-line="}// class"/>
         </inject-code>
@@ -267,10 +309,14 @@
             authenticationRequired.connect(this, "emitAuthenticationRequiredPrivate(QNetworkReply, QAuthenticator)", qt.core.Qt.ConnectionType.DirectConnection);
             authenticationRequiredPrivate.connect(this, "emitAuthenticationRequired(QNetworkReply, QNativePointer)", qt.core.Qt.ConnectionType.DirectConnection);
         </inject-code>
+        -->
     </object-type>
   <object-type name="QNetworkCookieJar"/>
-  <object-type name="QNetworkReply"/>
-
+  <object-type name="QNetworkReply">
+        <modify-function signature="error()const">
+            <rename to="error_"/>
+        </modify-function>
+  </object-type>
   <value-type name="QHostAddress">
     <modify-function signature="QHostAddress(unsigned char*)" remove="all"/>
     <modify-function signature="setAddress(unsigned char*)" remove="all"/>
@@ -280,11 +326,11 @@
 
   <value-type name="QHostInfo">
         <modify-function signature="operator=(QHostInfo)" remove="all"/>
-        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
+<!--        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
   
         <inject-code class="java">
             <import-file name="typesystem_network-java.java" quote-after-line="class QHostInfo___" quote-before-line="}// class"/>
-        </inject-code>
+        </inject-code> -->
     </value-type>
 
   <value-type name="QHttpRequestHeader">
@@ -305,7 +351,7 @@
 
   <value-type name="QNetworkProxy">
     <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
-  
+  <!--
         <inject-code>
             <import-file name="typesystem_network-java.java" quote-after-line="class QNetworkProxy___" quote-before-line="}// class"/>
         </inject-code>
@@ -318,7 +364,7 @@
             </modify-argument>
         </modify-function>
         <modify-function signature="setPort(unsigned short)" access="private"/>
-        <modify-function signature="port()const" access="private" rename="port_private"/>
+        <modify-function signature="port()const" access="private" rename="port_private"/>-->
     </value-type>
 
   <value-type name="QUrlInfo">
@@ -360,16 +406,23 @@
     </value-type>
   <value-type name="QSslCertificate">
       <modify-function signature="operator=(QSslCertificate)" remove="all"/>
+      <modify-function signature="version()const">
+        <rename to="version_"/>
+      </modify-function>
     </value-type>
   <value-type name="QSslConfiguration">
       <modify-function signature="operator=(QSslConfiguration)" remove="all"/>
     </value-type>
 
   <object-type name="QSslSocket">
-      <inject-code>
+        <modify-function signature="sslErrors()const">
+            <rename to="error_"/>
+        </modify-function>
+<!--      <inject-code>
         <import-file name="typesystem_network-java.java" quote-after-line="class QSslSocket___" quote-before-line="}// class"/>
       </inject-code>
       <modify-function signature="connectToHostImplementation(QString, unsigned short, QFlags&lt;QIODevice::OpenModeFlag&gt;)" access="private"/>
+-->
     </object-type>
 
   <suppress-warning text="*unmatched parameter type 'sockaddr const*"/>