Update various qt function definitions and static methods for tqt3

7 files changed, 47 insertions, 47 deletions

diff --git a/sip/qt/qbytearray.sip b/sip/qt/qbytearray.sip
index aa56baf..aedcd45 100644
--- a/sip/qt/qbytearray.sip
+++ b/sip/qt/qbytearray.sip
@@ -198,6 +198,6 @@ public:
 %If (TQt_3_1_0 -)
 TQByteArray qCompress(const uchar * /Array/,int /ArraySize/);
 TQByteArray qCompress(const TQByteArray &);
-TQByteArray qUncompress(const uchar * /Array/,int /ArraySize/);
-TQByteArray qUncompress(const TQByteArray &);
+TQByteArray tqUncompress(const uchar * /Array/,int /ArraySize/);
+TQByteArray tqUncompress(const TQByteArray &);
 %End
diff --git a/sip/qt/qevent.sip b/sip/qt/qevent.sip
index 46e899d..a0fc01d 100644
--- a/sip/qt/qevent.sip
+++ b/sip/qt/qevent.sip
@@ -462,7 +462,7 @@ public:
 		break;
 
 	case TQEvent::Accel:
-#if QT_VERSION >= 220
+#if TQT_VERSION >= 220
 	case TQEvent::AccelOverride:
 #endif
 	case TQEvent::KeyPress:
@@ -491,7 +491,7 @@ public:
 		sipClass = sipClass_TQCloseEvent;
 		break;
 
-#if QT_VERSION >= 0x030300
+#if TQT_VERSION >= 0x030300
 	case TQEvent::IconDrag:
 		sipClass = sipClass_TQIconDragEvent;
 		break;
@@ -532,7 +532,7 @@ public:
 		sipClass = sipClass_TQChildEvent;
 		break;
 
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 	case TQEvent::ContextMenu:
 		sipClass = sipClass_TQContextMenuEvent;
 		break;
@@ -543,7 +543,7 @@ public:
 		break;
 #endif
 
-#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100
+#if TQT_VERSION >= 0x030000 && TQT_VERSION < 0x030100
 	case TQEvent::IMCompose:
 		sipClass = sipClass_TQIMEvent;
 		break;
@@ -553,7 +553,7 @@ public:
 		break;
 #endif
 
-#if QT_VERSION >= 0x030100
+#if TQT_VERSION >= 0x030100
 	case TQEvent::IMCompose:
 		sipClass = sipClass_TQIMComposeEvent;
 		break;
diff --git a/sip/qt/qglobal.sip b/sip/qt/qglobal.sip
index a20090f..711e93c 100644
--- a/sip/qt/qglobal.sip
+++ b/sip/qt/qglobal.sip
@@ -25,8 +25,8 @@
 %End
 
 
-const int QT_VERSION;
-const char *QT_VERSION_STR;
+const int TQT_VERSION;
+const char *TQT_VERSION_STR;
 
 typedef unsigned char	uchar;
 typedef unsigned short	ushort;
diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip
index 78db056..be2e6c5 100644
--- a/sip/qt/qobject.sip
+++ b/sip/qt/qobject.sip
@@ -77,14 +77,14 @@ public:
 		int yes, no;
 	} graph[] = {
 		{sipName_TQWidget,	&sipClass_TQWidget,	25, 1},
-#if QT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT)
+#if TQT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT)
 		{sipName_TQAssistantClient,	&sipClass_TQAssistantClient,	-1, 2},
 #else
 		{NULL,				NULL,				-1, 2},
 #endif
 		{sipName_TQSessionManager,	&sipClass_TQSessionManager,	-1, 3},
 		{sipName_TQTranslator,	&sipClass_TQTranslator,	-1, 4},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQProcess,	&sipClass_TQProcess,	-1, 5},
 #else
 		{NULL,			NULL,			-1, 5},
@@ -95,42 +95,42 @@ public:
 #else
 		{NULL,				NULL,				-1, 7},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
 		{sipName_TQAction,	&sipClass_TQAction,	89, 8},
 #else
 		{NULL,			NULL,			-1, 8},
 #endif
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQObjectCleanupHandler,	&sipClass_TQObjectCleanupHandler,	-1, 9},
 #else
 		{NULL,				NULL,					-1, 9},
 #endif
 		{sipName_TQTimer,	&sipClass_TQTimer,	-1, 10},
 		{sipName_TQLayout,	&sipClass_TQLayout,	90, 11},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_TQUrlOperator,	&sipClass_TQUrlOperator,	-1, 12},
 #else
 		{NULL,			NULL,			-1, 12},
 #endif
 		{sipName_TQStyleSheet,	&sipClass_TQStyleSheet,	-1, 13},
 		{sipName_TQValidator,	&sipClass_TQValidator,	94, 14},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_TQNetworkOperation,	&sipClass_TQNetworkOperation,	-1, 15},
 #else
 		{NULL,				NULL,				-1, 15},
 #endif
 		{sipName_TQAccel,	&sipClass_TQAccel,	-1, 16},
