Update for recent TQ changes.

2 files changed, 66 insertions, 66 deletions

diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml
index d4f15ae1..e2e84dad 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -1127,20 +1127,20 @@ id="0">
   <qmethod name="at" access="public" return="bool" id="1">
     <qparam type="Offset" name="arg1"/>
   </qmethod>
-  <qmethod name="readBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="readBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="p"/>
-    <qparam type="Q_ULONG" name="arg1"/>
+    <qparam type="TQ_ULONG" name="arg1"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="p"/>
-    <qparam type="Q_ULONG" name="arg1"/>
+    <qparam type="TQ_ULONG" name="arg1"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="1">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1">
     <qparam type="TQByteArrayamp" name="data"/>
   </qmethod>
-  <qmethod name="readLine" access="public" return="Q_LONG" id="0">
+  <qmethod name="readLine" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="p"/>
-    <qparam type="Q_ULONG" name="arg1"/>
+    <qparam type="TQ_ULONG" name="arg1"/>
   </qmethod>
   <qmethod name="getch" access="public" return="int" id="0"/>
   <qmethod name="putch" access="public" return="int" id="0">
@@ -4238,14 +4238,14 @@ id="0">
 </qtype> <qtype name="MailServer" access="public">
   <qctor name="MailServer" access="public" id="0">
     <qparam type="TQStringamp" name="n" default="TQString::null"/>
-    <qparam type="Q_UINT16" name="p" default="0"/>
+    <qparam type="TQ_UINT16" name="p" default="0"/>
   </qctor>
 </qtype> <qtype name="Server" access="public">
   <qctor name="Server" access="public" id="0">
     <qparam type="TQStringamp" name="n" default="TQString::null"/>
-    <qparam type="Q_UINT16" name="p" default="0"/>
-    <qparam type="Q_UINT16" name="w" default="0"/>
-    <qparam type="Q_UINT16" name="po" default="0"/>
+    <qparam type="TQ_UINT16" name="p" default="0"/>
+    <qparam type="TQ_UINT16" name="w" default="0"/>
+    <qparam type="TQ_UINT16" name="po" default="0"/>
   </qctor>
 </qtype> <qtype name="TQDockArea" access="public">
   <qancestor name="TQWidget"/>
@@ -5255,24 +5255,24 @@ id="0"/>
     <qparam type="Offset" name="arg1"/>
   </qmethod>
   <qmethod name="atEnd" access="public" return="bool" id="0"/>
-  <qmethod name="readBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="readBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="1">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1">
     <qparam type="TQByteArrayamp" name="data"/>
   </qmethod>
-  <qmethod name="readLine" access="public" return="Q_LONG" id="0">
+  <qmethod name="readLine" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
-  <qmethod name="readLine" access="public" return="Q_LONG" id="1">
+  <qmethod name="readLine" access="public" return="TQ_LONG" id="1">
     <qparam type="TQStringamp" name="arg1"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
   <qmethod name="getch" access="public" return="int" id="0"/>
   <qmethod name="putch" access="public" return="int" id="0">
@@ -7450,26 +7450,26 @@ id="0">
 </qtype> <qtype name="TQHostAddress" access="public">
   <qctor name="TQHostAddress" access="public" id="0"/>
   <qctor name="TQHostAddress" access="public" id="1">
-    <qparam type="Q_UINT32" name="ip4Addr"/>
+    <qparam type="TQ_UINT32" name="ip4Addr"/>
   </qctor>
   <qctor name="TQHostAddress" access="public" id="2">
-    <qparam type="Q_UINT8*" name="ip6Addr"/>
+    <qparam type="TQ_UINT8*" name="ip6Addr"/>
   </qctor>
   <qctor name="TQHostAddress" access="public" id="3">
     <qparam type="TQHostAddressamp" name="arg1"/>
   </qctor>
   <qdctor name="TQHostAddress" access="public"/>
   <qmethod name="setAddress" access="public" return="void" id="0">
-    <qparam type="Q_UINT32" name="ip4Addr"/>
+    <qparam type="TQ_UINT32" name="ip4Addr"/>
   </qmethod>
   <qmethod name="setAddress" access="public" return="void" id="1">
