Update integer/long type names

6 files changed, 41 insertions, 41 deletions

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.