-#if QT_VERSION >= 0x030100
+#if TQT_VERSION >= 0x030100
 		{sipName_TQEventLoop,	&sipClass_TQEventLoop,	-1, 17},
 #else
 		{NULL,			NULL,			-1, 17},
 #endif
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_TQNetworkProtocol,	&sipClass_TQNetworkProtocol,	-1, 18},
 #else
 		{NULL,				NULL,				-1, 18},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND)
 		{sipName_TQSound,	&sipClass_TQSound,	-1, 19},
 #else
 		{NULL,			NULL,			-1, 19},
@@ -152,25 +152,25 @@ public:
 		{NULL,			NULL,			-1, 27},
 #endif
 		{sipName_TQTabWidget,	&sipClass_TQTabWidget,	-1, 28},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQDateEdit,	&sipClass_TQDateEdit,	-1, 29},
 #else
 		{NULL,			NULL,			-1, 29},
 #endif
 		{sipName_TQMainWindow,	&sipClass_TQMainWindow,	-1, 30},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQDateTimeEdit,	&sipClass_TQDateTimeEdit,	-1, 31},
 #else
 		{NULL,			NULL,			-1, 31},
 #endif
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQTimeEdit,	&sipClass_TQTimeEdit,	-1, 32},
 #else
 		{NULL,			NULL,			-1, 32},
 #endif
 		{sipName_TQFrame,	&sipClass_TQFrame,	46, 33},
 		{sipName_TQScrollBar,	&sipClass_TQScrollBar,	-1, 34},
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL)
 		{sipName_TQDial,		&sipClass_TQDial,	-1, 35},
 #else
 		{NULL,			NULL,			-1, 35},
@@ -180,37 +180,37 @@ public:
 		{sipName_TQDialog,	&sipClass_TQDialog,	79, 38},
 		{sipName_TQComboBox,	&sipClass_TQComboBox,	-1, 39},
 		{sipName_TQHeader,	&sipClass_TQHeader,	-1, 40},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQDockArea,	&sipClass_TQDockArea,	-1, 41},
 #else
 		{NULL,			NULL,			-1, 41},
 #endif
-#if QT_VERSION >= 0x030200
+#if TQT_VERSION >= 0x030200
 		{sipName_TQSplashScreen,	&sipClass_TQSplashScreen,	-1, 42},
 #else
 		{NULL,			NULL,				-1, 42},
 #endif
 		{sipName_TQSlider,	&sipClass_TQSlider,	-1, 43},
 		{sipName_TQSpinBox,	&sipClass_TQSpinBox,	-1, 44},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE)
 		{sipName_TQWorkspace,	&sipClass_TQWorkspace,	-1, 45},
 #else
 		{NULL,			NULL,			-1, 45},
 #endif
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQDesktopWidget,	&sipClass_TQDesktopWidget,	-1, -1},
 #else
 		{NULL,				NULL,				-1, -1},
 #endif
 		{sipName_TQGrid,	&sipClass_TQGrid,	-1, 47},
 		{sipName_TQLineEdit,	&sipClass_TQLineEdit,	-1, 48},
-#if QT_VERSION >= 0x030200
+#if TQT_VERSION >= 0x030200
 		{sipName_TQToolBox,	&sipClass_TQToolBox,	-1, 49},
 #else
 		{NULL,			NULL,			-1, 49},
 #endif
 		{sipName_TQWidgetStack,	&sipClass_TQWidgetStack,	-1, 50},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQDockWindow,	&sipClass_TQDockWindow,	60, 51},
 #else
 		{NULL,			NULL,			-1, 51},
@@ -234,19 +234,19 @@ public:
 		{sipName_TQVGroupBox,	&sipClass_TQVGroupBox,	-1, -1},
 		{sipName_TQVButtonGroup,	&sipClass_TQVButtonGroup,	-1, 65},
 		{sipName_TQHButtonGroup,	&sipClass_TQHButtonGroup,	-1, -1},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW)
 		{sipName_TQIconView,	&sipClass_TQIconView,	-1, 67},
 #else
 		{NULL,			NULL,			-1, 67},
 #endif
 		{sipName_TQListView,	&sipClass_TQListView,	-1, 68},
 		{sipName_TQListBox,	&sipClass_TQListBox,	-1, 69},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQGridView,	&sipClass_TQGridView,	-1, 70},
 #else
 		{NULL,			NULL,			-1, 70},
 #endif
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQTextEdit,	&sipClass_TQTextEdit,	71, -1},
 #else
 		{NULL,			NULL,			-1, -1},
