Update integer/long type names

16 files changed, 159 insertions, 159 deletions

diff --git a/configure.py b/configure.py
index efe0589..9384def 100644
--- a/configure.py
+++ b/configure.py
@@ -714,7 +714,7 @@ int main(int argc,char **argv)
 #endif
 
 #if defined(Q_OS_WIN64)
-    fprintf(fp,"-x TQt_Q_LONG_IS_long\\n");
+    fprintf(fp,"-x TQt_TQ_LONG_IS_long\\n");
 #endif
 """ % (name, name))
 
diff --git a/doc/PyQt.html b/doc/PyQt.html
index 418b3ca..607919d 100644
--- a/doc/PyQt.html
+++ b/doc/PyQt.html
@@ -3813,8 +3813,8 @@ NAME="AEN1273"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readBlock</CODE
->(char *data, Q_ULONG len);<P
+>TQ_LONG readBlock</CODE
+>(char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
@@ -3839,8 +3839,8 @@ NAME="AEN1284"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readLine</CODE
->(char *data, Q_ULONG maxlen);<P
+>TQ_LONG readLine</CODE
+>(char *data, TQ_ULONG maxlen);<P
 ></P
 ></DIV
 ><P
@@ -3895,8 +3895,8 @@ NAME="AEN1307"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG writeBlock</CODE
->(const char *data, Q_ULONG len);<P
+>TQ_LONG writeBlock</CODE
+>(const char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
@@ -5416,7 +5416,7 @@ NAME="AEN1947"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG toLong</CODE
+>TQ_LONG toLong</CODE
 >(bool *ok = 0);<P
 ></P
 ></DIV
@@ -5438,7 +5438,7 @@ NAME="AEN1955"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_ULONG toULong</CODE
+>TQ_ULONG toULong</CODE
 >(bool *ok = 0);<P
 ></P
 ></DIV
@@ -11069,8 +11069,8 @@ NAME="AEN4116"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readBlock</CODE
->(char *data, Q_ULONG maxlen);<P
+>TQ_LONG readBlock</CODE
+>(char *data, TQ_ULONG maxlen);<P
 ></P
 ></DIV
 ><P
@@ -11105,7 +11105,7 @@ NAME="AEN4129"
 ><CODE
 CLASS="FUNCDEF"
 >TQHostAddress</CODE
->(Q_UINT8 *ip6Addr);<P
+>(TQ_UINT8 *ip6Addr);<P
 ></P
 ></DIV
 ><P
@@ -11135,7 +11135,7 @@ NAME="AEN4141"
 ><CODE
 CLASS="FUNCDEF"
 >void setAddress</CODE
->(Q_UINT8 *ip6Addr);<P
+>(TQ_UINT8 *ip6Addr);<P
 ></P
 ></DIV
 ><P
@@ -11173,8 +11173,8 @@ NAME="AEN4155"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readBlock</CODE
->(char *data, Q_ULONG maxlen);<P
+>TQ_LONG readBlock</CODE
+>(char *data, TQ_ULONG maxlen);<P
 ></P
 ></DIV
 ><P
@@ -11278,8 +11278,8 @@ NAME="AEN4188"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readBlock</CODE
->(char *data, Q_ULONG len);<P
+>TQ_LONG readBlock</CODE
+>(char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
@@ -11304,8 +11304,8 @@ NAME="AEN4199"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readLine</CODE
->(char *data, Q_ULONG maxlen);<P
+>TQ_LONG readLine</CODE
+>(char *data, TQ_ULONG maxlen);<P
 ></P
 ></DIV
 ><P
@@ -11330,8 +11330,8 @@ NAME="AEN4210"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG writeBlock</CODE
->(const char *data, Q_ULONG len);<P
+>TQ_LONG writeBlock</CODE
+>(const char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
@@ -11361,8 +11361,8 @@ NAME="AEN4222"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG readBlock</CODE
->(char *data, Q_ULONG len);<P
+>TQ_LONG readBlock</CODE
+>(char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
@@ -11387,8 +11387,8 @@ NAME="AEN4233"
 ></A
 ><CODE
 CLASS="FUNCDEF"
->Q_LONG writeBlock</CODE
->(const char *data, Q_ULONG len);<P
+>TQ_LONG writeBlock</CODE
+>(const char *data, TQ_ULONG len);<P
 ></P
 ></DIV
 ><P
diff --git a/doc/PyQt.sgml b/doc/PyQt.sgml
index e8cd373..a5227d9 100644
--- a/doc/PyQt.sgml
+++ b/doc/PyQt.sgml
@@ -1995,9 +1995,9 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -2006,9 +2006,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readLine</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -2033,9 +2033,9 @@ Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
         <ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
@@ -2699,7 +2699,7 @@ This returns a tuple of the <Literal>uint</Literal> result and the
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>toLong</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>toLong</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -2708,7 +2708,7 @@ This returns a tuple of the <Literal>long</Literal> result and the
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>Q_ULONG <Function>toULong</Function></FuncDef>
+	<FuncDef>TQ_ULONG <Function>toULong</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -5084,9 +5084,9 @@ Not yet implemented.
 </Sect2>
 <Sect2><Title>TQFtp (TQt v2.2+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -5097,7 +5097,7 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 <Sect2><Title>TQHostAddress (TQt v2.2+)</Title>
 <FuncSynopsis>
 	<FuncDef><Function>TQHostAddress</Function></FuncDef>
-	<ParamDef>Q_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
+	<ParamDef>TQ_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
@@ -5113,7 +5113,7 @@ Not yet implemented.
 
 <FuncSynopsis>
 	<FuncDef>void <Function>setAddress</Function></FuncDef>
-	<ParamDef>Q_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
+	<ParamDef>TQ_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
@@ -5129,9 +5129,9 @@ Not yet implemented.
 </Sect2>
 <Sect2><Title>TQHttp (TQt v3+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -5169,9 +5169,9 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 </Sect2>
 <Sect2><Title>TQSocket (TQt v2.2+)</Title>
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
 	<ParamDef>char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -5180,9 +5180,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
  
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>readLine</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>readLine</Function></FuncDef>
 	<ParamDef>char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -5191,9 +5191,9 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 </Para>
  
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
 	<ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
@@ -5202,9 +5202,9 @@ as a parameter.
 </Sect2>
 <Sect2><Title>TQSocketDevice (TQt v2.2+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -5213,9 +5213,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
         <ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
diff --git a/sip/qt/qfile.sip b/sip/qt/qfile.sip
index 4bd3760..7f57ce6 100644
--- a/sip/qt/qfile.sip
+++ b/sip/qt/qfile.sip
@@ -32,9 +32,9 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -43,9 +43,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readLine</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readLine</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -70,9 +70,9 @@ Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
         <ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
@@ -177,7 +177,7 @@ public:
 	int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -185,7 +185,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipSelfWasArg ? sipCpp->TQFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0);
@@ -204,14 +204,14 @@ public:
 %End
 
 
-	Q_LONG writeBlock(const char * /Array/,
-			  Q_ULONG /ArraySize/) /ReleaseGIL/;
+	TQ_LONG writeBlock(const char * /Array/,
+			  TQ_ULONG /ArraySize/) /ReleaseGIL/;
 %End
 %If (TQt_2_00 - TQt_3_0_0)
 	int writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
+	TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 
 %If (- TQt_3_0_0)
@@ -249,7 +249,7 @@ public:
 %End
 %End
 %If (TQt_3_0_0 -)
-	SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -257,7 +257,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipSelfWasArg ? sipCpp->TQFile::readLine(buf,a0) : sipCpp->readLine(buf,a0);
@@ -287,7 +287,7 @@ public:
 	int readLine(TQString &,uint) /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	Q_LONG readLine(TQString &,Q_ULONG) /ReleaseGIL/;
+	TQ_LONG readLine(TQString &,TQ_ULONG) /ReleaseGIL/;
 %End
 
 	int getch();
diff --git a/sip/qt/qglobal.sip b/sip/qt/qglobal.sip
index c3205df..59c7017 100644
--- a/sip/qt/qglobal.sip
+++ b/sip/qt/qglobal.sip
@@ -36,20 +36,20 @@ typedef char *		pchar;
 typedef uchar *		puchar;
 typedef const char *	pcchar;
 
-typedef char		Q_INT8;
-typedef unsigned char	Q_UINT8;
-typedef short		Q_INT16;
-typedef unsigned short	Q_UINT16;
-typedef int		Q_INT32;
-typedef unsigned	Q_UINT32;
+typedef char		TQ_INT8;
+typedef unsigned char	TQ_UINT8;
+typedef short		TQ_INT16;
+typedef unsigned short	TQ_UINT16;
+typedef int		TQ_INT32;
+typedef unsigned	TQ_UINT32;
 
-%If (TQt_Q_LONG_IS_long)
-typedef long		Q_LONG;
-typedef unsigned long	Q_ULONG;
+%If (TQt_TQ_LONG_IS_long)
+typedef long		TQ_LONG;
+typedef unsigned long	TQ_ULONG;
 %End
-%If (!TQt_Q_LONG_IS_long)
-typedef long long	Q_LONG;
-typedef unsigned long long	Q_ULONG;
+%If (!TQt_TQ_LONG_IS_long)
+typedef long long	TQ_LONG;
+typedef unsigned long long	TQ_ULONG;
 %End
 
 const char *tqVersion();
diff --git a/sip/qt/qiodevice.sip b/sip/qt/qiodevice.sip
index f52e598..232cd94 100644
--- a/sip/qt/qiodevice.sip
+++ b/sip/qt/qiodevice.sip
@@ -85,7 +85,7 @@ class TQIODevice
 
 public:
 %If (TQt_3_0_0 -)
-	typedef Q_ULONG Offset;
+	typedef TQ_ULONG Offset;
 %End
 
 	TQIODevice();
@@ -188,7 +188,7 @@ public:
 %End
 %End
 %If (TQt_3_0_0 -)
-	virtual SIP_PYOBJECT readBlock(Q_ULONG) = 0 /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	virtual SIP_PYOBJECT readBlock(TQ_ULONG) = 0 /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -196,7 +196,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipCpp -> readBlock(buf,a0);
@@ -253,8 +253,8 @@ public:
 			       uint /ArraySize/) = 0 /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	virtual Q_LONG writeBlock(const char * /Array/,
-				  Q_ULONG /ArraySize/) = 0 /ReleaseGIL/;
+	virtual TQ_LONG writeBlock(const char * /Array/,
+				  TQ_ULONG /ArraySize/) = 0 /ReleaseGIL/;
 %End
 
 %If (- TQt_3_0_0)
@@ -318,7 +318,7 @@ public:
 %End
 %End
 %If (TQt_3_0_0 -)
-	virtual SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	virtual SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -326,7 +326,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipSelfWasArg ? sipCpp->TQIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0);
@@ -382,7 +382,7 @@ public:
 	int writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
+	TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 
 %If (TQt_2_00 - TQt_3_0_0)
diff --git a/sip/qt/qlocale.sip b/sip/qt/qlocale.sip
index 5a85274..99fce23 100644
--- a/sip/qt/qlocale.sip
+++ b/sip/qt/qlocale.sip
@@ -59,7 +59,7 @@ This returns a tuple of the <Literal>uint</Literal> result and the
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>toLong</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>toLong</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -68,7 +68,7 @@ This returns a tuple of the <Literal>long</Literal> result and the
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>Q_ULONG <Function>toULong</Function></FuncDef>
+	<FuncDef>TQ_ULONG <Function>toULong</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -519,8 +519,8 @@ public:
 	//TQString toString(ushort) const;
 	TQString toString(int /Constrained/) const;
 	//TQString toString(uint) const;
-	//TQString toString(Q_LONG) const;
-	//TQString toString(Q_ULONG) const;
+	//TQString toString(TQ_LONG) const;
+	//TQString toString(TQ_ULONG) const;
 	//TQString toString(Q_LLONG) const;
 	//TQString toString(Q_ULLONG) const;
 	//TQString toString(float,char = 'g',int = 6) const;
diff --git a/sip/qt/qwindowdefs.sip b/sip/qt/qwindowdefs.sip
index 1df6288..d694279 100644
--- a/sip/qt/qwindowdefs.sip
+++ b/sip/qt/qwindowdefs.sip
@@ -48,7 +48,7 @@ const int TQCOORD_MAX;
 %End
 
 %If (TQt_2_00 -)
-typedef Q_INT32 TQCOORD;
+typedef TQ_INT32 TQCOORD;
 
 const TQCOORD TQCOORD_MIN;
 const TQCOORD TQCOORD_MAX;
diff --git a/sip/qt/versions.sip b/sip/qt/versions.sip
index 0c7a589..f47b1e0 100644
--- a/sip/qt/versions.sip
+++ b/sip/qt/versions.sip
@@ -83,9 +83,9 @@
 %Feature	TQt_WIZARD
 %Feature	TQt_WORKSPACE
 
-// On Windows64 Q_LONG is defined as __int64 (which SIP doesn't handle) so
+// On Windows64 TQ_LONG is defined as __int64 (which SIP doesn't handle) so
 // this feature is disabled.
-%Feature	TQt_Q_LONG_IS_long
+%Feature	TQt_TQ_LONG_IS_long
 
 // SIP v4.7.3 and later support automatic generation of missing complementary
 // comparison operators.  This fixes a problem with v4.7.2.
diff --git a/sip/qtnetwork/qdns.sip b/sip/qtnetwork/qdns.sip
index 9ddf6f6..79d1d23 100644
--- a/sip/qtnetwork/qdns.sip
+++ b/sip/qtnetwork/qdns.sip
@@ -68,10 +68,10 @@ public:
 	class MailServer
 	{
 	public:
-		MailServer(const TQString & = TQString::null,Q_UINT16 = 0);
+		MailServer(const TQString & = TQString::null,TQ_UINT16 = 0);
 
 		TQString name;
-		Q_UINT16 priority;
+		TQ_UINT16 priority;
 	};
 
 	TQValueList<TQDns::MailServer> mailServers() const;
@@ -79,13 +79,13 @@ public:
 	class Server
 	{
 	public:
-		Server(const TQString & = TQString::null,Q_UINT16 = 0,
-		       Q_UINT16 = 0,Q_UINT16 = 0);
+		Server(const TQString & = TQString::null,TQ_UINT16 = 0,
+		       TQ_UINT16 = 0,TQ_UINT16 = 0);
 
 		TQString name;
-		Q_UINT16 priority;
-		Q_UINT16 weight;
-		Q_UINT16 port;
+		TQ_UINT16 priority;
+		TQ_UINT16 weight;
+		TQ_UINT16 port;
 	};
 
 	TQValueList<TQDns::Server> servers() const;
diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip
index 73dca92..14dc455 100644
--- a/sip/qtnetwork/qftp.sip
+++ b/sip/qtnetwork/qftp.sip
@@ -23,9 +23,9 @@
 %ExportedDoc
 <Sect2><Title>TQFtp (TQt v2.2+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -93,7 +93,7 @@ public:
 		RawCommand
 	};
 
-	int connectToHost(const TQString &,Q_UINT16 = 21) /ReleaseGIL/;
+	int connectToHost(const TQString &,TQ_UINT16 = 21) /ReleaseGIL/;
 	int login(const TQString & = TQString::null,
 		  const TQString & = TQString::null) /ReleaseGIL/;
 	int close() /ReleaseGIL/;
@@ -111,7 +111,7 @@ public:
 
 	unsigned long bytesAvailable() const;
 
-	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -119,7 +119,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipCpp -> TQFtp::readBlock(buf,a0);
diff --git a/sip/qtnetwork/qhostaddress.sip b/sip/qtnetwork/qhostaddress.sip
index 006acfb..0e825d6 100644
--- a/sip/qtnetwork/qhostaddress.sip
+++ b/sip/qtnetwork/qhostaddress.sip
@@ -24,7 +24,7 @@
 <Sect2><Title>TQHostAddress (TQt v2.2+)</Title>
 <FuncSynopsis>
 	<FuncDef><Function>TQHostAddress</Function></FuncDef>
-	<ParamDef>Q_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
+	<ParamDef>TQ_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
@@ -40,7 +40,7 @@ Not yet implemented.
 
 <FuncSynopsis>
 	<FuncDef>void <Function>setAddress</Function></FuncDef>
-	<ParamDef>Q_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
+	<ParamDef>TQ_UINT8 *<Parameter>ip6Addr</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
@@ -67,8 +67,8 @@ class TQHostAddress
 
 public:
 	TQHostAddress();
-	TQHostAddress(Q_UINT32);
-//	TQHostAddress(Q_UINT8 *);
+	TQHostAddress(TQ_UINT32);
+//	TQHostAddress(TQ_UINT8 *);
 %If (TQt_3_3_0 -)
 	//TQHostAddress(const Q_IPV6ADDR &);
 	// This isn't mentioned in the documentation.
@@ -76,15 +76,15 @@ public:
 %End
 	TQHostAddress(const TQHostAddress &);
 
-	void setAddress(Q_UINT32);
-//	void setAddress(Q_UINT8 *);
+	void setAddress(TQ_UINT32);
+//	void setAddress(TQ_UINT8 *);
 	bool setAddress(const TQString &);
 	bool isIp4Addr() const;
-	Q_UINT32 ip4Addr() const;
+	TQ_UINT32 ip4Addr() const;
 
 %If (TQt_3_3_0 -)
 	bool isIPv4Address() const;
-	Q_UINT32 toIPv4Address() const;
+	TQ_UINT32 toIPv4Address() const;
 	bool isIPv6Address() const;
 	//Q_IPV6ADDR toIPv6Address() const;
 %End
diff --git a/sip/qtnetwork/qhttp.sip b/sip/qtnetwork/qhttp.sip
index dfd9381..ba3a251 100644
--- a/sip/qtnetwork/qhttp.sip
+++ b/sip/qtnetwork/qhttp.sip
@@ -24,9 +24,9 @@
 %ExportedDoc
 <Sect2><Title>TQHttp (TQt v3+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -162,7 +162,7 @@ public:
 	TQHttp();
 %If (TQt_3_1_0 -)
 	TQHttp(TQObject * /TransferThis/,const char * = 0);
-	TQHttp(const TQString &,Q_UINT16 = 80,TQObject * /TransferThis/ = 0,
+	TQHttp(const TQString &,TQ_UINT16 = 80,TQObject * /TransferThis/ = 0,
 	      const char * = 0);
 	virtual ~TQHttp();
 %End
@@ -191,7 +191,7 @@ public:
 		Aborted
 	};
 
-	int setHost(const TQString &,Q_UINT16 = 80);
+	int setHost(const TQString &,TQ_UINT16 = 80);
 
 	int get(const TQString &,TQIODevice * = 0) /ReleaseGIL/;
 	int post(const TQString &,TQIODevice *,TQIODevice * = 0) /ReleaseGIL/;
@@ -207,7 +207,7 @@ public:
 
 	unsigned long bytesAvailable() const;
 
-	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -215,7 +215,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipCpp -> TQHttp::readBlock(buf,a0);
diff --git a/sip/qtnetwork/qserversocket.sip b/sip/qtnetwork/qserversocket.sip
index 9bf2101..403d424 100644
--- a/sip/qtnetwork/qserversocket.sip
+++ b/sip/qtnetwork/qserversocket.sip
@@ -39,22 +39,22 @@ class TQServerSocket : TQObject
 
 public:
 %If (- TQt_3_0_0)
-	TQServerSocket(Q_UINT16,int = 0,TQObject * /TransferThis/ = 0,
+	TQServerSocket(TQ_UINT16,int = 0,TQObject * /TransferThis/ = 0,
 		      const char * = 0);
-	TQServerSocket(const TQHostAddress &,Q_UINT16,int = 0,
+	TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 0,
 		      TQObject * /TransferThis/ = 0,const char * = 0);
 %End
 %If (TQt_3_0_0 -)
-	TQServerSocket(Q_UINT16,int = 1,TQObject * /TransferThis/ = 0,
+	TQServerSocket(TQ_UINT16,int = 1,TQObject * /TransferThis/ = 0,
 		      const char * = 0);
-	TQServerSocket(const TQHostAddress &,Q_UINT16,int = 1,
+	TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 1,
 		      TQObject * /TransferThis/ = 0,const char * = 0);
 %End
 	TQServerSocket(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	bool ok() const;
 
-	Q_UINT16 port() const;
+	TQ_UINT16 port() const;
 
 	int socket() const;
 	virtual void setSocket(int);
diff --git a/sip/qtnetwork/qsocket.sip b/sip/qtnetwork/qsocket.sip
index 24710c4..17dcd87 100644
--- a/sip/qtnetwork/qsocket.sip
+++ b/sip/qtnetwork/qsocket.sip
@@ -23,9 +23,9 @@
 %ExportedDoc
 <Sect2><Title>TQSocket (TQt v2.2+)</Title>
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
 	<ParamDef>char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -34,9 +34,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
  
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>readLine</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>readLine</Function></FuncDef>
 	<ParamDef>char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>maxlen</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>maxlen</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>maxlen</Literal> parameter.  The
@@ -45,9 +45,9 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 </Para>
  
 <FuncSynopsis>
-	<FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+	<FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
 	<ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-	<ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+	<ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
@@ -136,7 +136,7 @@ public:
 %End
 
 %If (TQt_DNS)
-	virtual void connectToHost(const TQString &,Q_UINT16) /ReleaseGIL/;
+	virtual void connectToHost(const TQString &,TQ_UINT16) /ReleaseGIL/;
 %End
 	TQString peerName() const;
 
@@ -156,10 +156,10 @@ public:
 	bool atEnd() const;
 
 %If (TQt_3_0_0 -)
-	Q_ULONG bytesAvailable() const;
-	Q_ULONG waitForMore(int) const /ReleaseGIL/;
-	//Q_ULONG waitForMore(int,bool *) const /ReleaseGIL/;
-	Q_ULONG bytesToWrite() const;
+	TQ_ULONG bytesAvailable() const;
+	TQ_ULONG waitForMore(int) const /ReleaseGIL/;
+	//TQ_ULONG waitForMore(int,bool *) const /ReleaseGIL/;
+	TQ_ULONG bytesToWrite() const;
 %End
 %If (- TQt_3_0_0)
 	int bytesAvailable() const;
@@ -240,7 +240,7 @@ public:
 %End
 %End
 %If (TQt_3_0_0 -)
-	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
  
@@ -248,7 +248,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
  
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipSelfWasArg ? sipCpp->TQSocket::readBlock(buf, a0) : sipCpp->readBlock(buf, a0);
@@ -273,10 +273,10 @@ public:
 		}
 %End
 
-	Q_LONG writeBlock(const char * /Array/,
-			  Q_ULONG /ArraySize/) /ReleaseGIL/;
+	TQ_LONG writeBlock(const char * /Array/,
+			  TQ_ULONG /ArraySize/) /ReleaseGIL/;
 
-	SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
  
@@ -284,7 +284,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
  
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipCpp -> readLine(buf,a0);
@@ -317,14 +317,14 @@ public:
 	bool canReadLine() const;
 	virtual TQString readLine() /ReleaseGIL/;
 
-	Q_UINT16 port() const;
-	Q_UINT16 peerPort() const;
+	TQ_UINT16 port() const;
+	TQ_UINT16 peerPort() const;
 	TQHostAddress address() const;
 	TQHostAddress peerAddress() const;
 
 %If (TQt_3_2_0 -)
-	void setReadBufferSize(Q_ULONG);
-	Q_ULONG readBufferSize() const;
+	void setReadBufferSize(TQ_ULONG);
+	TQ_ULONG readBufferSize() const;
 %End
 
 signals:
diff --git a/sip/qtnetwork/qsocketdevice.sip b/sip/qtnetwork/qsocketdevice.sip
index cd39996..c74b3f8 100644
--- a/sip/qtnetwork/qsocketdevice.sip
+++ b/sip/qtnetwork/qsocketdevice.sip
@@ -23,9 +23,9 @@
 %ExportedDoc
 <Sect2><Title>TQSocketDevice (TQt v2.2+)</Title>
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>readBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>readBlock</Function></FuncDef>
         <ParamDef>char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single <Literal>len</Literal> parameter.  The
@@ -34,9 +34,9 @@ This takes a single <Literal>len</Literal> parameter.  The
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>Q_LONG <Function>writeBlock</Function></FuncDef>
+        <FuncDef>TQ_LONG <Function>writeBlock</Function></FuncDef>
         <ParamDef>const char *<Parameter>data</Parameter></ParamDef>
-        <ParamDef>Q_ULONG <Parameter>len</Parameter></ParamDef>
+        <ParamDef>TQ_ULONG <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 <Literal>len</Literal> is derived from <Literal>data</Literal> and not passed
@@ -110,9 +110,9 @@ public:
 	int sendBufferSize() const;
 	virtual void setSendBufferSize(uint);
 
-	virtual bool connect(const TQHostAddress &,Q_UINT16);
+	virtual bool connect(const TQHostAddress &,TQ_UINT16);
 
-	virtual bool bind(const TQHostAddress &,Q_UINT16);
+	virtual bool bind(const TQHostAddress &,TQ_UINT16);
 	virtual bool listen(int);
 	virtual int accept();
 
@@ -121,8 +121,8 @@ public:
 	int waitForMore(int) const /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	Q_LONG bytesAvailable() const;
-	Q_LONG waitForMore(int) const /ReleaseGIL/;
+	TQ_LONG bytesAvailable() const;
+	TQ_LONG waitForMore(int) const /ReleaseGIL/;
 %End
 
 %If (- TQt_3_0_0)
@@ -154,10 +154,10 @@ public:
 
 	int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/;
 	virtual int writeBlock(const char * /Array/,uint /ArraySize/,
-			       const TQHostAddress &,Q_UINT16) /ReleaseGIL/;
+			       const TQHostAddress &,TQ_UINT16) /ReleaseGIL/;
 %End
 %If (TQt_3_0_0 -)
-	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
+	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
 
@@ -165,7 +165,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			Q_LONG actlen;
+			TQ_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
 			actlen = sipSelfWasArg ? sipCpp->TQSocketDevice::readBlock(buf, a0) : sipCpp->readBlock(buf, a0);
@@ -184,18 +184,18 @@ public:
 %End
 
 
-	Q_LONG writeBlock(const char * /Array/,
-			  Q_ULONG /ArraySize/) /ReleaseGIL/;
-	virtual Q_LONG writeBlock(const char * /Array/,Q_ULONG /ArraySize/,
-				  const TQHostAddress &,Q_UINT16) /ReleaseGIL/;
+	TQ_LONG writeBlock(const char * /Array/,
+			  TQ_ULONG /ArraySize/) /ReleaseGIL/;
+	virtual TQ_LONG writeBlock(const char * /Array/,TQ_ULONG /ArraySize/,
+				  const TQHostAddress &,TQ_UINT16) /ReleaseGIL/;
 %End
 
 	int getch();
 	int putch(int);
 	int ungetch(int);
 
-	Q_UINT16 port() const;
-	Q_UINT16 peerPort() const;
+	TQ_UINT16 port() const;
+	TQ_UINT16 peerPort() const;
 	TQHostAddress address() const;
 	TQHostAddress peerAddress() const;