-    <qparam type="Q_UINT8*" name="ip6Addr"/>
+    <qparam type="TQ_UINT8*" name="ip6Addr"/>
   </qmethod>
   <qmethod name="setAddress" access="public" return="bool" id="2">
     <qparam type="TQStringamp" name="address"/>
   </qmethod>
   <qmethod name="isIp4Addr" access="public" return="bool" id="0"/>
-  <qmethod name="ip4Addr" access="public" return="Q_UINT32" id="0"/>
+  <qmethod name="ip4Addr" access="public" return="TQ_UINT32" id="0"/>
   <qmethod name="toString" access="public" return="TQString" id="0"/>
 </qtype> <qtype name="TQHttp" access="public">
   <qancestor name="TQNetworkProtocol"/>
@@ -7526,19 +7526,19 @@ id="0">
   </qmethod>
   <qmethod name="atEnd" access="public" return="bool" id="0"/>
   <qmethod name="reset" access="public" return="bool" id="0"/>
-  <qmethod name="readBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="readBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
   </qmethod>
-  <qmethod name="readLine" access="public" return="Q_LONG" id="0">
+  <qmethod name="readLine" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="1">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1">
     <qparam type="TQByteArrayamp" name="data"/>
   </qmethod>
   <qmethod name="readAll" access="public" return="TQByteArray" id="0"/>
@@ -15206,7 +15206,7 @@ id="0">
   <qancestor name="TQObject"/>
   <qdctor name="TQServerSocket" access="public"/>
   <qmethod name="ok" access="public" return="bool" id="0"/>
-  <qmethod name="port" access="public" return="Q_UINT16" id="0"/>
+  <qmethod name="port" access="public" return="TQ_UINT16" id="0"/>
   <qmethod name="socket" access="public" return="int" id="0"/>
   <qmethod name="setSocket" access="public" return="void" id="0">
     <qparam type="int" name="socket"/>
@@ -15701,7 +15701,7 @@ id="0">
   </qmethod>
   <qmethod name="connectToHost" access="public" return="void" id="0">
     <qparam type="TQStringamp" name="host"/>
-    <qparam type="Q_UINT16" name="port"/>
+    <qparam type="TQ_UINT16" name="port"/>
   </qmethod>
   <qmethod name="peerName" access="public" return="TQString" id="0"/>
   <qmethod name="open" access="public" return="bool" id="0">
@@ -15715,22 +15715,22 @@ id="0">
     <qparam type="Offset" name="arg1"/>
   </qmethod>
   <qmethod name="atEnd" access="public" return="bool" id="0"/>
-  <qmethod name="bytesAvailable" access="public" return="Q_ULONG" id="0"/>
-  <qmethod name="waitForMore" access="public" return="Q_ULONG" id="0">
+  <qmethod name="bytesAvailable" access="public" return="TQ_ULONG" id="0"/>
+  <qmethod name="waitForMore" access="public" return="TQ_ULONG" id="0">
     <qparam type="int" name="msecs"/>
   </qmethod>
-  <qmethod name="bytesToWrite" access="public" return="Q_ULONG" id="0"/>
-  <qmethod name="readBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="bytesToWrite" access="public" return="TQ_ULONG" id="0"/>
+  <qmethod name="readBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
   </qmethod>
-  <qmethod name="readLine" access="public" return="Q_LONG" id="0">
+  <qmethod name="readLine" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
   <qmethod name="getch" access="public" return="int" id="0"/>
   <qmethod name="putch" access="public" return="int" id="0">
@@ -15741,8 +15741,8 @@ id="0">
   </qmethod>
   <qmethod name="canReadLine" access="public" return="bool" id="0"/>
   <qmethod name="readLine" access="public" return="TQString" id="1"/>
-  <qmethod name="port" access="public" return="Q_UINT16" id="0"/>
-  <qmethod name="peerPort" access="public" return="Q_UINT16" id="0"/>
+  <qmethod name="port" access="public" return="TQ_UINT16" id="0"/>
+  <qmethod name="peerPort" access="public" return="TQ_UINT16" id="0"/>
   <qmethod name="address" access="public" return="TQHostAddress" id="0"/>
   <qmethod name="peerAddress" access="public" return="TQHostAddress" id="0"/>
   <qmethod name="protected_sn_read" access="protected" return="void" id="0">
@@ -15811,34 +15811,34 @@ id="0">
   </qmethod>
   <qmethod name="connect" access="public" return="bool" id="0">
     <qparam type="TQHostAddressamp" name="arg1"/>