@@ -264,12 +264,12 @@ public:
 #else
 		{NULL,			NULL,			-1, 80},
 #endif
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQErrorMessage,	&sipClass_TQErrorMessage,	-1, 81},
 #else
 		{NULL,			NULL,				-1, 81},
 #endif
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG)
 		{sipName_TQInputDialog,	&sipClass_TQInputDialog,	-1, 82},
 #else
 		{NULL,			NULL,			-1, 82},
@@ -309,7 +309,7 @@ public:
 #else
 		{NULL,			NULL,			-1, -1},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
 		{sipName_TQActionGroup,	&sipClass_TQActionGroup,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
@@ -320,20 +320,20 @@ public:
 		{sipName_TQVBoxLayout,	&sipClass_TQVBoxLayout,	-1, -1},
 		{sipName_TQDoubleValidator,	&sipClass_TQDoubleValidator,	-1, 95},
 		{sipName_TQIntValidator,	&sipClass_TQIntValidator,	-1, 96},
-#if QT_VERSION >= 0x030000
+#if TQT_VERSION >= 0x030000
 		{sipName_TQRegExpValidator,	&sipClass_TQRegExpValidator,	-1, -1},
 #else
 		{NULL,				NULL,				-1, -1},
 #endif
 		{sipName_TQTextDrag,	&sipClass_TQTextDrag,	-1, 98},
 		{sipName_TQStoredDrag,	&sipClass_TQStoredDrag,	101, 99},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP)
+#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP)
 		{sipName_TQIconDrag,	&sipClass_TQIconDrag,	-1, 100},
 #else
 		{NULL,			NULL,			-1, 100},
 #endif
 		{sipName_TQImageDrag,	&sipClass_TQImageDrag,	-1, -1},
-#if QT_VERSION >= 210
+#if TQT_VERSION >= 210
 		{sipName_TQColorDrag,	&sipClass_TQColorDrag,	-1, 102},
 #else
 		{NULL,			NULL,			-1, 102},
@@ -360,12 +360,12 @@ public:
 #else
 		{NULL,			NULL,			-1, 108},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS)
 		{sipName_TQMotifPlusStyle,	&sipClass_TQMotifPlusStyle,	-1, 109},
 #else
 		{NULL,				NULL,				-1, 109},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI)
+#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI)
 		{sipName_TQSGIStyle,	&sipClass_TQSGIStyle,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
@@ -1421,7 +1421,7 @@ static PyObject *py_sender = 0;
 
 TQMetaObject *UniversalSlot::metaObj = 0;
 
-#if QT_VERSION >= 0x030100
+#if TQT_VERSION >= 0x030100
 static TQMetaObjectCleanUp cleanUp_UniversalSlot("UniversalSlot", &UniversalSlot::staticMetaObject);
 #else
 static TQMetaObjectCleanUp cleanUp_UniversalSlot;
diff --git a/sip/qt/qstring.sip b/sip/qt/qstring.sip
index 20b68de..93c47cc 100644
--- a/sip/qt/qstring.sip
+++ b/sip/qt/qstring.sip
@@ -957,7 +957,7 @@ static TQString *PyUnicodeStringToTQString(PyObject *py)
 			const char *asc = sipCpp->ascii();
 
 			*sipPtrPtr = (void *)asc;
-			sipRes = qstrlen(asc);
+			sipRes = tqstrlen(asc);
 		}
 	}
 %End
diff --git a/sip/qt/qtmod.sip b/sip/qt/qtmod.sip
index d727a78..5085eb8 100644
--- a/sip/qt/qtmod.sip
+++ b/sip/qt/qtmod.sip
@@ -28,12 +28,12 @@
 %Include copying.sip
 
 
-unsigned PYQT_VERSION;
-const char *PYQT_VERSION_STR;
+unsigned PYTQT_VERSION;
+const char *PYTQT_VERSION_STR;
 
 %ModuleCode
-static unsigned PYQT_VERSION = 0x031201;
-static const char *PYQT_VERSION_STR = "3.18.1";
+static unsigned PYTQT_VERSION = 0x031201;
+static const char *PYTQT_VERSION_STR = "3.18.1";
 %End
 
 
diff --git a/sip/qt/qwindowdefs.sip b/sip/qt/qwindowdefs.sip
index 8e7da10..1df6288 100644
--- a/sip/qt/qwindowdefs.sip
+++ b/sip/qt/qwindowdefs.sip
@@ -58,10 +58,10 @@ const TQCOORD TQCOORD_MAX;
 typedef unsigned TQRgb;
 
 %If (- TQt_3_0_0)
-char *qAppName();
+char *tqAppName();
 %End
 %If (TQt_3_0_0 -)
-const char *qAppName();
+const char *tqAppName();
 %End