--- a/generator/typesystem_network-common.xml	Sat May 16 21:34:54 2009 +0000
+++ b/generator/typesystem_network-common.xml	Sun May 17 01:44:06 2009 +0000
@@ -3,7 +3,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" />
@@ -35,6 +37,29 @@
   <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" />
   <object-type name="QFtp" />
 
@@ -56,6 +81,16 @@
             <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>
   </object-type>
   <object-type name="QNetworkCookieJar" />
   <object-type name="QNetworkReply" />