-    <qparam type="Q_UINT16" name="arg2"/>
+    <qparam type="TQ_UINT16" name="arg2"/>
   </qmethod>
   <qmethod name="bind" access="public" return="bool" id="0">
     <qparam type="TQHostAddressamp" name="arg1"/>
-    <qparam type="Q_UINT16" name="arg2"/>
+    <qparam type="TQ_UINT16" name="arg2"/>
   </qmethod>
   <qmethod name="listen" access="public" return="bool" id="0">
     <qparam type="int" name="backlog"/>
   </qmethod>
   <qmethod name="accept" access="public" return="int" id="0"/>
-  <qmethod name="bytesAvailable" access="public" return="Q_LONG" id="0"/>
-  <qmethod name="waitForMore" access="public" return="Q_LONG" id="0">
+  <qmethod name="bytesAvailable" access="public" return="TQ_LONG" id="0"/>
+  <qmethod name="waitForMore" access="public" return="TQ_LONG" id="0">
     <qparam type="int" name="msecs"/>
     <qparam type="bool*" name="timeout" default="0"/>
   </qmethod>
-  <qmethod name="readBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="readBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="maxlen"/>
+    <qparam type="TQ_ULONG" name="maxlen"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="0">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
   </qmethod>
-  <qmethod name="writeBlock" access="public" return="Q_LONG" id="1">
+  <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1">
     <qparam type="char*" name="data"/>
-    <qparam type="Q_ULONG" name="len"/>
+    <qparam type="TQ_ULONG" name="len"/>
     <qparam type="TQHostAddressamp" name="host"/>
-    <qparam type="Q_UINT16" name="port"/>
+    <qparam type="TQ_UINT16" name="port"/>
   </qmethod>
   <qmethod name="getch" access="public" return="int" id="0"/>
   <qmethod name="putch" access="public" return="int" id="0">
@@ -15847,8 +15847,8 @@ id="0">
   <qmethod name="ungetch" access="public" return="int" id="0">
     <qparam type="int" name="arg1"/>
   </qmethod>
-  <qmethod name="port" access="public" return="Q_UINT16" id="0"/>
-  <qmethod name="peerPort" access="public" return="Q_UINT16" id="0"/>
+  <qmethod name="port" access="public" return="TQ_UINT16" id="0"/>
+  <qmethod name="peerPort" access="public" return="TQ_UINT16" id="0"/>
   <qmethod name="address" access="public" return="TQHostAddress" id="0"/>
   <qmethod name="peerAddress" access="public" return="TQHostAddress" id="0"/>
   <qmethod name="error" access="public" return="Error" id="0"/>
diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs
index e0e65f10..8318cca4 100644
--- a/qtsharp/src/generator/TQTypeMap.cs
+++ b/qtsharp/src/generator/TQTypeMap.cs
@@ -78,15 +78,15 @@ namespace QtCSharp {
 			mastermap.Add ("array_data", "IntPtr");
 			mastermap.Add ("bitarr_data", "IntPtr");
 			mastermap.Add ("Offset", "int");
-			mastermap.Add ("Q_INT16", "short");
-			mastermap.Add ("Q_INT32", "int");
-			mastermap.Add ("Q_INT8", "char");
-			mastermap.Add ("Q_LONG", "long");
+			mastermap.Add ("TQ_INT16", "short");
+			mastermap.Add ("TQ_INT32", "int");
+			mastermap.Add ("TQ_INT8", "char");
+			mastermap.Add ("TQ_LONG", "long");
 			mastermap.Add ("TQ_PACKED", "uint");
-			mastermap.Add ("Q_UINT16", "ushort");
-			mastermap.Add ("Q_UINT32", "uint");
-			mastermap.Add ("Q_UINT8", "char");
-			mastermap.Add ("Q_ULONG", "long");
+			mastermap.Add ("TQ_UINT16", "ushort");
+			mastermap.Add ("TQ_UINT32", "uint");
+			mastermap.Add ("TQ_UINT8", "char");
+			mastermap.Add ("TQ_ULONG", "long");
 			mastermap.Add ("TQStyleHintReturn", "IntPtr");
 			mastermap.Add ("TQFileInfoList", "IntPtr");
 			mastermap.Add ("TQDomNodePrivate", "IntPtr");