Initial TQt conversion

181 files changed, 10180 insertions, 10180 deletions

diff --git a/sip/qt/copying.sip b/sip/qt/copying.sip
index 463904b..6da646e 100644
--- a/sip/qt/copying.sip
+++ b/sip/qt/copying.sip
@@ -1,22 +1,22 @@
-// This is the SIP file defining the PyQt license.
+// This is the SIP file defining the PyTQt license.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -24,20 +24,20 @@
 Copyright (c) 2007
 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 
-This file is part of PyQt.
+This file is part of PyTQt.
 
-This copy of PyQt is free software; you can redistribute it and/or modify it
+This copy of PyTQt is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 
-PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 details.
 
 You should have received a copy of the GNU General Public License along with
-PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 %End
 
diff --git a/sip/qt/qaccel.sip b/sip/qt/qaccel.sip
index 9c547ef..1dbf06c 100644
--- a/sip/qt/qaccel.sip
+++ b/sip/qt/qaccel.sip
@@ -1,44 +1,44 @@
-// This is the SIP interface definition for QAccel.
+// This is the SIP interface definition for TQAccel.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QAccel</Title>
+<Sect2><Title>TQAccel</Title>
 <Para>
-<Literal>QAccel</Literal> is fully implemented.
+<Literal>TQAccel</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QAccel : QObject
+class TQAccel : TQObject
 {
 %TypeHeaderCode
 #include <qaccel.h>
 %End
 
 public:
-	QAccel(QWidget * /TransferThis/,char * = 0);
-%If (Qt_2_1_0 -)
-	QAccel(QWidget *,QObject * /TransferThis/,char * = 0);
+	TQAccel(TQWidget * /TransferThis/,char * = 0);
+%If (TQt_2_1_0 -)
+	TQAccel(TQWidget *,TQObject * /TransferThis/,char * = 0);
 %End
 
 	bool isEnabled();
@@ -46,22 +46,22 @@ public:
 
 	uint count();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int insertItem(int,int = -1);
 %End
-%If (Qt_3_0_0 -)
-	int insertItem(const QKeySequence &,int = -1);
+%If (TQt_3_0_0 -)
+	int insertItem(const TQKeySequence &,int = -1);
 %End
 	void removeItem(int);
 	void clear();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int key(int);
 	int findKey(int) const;
 %End
-%If (Qt_3_0_0 -)
-	QKeySequence key(int);
-	int findKey(const QKeySequence &) const;
+%If (TQt_3_0_0 -)
+	TQKeySequence key(int);
+	int findKey(const TQKeySequence &) const;
 %End
 
 	bool isItemEnabled(int) const;
@@ -72,33 +72,33 @@ public:
 
 	void repairEventFilter();
 
-%If (Qt_2_00 -)
-	void setWhatsThis(int,const QString &);
-	QString whatsThis(int) const;
+%If (TQt_2_00 -)
+	void setWhatsThis(int,const TQString &);
+	TQString whatsThis(int) const;
 	void setIgnoreWhatsThis(bool);
 	bool ignoreWhatsThis() const;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	static int shortcutKey(const QString &);
-	static QString keyToString(int);
-	static int stringToKey(const QString &);
+%If (TQt_2_00 - TQt_3_0_0)
+	static int shortcutKey(const TQString &);
+	static TQString keyToString(int);
+	static int stringToKey(const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	static QKeySequence shortcutKey(const QString &);
-	static QString keyToString(QKeySequence);
-	static QKeySequence stringToKey(const QString &);
+%If (TQt_3_0_0 -)
+	static TQKeySequence shortcutKey(const TQString &);
+	static TQString keyToString(TQKeySequence);
+	static TQKeySequence stringToKey(const TQString &);
 %End
 
 signals:
 	void activated(int);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void activatedAmbiguously(int);
 %End
 
 protected:
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 private:
-	QAccel(const QAccel &);
+	TQAccel(const TQAccel &);
 };
diff --git a/sip/qt/qaction.sip b/sip/qt/qaction.sip
index e1f5c70..a8815fd 100644
--- a/sip/qt/qaction.sip
+++ b/sip/qt/qaction.sip
@@ -1,132 +1,132 @@
-// This is the SIP interface definition for QAction and QActionGroup.
+// This is the SIP interface definition for TQAction and TQActionGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QAction (Qt v2.2+)</Title>
+<Sect2><Title>TQAction (TQt v2.2+)</Title>
 <Para>
-<Literal>QAction</Literal> is fully implemented.
+<Literal>TQAction</Literal> is fully implemented.
 </Para>
 
 </Sect2>
-<Sect2><Title>QActionGroup (Qt v2.2+)</Title>
+<Sect2><Title>TQActionGroup (TQt v2.2+)</Title>
 <Para>
-<Literal>QActionGroup</Literal> is fully implemented.
+<Literal>TQActionGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_ACTION)
-%If (Qt_2_2_0 -)
+%If (TQt_ACTION)
+%If (TQt_2_2_0 -)
 
-class QAction : QObject
+class TQAction : TQObject
 {
 %TypeHeaderCode
 #include <qaction.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QAction(QObject * /TransferThis/ = 0,const char * = 0,bool = 0);
-	QAction(const QString &,const QIconSet &,const QString &,int,
-		QObject * /TransferThis/,const char * = 0,bool = 0);
-	QAction(const QString &,const QString &,int,QObject * /TransferThis/,
+%If (- TQt_3_0_0)
+	TQAction(TQObject * /TransferThis/ = 0,const char * = 0,bool = 0);
+	TQAction(const TQString &,const TQIconSet &,const TQString &,int,
+		TQObject * /TransferThis/,const char * = 0,bool = 0);
+	TQAction(const TQString &,const TQString &,int,TQObject * /TransferThis/,
 		const char * = 0,bool = 0);
 %End
-%If (Qt_3_0_0 - Qt_3_2_0)
-	QAction(QObject * /TransferThis/,const char * = 0,bool = 0);
+%If (TQt_3_0_0 - TQt_3_2_0)
+	TQAction(TQObject * /TransferThis/,const char * = 0,bool = 0);
 %End
-%If (Qt_3_2_0 -)
-	QAction(QObject * /TransferThis/,const char * = 0);
-	QAction(const QString &,QKeySequence,QObject * /TransferThis/,
+%If (TQt_3_2_0 -)
+	TQAction(TQObject * /TransferThis/,const char * = 0);
+	TQAction(const TQString &,TQKeySequence,TQObject * /TransferThis/,
 		const char * = 0);
-	QAction(const QIconSet &,const QString &,QKeySequence,
-		QObject * /TransferThis/,const char * = 0);
+	TQAction(const TQIconSet &,const TQString &,TQKeySequence,
+		TQObject * /TransferThis/,const char * = 0);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	// Obsolete.
-	QAction(const QString &,const QIconSet &,const QString &,QKeySequence,
-		QObject * /TransferThis/,const char * = 0,bool = 0);
+	TQAction(const TQString &,const TQIconSet &,const TQString &,TQKeySequence,
+		TQObject * /TransferThis/,const char * = 0,bool = 0);
 	// Obsolete.
-	QAction(const QString &,const QString &,QKeySequence,
-		QObject * /TransferThis/,const char * = 0,bool = 0);
+	TQAction(const TQString &,const TQString &,TQKeySequence,
+		TQObject * /TransferThis/,const char * = 0,bool = 0);
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	// Obsolete.
-	QAction(QObject * /TransferThis/,const char *,bool);
-%End
-
-	virtual void setIconSet(const QIconSet &);
-	QIconSet iconSet() const;
-	virtual void setText(const QString &);
-	QString text() const;
-	virtual void setMenuText(const QString &);
-	QString menuText() const;
-	virtual void setToolTip(const QString &);
-	QString toolTip() const;
-	virtual void setStatusTip(const QString &);
-	QString statusTip() const;
-	virtual void setWhatsThis(const QString &);
-	QString whatsThis() const;
-%If (- Qt_3_0_0)
+	TQAction(TQObject * /TransferThis/,const char *,bool);
+%End
+
+	virtual void setIconSet(const TQIconSet &);
+	TQIconSet iconSet() const;
+	virtual void setText(const TQString &);
+	TQString text() const;
+	virtual void setMenuText(const TQString &);
+	TQString menuText() const;
+	virtual void setToolTip(const TQString &);
+	TQString toolTip() const;
+	virtual void setStatusTip(const TQString &);
+	TQString statusTip() const;
+	virtual void setWhatsThis(const TQString &);
+	TQString whatsThis() const;
+%If (- TQt_3_0_0)
 	virtual void setAccel(int);
 	int accel() const;
 %End
-%If (Qt_3_0_0 -)
-	virtual void setAccel(const QKeySequence &);
-	QKeySequence accel() const;
+%If (TQt_3_0_0 -)
+	virtual void setAccel(const TQKeySequence &);
+	TQKeySequence accel() const;
 %End
 	virtual void setToggleAction(bool);
 	bool isToggleAction() const;
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void setOn(bool);
 %End
 	bool isOn() const;
 	bool isEnabled() const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isVisible() const;
 %End
-	virtual bool addTo(QWidget *);
-	virtual bool removeFrom(QWidget *);
+	virtual bool addTo(TQWidget *);
+	virtual bool removeFrom(TQWidget *);
 
 protected:
-%If (Qt_3_0_0 -)
-	virtual void addedTo(QWidget *,QWidget *);
-	virtual void addedTo(int,QPopupMenu *);
+%If (TQt_3_0_0 -)
+	virtual void addedTo(TQWidget *,TQWidget *);
+	virtual void addedTo(int,TQPopupMenu *);
 %End
 
 public slots:
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	void activate();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void toggle();
 	virtual void setOn(bool);
 %End
 	virtual void setEnabled(bool);
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	void setDisabled(bool);
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setVisible(bool);
 %End
 
@@ -135,74 +135,74 @@ signals:
 	void toggled(bool);
 
 private:
-%If (Qt_3_1_0 -)
-	QAction(const QAction &);
+%If (TQt_3_1_0 -)
+	TQAction(const TQAction &);
 %End
 };
 
 
-class QActionGroup : QAction
+class TQActionGroup : TQAction
 {
 %TypeHeaderCode
 #include <qaction.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QActionGroup(QWidget * /TransferThis/,const char * = 0,bool = 1);
+%If (- TQt_3_0_0)
+	TQActionGroup(TQWidget * /TransferThis/,const char * = 0,bool = 1);
 %End
-%If (Qt_3_0_0 - Qt_3_2_0)
-	QActionGroup(QObject * /TransferThis/,const char * = 0,bool = 1);
+%If (TQt_3_0_0 - TQt_3_2_0)
+	TQActionGroup(TQObject * /TransferThis/,const char * = 0,bool = 1);
 %End
-%If (Qt_3_2_0 -)
-	QActionGroup(QObject * /TransferThis/,const char * = 0);
+%If (TQt_3_2_0 -)
+	TQActionGroup(TQObject * /TransferThis/,const char * = 0);
 	// Obsolete.
-	QActionGroup(QObject * /TransferThis/,const char *,bool);
+	TQActionGroup(TQObject * /TransferThis/,const char *,bool);
 %End
 
 	void setExclusive(bool);
 	bool isExclusive() const;
-%If (- Qt_3_0_0)
-	void insert(QAction *);
+%If (- TQt_3_0_0)
+	void insert(TQAction *);
 %End
-%If (Qt_3_0_0 -)
-	void add(QAction *);
+%If (TQt_3_0_0 -)
+	void add(TQAction *);
 	void addSeparator();
 %End
-	bool addTo(QWidget *);
-	bool removeFrom(QWidget *);
+	bool addTo(TQWidget *);
+	bool removeFrom(TQWidget *);
 	void setEnabled(bool);
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setToggleAction(bool);
 	void setOn(bool);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setUsesDropDown(bool);
 	bool usesDropDown() const;
  
-	void setIconSet(const QIconSet &);
-	void setText(const QString &);
-	void setMenuText(const QString &);
-	void setToolTip(const QString &);
-	void setWhatsThis(const QString &);
+	void setIconSet(const TQIconSet &);
+	void setText(const TQString &);
+	void setMenuText(const TQString &);
+	void setToolTip(const TQString &);
+	void setWhatsThis(const TQString &);
 %End
 
 protected:
-%If (Qt_3_0_0 -)
-	void childEvent(QChildEvent *);
-	virtual void addedTo(QWidget *,QWidget *,QAction *);
-	virtual void addedTo(int,QPopupMenu *,QAction *);
-	virtual void addedTo(QWidget *,QWidget *);
-	virtual void addedTo(int,QPopupMenu *);
+%If (TQt_3_0_0 -)
+	void childEvent(TQChildEvent *);
+	virtual void addedTo(TQWidget *,TQWidget *,TQAction *);
+	virtual void addedTo(int,TQPopupMenu *,TQAction *);
+	virtual void addedTo(TQWidget *,TQWidget *);
+	virtual void addedTo(int,TQPopupMenu *);
 %End
  
 signals:
-	void selected(QAction *);
+	void selected(TQAction *);
 
 private:
-%If (Qt_3_1_0 -)
-	QActionGroup(const QActionGroup &);
+%If (TQt_3_1_0 -)
+	TQActionGroup(const TQActionGroup &);
 %End
 };
 
diff --git a/sip/qt/qapplication.sip b/sip/qt/qapplication.sip
index 57ff0d7..7093a33 100644
--- a/sip/qt/qapplication.sip
+++ b/sip/qt/qapplication.sip
@@ -1,57 +1,57 @@
-// This is the SIP interface definition for QApplication.
+// This is the SIP interface definition for TQApplication.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QApplication</Title>
+<Sect2><Title>TQApplication</Title>
 <FuncSynopsis>
-        <FuncDef><Function>QApplication</Function></FuncDef>
+        <FuncDef><Function>TQApplication</Function></FuncDef>
         <ParamDef>int &amp;<Parameter>argc</Parameter></ParamDef>
         <ParamDef>char **<Parameter>argv</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes one parameter which is a list of argument strings.  Arguments
-used by Qt are removed from the list.
+used by TQt are removed from the list.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QApplication</Function></FuncDef>
+        <FuncDef><Function>TQApplication</Function></FuncDef>
         <ParamDef>int &amp;<Parameter>argc</Parameter></ParamDef>
         <ParamDef>char **<Parameter>argv</Parameter></ParamDef>
         <ParamDef>bool <Parameter>GUIenabled</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes two parameters, the first of which is a list of argument strings.
-Arguments used by Qt are removed from the list.
+Arguments used by TQt are removed from the list.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QApplication</Function></FuncDef>
+        <FuncDef><Function>TQApplication</Function></FuncDef>
         <ParamDef>int &amp;<Parameter>argc</Parameter></ParamDef>
         <ParamDef>char **<Parameter>argv</Parameter></ParamDef>
         <ParamDef>Type <Parameter>type</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes two parameters, the first of which is a list of argument strings.
-Arguments used by Qt are removed from the list. (Qt v2.2+)
+Arguments used by TQt are removed from the list. (TQt v2.2+)
 </Para>
 
 <FuncSynopsis>
@@ -65,10 +65,10 @@ This has been renamed to <Literal>exec_loop</Literal> in Python.
 %End
 
 
-QApplication *qApp;
+TQApplication *qApp;
 
 
-class QApplication : QObject
+class TQApplication : TQObject
 {
 %TypeHeaderCode
 #include <qapplication.h>
@@ -76,7 +76,7 @@ class QApplication : QObject
 %End
 
 public:
-	QApplication(SIP_PYLIST) /PostHook=__pyQtQAppHook__/ [(int &,char **)];
+	TQApplication(SIP_PYLIST) /PostHook=__pyTQtTQAppHook__/ [(int &,char **)];
 %MethodCode
 		// The Python interface is a list of argument strings that is
 		// modified.
@@ -94,7 +94,7 @@ public:
 			nargc = argc;
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new sipQApplication(nargc,argv);
+			sipCpp = new sipTQApplication(nargc,argv);
 			Py_END_ALLOW_THREADS
 
 			// Now modify the original list.
@@ -102,7 +102,7 @@ public:
 		}
 %End
 
-	QApplication(SIP_PYLIST,bool) /PostHook=__pyQtQAppHook__/ [(int &,char **,bool)];
+	TQApplication(SIP_PYLIST,bool) /PostHook=__pyTQtTQAppHook__/ [(int &,char **,bool)];
 %MethodCode
 		// The Python interface is a list of argument strings that is
 		// modified.
@@ -120,7 +120,7 @@ public:
 			nargc = argc;
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new sipQApplication(nargc,argv,a1);
+			sipCpp = new sipTQApplication(nargc,argv,a1);
 			Py_END_ALLOW_THREADS
 
 			// Now modify the original list.
@@ -128,14 +128,14 @@ public:
 		}
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum Type {
 		Tty,
 		GuiClient,
 		GuiServer
 	};
 
-	QApplication(SIP_PYLIST,Type /Constrained/) /PostHook=__pyQtQAppHook__/ [(int &,char **,Type)];
+	TQApplication(SIP_PYLIST,Type /Constrained/) /PostHook=__pyTQtTQAppHook__/ [(int &,char **,Type)];
 %MethodCode
 		// The Python interface is a list of argument strings that is
 		// modified.
@@ -153,7 +153,7 @@ public:
 			nargc = argc;
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new sipQApplication(nargc,argv,(QApplication::Type)a1);
+			sipCpp = new sipTQApplication(nargc,argv,(TQApplication::Type)a1);
 			Py_END_ALLOW_THREADS
 
 			// Now modify the original list.
@@ -162,28 +162,28 @@ public:
 %End
 %End
 
-	~QApplication();
+	~TQApplication();
 %MethodCode
 		// Make sure all remaining top level widgets are not owned by
-		// Python.  When a PyQt script terminates we have no control
-		// over the order in which the QApplication instance and the
+		// Python.  When a PyTQt script terminates we have no control
+		// over the order in which the TQApplication instance and the
 		// top level widgets are destroyed.  If the former happens
 		// first then we get a seg. fault.  We could take the approach
-		// of only pretending to delete the QApplication instance, but
-		// Qt seems to allow an application to delete the QApplication
+		// of only pretending to delete the TQApplication instance, but
+		// TQt seems to allow an application to delete the TQApplication
 		// instance and then create another one.  The approach we take
 		// is to transfer ownership of all top level widgets away from
 		// Python so that the C++ dtor is not called if they are
-		// destroyed after the QApplication instance.  This might be
+		// destroyed after the TQApplication instance.  This might be
 		// seen as a memory leak - but if we really are terminating
 		// then it doesn't matter, and if we are just deleting the
-		// QApplication instance then (I think) we should have already
+		// TQApplication instance then (I think) we should have already
 		// deleted the top level widgets manually.  In any event, the X
 		// server resources will be freed.
 
-		QWidgetList *tlw = QApplication::topLevelWidgets();
-		QWidgetListIt it(*tlw);
-		QWidget *w;
+		TQWidgetList *tlw = TQApplication::topLevelWidgets();
+		TQWidgetListIt it(*tlw);
+		TQWidget *w;
 
 		while ((w = it.current()) != 0)
 		{
@@ -217,22 +217,22 @@ public:
 				}
 %End
 
-%If (Qt_2_3_0 -)
+%If (TQt_2_3_0 -)
 	Type type() const;
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	static GUIStyle style();
 	static void setStyle(GUIStyle);
 %End
-%If (Qt_2_00 -)
-	static QStyle &style();
-	static void setStyle(QStyle * /Transfer/);
+%If (TQt_2_00 -)
+	static TQStyle &style();
+	static void setStyle(TQStyle * /Transfer/);
 %End
-%If (Qt_3_0_0 -)
-	static QStyle *setStyle(const QString &);
+%If (TQt_3_0_0 -)
+	static TQStyle *setStyle(const TQString &);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum ColorSpec
 	{
 		NormalColor = 0,
@@ -242,7 +242,7 @@ public:
 		TrueColor = 4
 	};
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum ColorSpec
 	{
 		NormalColor = 0,
@@ -253,118 +253,118 @@ public:
 
 	static int colorSpec();
 	static void setColorSpec(int);
-	static QCursor *overrideCursor();
-	static void setOverrideCursor(QCursor &,bool = 0);
+	static TQCursor *overrideCursor();
+	static void setOverrideCursor(TQCursor &,bool = 0);
 	static void restoreOverrideCursor();
 	static bool hasGlobalMouseTracking();
 	static void setGlobalMouseTracking(bool);
-%If (- Qt_2_00)
-	static QPalette *palette();
-	static void setPalette(QPalette &,bool = 0);
-	static QFont *font();
-	static void setFont(const QFont &,bool = 0);
-%End
-%If (Qt_2_00 -)
-	static QPalette palette(const QWidget * = 0);
-	static void setPalette(QPalette &,bool = 0,const char * = 0);
-	static QFont font(const QWidget * = 0);
-	static void setFont(const QFont &,bool = 0,const char * = 0);
-%End
-	static QFontMetrics fontMetrics();
-	QWidget *mainWidget() const;
-%If (- Qt_2_00)
-	// We may not need the /Transfer/ now that the QApplication dtor is
+%If (- TQt_2_00)
+	static TQPalette *palette();
+	static void setPalette(TQPalette &,bool = 0);
+	static TQFont *font();
+	static void setFont(const TQFont &,bool = 0);
+%End
+%If (TQt_2_00 -)
+	static TQPalette palette(const TQWidget * = 0);
+	static void setPalette(TQPalette &,bool = 0,const char * = 0);
+	static TQFont font(const TQWidget * = 0);
+	static void setFont(const TQFont &,bool = 0,const char * = 0);
+%End
+	static TQFontMetrics fontMetrics();
+	TQWidget *mainWidget() const;
+%If (- TQt_2_00)
+	// We may not need the /Transfer/ now that the TQApplication dtor is
 	// instrumented, but we'll leave it in so as not to break old programs
 	// needlessly.
-	void setMainWidget(QWidget * /Transfer/);
+	void setMainWidget(TQWidget * /Transfer/);
 %End
-%If (Qt_2_00 -)
-	virtual void setMainWidget(QWidget *);
-	virtual void polish(QWidget *);
+%If (TQt_2_00 -)
+	virtual void setMainWidget(TQWidget *);
+	virtual void polish(TQWidget *);
 %End
-	static QWidgetList *allWidgets();
-	static QWidgetList *topLevelWidgets();
-%If (- Qt_3_0_0)
-	static QWidget *desktop();
+	static TQWidgetList *allWidgets();
+	static TQWidgetList *topLevelWidgets();
+%If (- TQt_3_0_0)
+	static TQWidget *desktop();
 %End
-%If (Qt_3_0_0 -)
-	static QDesktopWidget *desktop();
+%If (TQt_3_0_0 -)
+	static TQDesktopWidget *desktop();
 %End
-	static QWidget *activePopupWidget();
-	static QWidget *activeModalWidget();
-	static QClipboard *clipboard();
-	QWidget *focusWidget() const;
-%If (Qt_2_00 -)
-	QWidget *activeWindow() const;
+	static TQWidget *activePopupWidget();
+	static TQWidget *activeModalWidget();
+	static TQClipboard *clipboard();
+	TQWidget *focusWidget() const;
+%If (TQt_2_00 -)
+	TQWidget *activeWindow() const;
 %End
-	static QWidget *widgetAt(int,int,bool = 0);
-	static QWidget *widgetAt(const QPoint &,bool = 0);
+	static TQWidget *widgetAt(int,int,bool = 0);
+	static TQWidget *widgetAt(const TQPoint &,bool = 0);
 
-%If (Qt_3_1_0 -)
-	static QEventLoop *eventLoop();
+%If (TQt_3_1_0 -)
+	static TQEventLoop *eventLoop();
 %End
 
 	int exec() /PyName=exec_loop, ReleaseGIL,
-		    PreHook=__pyQtPreEventLoopHook__,
-		    PostHook=__pyQtPostEventLoopHook__/;
+		    PreHook=__pyTQtPreEventLoopHook__,
+		    PostHook=__pyTQtPostEventLoopHook__/;
 	void processEvents() /ReleaseGIL/;
 	void processEvents(int) /ReleaseGIL/;
 	void processOneEvent() /ReleaseGIL/;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool hasPendingEvents();
 %End
 	int enter_loop() /ReleaseGIL/;
 	void exit_loop();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int loopLevel() const;
 %End
 	static void exit(int = 0);
-	static bool sendEvent(QObject *,QEvent *) /ReleaseGIL/;
-	static void postEvent(QObject *,QEvent * /Transfer/) /ReleaseGIL/;
-	static void sendPostedEvents(QObject *,int) /ReleaseGIL/;
-%If (Qt_2_00 -)
+	static bool sendEvent(TQObject *,TQEvent *) /ReleaseGIL/;
+	static void postEvent(TQObject *,TQEvent * /Transfer/) /ReleaseGIL/;
+	static void sendPostedEvents(TQObject *,int) /ReleaseGIL/;
+%If (TQt_2_00 -)
 	static void sendPostedEvents() /ReleaseGIL/;
-	static void removePostedEvents(QObject *);
+	static void removePostedEvents(TQObject *);
 %End
-	virtual bool notify(QObject *,QEvent *) /ReleaseGIL/;
+	virtual bool notify(TQObject *,TQEvent *) /ReleaseGIL/;
 	static bool startingUp();
 	static bool closingDown();
 	static void flushX();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	static void flush();
 %End
 	static void syncX();
 	static void beep();
-%If (Qt_2_00 -)
-	void setDefaultCodec(QTextCodec *);
-	QTextCodec *defaultCodec() const;
-	void installTranslator(QTranslator *);
-	void removeTranslator(QTranslator *);
+%If (TQt_2_00 -)
+	void setDefaultCodec(TQTextCodec *);
+	TQTextCodec *defaultCodec() const;
+	void installTranslator(TQTranslator *);
+	void removeTranslator(TQTranslator *);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QString translate(const char *,const char *) const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQString translate(const char *,const char *) const;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
-	QString translate(const char *,const char *,const char *) const;
+%If (TQt_2_2_0 - TQt_3_0_0)
+	TQString translate(const char *,const char *,const char *) const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Encoding {
 		DefaultCodec,
 		UnicodeUTF8
 	};
 
-	QString translate(const char *,const char *,const char * = 0,
+	TQString translate(const char *,const char *,const char * = 0,
 			  Encoding = DefaultCodec) const;
 %End
-%If (Qt_3_2_0 -)
-	QString applicationDirPath();
-	QString applicationFilePath();
+%If (TQt_3_2_0 -)
+	TQString applicationDirPath();
+	TQString applicationFilePath();
 %End
-%If (- Qt_3_0_0)
-	static void setWinStyleHighlightColor(const QColor &);
-	static const QColor &winStyleHighlightColor();
+%If (- TQt_3_0_0)
+	static void setWinStyleHighlightColor(const TQColor &);
+	static const TQColor &winStyleHighlightColor();
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	static void setDesktopSettingsAware(bool);
 	static bool desktopSettingsAware();
 	static void setCursorFlashTime(int);
@@ -372,84 +372,84 @@ public:
 %End
 	static void setDoubleClickInterval(int);
 	static int doubleClickInterval();
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	static void setWheelScrollLines(int);
 	static int wheelScrollLines();
-%If (Qt_2_2_0 -)
-	static void setGlobalStrut(const QSize &);
-	static QSize globalStrut();
+%If (TQt_2_2_0 -)
+	static void setGlobalStrut(const TQSize &);
+	static TQSize globalStrut();
 %End
-%If (Qt_3_0_0 -)
-	static void setLibraryPaths(const QStringList &);
-	static QStringList libraryPaths();
-	static void addLibraryPath(const QString &);
-	static void removeLibraryPath(const QString &);
+%If (TQt_3_0_0 -)
+	static void setLibraryPaths(const TQStringList &);
+	static TQStringList libraryPaths();
+	static void addLibraryPath(const TQString &);
+	static void removeLibraryPath(const TQString &);
 %End
 	static void setStartDragTime(int);
 	static int startDragTime();
 	static void setStartDragDistance(int);
 	static int startDragDistance();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	static void setReverseLayout(bool);
 	static bool reverseLayout();
  
 	static int horizontalAlignment(int);
 %End
-%If (Qt_2_2_0 -)
-	static bool isEffectEnabled(Qt::UIEffect);
-	static void setEffectEnabled(Qt::UIEffect,bool = 1);
+%If (TQt_2_2_0 -)
+	static bool isEffectEnabled(TQt::UIEffect);
+	static void setEffectEnabled(TQt::UIEffect,bool = 1);
 %End
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool isSessionRestored() const;
-	QString sessionId() const;
-%If (Qt_3_1_0 -)
-	QString sessionKey() const;
+	TQString sessionId() const;
+%If (TQt_3_1_0 -)
+	TQString sessionKey() const;
 %End
-	virtual void commitData(QSessionManager &);
-	virtual void saveState(QSessionManager &);
+	virtual void commitData(TQSessionManager &);
+	virtual void saveState(TQSessionManager &);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void wakeUpGuiThread();
 %End
-%If (Qt_THREAD_SUPPORT)
-%If (Qt_2_2_0 -)
+%If (TQt_THREAD_SUPPORT)
+%If (TQt_2_2_0 -)
 	void lock() /ReleaseGIL/;
 	void unlock(bool = 1);
 	bool locked();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool tryLock();
 %End
 %End
 
 signals:
 	void lastWindowClosed();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void aboutToQuit();
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void guiThreadAwake();
 %End
 
 public slots:
 	void quit();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void closeAllWindows();
 %End
-%If (Qt_3_2_0 -)
-	void aboutQt();
+%If (TQt_3_2_0 -)
+	void aboutTQt();
 %End
 
 protected:
-%If (Qt_3_1_0 -)
-	bool event(QEvent *);
+%If (TQt_3_1_0 -)
+	bool event(TQEvent *);
 %End
 
 private:
-	QApplication(const QApplication &);
+	TQApplication(const TQApplication &);
 
 
 %TypeCode
@@ -507,22 +507,22 @@ static void updatePyArgv(PyObject *argvlist,int argc,char **argv)
 };
 
 
-enum QtMsgType {
-	QtDebugMsg,
-	QtWarningMsg,
-	QtFatalMsg
+enum TQtMsgType {
+	TQtDebugMsg,
+	TQtWarningMsg,
+	TQtFatalMsg
 };
 
 
 SIP_PYCALLABLE qInstallMsgHandler(SIP_PYCALLABLE /AllowNone/);
 %MethodCode
-	void (*old)(QtMsgType, const char *);
+	void (*old)(TQtMsgType, const char *);
 
 	// Treat None as the default handler.
 	old = qInstallMsgHandler((a0 != Py_None) ? pyqtMsgHandler : 0);
 
 	// If we recognise the old handler, then return it.  Otherwise return
-	// the default handler.  This doesn't exactly mimic the Qt behaviour
+	// the default handler.  This doesn't exactly mimic the TQt behaviour
 	// but it is probably close enough for the way it will be used.
 	sipRes = (old == pyqtMsgHandler) ? pyqtPyMsgHandler : Py_None;
 	Py_INCREF(sipRes);
@@ -538,14 +538,14 @@ SIP_PYCALLABLE qInstallMsgHandler(SIP_PYCALLABLE /AllowNone/);
 static PyObject *pyqtPyMsgHandler = 0;
 
 // The C++ wrapper around the Python handler.
-static void pyqtMsgHandler(QtMsgType type, const char *msg)
+static void pyqtMsgHandler(TQtMsgType type, const char *msg)
 {
 	PyObject *res;
 
 	SIP_BLOCK_THREADS
 
 #if SIP_VERSION >= 0x040200
-	res = sipCallMethod(0, pyqtPyMsgHandler, "Es", type, sipEnum_QtMsgType, msg);
+	res = sipCallMethod(0, pyqtPyMsgHandler, "Es", type, sipEnum_TQtMsgType, msg);
 #elif SIP_VERSION >= 0x040000
 	res = sipCallMethod(0, pyqtPyMsgHandler, "es", type, msg);
 #else
@@ -562,7 +562,7 @@ static void pyqtMsgHandler(QtMsgType type, const char *msg)
 
 	if (res != NULL && res != Py_None)
 	{
-		PyErr_SetString(PyExc_TypeError, "invalid result type from PyQt message handler");
+		PyErr_SetString(PyExc_TypeError, "invalid result type from PyTQt message handler");
 		res = NULL;
 	}
 
diff --git a/sip/qt/qarray.sip b/sip/qt/qarray.sip
index 76125e1..8d1fed4 100644
--- a/sip/qt/qarray.sip
+++ b/sip/qt/qarray.sip
@@ -1,39 +1,39 @@
-// This is the SIP interface definition for all types based on the QArray
+// This is the SIP interface definition for all types based on the TQArray
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QArray&lt;type&gt; (Qt 1.x, 2.x)</Title>
+<Sect2><Title>TQArray&lt;type&gt; (TQt 1.x, 2.x)</Title>
 <Para>
-Types based on the <Literal>QArray</Literal> template are automatically
+Types based on the <Literal>TQArray</Literal> template are automatically
 converted to and from Python lists of the type.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-%MappedType QArray<int>
+%MappedType TQArray<int>
 {
 %TypeHeaderCode
 #include <qarray.h>
@@ -63,12 +63,12 @@ converted to and from Python lists of the type.
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of integers to a QArray<int> on the heap.
+	// Convert a Python list of integers to a TQArray<int> on the heap.
  
 	if (sipIsErr == NULL)
 		return PyList_Check(sipPy);
 
-	QArray<int> *qa = new QArray<int>(PyList_GET_SIZE(sipPy));
+	TQArray<int> *qa = new TQArray<int>(PyList_GET_SIZE(sipPy));
  
 	PyErr_Clear();
 
diff --git a/sip/qt/qassistantclient.sip b/sip/qt/qassistantclient.sip
index 34c4820..fce0214 100644
--- a/sip/qt/qassistantclient.sip
+++ b/sip/qt/qassistantclient.sip
@@ -1,62 +1,62 @@
-// This is the SIP interface definition for QAssistantClient.
+// This is the SIP interface definition for TQAssistantClient.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QAssistantClient (Qt v3.1+)</Title>
+<Sect2><Title>TQAssistantClient (TQt v3.1+)</Title>
 <Para>
-<Literal>QAssistantClient</Literal> is fully implemented.
+<Literal>TQAssistantClient</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_ASSISTANTCLIENT)
-%If (Qt_3_1_0 -)
+%If (TQt_ASSISTANTCLIENT)
+%If (TQt_3_1_0 -)
 
-class QAssistantClient : QObject
+class TQAssistantClient : TQObject
 {
 %TypeHeaderCode
 #include <qassistantclient.h>
 %End
 
 public:
-	QAssistantClient(const QString &,QObject * /TransferThis/ = 0,
+	TQAssistantClient(const TQString &,TQObject * /TransferThis/ = 0,
 			 const char * = 0);
 
 	bool isOpen() const;
 
-%If (Qt_3_2_0 -)
-	void setArguments(const QStringList &);
+%If (TQt_3_2_0 -)
+	void setArguments(const TQStringList &);
 %End
 
 public slots:
 	virtual void openAssistant() /ReleaseGIL/;
 	virtual void closeAssistant();
-	virtual void showPage(const QString &);
+	virtual void showPage(const TQString &);
 
 signals:
 	void assistantOpened();
 	void assistantClosed();
-	void error(const QString &);
+	void error(const TQString &);
 };
 
 %End
diff --git a/sip/qt/qbitmap.sip b/sip/qt/qbitmap.sip
index b0132dd..e538d2d 100644
--- a/sip/qt/qbitmap.sip
+++ b/sip/qt/qbitmap.sip
@@ -1,59 +1,59 @@
-// This is the SIP interface definition for QBitmap.
+// This is the SIP interface definition for TQBitmap.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QBitmap</Title>
+<Sect2><Title>TQBitmap</Title>
 <Para>
-<Literal>QBitmap</Literal> is fully implemented.
+<Literal>TQBitmap</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QBitmap : QPixmap
+class TQBitmap : TQPixmap
 {
 %TypeHeaderCode
 #include <qbitmap.h>
 %End
 
 public:
-	QBitmap();
-%If (- Qt_2_00)
-	QBitmap(int,int,bool = 0);
-	QBitmap(const QSize &,bool = 0);
+	TQBitmap();
+%If (- TQt_2_00)
+	TQBitmap(int,int,bool = 0);
+	TQBitmap(const TQSize &,bool = 0);
 %End
-%If (Qt_2_00 -)
-	QBitmap(int,int,bool = 0,QPixmap::Optimization = QPixmap::DefaultOptim);
-	QBitmap(const QSize &,bool = 0,QPixmap::Optimization = QPixmap::DefaultOptim);
+%If (TQt_2_00 -)
+	TQBitmap(int,int,bool = 0,TQPixmap::Optimization = TQPixmap::DefaultOptim);
+	TQBitmap(const TQSize &,bool = 0,TQPixmap::Optimization = TQPixmap::DefaultOptim);
 %End
-	QBitmap(int,int,uchar *,bool = 0);
-	QBitmap(const QSize &,uchar *,bool = 0);
-	QBitmap(const QBitmap &);
-%If (- Qt_2_00)
-	QBitmap(const char *,const char * = 0);
+	TQBitmap(int,int,uchar *,bool = 0);
+	TQBitmap(const TQSize &,uchar *,bool = 0);
+	TQBitmap(const TQBitmap &);
+%If (- TQt_2_00)
+	TQBitmap(const char *,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QBitmap(const QString &,const char * = 0);
+%If (TQt_2_00 -)
+	TQBitmap(const TQString &,const char * = 0);
 %End
 
-	QBitmap xForm(const QWMatrix &) const;
+	TQBitmap xForm(const TQWMatrix &) const;
 };
diff --git a/sip/qt/qbrush.sip b/sip/qt/qbrush.sip
index ab629d7..fc9269f 100644
--- a/sip/qt/qbrush.sip
+++ b/sip/qt/qbrush.sip
@@ -1,36 +1,36 @@
-// This is the SIP interface definition for QBrush.
+// This is the SIP interface definition for TQBrush.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QBrush</Title>
+<Sect2><Title>TQBrush</Title>
 <Para>
-<Literal>QBrush</Literal> is fully implemented, including the Python
+<Literal>TQBrush</Literal> is fully implemented, including the Python
 <Literal>==</Literal> and <Literal>!=</Literal> operators.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 enum BrushStyle {
 	NoBrush,
@@ -52,54 +52,54 @@ enum BrushStyle {
 };
 
 
-class QBrush
+class TQBrush
 {
 %TypeHeaderCode
 #include <qbrush.h>
 %End
 
 public:
-	QBrush();
-	QBrush(BrushStyle);
-	QBrush(const QColor &,BrushStyle = SolidPattern);
-	QBrush(const QColor &,const QPixmap &);
-	QBrush(const QBrush &);
+	TQBrush();
+	TQBrush(BrushStyle);
+	TQBrush(const TQColor &,BrushStyle = SolidPattern);
+	TQBrush(const TQColor &,const TQPixmap &);
+	TQBrush(const TQBrush &);
 
 	BrushStyle style() const;
 	void setStyle(BrushStyle);
-	const QColor &color() const;
-	void setColor(const QColor &);
-	QPixmap *pixmap() const;
-	void setPixmap(const QPixmap &);
+	const TQColor &color() const;
+	void setColor(const TQColor &);
+	TQPixmap *pixmap() const;
+	void setPixmap(const TQPixmap &);
 };
 
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QBrush : Qt
+class TQBrush : TQt
 {
 %TypeHeaderCode
 #include <qbrush.h>
 %End
 
 public:
-	QBrush();
-	QBrush(BrushStyle);
-	QBrush(const QColor &,BrushStyle = SolidPattern);
-	QBrush(const QColor &,const QPixmap &);
-	QBrush(const QBrush &);
+	TQBrush();
+	TQBrush(BrushStyle);
+	TQBrush(const TQColor &,BrushStyle = SolidPattern);
+	TQBrush(const TQColor &,const TQPixmap &);
+	TQBrush(const TQBrush &);
 
 	BrushStyle style() const;
 	void setStyle(BrushStyle);
-	const QColor &color() const;
-	void setColor(const QColor &);
-	QPixmap *pixmap() const;
-	void setPixmap(const QPixmap &);
+	const TQColor &color() const;
+	void setColor(const TQColor &);
+	TQPixmap *pixmap() const;
+	void setPixmap(const TQPixmap &);
 
-	bool operator==(const QBrush &) const;
-	bool operator!=(const QBrush &) const;
+	bool operator==(const TQBrush &) const;
+	bool operator!=(const TQBrush &) const;
 };
 
 %End
diff --git a/sip/qt/qbutton.sip b/sip/qt/qbutton.sip
index 356de1e..fcd83ec 100644
--- a/sip/qt/qbutton.sip
+++ b/sip/qt/qbutton.sip
@@ -1,83 +1,83 @@
-// This is the SIP interface definition for QButton.
+// This is the SIP interface definition for TQButton.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QButton</Title>
+<Sect2><Title>TQButton</Title>
 <Para>
-<Literal>QButton</Literal> is fully implemented.
+<Literal>TQButton</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QButton : QWidget
+class TQButton : TQWidget
 {
 %TypeHeaderCode
 #include <qbutton.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QButton(QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQButton(TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QButton(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_2_00 -)
+	TQButton(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text() const;
 	void setText(const char *);
 %End
-%If (Qt_2_00 -)
-	QString text() const;
-	virtual void setText(const QString &);
+%If (TQt_2_00 -)
+	TQString text() const;
+	virtual void setText(const TQString &);
 %End
-	const QPixmap *pixmap() const;
-%If (- Qt_2_00)
-	void setPixmap(const QPixmap &);
+	const TQPixmap *pixmap() const;
+%If (- TQt_2_00)
+	void setPixmap(const TQPixmap &);
 %End
-%If (Qt_2_00 -)
-	virtual void setPixmap(const QPixmap &);
+%If (TQt_2_00 -)
+	virtual void setPixmap(const TQPixmap &);
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int accel() const;
 %End
-%If (Qt_3_0_0 -)
-	QKeySequence accel() const;
+%If (TQt_3_0_0 -)
+	TQKeySequence accel() const;
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAccel(int);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setAccel(int);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setAccel(const QKeySequence &);
+%If (TQt_3_0_0 -)
+	virtual void setAccel(const TQKeySequence &);
 %End
 
 	bool isToggleButton() const;
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum ToggleType
 	{
 		SingleShot,
@@ -88,17 +88,17 @@ public:
 	ToggleType toggleType() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDown(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setDown(bool);
 %End
 	bool isDown() const;
 
 	bool isOn() const;
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum ToggleState
 	{
 		Off,
@@ -109,34 +109,34 @@ public:
 	ToggleState state() const;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool autoResize() const;
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoResize(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setAutoResize(bool);
 %End
 
 	bool autoRepeat() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoRepeat(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAutoRepeat(bool);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool isExclusiveToggle() const;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	bool focusNextPrevChild(bool);
 %End
 
-%If (Qt_2_00 -)
-	QButtonGroup *group() const;
+%If (TQt_2_00 -)
+	TQButtonGroup *group() const;
 %End
 
 public slots:
@@ -148,37 +148,37 @@ signals:
 	void released();
 	void clicked();
 	void toggled(bool);
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void stateChanged(int);
 %End
 
 protected:
 	void setToggleButton(bool);
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setToggleType(ToggleType);
 %End
 	void setOn(bool);
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setState(ToggleState);
 %End
 
-	virtual bool hitButton(const QPoint &) const;
-	virtual void drawButton(QPainter *);
-	virtual void drawButtonLabel(QPainter *);
+	virtual bool hitButton(const TQPoint &) const;
+	virtual void drawButton(TQPainter *);
+	virtual void drawButtonLabel(TQPainter *);
 
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_1_0 -)
-	void keyReleaseEvent(QKeyEvent *);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_1_0 -)
+	void keyReleaseEvent(TQKeyEvent *);
 %End
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void paintEvent(QPaintEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void paintEvent(TQPaintEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 
 	void enabledChange(bool);
 
 private:
-	QButton(const QButton &);
+	TQButton(const TQButton &);
 };
diff --git a/sip/qt/qbuttongroup.sip b/sip/qt/qbuttongroup.sip
index 647bb17..61c0258 100644
--- a/sip/qt/qbuttongroup.sip
+++ b/sip/qt/qbuttongroup.sip
@@ -1,71 +1,71 @@
-// This is the SIP interface definition for QButtonGroup.
+// This is the SIP interface definition for TQButtonGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QButtonGroup</Title>
+<Sect2><Title>TQButtonGroup</Title>
 <Para>
-<Literal>QButtonGroup</Literal> is fully implemented.
+<Literal>TQButtonGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QButtonGroup : QGroupBox
+class TQButtonGroup : TQGroupBox
 {
 %TypeHeaderCode
 #include <qbuttongroup.h>
 %End
 
 public:
-	QButtonGroup(QWidget * /TransferThis/ = 0,const char * = 0);
-%If (- Qt_2_00)
-	QButtonGroup(const char *,QWidget * /TransferThis/ = 0,
+	TQButtonGroup(TQWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQButtonGroup(const char *,TQWidget * /TransferThis/ = 0,
 		     const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QButtonGroup(const QString &,QWidget * /TransferThis/ = 0,
+%If (TQt_2_00 -)
+	TQButtonGroup(const TQString &,TQWidget * /TransferThis/ = 0,
 		     const char * = 0);
-	QButtonGroup(int,Orientation,QWidget * /TransferThis/ = 0,
+	TQButtonGroup(int,Orientation,TQWidget * /TransferThis/ = 0,
 		     const char * = 0);
-	QButtonGroup(int,Orientation,const QString &,
-		     QWidget * /TransferThis/ = 0,const char * = 0);
+	TQButtonGroup(int,Orientation,const TQString &,
+		     TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
 
 	bool isExclusive() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setExclusive(bool);
 	void setButton(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool isRadioButtonExclusive() const;
 	virtual void setExclusive(bool);
 	virtual void setRadioButtonExclusive(bool);
 %End
 
-	int insert(QButton *,int = -1);
-	void remove(QButton *);
-	QButton *find(int) const;
-%If (Qt_2_00 -)
-	int id(QButton *) const;
+	int insert(TQButton *,int = -1);
+	void remove(TQButton *);
+	TQButton *find(int) const;
+%If (TQt_2_00 -)
+	int id(TQButton *) const;
 	int count() const;
 
 	virtual void setButton(int);
@@ -73,13 +73,13 @@ public:
 	virtual void moveFocus(int);
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	QButton *selected();
+%If (TQt_2_00 - TQt_3_0_0)
+	TQButton *selected();
 %End
-%If (Qt_3_0_0 -)
-	QButton *selected() const;
+%If (TQt_3_0_0 -)
+	TQButton *selected() const;
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int selectedId() const;
 %End
 
@@ -95,10 +95,10 @@ protected slots:
 	void buttonToggled(bool);
 
 protected:
-%If (Qt_3_1_0 -)
-	bool event(QEvent *);
+%If (TQt_3_1_0 -)
+	bool event(TQEvent *);
 %End
 
 private:
-	QButtonGroup(const QButtonGroup &);
+	TQButtonGroup(const TQButtonGroup &);
 };
diff --git a/sip/qt/qbytearray.sip b/sip/qt/qbytearray.sip
index fa992ec..5b4fd7e 100644
--- a/sip/qt/qbytearray.sip
+++ b/sip/qt/qbytearray.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QByteArray.
+// This is the SIP interface definition for TQByteArray.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QByteArray</Title>
+<Sect2><Title>TQByteArray</Title>
 <Para>
-A Python string can be used whenever a <Literal>QByteArray</Literal> can be
-used.  A <Literal>QByteArray</Literal> can be converted to a Python string
+A Python string can be used whenever a <Literal>TQByteArray</Literal> can be
+used.  A <Literal>TQByteArray</Literal> can be converted to a Python string
 using the Python <Literal>str()</Literal> function.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QByteArray &<Function>assign</Function></FuncDef>
+	<FuncDef>TQByteArray &<Function>assign</Function></FuncDef>
 	<ParamDef>const char *<Parameter>data</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>size</Parameter></ParamDef>
 </FuncSynopsis>
@@ -81,7 +81,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QByteArray &<Function>setRawData</Function></FuncDef>
+	<FuncDef>TQByteArray &<Function>setRawData</Function></FuncDef>
 	<ParamDef>const char *<Parameter>data</Parameter></ParamDef>
 	<ParamDef>uint<Parameter>size</Parameter></ParamDef>
 </FuncSynopsis>
@@ -92,20 +92,20 @@ Not implemented.
 %End
 
 
-class QByteArray
+class TQByteArray
 {
 %TypeHeaderCode
 #include <qstring.h>
 %End
 
 public:
-	QByteArray();
-	QByteArray(int);
-	QByteArray(const QByteArray &);
+	TQByteArray();
+	TQByteArray(int);
+	TQByteArray(const TQByteArray &);
 
 	SIP_PYOBJECT data() const;
 %MethodCode
-		// QByteArrays aren't '\0' terminated so set the size
+		// TQByteArrays aren't '\0' terminated so set the size
 		// explicitly.
 
 		char *res;
@@ -128,7 +128,7 @@ public:
 		}
 %End
 
-	// These are actually in QMemArray, which isn't implemented so pretend
+	// These are actually in TQMemArray, which isn't implemented so pretend
 	// they are here.
  
 	uint nrefs() const;
@@ -138,12 +138,12 @@ public:
 	bool truncate(uint);
 //	bool fill(const char &,int = -1);
 	void detach();
-	QByteArray copy() const;
-	QByteArray &assign(const QByteArray &);
-//	QByteArray &assign(const char *,uint);
-	QByteArray &duplicate(const QByteArray &);
-	QByteArray &duplicate(const char *,uint);
-//	QByteArray &setRawData(const char *,uint);
+	TQByteArray copy() const;
+	TQByteArray &assign(const TQByteArray &);
+//	TQByteArray &assign(const char *,uint);
+	TQByteArray &duplicate(const TQByteArray &);
+	TQByteArray &duplicate(const char *,uint);
+//	TQByteArray &setRawData(const char *,uint);
 //	void resetRawData(const char *,uint);
 //	int find(const char &,uint = 0) const;
 //	int contains(const char &) const;
@@ -151,7 +151,7 @@ public:
 
 	SIP_PYOBJECT __str__();
 %MethodCode
-		// QByteArrays aren't '\0' terminated so set the size
+		// TQByteArrays aren't '\0' terminated so set the size
 		// explicitly.
 
 		char *data;
@@ -169,7 +169,7 @@ public:
 %End
 
 %ConvertToTypeCode
-	// Allow a Python string whenever a QByteArray is expected.
+	// Allow a Python string whenever a TQByteArray is expected.
 
 	if (sipIsErr == NULL)
 		return (PyString_Check(sipPy) ||
@@ -178,7 +178,7 @@ public:
 	if (PyString_Check(sipPy))
 	{
 		Py_BEGIN_ALLOW_THREADS
-		QByteArray *ba = new QByteArray();
+		TQByteArray *ba = new TQByteArray();
 
 		ba -> duplicate(PyString_AS_STRING(sipPy),PyString_GET_SIZE(sipPy));
 
@@ -188,16 +188,16 @@ public:
     		return sipGetState(sipTransferObj);
 	}
 
-	*sipCppPtr = reinterpret_cast<QByteArray *>(sipConvertToInstance(sipPy,sipClass_QByteArray,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
+	*sipCppPtr = reinterpret_cast<TQByteArray *>(sipConvertToInstance(sipPy,sipClass_QByteArray,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
 
 	return 0;
 %End
 };
 
 
-%If (Qt_3_1_0 -)
-QByteArray qCompress(const uchar * /Array/,int /ArraySize/);
-QByteArray qCompress(const QByteArray &);
-QByteArray qUncompress(const uchar * /Array/,int /ArraySize/);
-QByteArray qUncompress(const QByteArray &);
+%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 &);
 %End
diff --git a/sip/qt/qcdestyle.sip b/sip/qt/qcdestyle.sip
index 790662f..b11f518 100644
--- a/sip/qt/qcdestyle.sip
+++ b/sip/qt/qcdestyle.sip
@@ -1,66 +1,66 @@
-// This is the SIP interface definition for QCDEStyle.
+// This is the SIP interface definition for TQCDEStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QCDEStyle (Qt v2+)</Title>
+<Sect2><Title>TQCDEStyle (TQt v2+)</Title>
 <Para>
-<Literal>QCDEStyle</Literal> is fully implemented.
+<Literal>TQCDEStyle</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_STYLE_CDE)
-%If (Qt_2_00 -)
+%If (TQt_STYLE_CDE)
+%If (TQt_2_00 -)
 
-class QCDEStyle : QMotifStyle
+class TQCDEStyle : TQMotifStyle
 {
 %TypeHeaderCode
 #include <qcdestyle.h>
 %End
 
 public:
-	QCDEStyle(bool = 0);
+	TQCDEStyle(bool = 0);
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int defaultFrameWidth() const;
-	void drawArrow(QPainter *,ArrowType,bool,int,int,int,int,
-		       const QColorGroup &,bool,const QBrush * = 0);
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,int,
+	void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int,
+		       const TQColorGroup &,bool,const TQBrush * = 0);
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int,
 			   bool = 0,bool = 1);
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+%If (TQt_3_0_0 -)
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
 %End
 };
 
diff --git a/sip/qt/qcheckbox.sip b/sip/qt/qcheckbox.sip
index 9c2bfc4..a554a17 100644
--- a/sip/qt/qcheckbox.sip
+++ b/sip/qt/qcheckbox.sip
@@ -1,88 +1,88 @@
-// This is the SIP interface definition for QCheckBox.
+// This is the SIP interface definition for TQCheckBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QCheckBox</Title>
+<Sect2><Title>TQCheckBox</Title>
 <Para>
-<Literal>QCheckBox</Literal> is fully implemented.
+<Literal>TQCheckBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QCheckBox : QButton
+class TQCheckBox : TQButton
 {
 %TypeHeaderCode
 #include <qcheckbox.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QCheckBox(QWidget * /TransferThis/ = 0,const char * = 0);
-	QCheckBox(const char *,QWidget * /TransferThis/,const char * = 0);
+%If (- TQt_2_00)
+	TQCheckBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQCheckBox(const char *,TQWidget * /TransferThis/,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QCheckBox(QWidget * /TransferThis/,const char * = 0);
-	QCheckBox(const QString &,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQCheckBox(TQWidget * /TransferThis/,const char * = 0);
+	TQCheckBox(const TQString &,TQWidget * /TransferThis/,const char * = 0);
 %End
 
 	bool isChecked() const;
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setNoChange();
 
 	void setTristate(bool = 1);
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool isTristate() const;
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void setChecked(bool);
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setChecked(bool);
 %End
 
 protected:
-%If (Qt_2_00 -)
-	void resizeEvent(QResizeEvent *);
+%If (TQt_2_00 -)
+	void resizeEvent(TQResizeEvent *);
 %End
-	void drawButton(QPainter *);
-	void drawButtonLabel(QPainter *);
-%If (Qt_2_00 -)
+	void drawButton(TQPainter *);
+	void drawButtonLabel(TQPainter *);
+%If (TQt_2_00 -)
 	void updateMask();
 %End
-%If (Qt_3_2_0 -)
-	bool hitButton(const QPoint &) const;
+%If (TQt_3_2_0 -)
+	bool hitButton(const TQPoint &) const;
 %End
 
 private:
-	QCheckBox(const QCheckBox &);
+	TQCheckBox(const TQCheckBox &);
 };
diff --git a/sip/qt/qclipboard.sip b/sip/qt/qclipboard.sip
index 4220c37..b6255ef 100644
--- a/sip/qt/qclipboard.sip
+++ b/sip/qt/qclipboard.sip
@@ -1,33 +1,33 @@
-// This is the SIP interface definition for QClipboard.
+// This is the SIP interface definition for TQClipboard.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QClipboard</Title>
+<Sect2><Title>TQClipboard</Title>
 <FuncSynopsis>
         <FuncDef>void *<Function>data</Function> const</FuncDef>
         <ParamDef>const char *<Parameter>format</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented (Qt v1.x).
+Not yet implemented (TQt v1.x).
 </Para>
 
 <FuncSynopsis>
@@ -36,26 +36,26 @@ Not yet implemented (Qt v1.x).
         <ParamDef>void *<Parameter></Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented (Qt v1.x).
+Not yet implemented (TQt v1.x).
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_CLIPBOARD)
+%If (TQt_CLIPBOARD)
 
-class QClipboard : QObject
+class TQClipboard : TQObject
 {
 %TypeHeaderCode
 #include <qclipboard.h>
 %End
 
 private:
-	QClipboard(QObject * /TransferThis/ = 0,const char * = 0);
-	~QClipboard();
+	TQClipboard(TQObject * /TransferThis/ = 0,const char * = 0);
+	~TQClipboard();
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum Mode {
 		Clipboard,
 		Selection
@@ -65,7 +65,7 @@ public:
 %End
 	void clear();
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool supportsSelection() const;
 	bool ownsSelection() const;
 	bool ownsClipboard() const;
@@ -74,79 +74,79 @@ public:
 	bool selectionModeEnabled() const;
 %End
 
-%If (Qt_3_1_0 -)
-	QString text(Mode) const;
-	QString text(QCString &,Mode) const;
-	void setText(const QString &,Mode);
+%If (TQt_3_1_0 -)
+	TQString text(Mode) const;
+	TQString text(TQCString &,Mode) const;
+	void setText(const TQString &,Mode);
 
-%If (Qt_MIMECLIPBOARD)
-	QMimeSource *data(Mode) const;
-	void setData(QMimeSource * /GetWrapper/,Mode);
+%If (TQt_MIMECLIPBOARD)
+	TQMimeSource *data(Mode) const;
+	void setData(TQMimeSource * /GetWrapper/,Mode);
 %MethodCode
 		sipCpp->setData(a0, a1);
 
 		// Transfer ownership to C++ and make sure the Python object
 		// stays alive by giving it a reference to itself.  The cycle
-		// will be broken by QMimeSource's virtual dtor.
+		// will be broken by TQMimeSource's virtual dtor.
 		sipTransferTo(a0Wrapper, a0Wrapper);
 %End
 
-	QImage image(Mode) const;
-	QPixmap pixmap(Mode) const;
-	void setImage(const QImage &,Mode);
-	void setPixmap(const QPixmap &,Mode);
+	TQImage image(Mode) const;
+	TQPixmap pixmap(Mode) const;
+	void setImage(const TQImage &,Mode);
+	void setPixmap(const TQPixmap &,Mode);
 %End
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 //	void *data(const char *) const;
 //	void setData(const char *,void *);
 	const char *text() const;
 	void setText(const char *);
-	QPixmap *pixmap() const;
+	TQPixmap *pixmap() const;
 %End
 
-%If (Qt_2_00 -)
-%If (Qt_MIMECLIPBOARD)
-	QMimeSource *data() const;
-	void setData(QMimeSource * /GetWrapper/);
+%If (TQt_2_00 -)
+%If (TQt_MIMECLIPBOARD)
+	TQMimeSource *data() const;
+	void setData(TQMimeSource * /GetWrapper/);
 %MethodCode
 		sipCpp->setData(a0);
 
 		// Transfer ownership to C++ and make sure the Python object
 		// stays alive by giving it a reference to itself.  The cycle
-		// will be broken by QMimeSource's virtual dtor.
+		// will be broken by TQMimeSource's virtual dtor.
 		sipTransferTo(a0Wrapper, a0Wrapper);
 %End
 %End
-	QString text() const;
-%If (Qt_2_2_0 -)
-	QString text(QCString &) const;
+	TQString text() const;
+%If (TQt_2_2_0 -)
+	TQString text(TQCString &) const;
 %End
-	void setText(const QString &);
-%If (Qt_MIMECLIPBOARD)
-	QImage image() const;
-	QPixmap pixmap() const;
-	void setImage(const QImage &);
+	void setText(const TQString &);
+%If (TQt_MIMECLIPBOARD)
+	TQImage image() const;
+	TQPixmap pixmap() const;
+	void setImage(const TQImage &);
 %End
 %End
 
-%If (Qt_MIMECLIPBOARD)
-	void setPixmap(const QPixmap &);
+%If (TQt_MIMECLIPBOARD)
+	void setPixmap(const TQPixmap &);
 %End
 
 signals:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void selectionChanged();
 %End
 	void dataChanged();
 
 protected:
 	void connectNotify(const char *);
-	bool event(QEvent *);
+	bool event(TQEvent *);
 
 private:
-	QClipboard(const QClipboard &);
+	TQClipboard(const TQClipboard &);
 };
 
 %End
diff --git a/sip/qt/qcolor.sip b/sip/qt/qcolor.sip
index 7d0d53e..d951617 100644
--- a/sip/qt/qcolor.sip
+++ b/sip/qt/qcolor.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QColor.
+// This is the SIP interface definition for TQColor.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QColor</Title>
+<Sect2><Title>TQColor</Title>
 <Para>
 The Python <Literal>==</Literal> and <Literal>!=</Literal> operators are
 supported.
@@ -79,47 +79,47 @@ This takes no parameters and returns the <Literal>r</Literal>,
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 // The global colours.
 
-QColor color0;
-QColor color1;
-QColor black;
-QColor white;
-QColor darkGray;
-QColor gray;
-QColor lightGray;
-QColor red;
-QColor green;
-QColor blue;
-QColor cyan;
-QColor magenta;
-QColor yellow;
-QColor darkRed;
-QColor darkGreen;
-QColor darkBlue;
-QColor darkCyan;
-QColor darkMagenta;
-QColor darkYellow;
+TQColor color0;
+TQColor color1;
+TQColor black;
+TQColor white;
+TQColor darkGray;
+TQColor gray;
+TQColor lightGray;
+TQColor red;
+TQColor green;
+TQColor blue;
+TQColor cyan;
+TQColor magenta;
+TQColor yellow;
+TQColor darkRed;
+TQColor darkGreen;
+TQColor darkBlue;
+TQColor darkCyan;
+TQColor darkMagenta;
+TQColor darkYellow;
 %End
 
 
 // Related functions.
 
-int qRed(QRgb);
-int qGreen(QRgb);
-int qBlue(QRgb);
-QRgb qRgb(int,int,int);
+int qRed(TQRgb);
+int qGreen(TQRgb);
+int qBlue(TQRgb);
+TQRgb qRgb(int,int,int);
 int qGray(int,int,int);
-int qGray(QRgb);
+int qGray(TQRgb);
 
-%If (Qt_2_00 -)
-int qAlpha(QRgb);
-QRgb qRgba(int,int,int,int);
+%If (TQt_2_00 -)
+int qAlpha(TQRgb);
+TQRgb qRgba(int,int,int,int);
 %End
 
 
-class QColor
+class TQColor
 {
 %TypeHeaderCode
 #include <qcolor.h>
@@ -131,32 +131,32 @@ public:
 		Hsv
 	};
 
-	QColor();
-	QColor(int,int,int);
-	QColor(int,int,int,Spec);
-	QColor(QRgb,uint = 0xffffffff);
-%If (Qt_2_00 -)
-	QColor(const QString &);
+	TQColor();
+	TQColor(int,int,int);
+	TQColor(int,int,int,Spec);
+	TQColor(TQRgb,uint = 0xffffffff);
+%If (TQt_2_00 -)
+	TQColor(const TQString &);
 %End
-	QColor(const char *);
-	QColor(const QColor &);
+	TQColor(const char *);
+	TQColor(const TQColor &);
 
 	bool isValid() const;
 	bool isDirty() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setNamedColor(const char *);
 %End
-%If (Qt_2_1_0 -)
-	QString name() const;
+%If (TQt_2_1_0 -)
+	TQString name() const;
 %End
-%If (Qt_2_00 -)
-	void setNamedColor(const QString &);
+%If (TQt_2_00 -)
+	void setNamedColor(const TQString &);
 %End
 
-	QRgb rgb() const;
+	TQRgb rgb() const;
 	void setRgb(int,int,int);
-	void setRgb(QRgb);
-%If (Qt_3_2_0 -)
+	void setRgb(TQRgb);
+%If (TQt_3_2_0 -)
 	void getRgb(int *,int *,int *) const;
 %End
 
@@ -169,25 +169,25 @@ public:
 
 	void setHsv(int,int,int);
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void getHsv(int *,int *,int *) const;
 %End
-%If (- Qt_3_2_0)
+%If (- TQt_3_2_0)
 	void getHsv(int &,int &,int &) const;
 %End
 
 	// Obsolete.
 	void hsv(int *,int *,int *) const;
 
-	QColor light(int = 150) const;
-	QColor dark(int = 200) const;
-%If (- Qt_3_0_0)
+	TQColor light(int = 150) const;
+	TQColor dark(int = 200) const;
+%If (- TQt_3_0_0)
 	static bool lazyAlloc();
 	static void setLazyAlloc(bool);
 %End
 
-	bool operator==(const QColor &) const;
-	bool operator!=(const QColor &) const;
+	bool operator==(const TQColor &) const;
+	bool operator!=(const TQColor &) const;
 
 	uint alloc();
 	uint pixel() const;
@@ -197,11 +197,11 @@ public:
 	static void leaveAllocContext();
 	static int currentAllocContext();
 	static void destroyAllocContext(int);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 %End
 	static void initialize();
 	static void cleanup();
-%If (Qt_3_2_0 -)
-	static QStringList colorNames();
+%If (TQt_3_2_0 -)
+	static TQStringList colorNames();
 %End
 };
diff --git a/sip/qt/qcolordialog.sip b/sip/qt/qcolordialog.sip
index 2f715d9..bbc9a46 100644
--- a/sip/qt/qcolordialog.sip
+++ b/sip/qt/qcolordialog.sip
@@ -1,75 +1,75 @@
-// This is the SIP interface definition for QColorDialog.
+// This is the SIP interface definition for TQColorDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QColorDialog (Qt v2+)</Title>
+<Sect2><Title>TQColorDialog (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef>static QRgb <Function>getRgba</Function></FuncDef>
-	<ParamDef>QRgb <Parameter>initial</Parameter></ParamDef>
+	<FuncDef>static TQRgb <Function>getRgba</Function></FuncDef>
+	<ParamDef>TQRgb <Parameter>initial</Parameter></ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter></ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 This takes the <Literal>initial</Literal>, <Literal>parent</Literal> and
 <Literal>name</Literal> parameters and returns a tuple containing the
-<Literal>QRgb</Literal> result and the <Literal>ok</Literal> value.
+<Literal>TQRgb</Literal> result and the <Literal>ok</Literal> value.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
-%If (Qt_COLORDIALOG)
+%If (TQt_2_00 -)
+%If (TQt_COLORDIALOG)
 
-class QColorDialog : QDialog
+class TQColorDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qcolordialog.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	static QColor getColor(QColor,QWidget * = 0,const char * = 0) /ReleaseGIL/;
+%If (- TQt_3_0_0)
+	static TQColor getColor(TQColor,TQWidget * = 0,const char * = 0) /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	static QColor getColor(const QColor & = Qt::white,QWidget * = 0,
+%If (TQt_3_0_0 -)
+	static TQColor getColor(const TQColor & = TQt::white,TQWidget * = 0,
 			       const char * = 0) /ReleaseGIL/;
 %End
-%If (Qt_2_1_0 -)
-	static QRgb getRgba(QRgb,bool * = 0,QWidget * = 0,const char * = 0) /ReleaseGIL/;
+%If (TQt_2_1_0 -)
+	static TQRgb getRgba(TQRgb,bool * = 0,TQWidget * = 0,const char * = 0) /ReleaseGIL/;
 	static int customCount();
-	static QRgb customColor(int);
-	static void setCustomColor(int,QRgb);
+	static TQRgb customColor(int);
+	static void setCustomColor(int,TQRgb);
 %End
-%If (Qt_3_1_0 -)
-	static void setStandardColor(int,QRgb);
+%If (TQt_3_1_0 -)
+	static void setStandardColor(int,TQRgb);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QColorDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
-	QColorDialog(const QColorDialog &);
-	~QColorDialog();
+%If (TQt_2_1_0 -)
+	TQColorDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
+	TQColorDialog(const TQColorDialog &);
+	~TQColorDialog();
 %End
 };
 
diff --git a/sip/qt/qcolorgroup.sip b/sip/qt/qcolorgroup.sip
index 20e37b0..0be09d3 100644
--- a/sip/qt/qcolorgroup.sip
+++ b/sip/qt/qcolorgroup.sip
@@ -1,56 +1,56 @@
-// This is the SIP interface definition for QColorGroup.
+// This is the SIP interface definition for TQColorGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QColorGroup</Title>
+<Sect2><Title>TQColorGroup</Title>
 <Para>
-<Literal>QColorGroup</Literal> is fully implemented.
+<Literal>TQColorGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QColorGroup
+class TQColorGroup
 {
 %TypeHeaderCode
 #include <qpalette.h>
 %End
 
 public:
-	QColorGroup();
-	QColorGroup(const QColor &,const QColor &,const QColor &,const QColor &,
-		    const QColor &,const QColor &,const QColor &);
-%If (Qt_2_00 -)
-	QColorGroup(const QBrush &,const QBrush &,const QBrush &,const QBrush &,
-		    const QBrush &,const QBrush &,const QBrush &,const QBrush &,
-		    const QBrush &);
+	TQColorGroup();
+	TQColorGroup(const TQColor &,const TQColor &,const TQColor &,const TQColor &,
+		    const TQColor &,const TQColor &,const TQColor &);
+%If (TQt_2_00 -)
+	TQColorGroup(const TQBrush &,const TQBrush &,const TQBrush &,const TQBrush &,
+		    const TQBrush &,const TQBrush &,const TQBrush &,const TQBrush &,
+		    const TQBrush &);
 %End
-	QColorGroup(QColorGroup&);
+	TQColorGroup(TQColorGroup&);
 
-%If (- Qt_2_00)
-	QColor midlight() const;
+%If (- TQt_2_00)
+	TQColor midlight() const;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	enum ColorRole
 	{
 		Foreground,
@@ -70,7 +70,7 @@ public:
 		NColorRoles
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum ColorRole
 	{
 		Foreground,
@@ -93,33 +93,33 @@ public:
 	};
 %End
 
-%If (Qt_2_00 -)
-	const QColor &color(ColorRole) const;
-	const QBrush &brush(ColorRole) const;
-	void setColor(ColorRole,const QColor &);
-	void setBrush(ColorRole,const QBrush &);
+%If (TQt_2_00 -)
+	const TQColor &color(ColorRole) const;
+	const TQBrush &brush(ColorRole) const;
+	void setColor(ColorRole,const TQColor &);
+	void setBrush(ColorRole,const TQBrush &);
 %End
 
-	const QColor &foreground() const;
-%If (Qt_2_00 -)
-	const QColor &button() const;
+	const TQColor &foreground() const;
+%If (TQt_2_00 -)
+	const TQColor &button() const;
 %End
-	const QColor &light() const;
-	const QColor &dark() const;
-	const QColor &mid() const;
-	const QColor &text() const;
-	const QColor &base() const;
-	const QColor &background() const;
-%If (Qt_2_00 -)
-	const QColor &midlight() const;
-	const QColor &brightText() const;
-	const QColor &buttonText() const;
-	const QColor &shadow() const;
-	const QColor &highlight() const;
-	const QColor &highlightedText() const;
+	const TQColor &light() const;
+	const TQColor &dark() const;
+	const TQColor &mid() const;
+	const TQColor &text() const;
+	const TQColor &base() const;
+	const TQColor &background() const;
+%If (TQt_2_00 -)
+	const TQColor &midlight() const;
+	const TQColor &brightText() const;
+	const TQColor &buttonText() const;
+	const TQColor &shadow() const;
+	const TQColor &highlight() const;
+	const TQColor &highlightedText() const;
 %End
-%If (Qt_3_0_0 -)
-	const QColor &link() const;
-	const QColor &linkVisited() const;
+%If (TQt_3_0_0 -)
+	const TQColor &link() const;
+	const TQColor &linkVisited() const;
 %End
 };
diff --git a/sip/qt/qcombobox.sip b/sip/qt/qcombobox.sip
index 3555eba..62f4863 100644
--- a/sip/qt/qcombobox.sip
+++ b/sip/qt/qcombobox.sip
@@ -1,154 +1,154 @@
-// This is the SIP interface definition for QComboBox.
+// This is the SIP interface definition for TQComboBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QComboBox</Title>
+<Sect2><Title>TQComboBox</Title>
 <Para>
-<Literal>QComboBox</Literal> is fully implemented.
+<Literal>TQComboBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QComboBox : QWidget
+class TQComboBox : TQWidget
 {
 %TypeHeaderCode
 #include <qcombobox.h>
 %End
 
 public:
-	QComboBox(QWidget * /TransferThis/ = 0,char * = 0);
-	QComboBox(bool,QWidget * /TransferThis/ = 0,char * = 0);
+	TQComboBox(TQWidget * /TransferThis/ = 0,char * = 0);
+	TQComboBox(bool,TQWidget * /TransferThis/ = 0,char * = 0);
 
 	int count() const;
 
-%If (Qt_2_00 -)
-	void insertStringList(QStringList &,int = -1);
+%If (TQt_2_00 -)
+	void insertStringList(TQStringList &,int = -1);
 %End
-	void insertStrList(const QStrList *,int = -1);
-//	void insertStrList(const QStrList &,int = -1);
+	void insertStrList(const TQStrList *,int = -1);
+//	void insertStrList(const TQStrList &,int = -1);
 //	void insertStrList(const char **,int = -1,int = -1);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void insertItem(const char *,int = -1);
 %End
-%If (Qt_2_00 -)
-	void insertItem(const QString &,int = -1);
+%If (TQt_2_00 -)
+	void insertItem(const TQString &,int = -1);
 %End
-	void insertItem(const QPixmap &,int = -1);
-%If (Qt_2_1_0 -)
-	void insertItem(const QPixmap &,const QString &,int = -1);
+	void insertItem(const TQPixmap &,int = -1);
+%If (TQt_2_1_0 -)
+	void insertItem(const TQPixmap &,const TQString &,int = -1);
 %End
 
 	void removeItem(int);
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void clear();
 %End
 
 	int currentItem() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setCurrentItem(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setCurrentItem(int);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *currentText() const;
 %End
-%If (Qt_2_00 -)
-	QString currentText() const;
+%If (TQt_2_00 -)
+	TQString currentText() const;
 %End
-%If (Qt_3_0_0 -)
-	virtual void setCurrentText(const QString &);
+%If (TQt_3_0_0 -)
+	virtual void setCurrentText(const TQString &);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text(int) const;
 %End
-%If (Qt_2_00 -)
-	QString text(int) const;
+%If (TQt_2_00 -)
+	TQString text(int) const;
 %End
-	const QPixmap *pixmap(int) const;
+	const TQPixmap *pixmap(int) const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void changeItem(const char *,int);
 %End
-%If (Qt_2_00 -)
-	void changeItem(const QString &,int);
+%If (TQt_2_00 -)
+	void changeItem(const TQString &,int);
 %End
-	void changeItem(const QPixmap &,int);
-%If (Qt_2_1_0 -)
-	void changeItem(const QPixmap &,const QString &,int);
+	void changeItem(const TQPixmap &,int);
+%If (TQt_2_1_0 -)
+	void changeItem(const TQPixmap &,const TQString &,int);
 %End
 
 	bool autoResize() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoResize(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAutoResize(bool);
 %End
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual TQSizePolicy sizePolicy() const;
 %End
 
-%If (- Qt_2_00)
-	void setBackgroundColor(const QColor &);
+%If (- TQt_2_00)
+	void setBackgroundColor(const TQColor &);
 	void setStyle(GUIStyle);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual void setBackgroundColor(const QColor &);
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual void setBackgroundColor(const TQColor &);
 %End
-%If (- Qt_2_00)
-	void setPalette(const QPalette &);
-	void setFont(const QFont &);
+%If (- TQt_2_00)
+	void setPalette(const TQPalette &);
+	void setFont(const TQFont &);
 	void setEnabled(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual void setPalette(const QPalette &);
-	virtual void setFont(const QFont &);
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual void setPalette(const TQPalette &);
+	virtual void setFont(const TQFont &);
 	virtual void setEnabled(bool);
 %End
-%If (Qt_3_0_0 -)
-	void setPalette(const QPalette &);
-	void setFont(const QFont &);
+%If (TQt_3_0_0 -)
+	void setPalette(const TQPalette &);
+	void setFont(const TQFont &);
 	void setEnabled(bool);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSizeLimit(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setSizeLimit(int);
 %End
 	int sizeLimit() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMaxCount(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMaxCount(int);
 %End
 	int maxCount() const;
@@ -162,116 +162,116 @@ public:
 		BeforeCurrent
 	};
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setInsertionPolicy(Policy);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setInsertionPolicy(Policy);
 %End
 	Policy insertionPolicy() const;
 
-%If (- Qt_2_00)
-	void setValidator(QValidator *);
-	QValidator *validator() const;
+%If (- TQt_2_00)
+	void setValidator(TQValidator *);
+	TQValidator *validator() const;
 %End
-%If (Qt_2_00 -)
-	virtual void setValidator(const QValidator *);
-	const QValidator *validator() const;
+%If (TQt_2_00 -)
+	virtual void setValidator(const TQValidator *);
+	const TQValidator *validator() const;
 %End
 
-%If (- Qt_2_00)
-	void setListBox(QListBox *);
+%If (- TQt_2_00)
+	void setListBox(TQListBox *);
 %End
-%If (Qt_2_00 -)
-	virtual void setListBox(QListBox *);
+%If (TQt_2_00 -)
+	virtual void setListBox(TQListBox *);
 %End
-	QListBox *listBox() const;
+	TQListBox *listBox() const;
 
-%If (Qt_3_0_0 -)
-	virtual void setLineEdit(QLineEdit *);
+%If (TQt_3_0_0 -)
+	virtual void setLineEdit(TQLineEdit *);
 %End
-%If (Qt_2_1_0 -)
-	QLineEdit *lineEdit() const;
+%If (TQt_2_1_0 -)
+	TQLineEdit *lineEdit() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoCompletion(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAutoCompletion(bool);
 %End
 	bool autoCompletion() const;
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setDuplicatesEnabled(bool);
 	bool duplicatesEnabled() const;
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool editable() const;
 	void setEditable(bool);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void popup();
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	void hide();
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void clear();
 %End
 	void clearValidator();
 	void clearEdit();
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setEditText(const char *);
 %End
-%If (Qt_2_00 -)
-	virtual void setEditText(const QString &);
+%If (TQt_2_00 -)
+	virtual void setEditText(const TQString &);
 %End
 
 signals:
 	void activated(int);
 	void highlighted(int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void activated(const char *);
 	void highlighted(const char *);
 %End
-%If (Qt_2_00 -)
-	void activated(const QString &);
-	void highlighted(const QString &);
-	void textChanged(const QString &);
+%If (TQt_2_00 -)
+	void activated(const TQString &);
+	void highlighted(const TQString &);
+	void textChanged(const TQString &);
 %End
 
 protected:
-	void paintEvent(QPaintEvent *);
-	void resizeEvent(QResizeEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-%If (Qt_3_1_1 -)
-	void focusOutEvent(QFocusEvent *);
-%End
-%If (Qt_3_1_0 -)
-	void wheelEvent(QWheelEvent *);
-%End
-%If (- Qt_3_0_0)
+	void paintEvent(TQPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+%If (TQt_3_1_1 -)
+	void focusOutEvent(TQFocusEvent *);
+%End
+%If (TQt_3_1_0 -)
+	void wheelEvent(TQWheelEvent *);
+%End
+%If (- TQt_3_0_0)
 	void popup();
 %End
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 
 	void updateMask();
 %End
 
 private:
-	QComboBox(const QComboBox &);
+	TQComboBox(const TQComboBox &);
 };
diff --git a/sip/qt/qcommonstyle.sip b/sip/qt/qcommonstyle.sip
index b838716..0209d68 100644
--- a/sip/qt/qcommonstyle.sip
+++ b/sip/qt/qcommonstyle.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QCommonStyle.
+// This is the SIP interface definition for TQCommonStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QCommonStyle (Qt v2+)</Title>
+<Sect2><Title>TQCommonStyle (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>virtual void <Function>getButtonShift</Function></FuncDef>
 	<ParamDef>int &amp;<Parameter>x</Parameter></ParamDef>
@@ -29,12 +29,12 @@
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>x</Literal> and
-<Literal>y</Literal> values.  (Qt v2)
+<Literal>y</Literal> values.  (TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>virtual void <Function>tabbarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>t</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>t</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>hframe</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>vframe</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>overlap</Parameter></ParamDef>
@@ -42,95 +42,95 @@ This takes no parameters and returns a tuple of the <Literal>x</Literal> and
 <Para>
 This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 <Literal>hframe</Literal>, <Literal>vframe</Literal> and
-<Literal>overlap</Literal> values.  (Qt v2)
+<Literal>overlap</Literal> values.  (TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QCommonStyle : QStyle
+class TQCommonStyle : TQStyle
 {
 %TypeHeaderCode
 #include <qcommonstyle.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
-	void drawComboButtonMask(QPainter *,int,int,int,int);
-	void drawPushButtonLabel(QPushButton *,QPainter *);
+%If (- TQt_3_0_0)
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
+	void drawComboButtonMask(TQPainter *,int,int,int,int);
+	void drawPushButtonLabel(TQPushButton *,TQPainter *);
 	void getButtonShift(int &,int &);
 	int defaultFrameWidth() const;
-	void tabbarMetrics(const QTabBar *,int &,int &,int &);
-	void drawTab(QPainter *,const QTabBar *,QTab *,bool);
-	void drawTabMask(QPainter *,const QTabBar *,QTab *,bool);
-	ScrollControl scrollBarPointOver(const QScrollBar *,int,const QPoint &);
-	void drawSliderMask(QPainter *,int,int,int,int,Orientation,bool,bool);
-	void drawSliderGrooveMask(QPainter *,int,int,int,int,QCOORD,Orientation);
+	void tabbarMetrics(const TQTabBar *,int &,int &,int &);
+	void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool);
+	void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool);
+	ScrollControl scrollBarPointOver(const TQScrollBar *,int,const TQPoint &);
+	void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool);
+	void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD,Orientation);
 	int maximumSliderDragDistance() const;
-	int popupSubmenuIndicatorWidth(const QFontMetrics &);
+	int popupSubmenuIndicatorWidth(const TQFontMetrics &);
 %End
 
-%If (Qt_3_0_0 -)
-	QCommonStyle();
+%If (TQt_3_0_0 -)
+	TQCommonStyle();
 
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption& = QStyleOption()) const;
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption& = TQStyleOption()) const;
 
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
 
-	void drawControlMask(ControlElement,QPainter *,const QWidget *,
-			     const QRect &,
-			     const QStyleOption & = QStyleOption()) const;
+	void drawControlMask(ControlElement,TQPainter *,const TQWidget *,
+			     const TQRect &,
+			     const TQStyleOption & = TQStyleOption()) const;
 
-	QRect subRect(SubRect,const QWidget *) const;
+	TQRect subRect(SubRect,const TQWidget *) const;
 
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const;
+				const TQStyleOption & = TQStyleOption()) const;
 
-	void drawComplexControlMask(ComplexControl,QPainter *,const QWidget *,
-				    const QRect &,
-				    const QStyleOption & = QStyleOption()) const;
+	void drawComplexControlMask(ComplexControl,TQPainter *,const TQWidget *,
+				    const TQRect &,
+				    const TQStyleOption & = TQStyleOption()) const;
 
-	QRect querySubControlMetrics(ComplexControl,const QWidget *,SubControl,
-				     const QStyleOption & = QStyleOption()) const;
+	TQRect querySubControlMetrics(ComplexControl,const TQWidget *,SubControl,
+				     const TQStyleOption & = TQStyleOption()) const;
 
-	SubControl querySubControl(ComplexControl,const QWidget *,
-				   const QPoint &,
-				   const QStyleOption & = QStyleOption()) const;
+	SubControl querySubControl(ComplexControl,const TQWidget *,
+				   const TQPoint &,
+				   const TQStyleOption & = TQStyleOption()) const;
 
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
 
-	QSize sizeFromContents(ContentsType,const QWidget *,const QSize &,
-			       const QStyleOption & = QStyleOption()) const;
+	TQSize sizeFromContents(ContentsType,const TQWidget *,const TQSize &,
+			       const TQStyleOption & = TQStyleOption()) const;
 
-	int styleHint(StyleHint,const QWidget *,const QStyleOption &,
-		      QStyleHintReturn *) const;
+	int styleHint(StyleHint,const TQWidget *,const TQStyleOption &,
+		      TQStyleHintReturn *) const;
 
-	QPixmap stylePixmap(StylePixmap,const QWidget * = 0,
-			    const QStyleOption & = QStyleOption()) const;
+	TQPixmap stylePixmap(StylePixmap,const TQWidget * = 0,
+			    const TQStyleOption & = TQStyleOption()) const;
 
 %End
 
 private:
-%If (- Qt_3_0_0)
-	QCommonStyle(GUIStyle);
-	~QCommonStyle();
+%If (- TQt_3_0_0)
+	TQCommonStyle(GUIStyle);
+	~TQCommonStyle();
 %End
-%If (Qt_3_0_0 -)
-	QCommonStyle(const QCommonStyle &);
+%If (TQt_3_0_0 -)
+	TQCommonStyle(const TQCommonStyle &);
 %End
 };
 
diff --git a/sip/qt/qcstring.sip b/sip/qt/qcstring.sip
index 64b3b2a..acf919d 100644
--- a/sip/qt/qcstring.sip
+++ b/sip/qt/qcstring.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QCString.
+// This is the SIP interface definition for TQCString.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QCString (Qt v2+)</Title>
+<Sect2><Title>TQCString (TQt v2+)</Title>
 <Para>
-A Python string can be used whenever a <Literal>QCString</Literal> can be used.
-A <Literal>QCString</Literal> can be converted to a Python string using the
+A Python string can be used whenever a <Literal>TQCString</Literal> can be used.
+A <Literal>TQCString</Literal> can be converted to a Python string using the
 Python <Literal>str()</Literal> function.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QCString &amp;<Function>sprintf</Function></FuncDef>
+	<FuncDef>TQCString &amp;<Function>sprintf</Function></FuncDef>
 	<ParamDef>const char *<Parameter>format</Parameter></ParamDef>
 	<ParamDef>...</ParamDef>
 </FuncSynopsis>
@@ -112,20 +112,20 @@ This returns a tuple of the <Literal>double</Literal> result and the
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QCString : QByteArray
+class TQCString : TQByteArray
 {
 %TypeHeaderCode
 #include <qcstring.h>
 %End
 
 public:
-	QCString();
-	QCString(int);
-	QCString(const QCString &);
-	QCString(const char *);
-	QCString(const char *,uint);
+	TQCString();
+	TQCString(int);
+	TQCString(const TQCString &);
+	TQCString(const char *);
+	TQCString(const char *,uint);
 
 	bool isNull() const;
 	bool isEmpty() const;
@@ -133,37 +133,37 @@ public:
 	bool resize(uint);
 	bool truncate(uint);
 	bool fill(char,int = -1);
-	QCString copy() const;
-//	QCString &sprintf(const char *,...);
+	TQCString copy() const;
+//	TQCString &sprintf(const char *,...);
 //	int find(char,int = 0,bool = 1) const;
 	int find(const char *,int = 0,bool = 1) const;
-	int find(const QRegExp &,int = 0) const;
+	int find(const TQRegExp &,int = 0) const;
 //	int findRev(char,int = -1,bool = 1) const;
 	int findRev(const char *,int = -1,bool = 1) const;
-	int findRev(const QRegExp &,int = -1) const;
+	int findRev(const TQRegExp &,int = -1) const;
 //	int contains(char,bool = 1) const;
 	int contains(const char *,bool = 1) const;
-	int contains(const QRegExp &) const;
-	QCString left(uint) const;
-	QCString right(uint) const;
-	QCString mid(uint,uint = 0xffffffff) const;
-	QCString leftJustify(uint,char = ' ',bool = 0) const;
-	QCString rightJustify(uint,char = ' ',bool = 0) const;
-	QCString lower() const;
-	QCString upper() const;
-	QCString stripWhiteSpace() const;
-	QCString simplifyWhiteSpace() const;
-	QCString &insert(uint,const char *);
-//	QCString &insert(uint,char);
-	QCString &append(const char *);
-	QCString &prepend(const char *);
-	QCString &remove(uint,uint);
-	QCString &replace(uint,uint,const char *);
-	QCString &replace(const QRegExp &,const char *);
-%If (Qt_3_1_0 -)
-//	QCString &replace(char,const char *);
-	QCString &replace(const char *,const char *);
-//	QCString &replace(char,char);
+	int contains(const TQRegExp &) const;
+	TQCString left(uint) const;
+	TQCString right(uint) const;
+	TQCString mid(uint,uint = 0xffffffff) const;
+	TQCString leftJustify(uint,char = ' ',bool = 0) const;
+	TQCString rightJustify(uint,char = ' ',bool = 0) const;
+	TQCString lower() const;
+	TQCString upper() const;
+	TQCString stripWhiteSpace() const;
+	TQCString simplifyWhiteSpace() const;
+	TQCString &insert(uint,const char *);
+//	TQCString &insert(uint,char);
+	TQCString &append(const char *);
+	TQCString &prepend(const char *);
+	TQCString &remove(uint,uint);
+	TQCString &replace(uint,uint,const char *);
+	TQCString &replace(const TQRegExp &,const char *);
+%If (TQt_3_1_0 -)
+//	TQCString &replace(char,const char *);
+	TQCString &replace(const char *,const char *);
+//	TQCString &replace(char,char);
 %End
 
 	short toShort(bool * = 0) const;
@@ -175,15 +175,15 @@ public:
 	float toFloat(bool * = 0) const;
 	double toDouble(bool * = 0) const;
 
-	QCString &setStr(const char *);
-//	QCString &setNum(short);
-//	QCString &setNum(ushort);
-	QCString &setNum(int /Constrained/);
-//	QCString &setNum(uint);
-//	QCString &setNum(long);
-//	QCString &setNum(ulong);
-//	QCString &setNum(float,char = 'g',int = 6);
-	QCString &setNum(double,char = 'g',int = 6);
+	TQCString &setStr(const char *);
+//	TQCString &setNum(short);
+//	TQCString &setNum(ushort);
+	TQCString &setNum(int /Constrained/);
+//	TQCString &setNum(uint);
+//	TQCString &setNum(long);
+//	TQCString &setNum(ulong);
+//	TQCString &setNum(float,char = 'g',int = 6);
+	TQCString &setNum(double,char = 'g',int = 6);
 	bool setExpand(uint,char);
 
 	SIP_PYOBJECT __str__();
@@ -201,7 +201,7 @@ public:
 %End
 
 %ConvertToTypeCode
-	// Allow a Python string whenever a QCString is expected.
+	// Allow a Python string whenever a TQCString is expected.
 
 	if (sipIsErr == NULL)
 		return (PyString_Check(sipPy) ||
@@ -209,12 +209,12 @@ public:
 
 	if (PyString_Check(sipPy))
 	{
-		*sipCppPtr = new QCString(PyString_AS_STRING(sipPy));
+		*sipCppPtr = new TQCString(PyString_AS_STRING(sipPy));
 
 		return sipGetState(sipTransferObj);
 	}
 
-	*sipCppPtr = reinterpret_cast<QCString *>(sipConvertToInstance(sipPy,sipClass_QCString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
+	*sipCppPtr = reinterpret_cast<TQCString *>(sipConvertToInstance(sipPy,sipClass_QCString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
 
 	return 0;
 %End
diff --git a/sip/qt/qcursor.sip b/sip/qt/qcursor.sip
index 3631c30..07b3554 100644
--- a/sip/qt/qcursor.sip
+++ b/sip/qt/qcursor.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QCursor.
+// This is the SIP interface definition for TQCursor.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QCursor</Title>
+<Sect2><Title>TQCursor</Title>
 <Para>
-<Literal>QCursor</Literal> is fully implemented.
+<Literal>TQCursor</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
@@ -34,25 +34,25 @@
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 // Global cursors.
 
-const QCursor arrowCursor;
-const QCursor upArrowCursor;
-const QCursor crossCursor;
-const QCursor waitCursor;
-const QCursor ibeamCursor;
-const QCursor sizeVerCursor;
-const QCursor sizeHorCursor;
-const QCursor sizeBDiagCursor;
-const QCursor sizeFDiagCursor;
-const QCursor sizeAllCursor;
-const QCursor blankCursor;
+const TQCursor arrowCursor;
+const TQCursor upArrowCursor;
+const TQCursor crossCursor;
+const TQCursor waitCursor;
+const TQCursor ibeamCursor;
+const TQCursor sizeVerCursor;
+const TQCursor sizeHorCursor;
+const TQCursor sizeBDiagCursor;
+const TQCursor sizeFDiagCursor;
+const TQCursor sizeAllCursor;
+const TQCursor blankCursor;
 %End
 
 
-%If (- Qt_3_0_0)
-enum QCursorShape {
+%If (- TQt_3_0_0)
+enum TQCursorShape {
 	ArrowCursor,
 	UpArrowCursor,
 	CrossCursor,
@@ -69,72 +69,72 @@ enum QCursorShape {
 };
 
 
-class QCursor
+class TQCursor
 {
 %TypeHeaderCode
 #include <qcursor.h>
 %End
 
 public:
-	QCursor();
-	QCursor(int);
-	QCursor(const QBitmap &,const QBitmap &,int = -1,int = -1);
-%If (Qt_2_00 -)
-	QCursor(const QPixmap &,int = -1,int = -1);
+	TQCursor();
+	TQCursor(int);
+	TQCursor(const TQBitmap &,const TQBitmap &,int = -1,int = -1);
+%If (TQt_2_00 -)
+	TQCursor(const TQPixmap &,int = -1,int = -1);
 %End
-	QCursor(const QCursor &);
+	TQCursor(const TQCursor &);
 
 	int shape() const;
 	void setShape(int);
-	const QBitmap *bitmap() const;
-	const QBitmap *mask() const;
-	QPoint hotSpot() const;
-%If (- Qt_2_00)
+	const TQBitmap *bitmap() const;
+	const TQBitmap *mask() const;
+	TQPoint hotSpot() const;
+%If (- TQt_2_00)
 	HANDLE handle() const;
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 %If (WS_X11)
 	HANDLE handle() const;
 %End
 %End
-	static QPoint pos();
+	static TQPoint pos();
 	static void setPos(int,int);
-	static void setPos(const QPoint &);
+	static void setPos(const TQPoint &);
 	static void initialize();
 	static void cleanup();
 };
 %End
 
-%If (Qt_3_0_0 -)
-class QCursor : Qt
+%If (TQt_3_0_0 -)
+class TQCursor : TQt
 {
 %TypeHeaderCode
 #include <qcursor.h>
 %End
 
 public:
-	QCursor();
-	QCursor(int);
-	QCursor(const QBitmap &,const QBitmap &,int = -1,int = -1);
-	QCursor(const QPixmap &,int = -1,int = -1);
-	QCursor(const QCursor &);
+	TQCursor();
+	TQCursor(int);
+	TQCursor(const TQBitmap &,const TQBitmap &,int = -1,int = -1);
+	TQCursor(const TQPixmap &,int = -1,int = -1);
+	TQCursor(const TQCursor &);
 
 	int shape() const;
 	void setShape(int);
-	const QBitmap *bitmap() const;
-	const QBitmap *mask() const;
-	QPoint hotSpot() const;
+	const TQBitmap *bitmap() const;
+	const TQBitmap *mask() const;
+	TQPoint hotSpot() const;
 
 %If (WS_X11)
 	HANDLE handle() const;
-%If (Qt_3_3_0 -)
-	// This would have the same Python signature as QCursor(int).
-	//QCursor(HANDLE);
+%If (TQt_3_3_0 -)
+	// This would have the same Python signature as TQCursor(int).
+	//TQCursor(HANDLE);
 %End
 %End
-	static QPoint pos();
+	static TQPoint pos();
 	static void setPos(int,int);
-	static void setPos(const QPoint &);
+	static void setPos(const TQPoint &);
 	static void initialize();
 	static void cleanup();
 %If (WS_X11)
diff --git a/sip/qt/qdatastream.sip b/sip/qt/qdatastream.sip
index 1a27132..e970c30 100644
--- a/sip/qt/qdatastream.sip
+++ b/sip/qt/qdatastream.sip
@@ -1,50 +1,50 @@
-// This is the SIP interface definition for QDataStream.
+// This is the SIP interface definition for TQDataStream.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDataStream</Title>
+<Sect2><Title>TQDataStream</Title>
 <FuncSynopsis>
-	<FuncDef>QDataStream &amp;<Function>readBytes</Function></FuncDef>
+	<FuncDef>TQDataStream &amp;<Function>readBytes</Function></FuncDef>
 	<ParamDef>const char *&amp;<Parameter>s</Parameter></ParamDef>
 	<ParamDef>uint &amp;<Parameter>l</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-This takes no parameters.  The <Literal>QDataStream</Literal> result and the
+This takes no parameters.  The <Literal>TQDataStream</Literal> result and the
 data read are returned as a tuple.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QDataStream &amp;<Function>readRawBytes</Function></FuncDef>
+	<FuncDef>TQDataStream &amp;<Function>readRawBytes</Function></FuncDef>
 	<ParamDef>const char *<Parameter>s</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>l</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes only the <Literal>l</Literal> parameter.  The
-<Literal>QDataStream</Literal> result and the data read are returned as a
+<Literal>TQDataStream</Literal> result and the data read are returned as a
 tuple.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QDataStream &amp;<Function>writeBytes</Function></FuncDef>
+	<FuncDef>TQDataStream &amp;<Function>writeBytes</Function></FuncDef>
 	<ParamDef>const char *<Parameter>s</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
@@ -54,7 +54,7 @@ parameter.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QDataStream &amp;<Function>writeRawBytes</Function></FuncDef>
+	<FuncDef>TQDataStream &amp;<Function>writeRawBytes</Function></FuncDef>
 	<ParamDef>const char *<Parameter>s</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
@@ -66,21 +66,21 @@ parameter.
 %End
 
 
-class QDataStream
+class TQDataStream
 {
 %TypeHeaderCode
 #include <qdatastream.h>
 %End
 
 public:
-	QDataStream();
-	QDataStream(QIODevice *);
-	QDataStream(QByteArray,int);
+	TQDataStream();
+	TQDataStream(TQIODevice *);
+	TQDataStream(TQByteArray,int);
 
-	QIODevice *device() const;
-	void setDevice(QIODevice *);
+	TQIODevice *device() const;
+	void setDevice(TQIODevice *);
 	void unsetDevice();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool atEnd() const;
 %End
 	bool eof() const;
@@ -103,7 +103,7 @@ public:
 		uint l;
 
 		Py_BEGIN_ALLOW_THREADS
-		sipCpp -> QDataStream::readBytes(c,l);
+		sipCpp -> TQDataStream::readBytes(c,l);
 		Py_END_ALLOW_THREADS
 
 		sipRes = sipBuildResult(&sipIsErr,"(Sa)",sipSelf,c,l);
@@ -121,7 +121,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp -> QDataStream::readRawBytes(buf,a0);
+			sipCpp -> TQDataStream::readRawBytes(buf,a0);
 			Py_END_ALLOW_THREADS
 
                         sipRes = sipBuildResult(&sipIsErr,"(Sa)",sipSelf,buf,a0);
@@ -130,95 +130,95 @@ public:
                 }
 %End
 
-	QDataStream &writeBytes(const char * /Array/,
+	TQDataStream &writeBytes(const char * /Array/,
 				uint /ArraySize/) /ReleaseGIL/;
-	QDataStream &writeRawBytes(const char * /Array/,
+	TQDataStream &writeRawBytes(const char * /Array/,
 				   uint /ArraySize/) /ReleaseGIL/;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	// These are taken from the corresponding class definitions.  We limit
-	// them to Qt v3.0.0 and later just to avoid checking earlier versions.
+	// them to TQt v3.0.0 and later just to avoid checking earlier versions.
 
-	QDataStream &operator<<(const QBrush &);
-	QDataStream &operator>>(QBrush & /Constrained/);
+	TQDataStream &operator<<(const TQBrush &);
+	TQDataStream &operator>>(TQBrush & /Constrained/);
 
-	QDataStream &operator<<(const QColor &);
-	QDataStream &operator>>(QColor & /Constrained/);
+	TQDataStream &operator<<(const TQColor &);
+	TQDataStream &operator>>(TQColor & /Constrained/);
 
-	QDataStream &operator<<(const QByteArray &);
-	QDataStream &operator>>(QByteArray & /Constrained/);
+	TQDataStream &operator<<(const TQByteArray &);
+	TQDataStream &operator>>(TQByteArray & /Constrained/);
 
-	QDataStream &operator<<(const QCString &);
-	QDataStream &operator>>(QCString & /Constrained/);
+	TQDataStream &operator<<(const TQCString &);
+	TQDataStream &operator>>(TQCString & /Constrained/);
 
-	QDataStream &operator<<(const QCursor &);
-	QDataStream &operator>>(QCursor & /Constrained/);
+	TQDataStream &operator<<(const TQCursor &);
+	TQDataStream &operator>>(TQCursor & /Constrained/);
 
-	QDataStream &operator<<(const QDate &);
-	QDataStream &operator>>(QDate & /Constrained/);
+	TQDataStream &operator<<(const TQDate &);
+	TQDataStream &operator>>(TQDate & /Constrained/);
 
-	QDataStream &operator<<(const QTime &);
-	QDataStream &operator>>(QTime & /Constrained/);
+	TQDataStream &operator<<(const TQTime &);
+	TQDataStream &operator>>(TQTime & /Constrained/);
 
-	QDataStream &operator<<(const QDateTime &);
-	QDataStream &operator>>(QDateTime & /Constrained/);
+	TQDataStream &operator<<(const TQDateTime &);
+	TQDataStream &operator>>(TQDateTime & /Constrained/);
 
-	QDataStream &operator<<(const QFont &);
-	QDataStream &operator>>(QFont & /Constrained/);
+	TQDataStream &operator<<(const TQFont &);
+	TQDataStream &operator>>(TQFont & /Constrained/);
 
-	QDataStream &operator<<(const QImage &);
-	QDataStream &operator>>(QImage & /Constrained/);
+	TQDataStream &operator<<(const TQImage &);
+	TQDataStream &operator>>(TQImage & /Constrained/);
 
-	QDataStream &operator<<(const QKeySequence &);
-	QDataStream &operator>>(QKeySequence & /Constrained/);
+	TQDataStream &operator<<(const TQKeySequence &);
+	TQDataStream &operator>>(TQKeySequence & /Constrained/);
 
-	QDataStream &operator<<(const QColorGroup &);
-	QDataStream &operator>>(QColorGroup & /Constrained/);
+	TQDataStream &operator<<(const TQColorGroup &);
+	TQDataStream &operator>>(TQColorGroup & /Constrained/);
 
-	QDataStream &operator<<(const QPalette &);
-	QDataStream &operator>>(QPalette & /Constrained/);
+	TQDataStream &operator<<(const TQPalette &);
+	TQDataStream &operator>>(TQPalette & /Constrained/);
 
-	QDataStream &operator<<(const QPen &);
-	QDataStream &operator>>(QPen & /Constrained/);
+	TQDataStream &operator<<(const TQPen &);
+	TQDataStream &operator>>(TQPen & /Constrained/);
 
-	QDataStream &operator<<(const QPicture &);
-	QDataStream &operator>>(QPicture & /Constrained/);
+	TQDataStream &operator<<(const TQPicture &);
+	TQDataStream &operator>>(TQPicture & /Constrained/);
 
-	QDataStream &operator<<(const QPixmap &);
-	QDataStream &operator>>(QPixmap & /Constrained/);
+	TQDataStream &operator<<(const TQPixmap &);
+	TQDataStream &operator>>(TQPixmap & /Constrained/);
 
-	QDataStream &operator<<(const QPointArray &);
-	QDataStream &operator>>(QPointArray & /Constrained/);
+	TQDataStream &operator<<(const TQPointArray &);
+	TQDataStream &operator>>(TQPointArray & /Constrained/);
 
-	QDataStream &operator<<(const QPoint &);
-	QDataStream &operator>>(QPoint & /Constrained/);
+	TQDataStream &operator<<(const TQPoint &);
+	TQDataStream &operator>>(TQPoint & /Constrained/);
 
-	QDataStream &operator<<(const QRect &);
-	QDataStream &operator>>(QRect & /Constrained/);
+	TQDataStream &operator<<(const TQRect &);
+	TQDataStream &operator>>(TQRect & /Constrained/);
 
-	QDataStream &operator<<(const QRegion &);
-	QDataStream &operator>>(QRegion & /Constrained/);
+	TQDataStream &operator<<(const TQRegion &);
+	TQDataStream &operator>>(TQRegion & /Constrained/);
 
-	QDataStream &operator<<(const QSize &);
-	QDataStream &operator>>(QSize & /Constrained/);
+	TQDataStream &operator<<(const TQSize &);
+	TQDataStream &operator>>(TQSize & /Constrained/);
 
-	QDataStream &operator<<(const QString &);
-	QDataStream &operator>>(QString & /Constrained/);
+	TQDataStream &operator<<(const TQString &);
+	TQDataStream &operator>>(TQString & /Constrained/);
 
-	QDataStream &operator<<(const QStringList &);
-	QDataStream &operator>>(QStringList & /Constrained/);
+	TQDataStream &operator<<(const TQStringList &);
+	TQDataStream &operator>>(TQStringList & /Constrained/);
 
-	QDataStream &operator<<(const QVariant &);
-	QDataStream &operator>>(QVariant & /Constrained/);
+	TQDataStream &operator<<(const TQVariant &);
+	TQDataStream &operator>>(TQVariant & /Constrained/);
 
-	QDataStream &operator<<(const QWMatrix &);
-	QDataStream &operator>>(QWMatrix & /Constrained/);
+	TQDataStream &operator<<(const TQWMatrix &);
+	TQDataStream &operator>>(TQWMatrix & /Constrained/);
 %End
-%If (Qt_3_1_0 -)
-	QDataStream &operator<<(const QUuid &);
-	QDataStream &operator>>(QUuid & /Constrained/);
+%If (TQt_3_1_0 -)
+	TQDataStream &operator<<(const TQUuid &);
+	TQDataStream &operator>>(TQUuid & /Constrained/);
 %End
 
 private:
-	QDataStream(const QDataStream &);
+	TQDataStream(const TQDataStream &);
 };
diff --git a/sip/qt/qdatetime.sip b/sip/qt/qdatetime.sip
index cede021..c631660 100644
--- a/sip/qt/qdatetime.sip
+++ b/sip/qt/qdatetime.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QDate, QDateTime and QTime.
+// This is the SIP interface definition for TQDate, TQDateTime and TQTime.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDate</Title>
+<Sect2><Title>TQDate</Title>
 <Para>
 The Python
 <Literal>==</Literal>, <Literal>!=</Literal>,
@@ -37,13 +37,13 @@ operators are supported.
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns the week number and the year number as a
-tuple. (Qt v3.1+)
+tuple. (TQt v3.1+)
 </Para>
 </Sect2>
 
-<Sect2><Title>QDateTime</Title>
+<Sect2><Title>TQDateTime</Title>
 <Para>
-<Literal>QDateTime</Literal> is fully implemented, including the Python
+<Literal>TQDateTime</Literal> is fully implemented, including the Python
 <Literal>==</Literal>, <Literal>!=</Literal>,
 <Literal>&lt;</Literal>, <Literal>&lt;=</Literal>,
 <Literal>&gt;</Literal>, <Literal>&gt;=</Literal>
@@ -52,9 +52,9 @@ operators.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTime</Title>
+<Sect2><Title>TQTime</Title>
 <Para>
-<Literal>QTime</Literal> is fully implemented, including the Python
+<Literal>TQTime</Literal> is fully implemented, including the Python
 <Literal>==</Literal>, <Literal>!=</Literal>,
 <Literal>&lt;</Literal>, <Literal>&lt;=</Literal>,
 <Literal>&gt;</Literal>, <Literal>&gt;=</Literal>
@@ -65,15 +65,15 @@ operators.
 %End
 
 
-class QDate
+class TQDate
 {
 %TypeHeaderCode
 #include <qdatetime.h>
 %End
 
 public:
-	QDate();
-	QDate(int,int,int);
+	TQDate();
+	TQDate(int,int,int);
 
 	bool isNull() const;
 	bool isValid() const;
@@ -86,79 +86,79 @@ public:
 	int daysInMonth() const;
 	int daysInYear() const;
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int weekNumber(int * = 0) const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual const char *monthName(int) const;
 	virtual const char *dayName(int) const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual QString monthName(int) const;
-	virtual QString dayName(int) const;
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual TQString monthName(int) const;
+	virtual TQString dayName(int) const;
 %End
-%If (Qt_3_0_0 -)
-	static QString shortMonthName(int);
-	static QString shortDayName(int);
-	static QString longMonthName(int);
-	static QString longDayName(int);
+%If (TQt_3_0_0 -)
+	static TQString shortMonthName(int);
+	static TQString shortDayName(int);
+	static TQString longMonthName(int);
+	static TQString longDayName(int);
 %End
 
-%If (- Qt_3_0_0)
-	QString toString() const;
+%If (- TQt_3_0_0)
+	TQString toString() const;
 %End
-%If (Qt_3_0_0 -)
-	QString toString(Qt::DateFormat = Qt::TextDate) const;
-	QString toString(const QString &) const;
+%If (TQt_3_0_0 -)
+	TQString toString(TQt::DateFormat = TQt::TextDate) const;
+	TQString toString(const TQString &) const;
 %End
 	bool setYMD(int,int,int);
-	QDate addDays(int) const;
-%If (Qt_3_0_0 -)
-	QDate addMonths(int) const;
-	QDate addYears(int) const;
+	TQDate addDays(int) const;
+%If (TQt_3_0_0 -)
+	TQDate addMonths(int) const;
+	TQDate addYears(int) const;
 %End
-	int daysTo(const QDate &) const;
+	int daysTo(const TQDate &) const;
 
 	int __nonzero__() const;
 %MethodCode
 		sipRes = !sipCpp -> isNull();
 %End
 
-	bool operator==(const QDate &) const;
-	bool operator!=(const QDate &) const;
-	bool operator<(const QDate &) const;
-	bool operator<=(const QDate &) const;
-	bool operator>(const QDate &) const;
-	bool operator>=(const QDate &) const;
+	bool operator==(const TQDate &) const;
+	bool operator!=(const TQDate &) const;
+	bool operator<(const TQDate &) const;
+	bool operator<=(const TQDate &) const;
+	bool operator>(const TQDate &) const;
+	bool operator>=(const TQDate &) const;
 
-	static QDate currentDate();
-%If (Qt_3_1_0 -)
-	static QDate currentDate(Qt::TimeSpec);
+	static TQDate currentDate();
+%If (TQt_3_1_0 -)
+	static TQDate currentDate(TQt::TimeSpec);
 %End
-%If (Qt_3_0_0 -)
-	static QDate fromString(const QString &,Qt::DateFormat = Qt::TextDate);
+%If (TQt_3_0_0 -)
+	static TQDate fromString(const TQString &,TQt::DateFormat = TQt::TextDate);
 %End
 	static bool isValid(int,int,int);
 	static bool leapYear(int);
 
-%If (Qt_3_0_0 -)
-	// These are defined in Qt3 but not documented.
+%If (TQt_3_0_0 -)
+	// These are defined in TQt3 but not documented.
 	//static uint gregorianToJulian(int,int,int);
 	//static void julianToGregorian(uint,int &,int &,int &);
 %End
 };
 
 
-class QTime
+class TQTime
 {
 %TypeHeaderCode
 #include <qdatetime.h>
 %End
 
 public:
-	QTime();
-	QTime(int,int,int = 0,int = 0);
+	TQTime();
+	TQTime(int,int,int = 0,int = 0);
 
 	bool isNull() const;
 	bool isValid() const;
@@ -167,114 +167,114 @@ public:
 	int second() const;
 	int msec() const;
 
-%If (- Qt_3_0_0)
-	QString toString() const;
+%If (- TQt_3_0_0)
+	TQString toString() const;
 %End
-%If (Qt_3_0_0 -)
-	QString toString(Qt::DateFormat = Qt::TextDate) const;
-	QString toString(const QString &) const;
+%If (TQt_3_0_0 -)
+	TQString toString(TQt::DateFormat = TQt::TextDate) const;
+	TQString toString(const TQString &) const;
 %End
 
 	bool setHMS(int,int,int,int = 0);
 
-	QTime addSecs(int) const;
-	int secsTo(const QTime &) const;
-	QTime addMSecs(int) const;
-	int msecsTo(const QTime &) const;
+	TQTime addSecs(int) const;
+	int secsTo(const TQTime &) const;
+	TQTime addMSecs(int) const;
+	int msecsTo(const TQTime &) const;
 
 	int __nonzero__() const;
 %MethodCode
 		sipRes = !sipCpp -> isNull();
 %End
 
-	bool operator==(const QTime &) const;
-	bool operator!=(const QTime &) const;
-	bool operator<(const QTime &) const;
-	bool operator<=(const QTime &) const;
-	bool operator>(const QTime &) const;
-	bool operator>=(const QTime &) const;
+	bool operator==(const TQTime &) const;
+	bool operator!=(const TQTime &) const;
+	bool operator<(const TQTime &) const;
+	bool operator<=(const TQTime &) const;
+	bool operator>(const TQTime &) const;
+	bool operator>=(const TQTime &) const;
 
-	static QTime currentTime();
-%If (Qt_3_1_0 -)
-	static QTime currentTime(Qt::TimeSpec);
+	static TQTime currentTime();
+%If (TQt_3_1_0 -)
+	static TQTime currentTime(TQt::TimeSpec);
 %End
-%If (Qt_3_0_0 -)
-	static QTime fromString(const QString &,Qt::DateFormat = Qt::TextDate);
+%If (TQt_3_0_0 -)
+	static TQTime fromString(const TQString &,TQt::DateFormat = TQt::TextDate);
 %End
 	static bool isValid(int,int,int,int = 0);
 
 	void start();
 	int restart();
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int elapsed();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int elapsed() const;
 %End
 };
 
 
-class QDateTime
+class TQDateTime
 {
 %TypeHeaderCode
 #include <qdatetime.h>
 %End
 
 public:
-	QDateTime();
-	QDateTime(const QDate &);
-	QDateTime(const QDate &,const QTime &);
+	TQDateTime();
+	TQDateTime(const TQDate &);
+	TQDateTime(const TQDate &,const TQTime &);
 
 	bool isNull() const;
 	bool isValid() const;
 
-	QDate date() const;
-	QTime time() const;
-%If (Qt_3_1_0 -)
+	TQDate date() const;
+	TQTime time() const;
+%If (TQt_3_1_0 -)
 	uint toTime_t() const;
 %End
-	void setDate(const QDate &);
-	void setTime(const QTime &);
+	void setDate(const TQDate &);
+	void setTime(const TQTime &);
 	void setTime_t(uint);
-%If (Qt_3_1_0 -)
-	void setTime_t(uint,Qt::TimeSpec);
+%If (TQt_3_1_0 -)
+	void setTime_t(uint,TQt::TimeSpec);
 %End
 
-%If (- Qt_3_0_0)
-	QString toString() const;
+%If (- TQt_3_0_0)
+	TQString toString() const;
 %End
-%If (Qt_3_0_0 -)
-	QString toString(Qt::DateFormat = Qt::TextDate) const;
-	QString toString(const QString &) const;
+%If (TQt_3_0_0 -)
+	TQString toString(TQt::DateFormat = TQt::TextDate) const;
+	TQString toString(const TQString &) const;
 %End
 
-	QDateTime addDays(int) const;
-%If (Qt_3_0_0 -)
-	QDateTime addMonths(int) const;
-	QDateTime addYears(int) const;
+	TQDateTime addDays(int) const;
+%If (TQt_3_0_0 -)
+	TQDateTime addMonths(int) const;
+	TQDateTime addYears(int) const;
 %End
-	QDateTime addSecs(int) const;
-	int daysTo(const QDateTime &) const;
-	int secsTo(const QDateTime &) const;
+	TQDateTime addSecs(int) const;
+	int daysTo(const TQDateTime &) const;
+	int secsTo(const TQDateTime &) const;
 
 	int __nonzero__() const;
 %MethodCode
 		sipRes = !sipCpp -> isNull();
 %End
 
-	bool operator==(const QDateTime &) const;
-	bool operator!=(const QDateTime &) const;
-	bool operator<(const QDateTime &) const;
-	bool operator<=(const QDateTime &) const;
-	bool operator>(const QDateTime &) const;
-	bool operator>=(const QDateTime &) const;
+	bool operator==(const TQDateTime &) const;
+	bool operator!=(const TQDateTime &) const;
+	bool operator<(const TQDateTime &) const;
+	bool operator<=(const TQDateTime &) const;
+	bool operator>(const TQDateTime &) const;
+	bool operator>=(const TQDateTime &) const;
 
-	static QDateTime currentDateTime();
-%If (Qt_3_1_0 -)
-	static QDateTime currentDateTime(Qt::TimeSpec);
+	static TQDateTime currentDateTime();
+%If (TQt_3_1_0 -)
+	static TQDateTime currentDateTime(TQt::TimeSpec);
 %End
-%If (Qt_3_0_0 -)
-	static QDateTime fromString(const QString &,
-				    Qt::DateFormat = Qt::TextDate);
+%If (TQt_3_0_0 -)
+	static TQDateTime fromString(const TQString &,
+				    TQt::DateFormat = TQt::TextDate);
 %End
 };
diff --git a/sip/qt/qdatetimeedit.sip b/sip/qt/qdatetimeedit.sip
index 27ee830..271c4ca 100644
--- a/sip/qt/qdatetimeedit.sip
+++ b/sip/qt/qdatetimeedit.sip
@@ -1,61 +1,61 @@
-// This is the SIP interface definition for QDateEdit, QDateTimeEdit and
-// QTimeEdit.
+// This is the SIP interface definition for TQDateEdit, TQDateTimeEdit and
+// TQTimeEdit.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDateEdit (Qt v3+)</Title>
+<Sect2><Title>TQDateEdit (TQt v3+)</Title>
 <Para>
-<Literal>QDateEdit</Literal> is fully implemented.
+<Literal>TQDateEdit</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTimeEdit (Qt v3+)</Title>
+<Sect2><Title>TQTimeEdit (TQt v3+)</Title>
 <Para>
-<Literal>QTimeEdit</Literal> is fully implemented.
+<Literal>TQTimeEdit</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDateTimeEdit (Qt v3+)</Title>
+<Sect2><Title>TQDateTimeEdit (TQt v3+)</Title>
 <Para>
-<Literal>QDateTimeEdit</Literal> is fully implemented.
+<Literal>TQDateTimeEdit</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-// QDateEdit actually inherits QDateTimeEditBase but that's an internal class
+// TQDateEdit actually inherits TQDateTimeEditBase but that's an internal class
 // and isn't exported under Windows in all versions.
 
-class QDateEdit : QWidget
+class TQDateEdit : TQWidget
 {
 %TypeHeaderCode
 #include <qdatetimeedit.h>
 %End
 
 public:
-	QDateEdit(QWidget * /TransferThis/ = 0,const char * = 0);
-	QDateEdit(const QDate &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQDateEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQDateEdit(const TQDate &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	enum Order {
 		DMY,
@@ -64,44 +64,44 @@ public:
 		YDM
 	};
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
-%If (- Qt_3_1_0)
-	virtual void setDate(const QDate &);
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
+%If (- TQt_3_1_0)
+	virtual void setDate(const TQDate &);
 %End
-	QDate date() const;
+	TQDate date() const;
 	virtual void setOrder(Order);
 	Order order() const;
 	virtual void setAutoAdvance(bool);
 	bool autoAdvance() const;
 
-	virtual void setMinValue(const QDate &);
-	QDate minValue() const;
-	virtual void setMaxValue(const QDate &);
-	QDate maxValue() const;
-	virtual void setRange(const QDate &,const QDate &);
-	QString separator() const;
-	virtual void setSeparator(const QString &);
+	virtual void setMinValue(const TQDate &);
+	TQDate minValue() const;
+	virtual void setMaxValue(const TQDate &);
+	TQDate maxValue() const;
+	virtual void setRange(const TQDate &,const TQDate &);
+	TQString separator() const;
+	virtual void setSeparator(const TQString &);
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void removeFirstNumber(int);
 %End
 
 public slots:
-%If (Qt_3_1_0 -)
-	virtual void setDate(const QDate &);
+%If (TQt_3_1_0 -)
+	virtual void setDate(const TQDate &);
 %End
 
 signals:
-	void valueChanged(const QDate &);
+	void valueChanged(const TQDate &);
 
 protected:
-	bool event(QEvent *);
-	void timerEvent(QTimerEvent *);
-	void resizeEvent(QResizeEvent *);
+	bool event(TQEvent *);
+	void timerEvent(TQTimerEvent *);
+	void resizeEvent(TQResizeEvent *);
 	void stepUp();
 	void stepDown();
-	QString sectionFormattedText(int);
+	TQString sectionFormattedText(int);
 	void addNumber(int,int);
 	void removeLastNumber(int);
 	bool setFocusSection(int);
@@ -116,23 +116,23 @@ protected slots:
 	void updateButtons();    
 
 private:
-%If (Qt_3_1_0 -)
-	QDateEdit(const QDateEdit &);
+%If (TQt_3_1_0 -)
+	TQDateEdit(const TQDateEdit &);
 %End
 };
 
 
-// QDateEdit actually inherits QDateTimeEditBase but that's an internal class
+// TQDateEdit actually inherits TQDateTimeEditBase but that's an internal class
 // and isn't exported under Windows in all versions.
 
-class QTimeEdit : QWidget
+class TQTimeEdit : TQWidget
 {
 %TypeHeaderCode
 #include <qdatetimeedit.h>
 %End
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum Display {
 		Hours,
 		Minutes,
@@ -141,50 +141,50 @@ public:
 	};
 %End
 
-	QTimeEdit(QWidget * /TransferThis/ = 0,const char * = 0);
-	QTimeEdit(const QTime &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTimeEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQTimeEdit(const TQTime &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
-%If (- Qt_3_1_0)
-	virtual void setTime(const QTime &);
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
+%If (- TQt_3_1_0)
+	virtual void setTime(const TQTime &);
 %End
-	QTime time() const;
+	TQTime time() const;
 	virtual void setAutoAdvance(bool);
 	bool autoAdvance() const;
 
-	virtual void setMinValue(const QTime &);
-	QTime minValue() const;
-	virtual void setMaxValue(const QTime &);
-	QTime maxValue() const;
-	virtual void setRange(const QTime &,const QTime &);
-	QString separator() const;
-	virtual void setSeparator(const QString &);
+	virtual void setMinValue(const TQTime &);
+	TQTime minValue() const;
+	virtual void setMaxValue(const TQTime &);
+	TQTime maxValue() const;
+	virtual void setRange(const TQTime &,const TQTime &);
+	TQString separator() const;
+	virtual void setSeparator(const TQString &);
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	uint display() const;
 	void setDisplay(uint);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void removeFirstNumber(int);
 %End
 
 public slots:
-%If (Qt_3_1_0 -)
-	virtual void setTime(const QTime &);
+%If (TQt_3_1_0 -)
+	virtual void setTime(const TQTime &);
 %End
 
 signals:
-	void valueChanged(const QTime &);
+	void valueChanged(const TQTime &);
 
 protected:
-	bool event(QEvent *);
-	void timerEvent(QTimerEvent *);
-	void resizeEvent(QResizeEvent *);
+	bool event(TQEvent *);
+	void timerEvent(TQTimerEvent *);
+	void resizeEvent(TQResizeEvent *);
 	void stepUp();
 	void stepDown();
-	QString sectionFormattedText(int);
+	TQString sectionFormattedText(int);
 	void addNumber(int,int);
 	void removeLastNumber(int);
 	bool setFocusSection(int);
@@ -198,58 +198,58 @@ protected slots:
 	void updateButtons();
 
 private:
-%If (Qt_3_1_0 -)
-	QTimeEdit(const QTimeEdit &);
+%If (TQt_3_1_0 -)
+	TQTimeEdit(const TQTimeEdit &);
 %End
 };
 
 
-class QDateTimeEdit : QWidget
+class TQDateTimeEdit : TQWidget
 {
 %TypeHeaderCode
 #include <qdatetimeedit.h>
 %End
 
 public:
-	QDateTimeEdit(QWidget * /TransferThis/ = 0,const char * = 0);
-	QDateTimeEdit(const QDateTime &,QWidget * /TransferThis/ = 0,
+	TQDateTimeEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQDateTimeEdit(const TQDateTime &,TQWidget * /TransferThis/ = 0,
 		      const char * = 0);
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
-%If (- Qt_3_1_0)
-	virtual void setDateTime(const QDateTime &);
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
+%If (- TQt_3_1_0)
+	virtual void setDateTime(const TQDateTime &);
 %End
-	QDateTime dateTime() const;
+	TQDateTime dateTime() const;
 
-	QDateEdit* dateEdit();
-	QTimeEdit* timeEdit();
+	TQDateEdit* dateEdit();
+	TQTimeEdit* timeEdit();
 
 	virtual void setAutoAdvance(bool);
 	bool autoAdvance() const;
 
 public slots:
-%If (Qt_3_1_0 -)
-	virtual void setDateTime(const QDateTime &);
+%If (TQt_3_1_0 -)
+	virtual void setDateTime(const TQDateTime &);
 %End
 
 signals:
-	void valueChanged(const QDateTime &);
+	void valueChanged(const TQDateTime &);
 
 protected:
 	void init();
-	void resizeEvent(QResizeEvent *);
-%If (- Qt_3_1_2)
+	void resizeEvent(TQResizeEvent *);
+%If (- TQt_3_1_2)
 	void layoutEditors();
 %End
 
 protected slots:
-	void newValue(const QDate &);
-	void newValue(const QTime &);
+	void newValue(const TQDate &);
+	void newValue(const TQTime &);
 
 private:
-%If (Qt_3_1_0 -)
-	QDateTimeEdit(const QDateTimeEdit &);
+%If (TQt_3_1_0 -)
+	TQDateTimeEdit(const TQDateTimeEdit &);
 %End
 };
 
diff --git a/sip/qt/qdesktopwidget.sip b/sip/qt/qdesktopwidget.sip
index a6030e6..76556ad 100644
--- a/sip/qt/qdesktopwidget.sip
+++ b/sip/qt/qdesktopwidget.sip
@@ -1,83 +1,83 @@
-// This is the SIP interface definition for QDesktopWidget.
+// This is the SIP interface definition for TQDesktopWidget.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDesktopWidget (Qt v3+)</Title>
+<Sect2><Title>TQDesktopWidget (TQt v3+)</Title>
 <Para>
-<Literal>QDesktopWidget</Literal> is fully implemented.
+<Literal>TQDesktopWidget</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QDesktopWidget : QWidget
+class TQDesktopWidget : TQWidget
 {
 %TypeHeaderCode
 #include <qdesktopwidget.h>
 %End
 
 public:
-	QDesktopWidget();
+	TQDesktopWidget();
 
 	bool isVirtualDesktop() const;
 
 	int numScreens() const;
 	int primaryScreen() const;
 
-	int screenNumber(QWidget * = 0) const;
-	int screenNumber(const QPoint &) const;
+	int screenNumber(TQWidget * = 0) const;
+	int screenNumber(const TQPoint &) const;
 
-	QWidget *screen(int = -1);
+	TQWidget *screen(int = -1);
     
-	const QRect &screenGeometry(int = -1) const;
-%If (Qt_3_1_0 -)
-	const QRect &screenGeometry(QWidget *) const;
-	const QRect &screenGeometry(const QPoint &) const;
+	const TQRect &screenGeometry(int = -1) const;
+%If (TQt_3_1_0 -)
+	const TQRect &screenGeometry(TQWidget *) const;
+	const TQRect &screenGeometry(const TQPoint &) const;
 
-	const QRect &availableGeometry(int = -1) const;
-	const QRect &availableGeometry(QWidget *) const;
-	const QRect &availableGeometry(const QPoint &) const;
+	const TQRect &availableGeometry(int = -1) const;
+	const TQRect &availableGeometry(TQWidget *) const;
+	const TQRect &availableGeometry(const TQPoint &) const;
 
-	void insertChild(QObject *);
+	void insertChild(TQObject *);
 %End
 
 signals:
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void resized(int);
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	void workAreaResized(int);
 %End
 
 protected:
-%If (Qt_3_1_0 -)
-	void resizeEvent(QResizeEvent *);
+%If (TQt_3_1_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
 
 private:
-%If (Qt_3_1_0 -)
-	QDesktopWidget(const QDesktopWidget &);
+%If (TQt_3_1_0 -)
+	TQDesktopWidget(const TQDesktopWidget &);
 %End
 };
 
diff --git a/sip/qt/qdial.sip b/sip/qt/qdial.sip
index 9587e8c..cbf80e1 100644
--- a/sip/qt/qdial.sip
+++ b/sip/qt/qdial.sip
@@ -1,51 +1,51 @@
-// This is the SIP interface definition for QDial.
+// This is the SIP interface definition for TQDial.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDial (Qt v2.2+)</Title>
+<Sect2><Title>TQDial (TQt v2.2+)</Title>
 <Para>
-<Literal>QDial</Literal> is fully implemented.
+<Literal>TQDial</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_2_0 -)
-%If (Qt_DIAL)
+%If (TQt_2_2_0 -)
+%If (TQt_DIAL)
 
-class QDial : QWidget, QRangeControl
+class TQDial : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
 #include <qdial.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QDial(QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_3_0_0)
+	TQDial(TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_3_0_0 -)
-	QDial(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQDial(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
-	QDial(int,int,int,int,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQDial(int,int,int,int,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	bool tracking() const;
 
@@ -58,8 +58,8 @@ public:
 
 	bool notchesVisible() const;
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 	int minValue() const;
 	int maxValue() const;
@@ -88,24 +88,24 @@ signals:
 	void dialReleased();
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void paintEvent(QPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void paintEvent(TQPaintEvent *);
 
-	void keyPressEvent(QKeyEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void wheelEvent(QWheelEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void wheelEvent(TQWheelEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 
 	void valueChange();
 	void rangeChange();
 
-	virtual void repaintScreen(const QRect * = 0);
+	virtual void repaintScreen(const TQRect * = 0);
 
 private:
-	QDial(const QDial &);
+	TQDial(const TQDial &);
 };
 
 %End
diff --git a/sip/qt/qdialog.sip b/sip/qt/qdialog.sip
index c283520..9874d26 100644
--- a/sip/qt/qdialog.sip
+++ b/sip/qt/qdialog.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QDialog.
+// This is the SIP interface definition for TQDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDialog</Title>
+<Sect2><Title>TQDialog</Title>
 <FuncSynopsis>
         <FuncDef>int <Function>exec</Function></FuncDef>
         <ParamDef></ParamDef>
@@ -34,41 +34,41 @@ This method also causes ownership of the underlying C++ dialog to be transfered
 to Python.  This means that the C++ dialog will be deleted when the Python
 wrapper is garbage collected.  Although this is a little inconsistent, it
 ensures that the dialog is deleted without having to explicity code it using
-<Literal>QObject.deleteLater()</Literal> or other techniques.
+<Literal>TQObject.deleteLater()</Literal> or other techniques.
 </Para>
 </Sect2>
 %End
 
 
-class QDialog : QWidget
+class TQDialog : TQWidget
 {
 %TypeHeaderCode
 #include <qdialog.h>
 %End
 
 public:
-	QDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,WFlags = 0);
+	TQDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,WFlags = 0);
 
 	enum DialogCode {
 		Rejected,
 		Accepted
 	};
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int exec() /PyName=exec_loop, ReleaseGIL,
-		    PreHook=__pyQtPreEventLoopHook__,
-		    PostHook=__pyQtPostEventLoopHook__/;
+		    PreHook=__pyTQtPreEventLoopHook__,
+		    PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal dialog will
 		// probably have the main window as it's parent).  This means
-		// the Qt dialog will be deleted when the Python wrapper is
+		// the TQt dialog will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QDialog::exec();
+		sipRes = sipCpp->TQDialog::exec();
 		Py_END_ALLOW_THREADS
 %End
 %End
@@ -76,83 +76,83 @@ public:
 	int result() const;
 
 	void show();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void hide();
 %End
 	void move(int,int);
-	void move(const QPoint &);
+	void move(const TQPoint &);
 	void resize(int,int);
-	void resize(const QSize &);
+	void resize(const TQSize &);
 	void setGeometry(int,int,int,int);
-	void setGeometry(const QRect &);
+	void setGeometry(const TQRect &);
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setOrientation(Orientation);
 	Orientation orientation() const;
 
-	void setExtension(QWidget *);
-	QWidget *extension() const;
+	void setExtension(TQWidget *);
+	TQWidget *extension() const;
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 	void setSizeGripEnabled(bool);
 	bool isSizeGripEnabled() const;
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setModal(bool);
 	bool isModal() const;
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int exec() /PyName=exec_loop, ReleaseGIL,
-		    PreHook=__pyQtPreEventLoopHook__,
-		    PostHook=__pyQtPostEventLoopHook__/;
+		    PreHook=__pyTQtPreEventLoopHook__,
+		    PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal dialog will
 		// probably have the main window as it's parent).  This means
-		// the Qt dialog will be deleted when the Python wrapper is
+		// the TQt dialog will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QDialog::exec();
+		sipRes = sipCpp->TQDialog::exec();
 		Py_END_ALLOW_THREADS
 %End
 %End
 
 protected slots:
 	virtual void done(int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void accept();
 	void reject();
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void accept();
 	virtual void reject();
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void showExtension(bool);
 %End
 
 protected:
 	void setResult(int);
-	void keyPressEvent(QKeyEvent *);
-	void closeEvent(QCloseEvent *);
-%If (Qt_2_2_0 -)
-	void resizeEvent(QResizeEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void closeEvent(TQCloseEvent *);
+%If (TQt_2_2_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
-%If (Qt_3_0_0 -)
-	void contextMenuEvent(QContextMenuEvent *);
-	bool eventFilter(QObject *,QEvent *);
-	void adjustPosition(QWidget *);
+%If (TQt_3_0_0 -)
+	void contextMenuEvent(TQContextMenuEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
+	void adjustPosition(TQWidget *);
 %End
 
 private:
-	QDialog(const QDialog &);
+	TQDialog(const TQDialog &);
 };
diff --git a/sip/qt/qdir.sip b/sip/qt/qdir.sip
index 93a1f3c..1c1d8d8 100644
--- a/sip/qt/qdir.sip
+++ b/sip/qt/qdir.sip
@@ -1,46 +1,46 @@
-// This is the SIP interface definition for QDir and QFileInfoList.
+// This is the SIP interface definition for TQDir and TQFileInfoList.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDir</Title>
+<Sect2><Title>TQDir</Title>
 <Para>
-<Literal>QDir</Literal> is fully implemented, including the Python
+<Literal>TQDir</Literal> is fully implemented, including the Python
 <Literal>len</Literal>, <Literal>[]</Literal> (for reading slices and
 individual elements), <Literal>==</Literal>, <Literal>!=</Literal> and
 <Literal>in</Literal> operators
 </Para>
 </Sect2>
 
-<Sect2><Title>QFileInfoList</Title>
+<Sect2><Title>TQFileInfoList</Title>
 <Para>
-This class isn't implemented.  Whenever a <Literal>QFileInfoList</Literal> is
+This class isn't implemented.  Whenever a <Literal>TQFileInfoList</Literal> is
 the return type of a function or the type of an argument, a Python list of
-<Literal>QFileInfo</Literal> instances is used instead.
+<Literal>TQFileInfo</Literal> instances is used instead.
 </Para>
 </Sect2>
 %End
 
 
-%MappedType QFileInfoList
+%MappedType TQFileInfoList
 {
 %TypeHeaderCode
 #include <qdir.h>
@@ -48,14 +48,14 @@ the return type of a function or the type of an argument, a Python list of
 
 %ConvertFromTypeCode
 	PyObject *pl;
-	QFileInfo *obj;
+	TQFileInfo *obj;
 
 	// Convert the list.
 
 	if ((pl = PyList_New(0)) == NULL)
 		return NULL;
 
-	for (QFileInfoListIterator it(*sipCpp); (obj = it.current()) != NULL; ++it)
+	for (TQFileInfoListIterator it(*sipCpp); (obj = it.current()) != NULL; ++it)
 	{
 		PyObject *inst;
 
@@ -74,7 +74,7 @@ the return type of a function or the type of an argument, a Python list of
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of QFileInfo instances to a QFileInfoList on
+	// Convert a Python list of TQFileInfo instances to a TQFileInfoList on
 	// the heap.
 
 	if (sipIsErr == NULL)
@@ -89,16 +89,16 @@ the return type of a function or the type of an argument, a Python list of
 		return 1;
 	}
 
-	QFileInfoList *qfil = new QFileInfoList;
+	TQFileInfoList *qfil = new TQFileInfoList;
  
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
-		QFileInfo *qfi;
+		TQFileInfo *qfi;
  
 		// We apply the transfer to the list itself, not the elements.
 		// Note that any temporary element will never be destroyed.
 		// There is nothing that can be done about this.
-		qfi = reinterpret_cast<QFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QFileInfo,0,0,0,sipIsErr));
+		qfi = reinterpret_cast<TQFileInfo *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QFileInfo,0,0,0,sipIsErr));
 
 		if (*sipIsErr)
 		{
@@ -116,7 +116,7 @@ the return type of a function or the type of an argument, a Python list of
 };
 
 
-class QDir
+class TQDir
 {
 %TypeHeaderCode
 #include <qdir.h>
@@ -157,27 +157,27 @@ public:
 		DefaultSort
 	};
 
-	QDir();
-%If (- Qt_2_00)
-	QDir(const char *,const char * = 0,int = Name | IgnoreCase,int = All);
+	TQDir();
+%If (- TQt_2_00)
+	TQDir(const char *,const char * = 0,int = Name | IgnoreCase,int = All);
 %End
-%If (Qt_2_00 -)
-	QDir(const QString &,const QString & = QString::null,
+%If (TQt_2_00 -)
+	TQDir(const TQString &,const TQString & = TQString::null,
 	     int = Name | IgnoreCase,int = All);
 %End
-	QDir(const QDir &);
+	TQDir(const TQDir &);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setPath(const char *);
 	const char *path() const;
-	QString absPath() const;
-	QString canonicalPath() const;
+	TQString absPath() const;
+	TQString canonicalPath() const;
 
-	QString dirName() const;
-	QString filePath(const char *,bool = 1) const;
-	QString absFilePath(const char *,bool = 1) const;
+	TQString dirName() const;
+	TQString filePath(const char *,bool = 1) const;
+	TQString absFilePath(const char *,bool = 1) const;
 
-	static QString convertSeparators(const char *);
+	static TQString convertSeparators(const char *);
 
 	bool cd(const char *,bool = 1);
 	bool cdUp();
@@ -185,44 +185,44 @@ public:
 	const char *nameFilter() const;
 	void setNameFilter(const char *);
 %End
-%If (Qt_2_00 -)
-	virtual void setPath(const QString &);
-	virtual QString path() const;
-	virtual QString absPath() const;
-	virtual QString canonicalPath() const;
+%If (TQt_2_00 -)
+	virtual void setPath(const TQString &);
+	virtual TQString path() const;
+	virtual TQString absPath() const;
+	virtual TQString canonicalPath() const;
 
-	virtual QString dirName() const;
-	virtual QString filePath(const QString &,bool = 1) const;
-	virtual QString absFilePath(const QString &,bool = 1) const;
+	virtual TQString dirName() const;
+	virtual TQString filePath(const TQString &,bool = 1) const;
+	virtual TQString absFilePath(const TQString &,bool = 1) const;
 
-	static QString convertSeparators(const QString &);
+	static TQString convertSeparators(const TQString &);
 
-	virtual bool cd(const QString &,bool = 1);
+	virtual bool cd(const TQString &,bool = 1);
 	virtual bool cdUp();
 
-	QString nameFilter() const;
-	virtual void setNameFilter(const QString &);
+	TQString nameFilter() const;
+	virtual void setNameFilter(const TQString &);
 %End
 	FilterSpec filter() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFilter(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setFilter(int);
 %End
 	SortSpec sorting() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSorting(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setSorting(int);
 %End
 
 	bool matchAllDirs() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMatchAllDirs(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMatchAllDirs(bool);
 %End
 
@@ -235,7 +235,7 @@ public:
 		Py_END_ALLOW_THREADS
 %End
 
-	QString operator[](int) const;
+	TQString operator[](int) const;
 %MethodCode
 		int len;
 
@@ -248,12 +248,12 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QString((*sipCpp)[a0]);
+			sipRes = new TQString((*sipCpp)[a0]);
 			Py_END_ALLOW_THREADS
 		}
 %End
 
-	QStringList operator[](SIP_PYSLICE) const;
+	TQStringList operator[](SIP_PYSLICE) const;
 %MethodCode
 #if PY_VERSION_HEX >= 0x02050000
 		Py_ssize_t len, start, stop, step, slicelength, i;
@@ -270,7 +270,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QStringList();
+			sipRes = new TQStringList();
 
 			for (i = 0; i < slicelength; ++i)
 			{
@@ -281,41 +281,41 @@ public:
 		}
 %End
 
-	int __contains__(const QString &) const;
+	int __contains__(const TQString &) const;
 %MethodCode
 		Py_BEGIN_ALLOW_THREADS
 		sipRes = (sipCpp -> entryList().findIndex(*a0) >= 0);
 		Py_END_ALLOW_THREADS
 %End
 
-%If (- Qt_2_00)
-	const QStrList *entryList(int = DefaultFilter,int = DefaultSort) const;
-	const QStrList *entryList(const char *,int = DefaultFilter,
+%If (- TQt_2_00)
+	const TQStrList *entryList(int = DefaultFilter,int = DefaultSort) const;
+	const TQStrList *entryList(const char *,int = DefaultFilter,
 				  int = DefaultSort) const;
-	const QFileInfoList *entryInfoList(int = DefaultFilter,
+	const TQFileInfoList *entryInfoList(int = DefaultFilter,
 					   int = DefaultSort) const;
-	const QFileInfoList *entryInfoList(const char *,int = DefaultFilter,
+	const TQFileInfoList *entryInfoList(const char *,int = DefaultFilter,
 					   int = DefaultSort) const;
 %End
-%If (Qt_2_00 -)
-	virtual QStrList encodedEntryList(int = DefaultFilter,
+%If (TQt_2_00 -)
+	virtual TQStrList encodedEntryList(int = DefaultFilter,
 					  int = DefaultSort) const;
-	virtual QStrList encodedEntryList(const QString &,int = DefaultFilter,
+	virtual TQStrList encodedEntryList(const TQString &,int = DefaultFilter,
 					  int = DefaultSort) const;
-	virtual QStringList entryList(int = DefaultFilter,
+	virtual TQStringList entryList(int = DefaultFilter,
 				      int = DefaultSort) const;
-	virtual QStringList entryList(const QString &,int = DefaultFilter,
+	virtual TQStringList entryList(const TQString &,int = DefaultFilter,
 				      int = DefaultSort) const;
-	virtual const QFileInfoList *entryInfoList(int = DefaultFilter,
+	virtual const TQFileInfoList *entryInfoList(int = DefaultFilter,
 						   int = DefaultSort) const;
-	virtual const QFileInfoList *entryInfoList(const QString &,
+	virtual const TQFileInfoList *entryInfoList(const TQString &,
 						   int = DefaultFilter,
 						   int = DefaultSort) const;
 %End
 
-	static const QFileInfoList *drives();
+	static const TQFileInfoList *drives();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool mkdir(const char *,bool = 1) const;
 	bool rmdir(const char *,bool = 1) const;
 
@@ -326,16 +326,16 @@ public:
 	bool isRelative() const;
 	void convertToAbs();
 
-	bool operator==(const QDir &) const;
-	bool operator!=(const QDir &) const;
+	bool operator==(const TQDir &) const;
+	bool operator!=(const TQDir &) const;
 
 	bool remove(const char *,bool = 1);
 	bool rename(const char *,const char *,bool = 1);
 	bool exists(const char *,bool = 1);
 %End
-%If (Qt_2_00 -)
-	virtual bool mkdir(const QString &,bool = 1) const;
-	virtual bool rmdir(const QString &,bool = 1) const;
+%If (TQt_2_00 -)
+	virtual bool mkdir(const TQString &,bool = 1) const;
+	virtual bool rmdir(const TQString &,bool = 1) const;
 
 	virtual bool isReadable() const;
 	virtual bool exists() const;
@@ -344,40 +344,40 @@ public:
 	virtual bool isRelative() const;
 	virtual void convertToAbs();
 
-	virtual bool remove(const QString &,bool = 1);
-	virtual bool rename(const QString &,const QString &,bool = 1);
-	virtual bool exists(const QString &,bool = 1);
+	virtual bool remove(const TQString &,bool = 1);
+	virtual bool rename(const TQString &,const TQString &,bool = 1);
+	virtual bool exists(const TQString &,bool = 1);
 %End
 
 	static char separator();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	static bool setCurrent(const char *);
 %End
-%If (Qt_2_00 -)
-	static bool setCurrent(const QString &);
+%If (TQt_2_00 -)
+	static bool setCurrent(const TQString &);
 %End
-	static QDir current();
-	static QDir home();
-	static QDir root();
-	static QString currentDirPath();
-	static QString homeDirPath();
-	static QString rootDirPath();
-
-%If (- Qt_2_00)
+	static TQDir current();
+	static TQDir home();
+	static TQDir root();
+	static TQString currentDirPath();
+	static TQString homeDirPath();
+	static TQString rootDirPath();
+
+%If (- TQt_2_00)
 	static bool match(const char *,const char *);
-	static QString cleanDirPath(const char *);
+	static TQString cleanDirPath(const char *);
 	static bool isRelativePath(const char *);
 %End
-%If (Qt_2_1_0 -)
-	static bool match(const QStringList &,const QString &);
+%If (TQt_2_1_0 -)
+	static bool match(const TQStringList &,const TQString &);
 %End
-%If (Qt_2_00 -)
-	static bool match(const QString &,const QString &);
-	static QString cleanDirPath(const QString &);
-	static bool isRelativePath(const QString &);
+%If (TQt_2_00 -)
+	static bool match(const TQString &,const TQString &);
+	static TQString cleanDirPath(const TQString &);
+	static bool isRelativePath(const TQString &);
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void refresh() const;
 %End
 };
diff --git a/sip/qt/qdockarea.sip b/sip/qt/qdockarea.sip
index 87c0126..7c1c7a3 100644
--- a/sip/qt/qdockarea.sip
+++ b/sip/qt/qdockarea.sip
@@ -1,43 +1,43 @@
-// This is the SIP interface definition for QDockArea.
+// This is the SIP interface definition for TQDockArea.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDockArea (Qt v3+)</Title>
+<Sect2><Title>TQDockArea (TQt v3+)</Title>
 <FuncSynopsis>
 	<FuncDef>bool <Function>hasDockWindow</Function> const</FuncDef>
-	<ParamDef>QDockWindow *<Parameter>w</Parameter></ParamDef>
+	<ParamDef>TQDockWindow *<Parameter>w</Parameter></ParamDef>
 	<ParamDef>int *<Parameter>index</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 This takes the <Literal>w</Literal> parameter and returns the index of the
-QDockWIndow or -1 if the QDockArea does not contain the QDockWindow.
+TQDockWIndow or -1 if the TQDockArea does not contain the TQDockWindow.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QDockArea : QWidget
+class TQDockArea : TQWidget
 {
 %TypeHeaderCode
 #include <qdockarea.h>
@@ -49,40 +49,40 @@ public:
 		Reverse
 	};
 
-	QDockArea(Orientation,HandlePosition = Normal,
-		  QWidget * /TransferThis/ = 0,const char * = 0);
+	TQDockArea(Orientation,HandlePosition = Normal,
+		  TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	void moveDockWindow(QDockWindow *,const QPoint &,const QRect &,bool);
-	void removeDockWindow(QDockWindow *,bool,bool,bool = 1);
-	void moveDockWindow(QDockWindow *,int = -1);
+	void moveDockWindow(TQDockWindow *,const TQPoint &,const TQRect &,bool);
+	void removeDockWindow(TQDockWindow *,bool,bool,bool = 1);
+	void moveDockWindow(TQDockWindow *,int = -1);
 
-	int hasDockWindow(QDockWindow *);
+	int hasDockWindow(TQDockWindow *);
 %MethodCode
 		// The Python interface returns the index.
  
 		Py_BEGIN_ALLOW_THREADS
-		sipCpp -> QDockArea::hasDockWindow(a0,&sipRes);
+		sipCpp -> TQDockArea::hasDockWindow(a0,&sipRes);
 		Py_END_ALLOW_THREADS
 %End
 
-	void invalidNextOffset(QDockWindow *);
+	void invalidNextOffset(TQDockWindow *);
 
 	Orientation orientation() const;
 	HandlePosition handlePosition() const;
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 	bool isEmpty() const;
 	int count() const;
-	QPtrList<QDockWindow> dockWindowList() const;
+	TQPtrList<TQDockWindow> dockWindowList() const;
 
-	bool isDockWindowAccepted(QDockWindow *);
-	void setAcceptDockWindow(QDockWindow *,bool);
+	bool isDockWindowAccepted(TQDockWindow *);
+	void setAcceptDockWindow(TQDockWindow *,bool);
 
 public slots:
 	void lineUp(bool);
 
 private:
-	QDockArea(const QDockArea &);
+	TQDockArea(const TQDockArea &);
 };
 
 %End
diff --git a/sip/qt/qdockwindow.sip b/sip/qt/qdockwindow.sip
index 5a2bef6..d9ad4fd 100644
--- a/sip/qt/qdockwindow.sip
+++ b/sip/qt/qdockwindow.sip
@@ -1,37 +1,37 @@
-// This is the SIP interface definition for QDockWindow.
+// This is the SIP interface definition for TQDockWindow.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDockWindow (Qt v3+)</Title>
+<Sect2><Title>TQDockWindow (TQt v3+)</Title>
 <Para>
-<Literal>QDockWindow</Literal> is fully implemented.
+<Literal>TQDockWindow</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QDockWindow : QFrame
+class TQDockWindow : TQFrame
 {
 %TypeHeaderCode
 #include <qdockwindow.h>
@@ -50,18 +50,18 @@ public:
 		Always
 	};
 
-	QDockWindow(Place = InDock,QWidget * /TransferThis/ = 0,
+	TQDockWindow(Place = InDock,TQWidget * /TransferThis/ = 0,
 		    const char * = 0,WFlags = 0);
-%If (Qt_3_1_0 -)
-	QDockWindow(QWidget * /TransferThis/,const char * = 0,WFlags = 0);
+%If (TQt_3_1_0 -)
+	TQDockWindow(TQWidget * /TransferThis/,const char * = 0,WFlags = 0);
 %End
 
-	virtual void setWidget(QWidget *);
-	QWidget *widget() const;
+	virtual void setWidget(TQWidget *);
+	TQWidget *widget() const;
 
 	Place place() const;
 
-	QDockArea *area() const;
+	TQDockArea *area() const;
 
 	virtual void setCloseMode(int);
 	bool isCloseEnabled() const;
@@ -83,53 +83,53 @@ public:
 
 	virtual void setFixedExtentWidth(int);
 	virtual void setFixedExtentHeight(int);
-	QSize fixedExtent() const;
+	TQSize fixedExtent() const;
 
 	virtual void setNewLine(bool);
 	bool newLine() const;
 
-	Qt::Orientation orientation() const;
+	TQt::Orientation orientation() const;
 
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize minimumSizeHint() const;
 
-	QBoxLayout *boxLayout();
+	TQBoxLayout *boxLayout();
 
 	virtual void setOpaqueMoving(bool);
 	bool opaqueMoving() const;
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 signals:
 	void orientationChanged(Orientation);
-	void placeChanged(QDockWindow::Place);
+	void placeChanged(TQDockWindow::Place);
 	void visibilityChanged(bool);
 
 public slots:
-	virtual void undock(QWidget *);
+	virtual void undock(TQWidget *);
 	virtual void undock();
 	virtual void dock();
 	virtual void setOrientation(Orientation);
-	void setCaption(const QString &);
+	void setCaption(const TQString &);
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void showEvent(QShowEvent *);
-	void hideEvent(QHideEvent *);
-	void contextMenuEvent(QContextMenuEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void showEvent(TQShowEvent *);
+	void hideEvent(TQHideEvent *);
+	void contextMenuEvent(TQContextMenuEvent *);
 
-%If (Qt_3_0_1 -)
-	void drawFrame(QPainter *);
+%If (TQt_3_0_1 -)
+	void drawFrame(TQPainter *);
 %End
-%If (Qt_3_1_0 -)
-	void drawContents(QPainter *);
+%If (TQt_3_1_0 -)
+	void drawContents(TQPainter *);
 %End
 
-	bool event(QEvent *);
+	bool event(TQEvent *);
 
 private:
-	QDockWindow(const QDockWindow &);
+	TQDockWindow(const TQDockWindow &);
 };
 
 %End
diff --git a/sip/qt/qdragobject.sip b/sip/qt/qdragobject.sip
index 5465219..9c7f50f 100644
--- a/sip/qt/qdragobject.sip
+++ b/sip/qt/qdragobject.sip
@@ -1,74 +1,74 @@
-// This is the SIP interface definition for QDragObject, QImageDrag,
-// QStoredDrag, QTextDrag, QUriDrag, QUrlDrag, QColorDrag.
+// This is the SIP interface definition for TQDragObject, TQImageDrag,
+// TQStoredDrag, TQTextDrag, TQUriDrag, TQUrlDrag, TQColorDrag.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QColorDrag (Qt v2.1+)</Title>
+<Sect2><Title>TQColorDrag (TQt v2.1+)</Title>
 <Para>
-<Literal>QColorDrag</Literal> is fully implemented.
+<Literal>TQColorDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDragObject</Title>
+<Sect2><Title>TQDragObject</Title>
 <Para>
-<Literal>QDragObject</Literal> is fully implemented.
+<Literal>TQDragObject</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QImageDrag</Title>
+<Sect2><Title>TQImageDrag</Title>
 <Para>
-<Literal>QImageDrag</Literal> is fully implemented.
+<Literal>TQImageDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QStoredDrag</Title>
+<Sect2><Title>TQStoredDrag</Title>
 <Para>
-<Literal>QStoredDrag</Literal> is fully implemented.
+<Literal>TQStoredDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTextDrag</Title>
+<Sect2><Title>TQTextDrag</Title>
 <Para>
-<Literal>QTextDrag</Literal> is fully implemented.
+<Literal>TQTextDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QUriDrag (Qt v2+)</Title>
+<Sect2><Title>TQUriDrag (TQt v2+)</Title>
 <Para>
-<Literal>QUriDrag</Literal> is fully implemented.
+<Literal>TQUriDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QUrlDrag (Qt v1.x)</Title>
+<Sect2><Title>TQUrlDrag (TQt v1.x)</Title>
 <Para>
-<Literal>QUrlDrag</Literal> is fully implemented.
+<Literal>TQUrlDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QDragObject : QObject
+class TQDragObject : TQObject
 {
 %TypeHeaderCode
 #include <qdragobject.h>
@@ -82,19 +82,19 @@ public:
 		DragCopyOrMove
 	};
 
-	QDragObject(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQDragObject(TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	bool drag();
 	bool dragMove();
 	void dragCopy();
 	virtual bool provides(const char *) const;
 	virtual const char *format(int) const = 0;
-	virtual QByteArray encodedData(const char *) const = 0;
-	void setPixmap(QPixmap);
-	void setPixmap(QPixmap,QPoint);
-	QPixmap pixmap() const;
-	QPoint pixmapHotSpot() const;
-	QWidget *source();
+	virtual TQByteArray encodedData(const char *) const = 0;
+	void setPixmap(TQPixmap);
+	void setPixmap(TQPixmap,TQPoint);
+	TQPixmap pixmap() const;
+	TQPoint pixmapHotSpot() const;
+	TQWidget *source();
 
 protected:
 	virtual bool drag(DragMode);
@@ -102,43 +102,43 @@ protected:
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QDragObject : QObject, QMimeSource
+class TQDragObject : TQObject, TQMimeSource
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QDragObject(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQDragObject(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (Qt_DRAGANDDROP)
+%If (TQt_DRAGANDDROP)
 	bool drag();
 	bool dragMove();
 	void dragCopy();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void dragLink();
 %End
 
-	virtual void setPixmap(QPixmap);
-%If (- Qt_3_0_0)
-	virtual void setPixmap(QPixmap,QPoint);
+	virtual void setPixmap(TQPixmap);
+%If (- TQt_3_0_0)
+	virtual void setPixmap(TQPixmap,TQPoint);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setPixmap(QPixmap,const QPoint &);
+%If (TQt_3_0_0 -)
+	virtual void setPixmap(TQPixmap,const TQPoint &);
 %End
-	QPixmap pixmap() const;
-	QPoint pixmapHotSpot() const;
+	TQPixmap pixmap() const;
+	TQPoint pixmapHotSpot() const;
 %End
 
-	QWidget *source();
-	static QWidget *target();
+	TQWidget *source();
+	static TQWidget *target();
 
-	static void setTarget(QWidget *);
+	static void setTarget(TQWidget *);
 
-%If (Qt_DRAGANDDROP)
-%If (- Qt_3_0_0)
+%If (TQt_DRAGANDDROP)
+%If (- TQt_3_0_0)
 	enum DragMode {
 		DragDefault,
 		DragCopy,
@@ -146,7 +146,7 @@ public:
 		DragCopyOrMove
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum DragMode {
 		DragDefault,
 		DragCopy,
@@ -158,216 +158,216 @@ public:
 %End
 
 protected:
-%If (Qt_DRAGANDDROP)
+%If (TQt_DRAGANDDROP)
 	virtual bool drag(DragMode);
 %End
 
 private:
-%If (Qt_3_1_0 -)
-	QDragObject(const QDragObject &);
+%If (TQt_3_1_0 -)
+	TQDragObject(const TQDragObject &);
 %End
 };
 
 %End
 
 
-class QStoredDrag : QDragObject
+class TQStoredDrag : TQDragObject
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QStoredDrag(const char *,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQStoredDrag(const char *,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_00)
-	void setEncodedData(const QByteArray&);
+%If (- TQt_2_00)
+	void setEncodedData(const TQByteArray&);
 %End
-%If (Qt_2_00 -)
-	virtual void setEncodedData(const QByteArray&);
+%If (TQt_2_00 -)
+	virtual void setEncodedData(const TQByteArray&);
 %End
 
 	const char *format(int) const;
-	virtual QByteArray encodedData(const char *) const;
+	virtual TQByteArray encodedData(const char *) const;
 
 private:
-%If (Qt_3_1_0 -)
-	QStoredDrag(const QStoredDrag &);
+%If (TQt_3_1_0 -)
+	TQStoredDrag(const TQStoredDrag &);
 %End
 };
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QTextDrag : QStoredDrag
+class TQTextDrag : TQStoredDrag
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QTextDrag(const char *,QWidget * /TransferThis/ = 0,const char * = 0);
-	QTextDrag(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextDrag(const char *,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	void setText(const char *);
-	static bool canDecode(QDragMoveEvent *);
-	static bool decode(QDropEvent *,QString &);
+	static bool canDecode(TQDragMoveEvent *);
+	static bool decode(TQDropEvent *,TQString &);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QTextDrag : QDragObject
+class TQTextDrag : TQDragObject
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QTextDrag(const QString &,QWidget * /TransferThis/ = 0,
+	TQTextDrag(const TQString &,TQWidget * /TransferThis/ = 0,
 		  const char * = 0);
-	QTextDrag(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	virtual void setText(const QString &);
-	virtual void setSubtype(const QCString &);
+	virtual void setText(const TQString &);
+	virtual void setSubtype(const TQCString &);
 
 	const char *format(int) const;
-	virtual QByteArray encodedData(const char *) const;
+	virtual TQByteArray encodedData(const char *) const;
 
-	static bool canDecode(const QMimeSource *);
-	static bool decode(const QMimeSource *,QString &);
-	static bool decode(const QMimeSource *,QString &,QCString &);
+	static bool canDecode(const TQMimeSource *);
+	static bool decode(const TQMimeSource *,TQString &);
+	static bool decode(const TQMimeSource *,TQString &,TQCString &);
 
 private:
-%If (Qt_3_1_0 -)
-	QTextDrag(const QTextDrag &);
+%If (TQt_3_1_0 -)
+	TQTextDrag(const TQTextDrag &);
 %End
 };
 
 %End
 
 
-class QImageDrag : QDragObject
+class TQImageDrag : TQDragObject
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QImageDrag(QImage,QWidget * /TransferThis/ = 0,const char * = 0);
-	QImageDrag(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQImageDrag(TQImage,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQImageDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_00)
-	void setImage(QImage);
+%If (- TQt_2_00)
+	void setImage(TQImage);
 %End
-%If (Qt_2_00 -)
-	virtual void setImage(QImage);
+%If (TQt_2_00 -)
+	virtual void setImage(TQImage);
 %End
 
 	const char *format(int) const;
-	virtual QByteArray encodedData(const char *) const;
+	virtual TQByteArray encodedData(const char *) const;
 
-%If (- Qt_2_00)
-	static bool canDecode(QDragMoveEvent *);
-	static bool decode(QDropEvent *,QImage &);
-	static bool decode(QDropEvent *,QPixmap &);
+%If (- TQt_2_00)
+	static bool canDecode(TQDragMoveEvent *);
+	static bool decode(TQDropEvent *,TQImage &);
+	static bool decode(TQDropEvent *,TQPixmap &);
 %End
-%If (Qt_2_00 -)
-	static bool canDecode(const QMimeSource *);
-	static bool decode(const QMimeSource *,QImage &);
-	static bool decode(const QMimeSource *,QPixmap &);
+%If (TQt_2_00 -)
+	static bool canDecode(const TQMimeSource *);
+	static bool decode(const TQMimeSource *,TQImage &);
+	static bool decode(const TQMimeSource *,TQPixmap &);
 %End
 
 private:
-%If (Qt_3_1_0 -)
-	QImageDrag(const QImageDrag &);
+%If (TQt_3_1_0 -)
+	TQImageDrag(const TQImageDrag &);
 %End
 };
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QUrlDrag : QStoredDrag
+class TQUrlDrag : TQStoredDrag
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QUrlDrag(QStrList,QWidget * /TransferThis/ = 0,const char * = 0);
-	QUrlDrag(QWidget * /TransferThis/ = 0,const char * = 0);
-
-	void setUrls(QStrList);
-	static QString urlToLocalFile(const char *);
-	static bool canDecode(QDragMoveEvent *);
-	static bool decode(QDropEvent *,QStrList &);
-	static bool decodeLocalFiles(QDropEvent *,QStrList &);
+	TQUrlDrag(TQStrList,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQUrlDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
+
+	void setUrls(TQStrList);
+	static TQString urlToLocalFile(const char *);
+	static bool canDecode(TQDragMoveEvent *);
+	static bool decode(TQDropEvent *,TQStrList &);
+	static bool decodeLocalFiles(TQDropEvent *,TQStrList &);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QUriDrag : QStoredDrag
+class TQUriDrag : TQStoredDrag
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QUriDrag(QStrList,QWidget * /TransferThis/ = 0,const char * = 0);
-	QUriDrag(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQUriDrag(TQStrList,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQUriDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_3_0_0)
-	void setFilenames(QStringList);
-	void setUnicodeUris(QStringList);
+%If (- TQt_3_0_0)
+	void setFilenames(TQStringList);
+	void setUnicodeUris(TQStringList);
 %End
-%If (Qt_3_0_0 -)
-	void setFileNames(const QStringList &);
-	void setUnicodeUris(const QStringList &);
+%If (TQt_3_0_0 -)
+	void setFileNames(const TQStringList &);
+	void setUnicodeUris(const TQStringList &);
 %End
-	virtual void setUris(QStrList);
+	virtual void setUris(TQStrList);
 
-	static QString uriToLocalFile(const char *);
-	static QCString localFileToUri(const QString &);
-	static QString uriToUnicodeUri(const char *);
-	static QCString unicodeUriToUri(const QString &);
-	static bool canDecode(const QMimeSource *);
-	static bool decode(const QMimeSource *,QStrList &);
-	static bool decodeToUnicodeUris(const QMimeSource *,QStringList &);
-	static bool decodeLocalFiles(const QMimeSource *,QStringList &);
+	static TQString uriToLocalFile(const char *);
+	static TQCString localFileToUri(const TQString &);
+	static TQString uriToUnicodeUri(const char *);
+	static TQCString unicodeUriToUri(const TQString &);
+	static bool canDecode(const TQMimeSource *);
+	static bool decode(const TQMimeSource *,TQStrList &);
+	static bool decodeToUnicodeUris(const TQMimeSource *,TQStringList &);
+	static bool decodeLocalFiles(const TQMimeSource *,TQStringList &);
 
 private:
-%If (Qt_3_1_0 -)
-	QUriDrag(const QUriDrag &);
+%If (TQt_3_1_0 -)
+	TQUriDrag(const TQUriDrag &);
 %End
 };
 
 %End
 
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 
-class QColorDrag : QStoredDrag
+class TQColorDrag : TQStoredDrag
 {
 %TypeHeaderCode
 #include <qdragobject.h>
 %End
 
 public:
-	QColorDrag(const QColor &,QWidget * /TransferThis/ = 0,
+	TQColorDrag(const TQColor &,TQWidget * /TransferThis/ = 0,
 		   const char * = 0);
-	QColorDrag(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQColorDrag(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	void setColor(const QColor &);
+	void setColor(const TQColor &);
  
-	static bool canDecode(QMimeSource *);
-	static bool decode(QMimeSource *,QColor &);
+	static bool canDecode(TQMimeSource *);
+	static bool decode(TQMimeSource *,TQColor &);
 
 private:
-%If (Qt_3_1_0 -)
-	QColorDrag(const QColorDrag &);
+%If (TQt_3_1_0 -)
+	TQColorDrag(const TQColorDrag &);
 %End
 };
 
diff --git a/sip/qt/qdrawutil.sip b/sip/qt/qdrawutil.sip
index 413ca4a..0cd9ec8 100644
--- a/sip/qt/qdrawutil.sip
+++ b/sip/qt/qdrawutil.sip
@@ -1,22 +1,22 @@
-// This is the SIP interface definition for the Qt drawing utilities.
+// This is the SIP interface definition for the TQt drawing utilities.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -25,42 +25,42 @@
 %End
 
 
-void qDrawShadeLine(QPainter *,int,int,int,int,const QColorGroup &,bool = 1,
+void qDrawShadeLine(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 1,
 		    int = 1,int = 0);
-void qDrawShadeLine(QPainter *,const QPoint &,const QPoint &,
-		    const QColorGroup &,bool = 1,int = 1,int = 0);
+void qDrawShadeLine(TQPainter *,const TQPoint &,const TQPoint &,
+		    const TQColorGroup &,bool = 1,int = 1,int = 0);
 
-void qDrawShadeRect(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		    int = 1,int = 0,const QBrush * = 0);
-void qDrawShadeRect(QPainter *,const QRect &,const QColorGroup &,bool = 0,
-		    int = 1,int = 0,const QBrush * = 0);
+void qDrawShadeRect(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		    int = 1,int = 0,const TQBrush * = 0);
+void qDrawShadeRect(TQPainter *,const TQRect &,const TQColorGroup &,bool = 0,
+		    int = 1,int = 0,const TQBrush * = 0);
 
-void qDrawShadePanel(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		     int = 1,const QBrush * = 0);
-void qDrawShadePanel(QPainter *,const QRect &,const QColorGroup &,bool = 0,
-		     int = 1,const QBrush * = 0);
+void qDrawShadePanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		     int = 1,const TQBrush * = 0);
+void qDrawShadePanel(TQPainter *,const TQRect &,const TQColorGroup &,bool = 0,
+		     int = 1,const TQBrush * = 0);
 
-void qDrawWinButton(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		    const QBrush * = 0);
-void qDrawWinButton(QPainter *,const QRect &,const QColorGroup &,bool = 0,
-		    const QBrush * = 0);
+void qDrawWinButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		    const TQBrush * = 0);
+void qDrawWinButton(TQPainter *,const TQRect &,const TQColorGroup &,bool = 0,
+		    const TQBrush * = 0);
 
-void qDrawWinPanel(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		   const QBrush * = 0);
-void qDrawWinPanel(QPainter *,const QRect &,const QColorGroup &,bool = 0,
-		   const QBrush * = 0);
+void qDrawWinPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		   const TQBrush * = 0);
+void qDrawWinPanel(TQPainter *,const TQRect &,const TQColorGroup &,bool = 0,
+		   const TQBrush * = 0);
 
-void qDrawPlainRect(QPainter *,int,int,int,int,const QColor &,int = 1,
-		    const QBrush * = 0);
-void qDrawPlainRect(QPainter *,const QRect &,const QColor &,int = 1,
-		    const QBrush * = 0);
+void qDrawPlainRect(TQPainter *,int,int,int,int,const TQColor &,int = 1,
+		    const TQBrush * = 0);
+void qDrawPlainRect(TQPainter *,const TQRect &,const TQColor &,int = 1,
+		    const TQBrush * = 0);
 
-%If (- Qt_2_00)
-QRect qItemRect(QPainter *,GUIStyle,int,int,int,int,int,bool,const QPixmap *,
+%If (- TQt_2_00)
+TQRect qItemRect(TQPainter *,GUIStyle,int,int,int,int,int,bool,const TQPixmap *,
 		const char *,int = -1);
 
-void qDrawItem(QPainter *,GUIStyle,int,int,int,int,int,const QColorGroup &,bool,
-	       const QPixmap *,const char *,int = -1);
+void qDrawItem(TQPainter *,GUIStyle,int,int,int,int,int,const TQColorGroup &,bool,
+	       const TQPixmap *,const char *,int = -1);
 
 enum ArrowType {
 	UpArrow,
@@ -69,6 +69,6 @@ enum ArrowType {
 	RightArrow
 };
 
-void qDrawArrow(QPainter *,ArrowType,GUIStyle,bool,int,int,int,int,
-		const QColorGroup &,bool);
+void qDrawArrow(TQPainter *,ArrowType,GUIStyle,bool,int,int,int,int,
+		const TQColorGroup &,bool);
 %End
diff --git a/sip/qt/qdropsite.sip b/sip/qt/qdropsite.sip
index a2c11de..90a64ee 100644
--- a/sip/qt/qdropsite.sip
+++ b/sip/qt/qdropsite.sip
@@ -1,50 +1,50 @@
-// This is the SIP interface definition for QDropSite.
+// This is the SIP interface definition for TQDropSite.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QDropSite</Title>
+<Sect2><Title>TQDropSite</Title>
 <Para>
-<Literal>QDropSite</Literal> is fully implemented.
+<Literal>TQDropSite</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_DRAGANDDROP)
+%If (TQt_DRAGANDDROP)
 
-class QDropSite
+class TQDropSite
 {
 %TypeHeaderCode
 #include <qdropsite.h>
 %End
 
 public:
-	QDropSite(QWidget *);
+	TQDropSite(TQWidget *);
 
-%If (- Qt_2_00)
-	virtual void dragEnterEvent(QDragEnterEvent *);
-	virtual void dragMoveEvent(QDragMoveEvent *);
-	virtual void dragLeaveEvent(QDragLeaveEvent *);
-	virtual void dropEvent(QDropEvent *);
+%If (- TQt_2_00)
+	virtual void dragEnterEvent(TQDragEnterEvent *);
+	virtual void dragMoveEvent(TQDragMoveEvent *);
+	virtual void dragLeaveEvent(TQDragLeaveEvent *);
+	virtual void dropEvent(TQDropEvent *);
 %End
 };
 
diff --git a/sip/qt/qerrormessage.sip b/sip/qt/qerrormessage.sip
index 1f31264..9393b01 100644
--- a/sip/qt/qerrormessage.sip
+++ b/sip/qt/qerrormessage.sip
@@ -1,56 +1,56 @@
-// This is the SIP interface definition for QErrorMessage.
+// This is the SIP interface definition for TQErrorMessage.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QErrorMessage (Qt v3+)</Title>
+<Sect2><Title>TQErrorMessage (TQt v3+)</Title>
 <Para>
-<Literal>QErrorMessage</Literal> is fully implemented.
+<Literal>TQErrorMessage</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QErrorMessage : QDialog
+class TQErrorMessage : TQDialog
 {
 %TypeHeaderCode
 #include <qerrormessage.h>
 %End
 
 public:
-	QErrorMessage(QWidget * /TransferThis/,const char * = 0);
+	TQErrorMessage(TQWidget * /TransferThis/,const char * = 0);
 
-	static QErrorMessage *qtHandler();
+	static TQErrorMessage *qtHandler();
 
 public slots:
-	void message(const QString &);
+	void message(const TQString &);
 
 protected:
 	void done(int);
 
 private:
-%If (Qt_3_1_0 -)
-	QErrorMessage(const QErrorMessage &);
+%If (TQt_3_1_0 -)
+	TQErrorMessage(const TQErrorMessage &);
 %End
 };
 
diff --git a/sip/qt/qevent.sip b/sip/qt/qevent.sip
index d4db705..ee66b43 100644
--- a/sip/qt/qevent.sip
+++ b/sip/qt/qevent.sip
@@ -1,170 +1,170 @@
-// This is the SIP interface definition for QEvent, QChildEvent, QCloseEvent,
-// QIconDragEvent, QContextMenuEvent, QCustomEvent, QDragEnterEvent,
-// QDragLeaveEvent, QDragMoveEvent, QDropEvent, QFocusEvent, QHideEvent,
-// QIMEvent, QIMComposeEvent, QKeyEvent, QMouseEvent, QMoveEvent, QPaintEvent,
-// QResizeEvent, QShowEvent, QTabletEvent, QTimerEvent, QWheelEvent.
+// This is the SIP interface definition for TQEvent, TQChildEvent, TQCloseEvent,
+// TQIconDragEvent, TQContextMenuEvent, TQCustomEvent, TQDragEnterEvent,
+// TQDragLeaveEvent, TQDragMoveEvent, TQDropEvent, TQFocusEvent, TQHideEvent,
+// TQIMEvent, TQIMComposeEvent, TQKeyEvent, TQMouseEvent, TQMoveEvent, TQPaintEvent,
+// TQResizeEvent, TQShowEvent, TQTabletEvent, TQTimerEvent, TQWheelEvent.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QEvent</Title>
+<Sect2><Title>TQEvent</Title>
 <Para>
-<Literal>QEvent</Literal> is fully implemented.
+<Literal>TQEvent</Literal> is fully implemented.
 </Para>
 <Para>
-Instances of <Literal>QEvent</Literal>s are automatically converted to the
+Instances of <Literal>TQEvent</Literal>s are automatically converted to the
 correct sub-class.
 </Para>
 </Sect2>
 
-<Sect2><Title>QChildEvent</Title>
+<Sect2><Title>TQChildEvent</Title>
 <Para>
-<Literal>QChildEvent</Literal> is fully implemented.
+<Literal>TQChildEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QCloseEvent</Title>
+<Sect2><Title>TQCloseEvent</Title>
 <Para>
-<Literal>QCloseEvent</Literal> is fully implemented.
+<Literal>TQCloseEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIconDragEvent (Qt v3.3+)</Title>
+<Sect2><Title>TQIconDragEvent (TQt v3.3+)</Title>
 <Para>
-<Literal>QIconDragEvent</Literal> is fully implemented.
+<Literal>TQIconDragEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QContextMenuEvent (Qt v3+)</Title>
+<Sect2><Title>TQContextMenuEvent (TQt v3+)</Title>
 <Para>
-<Literal>QContextMenuEvent</Literal> is fully implemented.
+<Literal>TQContextMenuEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QCustomEvent</Title>
+<Sect2><Title>TQCustomEvent</Title>
 <Para>
-<Literal>QCustomEvent</Literal> is fully implemented.  Any Python object can be
+<Literal>TQCustomEvent</Literal> is fully implemented.  Any Python object can be
 passed as the event data and its reference count is increased.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDragEnterEvent</Title>
+<Sect2><Title>TQDragEnterEvent</Title>
 <Para>
-<Literal>QDragEnterEvent</Literal> is fully implemented.
+<Literal>TQDragEnterEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDragLeaveEvent</Title>
+<Sect2><Title>TQDragLeaveEvent</Title>
 <Para>
-<Literal>QDragLeaveEvent</Literal> is fully implemented.
+<Literal>TQDragLeaveEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDragMoveEvent</Title>
+<Sect2><Title>TQDragMoveEvent</Title>
 <Para>
-<Literal>QDragMoveEvent</Literal> is fully implemented.
+<Literal>TQDragMoveEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDropEvent</Title>
+<Sect2><Title>TQDropEvent</Title>
 <Para>
-<Literal>QDropEvent</Literal> is fully implemented.
+<Literal>TQDropEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QFocusEvent</Title>
+<Sect2><Title>TQFocusEvent</Title>
 <Para>
-<Literal>QFocusEvent</Literal> is fully implemented.
+<Literal>TQFocusEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QHideEvent</Title>
+<Sect2><Title>TQHideEvent</Title>
 <Para>
-<Literal>QHideEvent</Literal> is fully implemented.
+<Literal>TQHideEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIMComposeEvent (Qt v3.1+)</Title>
+<Sect2><Title>TQIMComposeEvent (TQt v3.1+)</Title>
 <Para>
-<Literal>QIMComposeEvent</Literal> is fully implemented.
+<Literal>TQIMComposeEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIMEvent (Qt v3+)</Title>
+<Sect2><Title>TQIMEvent (TQt v3+)</Title>
 <Para>
-<Literal>QIMEvent</Literal> is fully implemented.
+<Literal>TQIMEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QKeyEvent</Title>
+<Sect2><Title>TQKeyEvent</Title>
 <Para>
-<Literal>QKeyEvent</Literal> is fully implemented.
+<Literal>TQKeyEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMouseEvent</Title>
+<Sect2><Title>TQMouseEvent</Title>
 <Para>
-<Literal>QMouseEvent</Literal> is fully implemented.
+<Literal>TQMouseEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMoveEvent</Title>
+<Sect2><Title>TQMoveEvent</Title>
 <Para>
-<Literal>QMoveEvent</Literal> is fully implemented.
+<Literal>TQMoveEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QPaintEvent</Title>
+<Sect2><Title>TQPaintEvent</Title>
 <Para>
-<Literal>QPaintEvent</Literal> is fully implemented.
+<Literal>TQPaintEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QResizeEvent</Title>
+<Sect2><Title>TQResizeEvent</Title>
 <Para>
-<Literal>QResizeEvent</Literal> is fully implemented.
+<Literal>TQResizeEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QShowEvent</Title>
+<Sect2><Title>TQShowEvent</Title>
 <Para>
-<Literal>QShowEvent</Literal> is fully implemented.
+<Literal>TQShowEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTabletEvent (Qt v3+)</Title>
+<Sect2><Title>TQTabletEvent (TQt v3+)</Title>
 <Para>
-<Literal>QTabletEvent</Literal> is fully implemented.
+<Literal>TQTabletEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTimerEvent</Title>
+<Sect2><Title>TQTimerEvent</Title>
 <Para>
-<Literal>QTimerEvent</Literal> is fully implemented.
+<Literal>TQTimerEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QWheelEvent (Qt v2+)</Title>
+<Sect2><Title>TQWheelEvent (TQt v2+)</Title>
 <Para>
-<Literal>QWheelEvent</Literal> is fully implemented.
+<Literal>TQWheelEvent</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
@@ -175,7 +175,7 @@ passed as the event data and its reference count is increased.
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 const int Event_None;
 const int Event_Timer;
@@ -227,15 +227,15 @@ enum ButtonState {
 };
 
 
-class QEvent
+class TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QEvent(int);
-	QEvent(QEvent&);
+	TQEvent(int);
+	TQEvent(TQEvent&);
 
 	int type() const;
 
@@ -316,9 +316,9 @@ public:
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QEvent : Qt
+class TQEvent : TQt
 {
 %TypeHeaderCode
 #include <qevent.h>
@@ -348,7 +348,7 @@ public:
 		Hide,
 		Close,
 		Quit,
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		Reparent,
 		ShowMinimized,
 		ShowNormal,
@@ -358,13 +358,13 @@ public:
 		HideToParent,
 		ShowMaximized,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		ShowFullScreen,
 %End
 		Accel,
 		Wheel,
 		AccelAvailable,
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		CaptionChange,
 		IconChange,
 		ParentFontChange,
@@ -372,18 +372,18 @@ public:
 		ParentPaletteChange,
 		ApplicationPaletteChange,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		PaletteChange,
 %End
 		Clipboard,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		Speech,
 %End
 		SockAct,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		AccelOverride,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		DeferredDelete,
 %End
 		DragEnter,
@@ -394,30 +394,30 @@ public:
 		ChildInserted,
 		ChildRemoved,
 		LayoutHint,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		ShowWindowRequest,
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		WindowBlocked,
 		WindowUnblocked,
 %End
 		ActivateControl,
 		DeactivateControl,
-%If (Qt_2_1_0 - Qt_2_2_0)
+%If (TQt_2_1_0 - TQt_2_2_0)
 		Configure,
 		ConfigureLayout,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		ContextMenu,
 		IMStart,
 		IMCompose,
 		IMEnd,
 		Accessibility,
 %End
-%If (Qt_3_0_0 - Qt_3_1_0)
+%If (TQt_3_0_0 - TQt_3_1_0)
 		Tablet,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		TabletMove,
 		LocaleChange,
 		LanguageChange,
@@ -426,147 +426,147 @@ public:
 		TabletPress,
 		TabletRelease,
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		OkRequest,
 		HelpRequest,
 		IconDrag,
 		WindowStateChange,
 %End
 		User,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		MaxUser,
 %End
 	};
 
-	QEvent(Type);
-	QEvent(QEvent&);
-	virtual ~QEvent();
+	TQEvent(Type);
+	TQEvent(TQEvent&);
+	virtual ~TQEvent();
 
 	Type type() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool spontaneous() const;
 %End
 
 %ConvertToSubClassCode
 	switch (sipCpp -> type())
 	{
-	case QEvent::Timer:
+	case TQEvent::Timer:
 		sipClass = sipClass_QTimerEvent;
 		break;
 
-	case QEvent::MouseButtonPress:
-	case QEvent::MouseButtonRelease:
-	case QEvent::MouseButtonDblClick:
-	case QEvent::MouseMove:
+	case TQEvent::MouseButtonPress:
+	case TQEvent::MouseButtonRelease:
+	case TQEvent::MouseButtonDblClick:
+	case TQEvent::MouseMove:
 		sipClass = sipClass_QMouseEvent;
 		break;
 
-	case QEvent::Accel:
+	case TQEvent::Accel:
 #if QT_VERSION >= 220
-	case QEvent::AccelOverride:
+	case TQEvent::AccelOverride:
 #endif
-	case QEvent::KeyPress:
-	case QEvent::KeyRelease:
+	case TQEvent::KeyPress:
+	case TQEvent::KeyRelease:
 		sipClass = sipClass_QKeyEvent;
 		break;
 
-	case QEvent::FocusIn:
-	case QEvent::FocusOut:
+	case TQEvent::FocusIn:
+	case TQEvent::FocusOut:
 		sipClass = sipClass_QFocusEvent;
 		break;
 
-	case QEvent::Paint:
+	case TQEvent::Paint:
 		sipClass = sipClass_QPaintEvent;
 		break;
 
-	case QEvent::Move:
+	case TQEvent::Move:
 		sipClass = sipClass_QMoveEvent;
 		break;
 
-	case QEvent::Resize:
+	case TQEvent::Resize:
 		sipClass = sipClass_QResizeEvent;
 		break;
 
-	case QEvent::Close:
+	case TQEvent::Close:
 		sipClass = sipClass_QCloseEvent;
 		break;
 
 #if QT_VERSION >= 0x030300
-	case QEvent::IconDrag:
+	case TQEvent::IconDrag:
 		sipClass = sipClass_QIconDragEvent;
 		break;
 #endif
 
-	case QEvent::Wheel:
+	case TQEvent::Wheel:
 		sipClass = sipClass_QWheelEvent;
 		break;
 
-	case QEvent::Show:
+	case TQEvent::Show:
 		sipClass = sipClass_QShowEvent;
 		break;
 
-	case QEvent::Hide:
+	case TQEvent::Hide:
 		sipClass = sipClass_QHideEvent;
 		break;
 
-#if defined(SIP_FEATURE_Qt_DRAGANDDROP)
-	case QEvent::DragMove:
+#if defined(SIP_FEATURE_TQt_DRAGANDDROP)
+	case TQEvent::DragMove:
 		sipClass = sipClass_QDragMoveEvent;
 		break;
 
-	case QEvent::DragEnter:
+	case TQEvent::DragEnter:
 		sipClass = sipClass_QDragEnterEvent;
 		break;
 
-	case QEvent::DragLeave:
+	case TQEvent::DragLeave:
 		sipClass = sipClass_QDragLeaveEvent;
 		break;
 
-	case QEvent::Drop:
+	case TQEvent::Drop:
 		sipClass = sipClass_QDropEvent;
 		break;
 #endif
 
-	case QEvent::ChildInserted:
-	case QEvent::ChildRemoved:
+	case TQEvent::ChildInserted:
+	case TQEvent::ChildRemoved:
 		sipClass = sipClass_QChildEvent;
 		break;
 
 #if QT_VERSION >= 0x030000
-	case QEvent::ContextMenu:
+	case TQEvent::ContextMenu:
 		sipClass = sipClass_QContextMenuEvent;
 		break;
 
-	case QEvent::IMStart:
-	case QEvent::IMEnd:
+	case TQEvent::IMStart:
+	case TQEvent::IMEnd:
 		sipClass = sipClass_QIMEvent;
 		break;
 #endif
 
 #if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100
-	case QEvent::IMCompose:
+	case TQEvent::IMCompose:
 		sipClass = sipClass_QIMEvent;
 		break;
 
-	case QEvent::Tablet:
+	case TQEvent::Tablet:
 		sipClass = sipClass_QTabletEvent;
 		break;
 #endif
 
 #if QT_VERSION >= 0x030100
-	case QEvent::IMCompose:
+	case TQEvent::IMCompose:
 		sipClass = sipClass_QIMComposeEvent;
 		break;
 
-	case QEvent::TabletMove:
-	case QEvent::TabletPress:
-	case QEvent::TabletRelease:
+	case TQEvent::TabletMove:
+	case TQEvent::TabletPress:
+	case TQEvent::TabletRelease:
 		sipClass = sipClass_QTabletEvent;
 		break;
 #endif
 
 	default:
-		sipClass = (sipCpp -> type() < QEvent::User ?
+		sipClass = (sipCpp -> type() < TQEvent::User ?
 				sipClass_QEvent :
 				sipClass_QCustomEvent);
 	}
@@ -576,51 +576,51 @@ public:
 %End
 
 
-class QTimerEvent : QEvent
+class TQTimerEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QTimerEvent(int);
+	TQTimerEvent(int);
 
 	int timerId() const;
 };
 
 
-class QMouseEvent : QEvent
+class TQMouseEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QMouseEvent(int,const QPoint &,int,int);
-	QMouseEvent(int,const QPoint &,const QPoint &,int,int);
+%If (- TQt_2_00)
+	TQMouseEvent(int,const TQPoint &,int,int);
+	TQMouseEvent(int,const TQPoint &,const TQPoint &,int,int);
 %End
-%If (Qt_2_00 -)
-	QMouseEvent(Type,const QPoint &,int,int);
-	QMouseEvent(Type,const QPoint &,const QPoint &,int,int);
+%If (TQt_2_00 -)
+	TQMouseEvent(Type,const TQPoint &,int,int);
+	TQMouseEvent(Type,const TQPoint &,const TQPoint &,int,int);
 %End
 
-	const QPoint &pos() const;
-	const QPoint &globalPos() const;
+	const TQPoint &pos() const;
+	const TQPoint &globalPos() const;
 	int x() const;
 	int y() const;
 	int globalX() const;
 	int globalY() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int button() const;
 	int state() const;
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	ButtonState button() const;
 	ButtonState state() const;
 	ButtonState stateAfter() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isAccepted() const;
 	void accept();
 	void ignore();
@@ -628,34 +628,34 @@ public:
 };
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QWheelEvent : QEvent
+class TQWheelEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QWheelEvent(const QPoint &,int,int);
-	QWheelEvent(const QPoint &,const QPoint &,int,int);
+%If (- TQt_3_0_0)
+	TQWheelEvent(const TQPoint &,int,int);
+	TQWheelEvent(const TQPoint &,const TQPoint &,int,int);
 %End
-%If (Qt_3_0_0 -)
-	QWheelEvent(const QPoint &,int,int,Orientation = Vertical);
-	QWheelEvent(const QPoint &,const QPoint &,int,int,
+%If (TQt_3_0_0 -)
+	TQWheelEvent(const TQPoint &,int,int,Orientation = Vertical);
+	TQWheelEvent(const TQPoint &,const TQPoint &,int,int,
 		    Orientation = Vertical);
 %End
 
 	int delta() const;
-	const QPoint &pos() const;
-	const QPoint &globalPos() const;
+	const TQPoint &pos() const;
+	const TQPoint &globalPos() const;
 	int x() const;
 	int y() const;
 	int globalX() const;
 	int globalY() const;
 	ButtonState state() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	Orientation orientation() const;
 %End
 	bool isAccepted() const;
@@ -666,9 +666,9 @@ public:
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QTabletEvent : QEvent
+class TQTabletEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
@@ -682,21 +682,21 @@ public:
 		Eraser
 	};
 
-%If (- Qt_3_1_0)
-	QTabletEvent(const QPoint &,int,int,int,int,const QPair<int,int> &);
+%If (- TQt_3_1_0)
+	TQTabletEvent(const TQPoint &,int,int,int,int,const TQPair<int,int> &);
 %End
-%If (Qt_3_1_0 -)
-	QTabletEvent(Type,const QPoint &,const QPoint &,int,int,int,int,
-		     const QPair<int,int> &);
+%If (TQt_3_1_0 -)
+	TQTabletEvent(Type,const TQPoint &,const TQPoint &,int,int,int,int,
+		     const TQPair<int,int> &);
 %End
-	QTabletEvent(const QPoint &,const QPoint &,int,int,int,int,
-		     const QPair<int,int> &);
+	TQTabletEvent(const TQPoint &,const TQPoint &,int,int,int,int,
+		     const TQPair<int,int> &);
 
 	int pressure() const;
 	int xTilt() const;
 	int yTilt() const;
-	const QPoint &pos() const;
-	const QPoint &globalPos() const;
+	const TQPoint &pos() const;
+	const TQPoint &globalPos() const;
 	int x() const;
 	int y() const;
 	int globalX() const;
@@ -705,24 +705,24 @@ public:
 	int isAccepted() const;
 	void accept();
 	void ignore();
-	QPair<int,int> uniqueId();
+	TQPair<int,int> uniqueId();
 };
 
 %End
 
 
-class QKeyEvent : QEvent
+class TQKeyEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QKeyEvent(int,int,int,int);
+%If (- TQt_2_00)
+	TQKeyEvent(int,int,int,int);
 %End
-%If (Qt_2_00 -)
-	QKeyEvent(Type,int,int,int,const QString & = QString::null,bool = 0,
+%If (TQt_2_00 -)
+	TQKeyEvent(Type,int,int,int,const TQString & = TQString::null,bool = 0,
 		  ushort = 1);
 %End
 
@@ -732,39 +732,39 @@ public:
 	void accept();
 	void ignore();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int state() const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	ButtonState state() const;
 	ButtonState stateAfter() const;
-	QString text() const;
+	TQString text() const;
 	bool isAutoRepeat() const;
 	int count() const;
 %End
 };
 
 
-class QFocusEvent : QEvent
+class TQFocusEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QFocusEvent(int);
+%If (- TQt_2_00)
+	TQFocusEvent(int);
 %End
-%If (Qt_2_00 -)
-	QFocusEvent(Type);
+%If (TQt_2_00 -)
+	TQFocusEvent(Type);
 %End
 
 	bool gotFocus() const;
 	bool lostFocus() const;
 
-%If (Qt_2_1_0 -)
-%If (- Qt_3_0_0)
+%If (TQt_2_1_0 -)
+%If (- TQt_3_0_0)
 	enum Reason {
 		Mouse,
 		Tab,
@@ -774,7 +774,7 @@ public:
 		Other
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Reason {
 		Mouse,
 		Tab,
@@ -793,68 +793,68 @@ public:
 };
 
 
-class QPaintEvent : QEvent
+class TQPaintEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QPaintEvent(const QRect &);
+%If (- TQt_2_00)
+	TQPaintEvent(const TQRect &);
 %End
-%If (Qt_2_00 -)
-	QPaintEvent(const QRegion &,bool = 1);
-	QPaintEvent(const QRect &,bool = 1);
+%If (TQt_2_00 -)
+	TQPaintEvent(const TQRegion &,bool = 1);
+	TQPaintEvent(const TQRect &,bool = 1);
 %End
-%If (Qt_3_3_0 -)
-	QPaintEvent(const QRegion &,const QRect &,bool = 1);
+%If (TQt_3_3_0 -)
+	TQPaintEvent(const TQRegion &,const TQRect &,bool = 1);
 %End
 
-	const QRect &rect() const;
-%If (Qt_2_00 -)
-	const QRegion &region() const;
+	const TQRect &rect() const;
+%If (TQt_2_00 -)
+	const TQRegion &region() const;
 	bool erased() const;
 %End
 };
 
 
-class QMoveEvent : QEvent
+class TQMoveEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QMoveEvent(const QPoint &,const QPoint &);
+	TQMoveEvent(const TQPoint &,const TQPoint &);
 
-	const QPoint &pos() const;
-	const QPoint &oldPos() const;
+	const TQPoint &pos() const;
+	const TQPoint &oldPos() const;
 };
 
 
-class QResizeEvent : QEvent
+class TQResizeEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QResizeEvent(const QSize &,const QSize &);
+	TQResizeEvent(const TQSize &,const TQSize &);
 
-	const QSize &size() const;
-	const QSize &oldSize() const;
+	const TQSize &size() const;
+	const TQSize &oldSize() const;
 };
 
 
-class QCloseEvent : QEvent
+class TQCloseEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QCloseEvent();
+	TQCloseEvent();
 
 	bool isAccepted() const;
 	void accept();
@@ -862,16 +862,16 @@ public:
 };
 
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 
-class QIconDragEvent : QEvent
+class TQIconDragEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QIconDragEvent();
+	TQIconDragEvent();
 
 	bool isAccepted() const;
 	void accept();
@@ -881,45 +881,45 @@ public:
 %End
 
 
-class QShowEvent : QEvent
+class TQShowEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QShowEvent(bool);
+%If (- TQt_3_0_0)
+	TQShowEvent(bool);
 
 	bool spontaneous() const;
 %End
-%If (Qt_3_0_0 -)
-	QShowEvent();
+%If (TQt_3_0_0 -)
+	TQShowEvent();
 %End
 };
 
 
-class QHideEvent : QEvent
+class TQHideEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QHideEvent(bool);
+%If (- TQt_3_0_0)
+	TQHideEvent(bool);
 
 	bool spontaneous() const;
 %End
-%If (Qt_3_0_0 -)
-	QHideEvent();
+%If (TQt_3_0_0 -)
+	TQHideEvent();
 %End
 };
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QContextMenuEvent : QEvent
+class TQContextMenuEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
@@ -932,16 +932,16 @@ public:
 		Other
 	};
 
-	QContextMenuEvent(Reason,const QPoint &,const QPoint &,int);
-	QContextMenuEvent(Reason,const QPoint &,int);
+	TQContextMenuEvent(Reason,const TQPoint &,const TQPoint &,int);
+	TQContextMenuEvent(Reason,const TQPoint &,int);
  
 	int x() const;
 	int y() const;
 	int globalX() const;
 	int globalY() const;
 
-	const QPoint &pos() const;
-	const QPoint &globalPos() const;
+	const TQPoint &pos() const;
+	const TQPoint &globalPos() const;
 
 	ButtonState state() const;
 	bool isAccepted() const;
@@ -955,23 +955,23 @@ public:
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QIMEvent : QEvent
+class TQIMEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QIMEvent(Type,const QString &,int);
+	TQIMEvent(Type,const TQString &,int);
 
-	const QString &text() const;
+	const TQString &text() const;
 	int cursorPos() const;
 	bool isAccepted() const;
 	void accept();
 	void ignore();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int selectionLength() const;
 %End
 };
@@ -979,55 +979,55 @@ public:
 %End
 
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 
-class QIMComposeEvent : QIMEvent
+class TQIMComposeEvent : TQIMEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QIMComposeEvent(Type,const QString &,int,int);
+	TQIMComposeEvent(Type,const TQString &,int,int);
 };
 
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QDropEvent : QEvent
+class TQDropEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDropEvent(const QPoint &);
+	TQDropEvent(const TQPoint &);
 
-	const QPoint &pos() const;
+	const TQPoint &pos() const;
 	bool isAccepted() const;
 	void accept();
 	void ignore();
-	QByteArray data(const char *);
+	TQByteArray data(const char *);
 };
 
 %End
 
 
-%If (Qt_2_00 -)
-%If (Qt_DRAGANDDROP)
+%If (TQt_2_00 -)
+%If (TQt_DRAGANDDROP)
 
-class QDropEvent : QEvent, QMimeSource
+class TQDropEvent : TQEvent, TQMimeSource
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDropEvent(const QPoint &,Type = Drop);
+	TQDropEvent(const TQPoint &,Type = Drop);
 
-	const QPoint &pos() const;
+	const TQPoint &pos() const;
 	bool isAccepted() const;
 	void accept(bool = 1);
 	void ignore();
@@ -1045,135 +1045,135 @@ public:
 
 	void setAction(Action);
 	Action action() const;
-	QWidget *source() const;
+	TQWidget *source() const;
 	const char *format(int = 0) const;
-	QByteArray encodedData(const char *) const;
+	TQByteArray encodedData(const char *) const;
 	bool provides(const char *) const;
-	QByteArray data(const char *) const;
-	void setPoint(const QPoint &);
+	TQByteArray data(const char *) const;
+	void setPoint(const TQPoint &);
 };
 
 %End
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QDragMoveEvent : QEvent
+class TQDragMoveEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDragMoveEvent(const QPoint &);
+	TQDragMoveEvent(const TQPoint &);
 
-	const QPoint &pos() const;
+	const TQPoint &pos() const;
 	bool isAccepted() const;
 	void accept();
 	void ignore();
-	void accept(const QRect &);
-	void ignore(const QRect &);
-	QRect answerRect() const;
+	void accept(const TQRect &);
+	void ignore(const TQRect &);
+	TQRect answerRect() const;
 	const char *format(int = 0);
 	bool provides(const char *);
-	QByteArray data(const char *);
+	TQByteArray data(const char *);
 
 protected:
-	QDragMoveEvent(const QPoint &,int);
+	TQDragMoveEvent(const TQPoint &,int);
 };
 
 %End
 
 
-%If (Qt_DRAGANDDROP)
-%If (Qt_2_00 -)
+%If (TQt_DRAGANDDROP)
+%If (TQt_2_00 -)
 
-class QDragMoveEvent : QDropEvent
+class TQDragMoveEvent : TQDropEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDragMoveEvent(const QPoint &,Type = DragMove);
+	TQDragMoveEvent(const TQPoint &,Type = DragMove);
 
-	QRect answerRect() const;
+	TQRect answerRect() const;
 	void accept(bool = 1);
-	void accept(const QRect &);
-	void ignore(const QRect &);
+	void accept(const TQRect &);
+	void ignore(const TQRect &);
 	void ignore();
 };
 
 %End
 
 
-class QDragEnterEvent : QDragMoveEvent
+class TQDragEnterEvent : TQDragMoveEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDragEnterEvent(const QPoint &);
+	TQDragEnterEvent(const TQPoint &);
 };
 
 
-class QDragLeaveEvent : QEvent
+class TQDragLeaveEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-	QDragLeaveEvent();
+	TQDragLeaveEvent();
 };
 
 %End
 
 
-class QChildEvent : QEvent
+class TQChildEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QChildEvent(int,QWidget *);
+%If (- TQt_2_00)
+	TQChildEvent(int,TQWidget *);
 %End
-%If (Qt_2_00 -)
-	QChildEvent(Type,QObject *);
+%If (TQt_2_00 -)
+	TQChildEvent(Type,TQObject *);
 %End
 
-%If (- Qt_2_00)
-	QWidget *child() const;
+%If (- TQt_2_00)
+	TQWidget *child() const;
 %End
-%If (Qt_2_00 -)
-	QObject *child() const;
+%If (TQt_2_00 -)
+	TQObject *child() const;
 %End
 	bool inserted() const;
 	bool removed() const;
 };
 
 
-class QCustomEvent : QEvent
+class TQCustomEvent : TQEvent
 {
 %TypeHeaderCode
 #include <qevent.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QCustomEvent(int,SIP_PYOBJECT /Transfer/);
+%If (- TQt_2_00)
+	TQCustomEvent(int,SIP_PYOBJECT /Transfer/);
 %End
-%If (Qt_2_00 -)
-	QCustomEvent(Type,SIP_PYOBJECT /Transfer/);
+%If (TQt_2_00 -)
+	TQCustomEvent(Type,SIP_PYOBJECT /Transfer/);
 %End
-%If (Qt_2_1_0 -)
-	QCustomEvent(int);
+%If (TQt_2_1_0 -)
+	TQCustomEvent(int);
 %End
-	~QCustomEvent();
+	~TQCustomEvent();
 %VirtualCatcherCode
 		// We need to garbage collect any current data.
 
@@ -1188,7 +1188,7 @@ public:
 %MethodCode
 		// We need to cast the result.
 
-		sipRes = reinterpret_cast<PyObject *>(sipCpp -> QCustomEvent::data());
+		sipRes = reinterpret_cast<PyObject *>(sipCpp -> TQCustomEvent::data());
 
 		// In case the event has been created from C++ code.
 		if (!sipRes)
@@ -1197,13 +1197,13 @@ public:
 		Py_INCREF(sipRes);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setData(SIP_PYOBJECT /Transfer/);
 %MethodCode
 		// We need to garbage collect any current data.
 
-		PyObject *old = reinterpret_cast<PyObject *>(sipCpp -> QCustomEvent::data());
-		sipCpp -> QCustomEvent::setData(a0);
+		PyObject *old = reinterpret_cast<PyObject *>(sipCpp -> TQCustomEvent::data());
+		sipCpp -> TQCustomEvent::setData(a0);
 
 		Py_XDECREF(old);
 %End
@@ -1213,7 +1213,7 @@ public:
 		// Support the Python garbage collector.  Although it's not obviously
         // documented, we can't release the GIL in traverse code.
 
-		PyObject *obj = reinterpret_cast<PyObject *>(sipCpp -> QCustomEvent::data());
+		PyObject *obj = reinterpret_cast<PyObject *>(sipCpp -> TQCustomEvent::data());
 
 		if (obj)
 			sipRes = sipVisit(obj, sipArg);
@@ -1224,9 +1224,9 @@ public:
 %GCClearCode
 		// Support the Python garbage collector.
 
-		PyObject *obj = reinterpret_cast<PyObject *>(sipCpp -> QCustomEvent::data());
+		PyObject *obj = reinterpret_cast<PyObject *>(sipCpp -> TQCustomEvent::data());
 
-		sipCpp -> QCustomEvent::setData(0);
+		sipCpp -> TQCustomEvent::setData(0);
 
 		Py_XDECREF(obj);
 
diff --git a/sip/qt/qeventloop.sip b/sip/qt/qeventloop.sip
index 22d7a2c..8ad3b06 100644
--- a/sip/qt/qeventloop.sip
+++ b/sip/qt/qeventloop.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QEventLoop.
+// This is the SIP interface definition for TQEventLoop.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QEventLoop (Qt v3.1+)</Title>
+<Sect2><Title>TQEventLoop (TQt v3.1+)</Title>
 <FuncSynopsis>
 	<FuncDef>virtual int <Function>exec</Function></FuncDef>
 	<ParamDef></ParamDef>
@@ -33,16 +33,16 @@ This has been renamed to <Literal>exec_loop</Literal> in Python.
 %End
 
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 
-class QEventLoop : QObject
+class TQEventLoop : TQObject
 {
 %TypeHeaderCode
 #include <qeventloop.h>
 %End
 
 public:
-	QEventLoop(QObject * /TransferThis/ = 0,const char * = 0);
+	TQEventLoop(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	enum ProcessEvents {
 		AllEvents,
@@ -58,12 +58,12 @@ public:
 
 	virtual bool hasPendingEvents() const;
 
-	virtual void registerSocketNotifier(QSocketNotifier *);
-	virtual void unregisterSocketNotifier(QSocketNotifier *);
-%If (Qt_3_1_1 -)
-	// These were present in the X11 version of Qt v3.1.0 but didn't make
-	// it to the Windows version until Qt v3.1.1.
-	void setSocketNotifierPending(QSocketNotifier *);
+	virtual void registerSocketNotifier(TQSocketNotifier *);
+	virtual void unregisterSocketNotifier(TQSocketNotifier *);
+%If (TQt_3_1_1 -)
+	// These were present in the X11 version of TQt v3.1.0 but didn't make
+	// it to the Windows version until TQt v3.1.1.
+	void setSocketNotifierPending(TQSocketNotifier *);
 	int activateSocketNotifiers();
 
 	int activateTimers();
@@ -71,8 +71,8 @@ public:
 %End
 
 	virtual int exec() /PyName=exec_loop, ReleaseGIL,
-			    PreHook=__pyQtPreEventLoopHook__,
-			    PostHook=__pyQtPostEventLoopHook__/;
+			    PreHook=__pyTQtPreEventLoopHook__,
+			    PostHook=__pyTQtPostEventLoopHook__/;
 	virtual void exit(int = 0);
 
 	virtual int enterLoop();
diff --git a/sip/qt/qfile.sip b/sip/qt/qfile.sip
index 06012f1..2b3eb28 100644
--- a/sip/qt/qfile.sip
+++ b/sip/qt/qfile.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QFile.
+// This is the SIP interface definition for TQFile.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFile</Title>
+<Sect2><Title>TQFile</Title>
 <FuncSynopsis>
         <FuncDef>bool <Function>open</Function></FuncDef>
         <ParamDef>int <Parameter>m</Parameter></ParamDef>
@@ -58,7 +58,7 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
         <ParamDef>EncoderFn <Parameter>f</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2+)
+Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
@@ -66,7 +66,7 @@ Not yet implemented. (Qt v2+)
         <ParamDef>EncoderFn <Parameter>f</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2+)
+Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
@@ -82,51 +82,51 @@ as a parameter.
 %End
 
 
-class QFile : QIODevice
+class TQFile : TQIODevice
 {
 %TypeHeaderCode
 #include <qfile.h>
 %End
 
 public:
-	QFile();
-%If (- Qt_2_00)
-	QFile(const char *);
+	TQFile();
+%If (- TQt_2_00)
+	TQFile(const char *);
 %End
-%If (Qt_2_00 -)
-	QFile(const QString &);
+%If (TQt_2_00 -)
+	TQFile(const TQString &);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *name() const;
 	void setName(const char *);
 %End
-%If (Qt_2_00 -)
-	QString name() const;
-	void setName(const QString &);
+%If (TQt_2_00 -)
+	TQString name() const;
+	void setName(const TQString &);
 %End
 
-%If (Qt_2_00 -)
-	static QCString encodeName(const QString &);
-	static QString decodeName(const QCString &);
+%If (TQt_2_00 -)
+	static TQCString encodeName(const TQString &);
+	static TQString decodeName(const TQCString &);
 //	static void setEncodingFunction(EncoderFn);
 //	static void setDecodingFunction(DecoderFn);
 %End
 
 	bool exists() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	static bool exists(const char *);
 %End
-%If (Qt_2_00 -)
-	static bool exists(const QString &);
+%If (TQt_2_00 -)
+	static bool exists(const TQString &);
 %End
 
 	bool remove();
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	static bool remove(const char *);
 %End
-%If (Qt_2_00 -)
-	static bool remove(const QString &);
+%If (TQt_2_00 -)
+	static bool remove(const TQString &);
 %End
 
 	bool open(int) /ReleaseGIL/;
@@ -135,19 +135,19 @@ public:
 	void close();
 	void flush() /ReleaseGIL/;
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	uint size() const;
 	int at() const;
 	bool at(int);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	Offset size() const;
 	Offset at() const;
 	bool at(Offset);
 %End
 	bool atEnd() const;
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)];
 %MethodCode
 		char *buf;
@@ -159,7 +159,7 @@ public:
 			int actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0);
+			actlen = sipSelfWasArg ? sipCpp->TQFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -176,7 +176,7 @@ public:
 
 	int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	SIP_PYOBJECT readBlock(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
 %MethodCode
 		char *buf;
@@ -188,7 +188,7 @@ public:
 			Q_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0);
+			actlen = sipSelfWasArg ? sipCpp->TQFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -207,14 +207,14 @@ public:
 	Q_LONG writeBlock(const char * /Array/,
 			  Q_ULONG /ArraySize/) /ReleaseGIL/;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	int writeBlock(const QByteArray &) /ReleaseGIL/;
+%If (TQt_2_00 - TQt_3_0_0)
+	int writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	Q_LONG writeBlock(const QByteArray &) /ReleaseGIL/;
+%If (TQt_3_0_0 -)
+	Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)];
 %MethodCode
 		char *buf;
@@ -226,7 +226,7 @@ public:
 			int actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QFile::readLine(buf,a0) : sipCpp->readLine(buf,a0);
+			actlen = sipSelfWasArg ? sipCpp->TQFile::readLine(buf,a0) : sipCpp->readLine(buf,a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -248,7 +248,7 @@ public:
 		}
 %End
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
 %MethodCode
 		char *buf;
@@ -260,7 +260,7 @@ public:
 			Q_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QFile::readLine(buf,a0) : sipCpp->readLine(buf,a0);
+			actlen = sipSelfWasArg ? sipCpp->TQFile::readLine(buf,a0) : sipCpp->readLine(buf,a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -283,11 +283,11 @@ public:
 %End
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	int readLine(QString &,uint) /ReleaseGIL/;
+%If (TQt_2_00 - TQt_3_0_0)
+	int readLine(TQString &,uint) /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	Q_LONG readLine(QString &,Q_ULONG) /ReleaseGIL/;
+%If (TQt_3_0_0 -)
+	Q_LONG readLine(TQString &,Q_ULONG) /ReleaseGIL/;
 %End
 
 	int getch();
@@ -296,15 +296,15 @@ public:
 
 	int handle() const;
 
-%If (Qt_3_2_0 -)
-	QString errorString() const;
+%If (TQt_3_2_0 -)
+	TQString errorString() const;
 %End
 
 protected:
-%If (Qt_3_2_0 -)
-	void setErrorString(const QString &);
+%If (TQt_3_2_0 -)
+	void setErrorString(const TQString &);
 %End
 
 private:
-	QFile(const QFile &);
+	TQFile(const TQFile &);
 };
diff --git a/sip/qt/qfiledialog.sip b/sip/qt/qfiledialog.sip
index 611387a..212b74c 100644
--- a/sip/qt/qfiledialog.sip
+++ b/sip/qt/qfiledialog.sip
@@ -1,239 +1,239 @@
-// This is the SIP interface definition for QFileDialog, QFileIconProvider and
-// QFilePreview.
+// This is the SIP interface definition for TQFileDialog, TQFileIconProvider and
+// TQFilePreview.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFileDialog</Title>
+<Sect2><Title>TQFileDialog</Title>
 <Para>
-<Literal>QFileDialog</Literal> is fully implemented.
+<Literal>TQFileDialog</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QFileIconProvider</Title>
+<Sect2><Title>TQFileIconProvider</Title>
 <Para>
-<Literal>QFileIconProvider</Literal> is fully implemented.
+<Literal>TQFileIconProvider</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QFilePreview</Title>
+<Sect2><Title>TQFilePreview</Title>
 <Para>
-<Literal>QFilePreview</Literal> is fully implemented.  However it cannot be
-used from Python in the same way as it is used from C++ because PyQt does not
+<Literal>TQFilePreview</Literal> is fully implemented.  However it cannot be
+used from Python in the same way as it is used from C++ because PyTQt does not
 support multiple inheritance involving more than one wrapped class.  A trick
 that seems to work is to use composition rather than inheritance as in the
 following code fragment.
 </Para>
 <ProgramListing>
-class FilePreview(QFilePreview):
+class FilePreview(TQFilePreview):
     pass
 
-class Preview(QLabel):
+class Preview(TQLabel):
     def __init__(self, parent=None):
-        QLabel.__init__(self, parent)
+        TQLabel.__init__(self, parent)
         self.preview = FilePreview()
         self.preview.previewUrl = self.previewUrl
 </ProgramListing>
 <Para>
-Note that QFilePreview cannot be instantiated directly because it is abstract.
+Note that TQFilePreview cannot be instantiated directly because it is abstract.
 Thanks to Hans-Peter Jansen for this trick.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_FILEDIALOG)
+%If (TQt_FILEDIALOG)
 
-class QFileIconProvider : QObject
+class TQFileIconProvider : TQObject
 {
 %TypeHeaderCode
 #include <qfiledialog.h>
 %End
 
 public:
-	QFileIconProvider(QObject * /TransferThis/ = 0,const char * = 0);
+	TQFileIconProvider(TQObject * /TransferThis/ = 0,const char * = 0);
 
-	virtual const QPixmap *pixmap(const QFileInfo &);
+	virtual const TQPixmap *pixmap(const TQFileInfo &);
 
 private:
-%If (Qt_2_1_0 -)
-	QFileIconProvider(const QFileIconProvider &);
+%If (TQt_2_1_0 -)
+	TQFileIconProvider(const TQFileIconProvider &);
 %End
 };
 
 
-%If (Qt_2_1_0 -)
-class QFilePreview
+%If (TQt_2_1_0 -)
+class TQFilePreview
 {
 %TypeHeaderCode
 #include <qfiledialog.h>
 %End
 
 public:
-	QFilePreview();
+	TQFilePreview();
 
-	virtual void previewUrl(const QUrl &) = 0;
+	virtual void previewUrl(const TQUrl &) = 0;
 };
 %End
 
 
-class QFileDialog : QDialog
+class TQFileDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qfiledialog.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QFileDialog(const char *,const char * = 0,QWidget * /TransferThis/ = 0,
+%If (- TQt_2_00)
+	TQFileDialog(const char *,const char * = 0,TQWidget * /TransferThis/ = 0,
 		    const char * = 0,bool = 0);
 %End
-%If (Qt_2_00 -)
-	QFileDialog(const QString &,const QString & = QString::null,
-		    QWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
+%If (TQt_2_00 -)
+	TQFileDialog(const TQString &,const TQString & = TQString::null,
+		    TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
 %End
-	QFileDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
+	TQFileDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0);
 
-%If (- Qt_2_00)
-	static QString getOpenFileName(const char * = 0,const char * = 0,
-				       QWidget * = 0,
+%If (- TQt_2_00)
+	static TQString getOpenFileName(const char * = 0,const char * = 0,
+				       TQWidget * = 0,
 				       const char * = 0) /ReleaseGIL/;
-	static QString getSaveFileName(const char * = 0,const char * = 0,
-				       QWidget * = 0,
+	static TQString getSaveFileName(const char * = 0,const char * = 0,
+				       TQWidget * = 0,
 				       const char * = 0) /ReleaseGIL/;
-	static QString getExistingDirectory(const char * = 0,QWidget * = 0,
+	static TQString getExistingDirectory(const char * = 0,TQWidget * = 0,
 					    const char * = 0) /ReleaseGIL/;
-	static QStrList getOpenFileNames(const char * = 0,const char * = 0,
-					 QWidget * = 0,
+	static TQStrList getOpenFileNames(const char * = 0,const char * = 0,
+					 TQWidget * = 0,
 					 const char * = 0) /ReleaseGIL/;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	static QString getOpenFileName(const QString & = QString::null,
-				       const QString & = QString::null,
-				       QWidget * = 0,
+%If (TQt_2_00 - TQt_3_0_0)
+	static TQString getOpenFileName(const TQString & = TQString::null,
+				       const TQString & = TQString::null,
+				       TQWidget * = 0,
 				       const char * = 0) /ReleaseGIL/;
-	static QString getSaveFileName(const QString & = QString::null,
-				       const QString & = QString::null,
-				       QWidget * = 0,
+	static TQString getSaveFileName(const TQString & = TQString::null,
+				       const TQString & = TQString::null,
+				       TQWidget * = 0,
 				       const char * = 0) /ReleaseGIL/;
-	static QString getExistingDirectory(const QString & = QString::null,
-					    QWidget * = 0,
+	static TQString getExistingDirectory(const TQString & = TQString::null,
+					    TQWidget * = 0,
 					    const char * = 0) /ReleaseGIL/;
-	static QStringList getOpenFileNames(const QString & = QString::null,
-					    const QString & = QString::null,
-					    QWidget * = 0,
+	static TQStringList getOpenFileNames(const TQString & = TQString::null,
+					    const TQString & = TQString::null,
+					    TQWidget * = 0,
 					    const char * = 0) /ReleaseGIL/;
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	static QString getOpenFileName(const QString &,const QString &,
-				       QWidget *,const char *,
-				       const QString &) /ReleaseGIL/;
-	static QString getSaveFileName(const QString &,const QString &,
-				       QWidget *,const char *,
-				       const QString &) /ReleaseGIL/;
-	static QString getExistingDirectory(const QString &,QWidget *,
+%If (TQt_2_1_0 - TQt_3_0_0)
+	static TQString getOpenFileName(const TQString &,const TQString &,
+				       TQWidget *,const char *,
+				       const TQString &) /ReleaseGIL/;
+	static TQString getSaveFileName(const TQString &,const TQString &,
+				       TQWidget *,const char *,
+				       const TQString &) /ReleaseGIL/;
+	static TQString getExistingDirectory(const TQString &,TQWidget *,
 					    const char *,
-					    const QString &) /ReleaseGIL/;
-	static QStringList getOpenFileNames(const QString &,const QString &,
-					   QWidget *,const char *,
-					   const QString &) /ReleaseGIL/;
+					    const TQString &) /ReleaseGIL/;
+	static TQStringList getOpenFileNames(const TQString &,const TQString &,
+					   TQWidget *,const char *,
+					   const TQString &) /ReleaseGIL/;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
-	static QString getExistingDirectory(const QString &,QWidget *,
+%If (TQt_2_2_0 - TQt_3_0_0)
+	static TQString getExistingDirectory(const TQString &,TQWidget *,
 					    const char *,
-					    const QString &,bool) /ReleaseGIL/;
-%End
-%If (Qt_3_0_0 -)
-	static QString getOpenFileName(const QString & = QString::null,
-				       const QString & = QString::null,
-				       QWidget * = 0,const char * = 0,
-				       const QString & = QString::null,
-				       QString * = 0,bool = 1) /ReleaseGIL/;
-
-	static QString getSaveFileName(const QString & = QString::null,
-				       const QString & = QString::null,
-				       QWidget * = 0,const char * = 0,
-				       const QString & = QString::null,
-				       QString * = 0,bool = 1) /ReleaseGIL/;
-
-	static QString getExistingDirectory(const QString & = QString::null,
-					    QWidget * = 0,const char * = 0,
-					    const QString & = QString::null,
+					    const TQString &,bool) /ReleaseGIL/;
+%End
+%If (TQt_3_0_0 -)
+	static TQString getOpenFileName(const TQString & = TQString::null,
+				       const TQString & = TQString::null,
+				       TQWidget * = 0,const char * = 0,
+				       const TQString & = TQString::null,
+				       TQString * = 0,bool = 1) /ReleaseGIL/;
+
+	static TQString getSaveFileName(const TQString & = TQString::null,
+				       const TQString & = TQString::null,
+				       TQWidget * = 0,const char * = 0,
+				       const TQString & = TQString::null,
+				       TQString * = 0,bool = 1) /ReleaseGIL/;
+
+	static TQString getExistingDirectory(const TQString & = TQString::null,
+					    TQWidget * = 0,const char * = 0,
+					    const TQString & = TQString::null,
 					    bool = 1,bool = 1) /ReleaseGIL/;
 
-	static QStringList getOpenFileNames(const QString & = QString::null,
-					    const QString & = QString::null,
-					    QWidget * = 0,const char * = 0,
-					    const QString & = QString::null,
-					    QString * = 0,
+	static TQStringList getOpenFileNames(const TQString & = TQString::null,
+					    const TQString & = TQString::null,
+					    TQWidget * = 0,const char * = 0,
+					    const TQString & = TQString::null,
+					    TQString * = 0,
 					    bool = 1) /ReleaseGIL/;
 
 %End
 
-	static void setIconProvider(QFileIconProvider *);
-	static QFileIconProvider *iconProvider();
+	static void setIconProvider(TQFileIconProvider *);
+	static TQFileIconProvider *iconProvider();
 
-	QString selectedFile() const;
-%If (Qt_2_1_0 -)
-	QString selectedFilter() const;
+	TQString selectedFile() const;
+%If (TQt_2_1_0 -)
+	TQString selectedFilter() const;
 %End
-%If (Qt_3_0_0 -)
-	virtual void setSelectedFilter(const QString &);
+%If (TQt_3_0_0 -)
+	virtual void setSelectedFilter(const TQString &);
 	virtual void setSelectedFilter(int);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSelection(const char *);
 %End
-%If (Qt_2_00 -)
-	void setSelection(const QString &);
+%If (TQt_2_00 -)
+	void setSelection(const TQString &);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void selectAll(bool);
 
-	QStringList selectedFiles() const;
+	TQStringList selectedFiles() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *dirPath() const;
 %End
-%If (Qt_2_00 -)
-	QString dirPath() const;
+%If (TQt_2_00 -)
+	TQString dirPath() const;
 %End
 
-	void setDir(const QDir &);
-	const QDir* dir() const;
+	void setDir(const TQDir &);
+	const TQDir* dir() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setShowHiddenFiles(bool);
 	bool showHiddenFiles() const;
 %End
 
 	void rereadDir() /ReleaseGIL/;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void resortDir();
 %End
 
-%If (- Qt_2_2_0)
+%If (- TQt_2_2_0)
 	enum Mode {
 		AnyFile,
 		ExistingFile,
@@ -241,7 +241,7 @@ public:
 		ExistingFiles
 	};
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum Mode {
 		AnyFile,
 		ExistingFile,
@@ -254,7 +254,7 @@ public:
 	void setMode(Mode);
 	Mode mode() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum ViewMode {
 		Detail,
 		List
@@ -272,90 +272,90 @@ public:
 	PreviewMode previewMode() const;
 %End
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool isInfoPreviewEnabled() const;
 	bool isContentsPreviewEnabled() const;
 	void setInfoPreviewEnabled(bool);
 	void setContentsPreviewEnabled(bool);
 
-	void setInfoPreview(QWidget *,QFilePreview *);
-	void setContentsPreview(QWidget *,QFilePreview *);
+	void setInfoPreview(TQWidget *,TQFilePreview *);
+	void setContentsPreview(TQWidget *,TQFilePreview *);
 
-	QUrl url() const;
+	TQUrl url() const;
 %End
 
-%If (Qt_3_0_0 -)
-	void addFilter(const QString &);
+%If (TQt_3_0_0 -)
+	void addFilter(const TQString &);
 %End
 
 public slots:
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void done(int);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDir(const char *);
 %End
-%If (Qt_2_00 -)
-	void setDir(const QString &);
+%If (TQt_2_00 -)
+	void setDir(const TQString &);
 %End
-%If (Qt_2_1_0 -)
-	void setUrl(const QUrlOperator &);
+%If (TQt_2_1_0 -)
+	void setUrl(const TQUrlOperator &);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFilter(const char *);
 %End
-%If (Qt_2_00 -)
-	void setFilter(const QString &);
+%If (TQt_2_00 -)
+	void setFilter(const TQString &);
 %End
-%If (Qt_2_1_0 -)
-	void setFilters(const QString &);
+%If (TQt_2_1_0 -)
+	void setFilters(const TQString &);
 %End
 //	void setFilters(const char **);
-%If (- Qt_2_00)
-	void setFilters(const QStrList &);
+%If (- TQt_2_00)
+	void setFilters(const TQStrList &);
 %End
-%If (Qt_2_00 -)
-	void setFilters(const QStringList &);
+%If (TQt_2_00 -)
+	void setFilters(const TQStringList &);
 %End
 
 signals:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void fileHighlighted(const char *);
 	void fileSelected(const char *);
 	void dirEntered(const char *);
 %End
-%If (Qt_2_00 -)
-	void fileHighlighted(const QString &);
-	void fileSelected(const QString &);
+%If (TQt_2_00 -)
+	void fileHighlighted(const TQString &);
+	void fileSelected(const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	void filesSelected(const QStringList &);
+%If (TQt_3_0_0 -)
+	void filesSelected(const TQStringList &);
 %End
-%If (Qt_2_00 -)
-	void dirEntered(const QString &);
+%If (TQt_2_00 -)
+	void dirEntered(const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	void filterSelected(const QString &);
+%If (TQt_3_0_0 -)
+	void filterSelected(const TQString &);
 %End
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void keyPressEvent(QKeyEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void keyPressEvent(TQKeyEvent *);
 
-	void addWidgets(QLabel *,QWidget *,QPushButton *);
-%If (Qt_2_1_0 -)
-	void addToolButton(QButton *,bool = 0);
-	void addLeftWidget(QWidget *);
-	void addRightWidget(QWidget *);
+	void addWidgets(TQLabel *,TQWidget *,TQPushButton *);
+%If (TQt_2_1_0 -)
+	void addToolButton(TQButton *,bool = 0);
+	void addLeftWidget(TQWidget *);
+	void addRightWidget(TQWidget *);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void addFilter(const QString &);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void addFilter(const TQString &);
 %End
 
 private:
-	QFileDialog(const QFileDialog &);
+	TQFileDialog(const TQFileDialog &);
 };
 
 %End
diff --git a/sip/qt/qfileinfo.sip b/sip/qt/qfileinfo.sip
index 3755e31..a43f156 100644
--- a/sip/qt/qfileinfo.sip
+++ b/sip/qt/qfileinfo.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QFileInfo.
+// This is the SIP interface definition for TQFileInfo.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFileInfo</Title>
+<Sect2><Title>TQFileInfo</Title>
 <Para>
-<Literal>QFileInfo</Literal> is fully implemented.
+<Literal>TQFileInfo</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QFileInfo
+class TQFileInfo
 {
 %TypeHeaderCode
 #include <qfileinfo.h>
@@ -37,7 +37,7 @@ class QFileInfo
 
 public:
 	enum PermissionSpec {
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		ReadOwner, WriteOwner, ExeOwner,
 %End
 		ReadUser,  WriteUser,  ExeUser,
@@ -45,67 +45,67 @@ public:
 		ReadOther, WriteOther, ExeOther
 	};
 
-	QFileInfo();
-%If (- Qt_2_00)
-	QFileInfo(const char *);
+	TQFileInfo();
+%If (- TQt_2_00)
+	TQFileInfo(const char *);
 %End
-%If (Qt_2_00 -)
-	QFileInfo(const QString &);
+%If (TQt_2_00 -)
+	TQFileInfo(const TQString &);
 %End
-	QFileInfo(const QFile &);
-%If (- Qt_2_00)
-	QFileInfo(const QDir &,const char *);
+	TQFileInfo(const TQFile &);
+%If (- TQt_2_00)
+	TQFileInfo(const TQDir &,const char *);
 %End
-%If (Qt_2_00 -)
-	QFileInfo(const QDir &,const QString &);
+%If (TQt_2_00 -)
+	TQFileInfo(const TQDir &,const TQString &);
 %End
-	QFileInfo(const QFileInfo &);
+	TQFileInfo(const TQFileInfo &);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFile(const char *);
 %End
-%If (Qt_2_00 -)
-	void setFile(const QString &);
+%If (TQt_2_00 -)
+	void setFile(const TQString &);
 %End
-	void setFile(const QFile &);
-%If (- Qt_2_00)
-	void setFile(const QDir &,const char *);
+	void setFile(const TQFile &);
+%If (- TQt_2_00)
+	void setFile(const TQDir &,const char *);
 %End
-%If (Qt_2_00 -)
-	void setFile(const QDir &,const QString &);
+%If (TQt_2_00 -)
+	void setFile(const TQDir &,const TQString &);
 %End
 	bool exists() const;
 	void refresh() const;
 	bool caching() const;
 	void setCaching(bool);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *filePath() const;
 %End
-%If (Qt_2_00 -)
-	const QString filePath() const;
+%If (TQt_2_00 -)
+	const TQString filePath() const;
 %End
-	QString fileName() const;
-	QString absFilePath() const;
-%If (- Qt_3_0_0)
-	QString baseName() const;
+	TQString fileName() const;
+	TQString absFilePath() const;
+%If (- TQt_3_0_0)
+	TQString baseName() const;
 %End
-%If (Qt_3_0_0 -)
-	QString baseName(bool = 1) const;
+%If (TQt_3_0_0 -)
+	TQString baseName(bool = 1) const;
 %End
-%If (- Qt_2_00)
-	QString extension() const;
+%If (- TQt_2_00)
+	TQString extension() const;
 %End
-%If (Qt_2_00 -)
-	QString extension(bool = 1) const;
+%If (TQt_2_00 -)
+	TQString extension(bool = 1) const;
 %End
 
-	QString dirPath(bool = 0) const;
-	QDir dir(bool = 0) const;
+	TQString dirPath(bool = 0) const;
+	TQDir dir(bool = 0) const;
 	bool isReadable() const;
 	bool isWritable() const;
 	bool isExecutable() const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isHidden() const;
 %End
 
@@ -116,20 +116,20 @@ public:
 	bool isDir() const;
 	bool isSymLink() const;
 
-	QString readLink() const /ReleaseGIL/;
+	TQString readLink() const /ReleaseGIL/;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *owner() const;
 %End
-%If (Qt_2_00 -)
-	QString owner() const;
+%If (TQt_2_00 -)
+	TQString owner() const;
 %End
 	uint ownerId() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *group() const;
 %End
-%If (Qt_2_00 -)
-	QString group() const;
+%If (TQt_2_00 -)
+	TQString group() const;
 %End
 	uint groupId() const;
 
@@ -137,9 +137,9 @@ public:
 
 	uint size() const;
 
-%If (Qt_3_0_0 -)
-	QDateTime created() const;
+%If (TQt_3_0_0 -)
+	TQDateTime created() const;
 %End
-	QDateTime lastModified() const;
-	QDateTime lastRead() const;
+	TQDateTime lastModified() const;
+	TQDateTime lastRead() const;
 };
diff --git a/sip/qt/qfont.sip b/sip/qt/qfont.sip
index b2abfd4..54689e9 100644
--- a/sip/qt/qfont.sip
+++ b/sip/qt/qfont.sip
@@ -1,43 +1,43 @@
-// This is the SIP interface definition for QFont.
+// This is the SIP interface definition for TQFont.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFont</Title>
+<Sect2><Title>TQFont</Title>
 <Para>
-<Literal>QFont</Literal> is fully implemented, including the Python
+<Literal>TQFont</Literal> is fully implemented, including the Python
 <Literal>==</Literal> and <Literal>!=</Literal> operators.
 </Para>
 </Sect2>
 %End
 
 
-class QFont
+class TQFont
 {
 %TypeHeaderCode
 #include <qfont.h>
 %End
 
 public:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum CharSet {
 		Latin1,	ISO_8859_1 = Latin1, AnyCharSet,
 		Latin2,	ISO_8859_2 = Latin2,
@@ -51,7 +51,7 @@ public:
 		KOI8R
 	};
 %End
-%If (Qt_2_00 - Qt_2_1_0)
+%If (TQt_2_00 - TQt_2_1_0)
 	enum CharSet {
 		ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet,
 		ISO_8859_2, Latin2 = ISO_8859_2,
@@ -77,7 +77,7 @@ public:
 		Unicode
 	};
 %End
-%If (Qt_2_1_0 - Qt_2_2_0)
+%If (TQt_2_1_0 - TQt_2_2_0)
 	enum CharSet {
 		ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet,
 		ISO_8859_2, Latin2 = ISO_8859_2,
@@ -105,7 +105,7 @@ public:
 		Set_Big5
 	};
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	enum CharSet {
 		ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet,
 		ISO_8859_2, Latin2 = ISO_8859_2,
@@ -153,7 +153,7 @@ public:
 		Decorative
 	};
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum StyleStrategy {
 		PreferDefault,
 		PreferBitmap,
@@ -162,11 +162,11 @@ public:
 		ForceOutline,
 		PreferMatch,
 		PreferQuality,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		PreferAntialias,
 		NoAntialias,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		OpenGLCompatible,
 %End
 	};
@@ -180,7 +180,7 @@ public:
 		Black
 	};
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum Stretch {
 		UltraCondensed,
 		ExtraCondensed,
@@ -194,29 +194,29 @@ public:
 	};
 %End
 
-	QFont();
-%If (- Qt_2_00)
-	QFont(const char *,int = 12,int = Normal,bool = 0);
-	QFont(const char *,int,int,bool,CharSet);
+	TQFont();
+%If (- TQt_2_00)
+	TQFont(const char *,int = 12,int = Normal,bool = 0);
+	TQFont(const char *,int,int,bool,CharSet);
 %End
-%If (Qt_2_00 - Qt_3_2_0)
-	QFont(const QString &,int = 12,int = Normal,bool = 0);
+%If (TQt_2_00 - TQt_3_2_0)
+	TQFont(const TQString &,int = 12,int = Normal,bool = 0);
 %End
-%If (Qt_3_2_0 -)
-	QFont(const QString &,int = 12,int = -1,bool = 0);
+%If (TQt_3_2_0 -)
+	TQFont(const TQString &,int = 12,int = -1,bool = 0);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QFont(const QString &,int,int,bool,CharSet);
+%If (TQt_2_00 - TQt_3_0_0)
+	TQFont(const TQString &,int,int,bool,CharSet);
 %End
-	QFont(const QFont &);
+	TQFont(const TQFont &);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *family() const;
 	void setFamily(const char *);
 %End
-%If (Qt_2_00 -)
-	QString family() const;
-	void setFamily(const QString &);
+%If (TQt_2_00 -)
+	TQString family() const;
+	void setFamily(const TQString &);
 
 	float pointSizeFloat() const;
 	void setPointSizeFloat(float);
@@ -240,7 +240,7 @@ public:
 	bool underline() const;
 	void setUnderline(bool);
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool overline() const;
 	void setOverline(bool);
 %End
@@ -252,26 +252,26 @@ public:
 	void setFixedPitch(bool);
 
 	StyleHint styleHint() const;
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	StyleStrategy styleStrategy() const;
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void setStyleHint(StyleHint);
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	void setStyleHint(StyleHint,StyleStrategy);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setStyleHint(StyleHint,StyleStrategy = PreferDefault);
 	void setStyleStrategy(StyleStrategy);
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	CharSet charSet() const;
 	void setCharSet(CharSet);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int stretch() const;
 	void setStretch(int);
 %End
@@ -281,59 +281,59 @@ public:
 
 	bool exactMatch() const;
 
-	bool operator==(const QFont &) const;
-	bool operator!=(const QFont &) const;
+	bool operator==(const TQFont &) const;
+	bool operator!=(const TQFont &) const;
 
-	bool isCopyOf(const QFont &) const;
+	bool isCopyOf(const TQFont &) const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	HANDLE handle(HANDLE = 0);
 	const char *rawName() const;
-	static const QFont &defaultFont();
+	static const TQFont &defaultFont();
 	static const char *substitute(const char *);
 	static void insertSubstitution(const char *,const char *);
 	static void removeSubstitution(const char *);
-	static void listSubstitutions(QStrList *);
+	static void listSubstitutions(TQStrList *);
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	static CharSet charSetForLocale();
 %End
 
-%If (Qt_2_00 -)
-%If (- Qt_3_0_0)
+%If (TQt_2_00 -)
+%If (- TQt_3_0_0)
 %If (WS_X11)
 	HANDLE handle() const;
 %End
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 %If (WS_X11)
-	Qt::HANDLE handle() const;
+	TQt::HANDLE handle() const;
 %End
 %End
-	void setRawName(const QString &);
-	QString rawName() const;
+	void setRawName(const TQString &);
+	TQString rawName() const;
 %End
-	QString key() const;
-%If (Qt_3_0_0 -)
-	QString toString() const;
-	bool fromString(const QString &);
+	TQString key() const;
+%If (TQt_3_0_0 -)
+	TQString toString() const;
+	bool fromString(const TQString &);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	static QString encodingName(CharSet);
+%If (TQt_2_00 - TQt_3_0_0)
+	static TQString encodingName(CharSet);
 %End
-%If (Qt_2_00 -)
-	static QString substitute(const QString &);
-%If (Qt_3_0_0 -)
-	static QStringList substitutes(const QString &);
+%If (TQt_2_00 -)
+	static TQString substitute(const TQString &);
+%If (TQt_3_0_0 -)
+	static TQStringList substitutes(const TQString &);
 %End
-	static QStringList substitutions();
-	static void insertSubstitution(const QString &,const QString &);
-%If (Qt_3_0_0 -)
-	static void insertSubstitutions(const QString &,const QStringList &);
+	static TQStringList substitutions();
+	static void insertSubstitution(const TQString &,const TQString &);
+%If (TQt_3_0_0 -)
+	static void insertSubstitutions(const TQString &,const TQStringList &);
 %End
-	static void removeSubstitution(const QString &);
-%If (- Qt_3_0_0)
+	static void removeSubstitution(const TQString &);
+%If (- TQt_3_0_0)
 	static void locale_init();
 %End
 %End
@@ -342,7 +342,7 @@ public:
 	static void cleanup();
 	static void cacheStatistics();
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Script {
 		Latin,
 		Greek,
@@ -399,7 +399,7 @@ public:
  
 		Unicode,
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		Tagalog,
 		Hanunoo,
 		Buhid,
@@ -408,34 +408,34 @@ public:
 		KatakanaHalfWidth,
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		Limbu,
 		TaiLe,
 %End
 	};
 
-	QString defaultFamily() const;
-	QString lastResortFamily() const;
-	QString lastResortFont() const;
+	TQString defaultFamily() const;
+	TQString lastResortFamily() const;
+	TQString lastResortFont() const;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	static QFont defaultFont();
+%If (TQt_2_00 - TQt_3_0_0)
+	static TQFont defaultFont();
 %End
-%If (- Qt_3_0_0)
-	static void setDefaultFont(const QFont &);
+%If (- TQt_3_0_0)
+	static void setDefaultFont(const TQFont &);
 %End
 
-%If (Qt_3_2_0 -)
-	QFont resolve(const QFont &) const;
+%If (TQt_3_2_0 -)
+	TQFont resolve(const TQFont &) const;
 %End
 
 protected:
 	bool dirty() const;
-%If (- Qt_3_0_0)
-	QString defaultFamily() const;
-	QString lastResortFamily() const;
-	QString lastResortFont() const;
+%If (- TQt_3_0_0)
+	TQString defaultFamily() const;
+	TQString lastResortFamily() const;
+	TQString lastResortFont() const;
 %End
 	int deciPointSize() const;
 };
diff --git a/sip/qt/qfontdatabase.sip b/sip/qt/qfontdatabase.sip
index cacecea..4676e43 100644
--- a/sip/qt/qfontdatabase.sip
+++ b/sip/qt/qfontdatabase.sip
@@ -1,119 +1,119 @@
-// This is the SIP interface definition for QFontDatabase.
+// This is the SIP interface definition for TQFontDatabase.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFontDatabase (Qt v2.1+)</Title>
+<Sect2><Title>TQFontDatabase (TQt v2.1+)</Title>
 <Para>
-<Literal>QFontDatabase</Literal> is fully implemented.
+<Literal>TQFontDatabase</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_FONTDATABASE)
-%If (Qt_2_1_0 -)
+%If (TQt_FONTDATABASE)
+%If (TQt_2_1_0 -)
 
-class QFontDatabase
+class TQFontDatabase
 {
 %TypeHeaderCode
 #include <qfontdatabase.h>
 %End
 
 public:
-	QFontDatabase();
+	TQFontDatabase();
 
-	static QValueList<int> standardSizes();
+	static TQValueList<int> standardSizes();
 
-%If (- Qt_3_0_0)
-	QStringList charSets(const QString &,bool = 1 ) const;
-	QStringList families(bool = 1) const;
-	QStringList styles(const QString &,
-			   const QString & = QString::null) const;
-	QValueList<int> pointSizes(const QString &,
-				   const QString & = QString::null,
-				   const QString & = QString::null);
-	QValueList<int> smoothSizes(const QString &,const QString &,
-				    const QString & = QString::null);
+%If (- TQt_3_0_0)
+	TQStringList charSets(const TQString &,bool = 1 ) const;
+	TQStringList families(bool = 1) const;
+	TQStringList styles(const TQString &,
+			   const TQString & = TQString::null) const;
+	TQValueList<int> pointSizes(const TQString &,
+				   const TQString & = TQString::null,
+				   const TQString & = TQString::null);
+	TQValueList<int> smoothSizes(const TQString &,const TQString &,
+				    const TQString & = TQString::null);
 %End
-%If (Qt_3_0_0 -)
-	QStringList families() const;
-%If (Qt_3_2_0 -)
-	QStringList families(QFont::Script) const;
+%If (TQt_3_0_0 -)
+	TQStringList families() const;
+%If (TQt_3_2_0 -)
+	TQStringList families(TQFont::Script) const;
 %End
-	QStringList styles(const QString &) const;
-	QValueList<int> pointSizes(const QString &,
-				   const QString & = QString::null);
-	QValueList<int> smoothSizes(const QString &,const QString &);
+	TQStringList styles(const TQString &) const;
+	TQValueList<int> pointSizes(const TQString &,
+				   const TQString & = TQString::null);
+	TQValueList<int> smoothSizes(const TQString &,const TQString &);
 %End
-	QString styleString(const QFont &);
+	TQString styleString(const TQFont &);
 
-%If (- Qt_3_0_0)
-	QFont font(const QString,const QString &,int,
-		   const QString = QString::null);
+%If (- TQt_3_0_0)
+	TQFont font(const TQString,const TQString &,int,
+		   const TQString = TQString::null);
 
-	bool isBitmapScalable(const QString &,const QString & = QString::null,
-			      const QString & = QString::null) const;
-	bool isSmoothlyScalable(const QString &,
-				const QString & = QString::null,
-				const QString & = QString::null) const;
-	bool isScalable(const QString &,const QString & = QString::null,
-			const QString & = QString::null) const;
+	bool isBitmapScalable(const TQString &,const TQString & = TQString::null,
+			      const TQString & = TQString::null) const;
+	bool isSmoothlyScalable(const TQString &,
+				const TQString & = TQString::null,
+				const TQString & = TQString::null) const;
+	bool isScalable(const TQString &,const TQString & = TQString::null,
+			const TQString & = TQString::null) const;
 %End
-%If (Qt_3_0_0 -)
-	QFont font(const QString,const QString &,int);
+%If (TQt_3_0_0 -)
+	TQFont font(const TQString,const TQString &,int);
 
-	bool isBitmapScalable(const QString &,
-			      const QString & = QString::null) const;
-	bool isSmoothlyScalable(const QString &,
-				const QString & = QString::null) const;
-	bool isScalable(const QString &,const QString & = QString::null) const;
+	bool isBitmapScalable(const TQString &,
+			      const TQString & = TQString::null) const;
+	bool isSmoothlyScalable(const TQString &,
+				const TQString & = TQString::null) const;
+	bool isScalable(const TQString &,const TQString & = TQString::null) const;
 %End
-%If (Qt_2_3_0 - Qt_3_0_0)
-	bool isFixedPitch(const QString &,const QString & = QString::null,
-			  const QString & = QString::null) const;
+%If (TQt_2_3_0 - TQt_3_0_0)
+	bool isFixedPitch(const TQString &,const TQString & = TQString::null,
+			  const TQString & = TQString::null) const;
 %End
-%If (Qt_3_0_0 -)
-	bool isFixedPitch(const QString &,
-			  const QString & = QString::null) const;
+%If (TQt_3_0_0 -)
+	bool isFixedPitch(const TQString &,
+			  const TQString & = TQString::null) const;
 %End
 
-%If (- Qt_3_0_0)
-	bool italic(const QString &,const QString &,
-		    const QString & = QString::null) const;
-	bool bold(const QString &,const QString &,
-		  const QString & = QString::null) const;
-	int weight(const QString &,const QString &,
-		   const QString & = QString::null) const;
+%If (- TQt_3_0_0)
+	bool italic(const TQString &,const TQString &,
+		    const TQString & = TQString::null) const;
+	bool bold(const TQString &,const TQString &,
+		  const TQString & = TQString::null) const;
+	int weight(const TQString &,const TQString &,
+		   const TQString & = TQString::null) const;
 
-	static QString verboseCharSetName(const QString &);
-	static QString charSetSample(const QString &);
+	static TQString verboseCharSetName(const TQString &);
+	static TQString charSetSample(const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	bool italic(const QString &,const QString &) const;
-	bool bold(const QString &,const QString &) const;
-	int weight(const QString &,const QString &) const;
+%If (TQt_3_0_0 -)
+	bool italic(const TQString &,const TQString &) const;
+	bool bold(const TQString &,const TQString &) const;
+	int weight(const TQString &,const TQString &) const;
  
-	static QString scriptName(QFont::Script);
-	static QString scriptSample(QFont::Script);
+	static TQString scriptName(TQFont::Script);
+	static TQString scriptSample(TQFont::Script);
 %End
 };
 
diff --git a/sip/qt/qfontdialog.sip b/sip/qt/qfontdialog.sip
index 9196000..e4f93f1 100644
--- a/sip/qt/qfontdialog.sip
+++ b/sip/qt/qfontdialog.sip
@@ -1,104 +1,104 @@
-// This is the SIP interface definition for QFontDialog.
+// This is the SIP interface definition for TQFontDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFontDialog (Qt v2+)</Title>
+<Sect2><Title>TQFontDialog (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef>static QFont <Function>getFont</Function></FuncDef>
+	<FuncDef>static TQFont <Function>getFont</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter></ParamDef>
-	<ParamDef>const QFont &<Parameter>def</Parameter></ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>const TQFont &<Parameter>def</Parameter></ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 This takes the <Literal>def</Literal>, <Literal>parent</Literal> and
 <Literal>name</Literal> parameters and returns a tuple containing the
-<Literal>QFont</Literal> result and the <Literal>ok</Literal> value.
+<Literal>TQFont</Literal> result and the <Literal>ok</Literal> value.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>static QFont <Function>getFont</Function></FuncDef>
+	<FuncDef>static TQFont <Function>getFont</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter></ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 This takes the <Literal>parent</Literal> and <Literal>name</Literal> parameters
-and returns a tuple containing the <Literal>QFont</Literal> result and the
+and returns a tuple containing the <Literal>TQFont</Literal> result and the
 <Literal>ok</Literal> value.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
-%If (Qt_FONTDIALOG)
+%If (TQt_2_00 -)
+%If (TQt_FONTDIALOG)
 
-class QFontDialog : QDialog
+class TQFontDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qfontdialog.h>
 %End
 
 public:
-	static QFont getFont(bool *,const QFont &,QWidget * = 0,
+	static TQFont getFont(bool *,const TQFont &,TQWidget * = 0,
 			     const char * = 0);
-	static QFont getFont(bool *,QWidget * = 0,const char * = 0);
+	static TQFont getFont(bool *,TQWidget * = 0,const char * = 0);
 
 signals:
-%If (- Qt_3_2_0)
-	void fontSelected(const QFont &);
-	void fontHighlighted(const QFont &);
+%If (- TQt_3_2_0)
+	void fontSelected(const TQFont &);
+	void fontHighlighted(const TQFont &);
 %End
 
 protected:
-%If (- Qt_3_2_0)
-	bool eventFilter(QObject *,QEvent *);
+%If (- TQt_3_2_0)
+	bool eventFilter(TQObject *,TQEvent *);
 
-	QListBox *familyListBox() const;
+	TQListBox *familyListBox() const;
 	virtual void updateFamilies();
 
-	QListBox *styleListBox() const;
+	TQListBox *styleListBox() const;
 	virtual void updateStyles();
 
-	QListBox *sizeListBox() const;
+	TQListBox *sizeListBox() const;
 	virtual void updateSizes();
 
-	QComboBox *scriptCombo() const;
+	TQComboBox *scriptCombo() const;
 	virtual void updateScripts();
 %End
 
 protected slots:
-%If (- Qt_3_2_0)
-	void sizeChanged(const QString &);
+%If (- TQt_3_2_0)
+	void sizeChanged(const TQString &);
 %End
 
 private:
-	QFontDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQFontDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 		    WFlags = 0);
-%If (Qt_2_1_0 -)
-	QFontDialog(const QFontDialog &);
+%If (TQt_2_1_0 -)
+	TQFontDialog(const TQFontDialog &);
 %End
-	~QFontDialog();
+	~TQFontDialog();
 };
 
 %End
diff --git a/sip/qt/qfontinfo.sip b/sip/qt/qfontinfo.sip
index d58eab0..f2d48ff 100644
--- a/sip/qt/qfontinfo.sip
+++ b/sip/qt/qfontinfo.sip
@@ -1,54 +1,54 @@
-// This is the SIP interface definition for QFontInfo.
+// This is the SIP interface definition for TQFontInfo.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFontInfo</Title>
+<Sect2><Title>TQFontInfo</Title>
 <Para>
-<Literal>QFontInfo</Literal> is fully implemented.
+<Literal>TQFontInfo</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QFontInfo
+class TQFontInfo
 {
 %TypeHeaderCode
 #include <qfontinfo.h>
 %End
 
 public:
-	QFontInfo(const QFont &);
-%If (Qt_3_2_0 -)
-	QFontInfo(const QFont &,QFont::Script);
+	TQFontInfo(const TQFont &);
+%If (TQt_3_2_0 -)
+	TQFontInfo(const TQFont &,TQFont::Script);
 %End
-	QFontInfo(const QFontInfo &);
+	TQFontInfo(const TQFontInfo &);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *family() const;
 %End
-%If (Qt_2_00 -)
-	QString family() const;
+%If (TQt_2_00 -)
+	TQString family() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int pixelSize() const;
 %End
 	int pointSize() const;
@@ -56,14 +56,14 @@ public:
 	int weight() const;
 	bool bold() const;
 	bool underline() const;
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool overline() const;
 %End
 	bool strikeOut() const;
 	bool fixedPitch() const;
-	QFont::StyleHint styleHint() const;
-%If (- Qt_3_0_0)
-	QFont::CharSet charSet() const;
+	TQFont::StyleHint styleHint() const;
+%If (- TQt_3_0_0)
+	TQFont::CharSet charSet() const;
 %End
 	bool rawMode() const;
 	bool exactMatch() const;
diff --git a/sip/qt/qfontmetrics.sip b/sip/qt/qfontmetrics.sip
index e5059fb..c3dbf4e 100644
--- a/sip/qt/qfontmetrics.sip
+++ b/sip/qt/qfontmetrics.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QFontMetrics.
+// This is the SIP interface definition for TQFontMetrics.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFontMetrics</Title>
+<Sect2><Title>TQFontMetrics</Title>
 <FuncSynopsis>
-        <FuncDef>QRect <Function>boundingRect</Function></FuncDef>
+        <FuncDef>TQRect <Function>boundingRect</Function></FuncDef>
         <ParamDef>int <Parameter>x</Parameter></ParamDef>
         <ParamDef>int <Parameter>y</Parameter></ParamDef>
         <ParamDef>int <Parameter>w</Parameter></ParamDef>
         <ParamDef>int <Parameter>h</Parameter></ParamDef>
         <ParamDef>int <Parameter>flags</Parameter></ParamDef>
-        <ParamDef>const QString &amp;<Parameter>str</Parameter></ParamDef>
+        <ParamDef>const TQString &amp;<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>len</Parameter> = -1</ParamDef>
         <ParamDef>int <Parameter>tabstops</Parameter> = 0</ParamDef>
         <ParamDef>int *<Parameter>tabarray</Parameter> = 0</ParamDef>
@@ -39,9 +39,9 @@ The <Literal>tabarray</Literal> parameter is a Python list of integers.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QSize <Function>size</Function></FuncDef>
+        <FuncDef>TQSize <Function>size</Function></FuncDef>
         <ParamDef>int <Parameter>flags</Parameter></ParamDef>
-        <ParamDef>const QString &amp;<Parameter>str</Parameter></ParamDef>
+        <ParamDef>const TQString &amp;<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>len</Parameter> = -1</ParamDef>
         <ParamDef>int <Parameter>tabstops</Parameter> = 0</ParamDef>
         <ParamDef>int *<Parameter>tabarray</Parameter> = 0</ParamDef>
@@ -53,18 +53,18 @@ The <Literal>tabarray</Literal> parameter is a Python list of integers.
 %End
 
 
-class QFontMetrics
+class TQFontMetrics
 {
 %TypeHeaderCode
 #include <qfontmetrics.h>
 %End
 
 public:
-	QFontMetrics(const QFont &);
-%If (Qt_3_2_0 -)
-	QFontMetrics(const QFont &,QFont::Script);
+	TQFontMetrics(const TQFont &);
+%If (TQt_3_2_0 -)
+	TQFontMetrics(const TQFont &,TQFont::Script);
 %End
-	QFontMetrics(const QFontMetrics &);
+	TQFontMetrics(const TQFontMetrics &);
 
 	int ascent() const;
 	int descent() const;
@@ -74,16 +74,16 @@ public:
 	int minLeftBearing() const;
 	int minRightBearing() const;
 	int maxWidth() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool inFont(char) const;
 	int leftBearing(char) const;
 	int rightBearing(char) const;
 	int width(const char *,int = -1) const;
 	int width(char) const;
-	QRect boundingRect(const char *,int = -1) const;
-	QRect boundingRect(char) const;
+	TQRect boundingRect(const char *,int = -1) const;
+	TQRect boundingRect(char) const;
 
-	QRect boundingRect(int,int,int,int,int,const char *,int = -1,
+	TQRect boundingRect(int,int,int,int,int,const char *,int = -1,
 			   SIP_PYLIST /AllowNone/ = 0) const;
 %MethodCode
 		int *tabarray;
@@ -93,7 +93,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QRect(sipCpp -> QFontMetrics::boundingRect(a0,a1,a2,a3,a4,a5,a6,a7,tabarray));
+			sipRes = new TQRect(sipCpp -> TQFontMetrics::boundingRect(a0,a1,a2,a3,a4,a5,a6,a7,tabarray));
 			Py_END_ALLOW_THREADS
 
 			if (tabarray)
@@ -101,7 +101,7 @@ public:
 		}
 %End
 
-	QSize size(int,const char *,int = -1,int = 0,
+	TQSize size(int,const char *,int = -1,int = 0,
 		   SIP_PYLIST /AllowNone/ = 0) const;
 %MethodCode
 		int *tabarray;
@@ -111,7 +111,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QSize(sipCpp -> QFontMetrics::size(a0,a1,a2,a3,tabarray));
+			sipRes = new TQSize(sipCpp -> TQFontMetrics::size(a0,a1,a2,a3,tabarray));
 			Py_END_ALLOW_THREADS
 
 			if (tabarray)
@@ -119,19 +119,19 @@ public:
 		}
 %End
 %End
-%If (Qt_2_00 -)
-	bool inFont(QChar) const;
-	int leftBearing(QChar) const;
-	int rightBearing(QChar) const;
-	int width(const QString &,int = -1) const;
-	int width(QChar) const;
-%If (Qt_3_0_0 -)
-	int charWidth(const QString &,int) const;
+%If (TQt_2_00 -)
+	bool inFont(TQChar) const;
+	int leftBearing(TQChar) const;
+	int rightBearing(TQChar) const;
+	int width(const TQString &,int = -1) const;
+	int width(TQChar) const;
+%If (TQt_3_0_0 -)
+	int charWidth(const TQString &,int) const;
 %End
-	QRect boundingRect(const QString &,int = -1) const;
-	QRect boundingRect(QChar) const;
+	TQRect boundingRect(const TQString &,int = -1) const;
+	TQRect boundingRect(TQChar) const;
 
-	QRect boundingRect(int,int,int,int,int,const QString &,int = -1,
+	TQRect boundingRect(int,int,int,int,int,const TQString &,int = -1,
 			   int = 0,SIP_PYLIST /AllowNone/ = 0) const;
 %MethodCode
 		int *tabarray;
@@ -141,7 +141,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QRect(sipCpp -> QFontMetrics::boundingRect(a0,a1,a2,a3,a4,*a5,a6,a7,tabarray));
+			sipRes = new TQRect(sipCpp -> TQFontMetrics::boundingRect(a0,a1,a2,a3,a4,*a5,a6,a7,tabarray));
 			Py_END_ALLOW_THREADS
 
 			if (tabarray)
@@ -149,7 +149,7 @@ public:
 		}
 %End
 
-	QSize size(int,const QString &,int = -1,int = 0,
+	TQSize size(int,const TQString &,int = -1,int = 0,
 		   SIP_PYLIST /AllowNone/ = 0) const;
 %MethodCode
 		int *tabarray;
@@ -159,7 +159,7 @@ public:
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipRes = new QSize(sipCpp -> QFontMetrics::size(a0,*a1,a2,a3,tabarray));
+			sipRes = new TQSize(sipCpp -> TQFontMetrics::size(a0,*a1,a2,a3,tabarray));
 			Py_END_ALLOW_THREADS
 
 			if (tabarray)
@@ -169,7 +169,7 @@ public:
 %End
 
 	int underlinePos() const;
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int overlinePos() const;
 %End
 	int strikeOutPos() const;
diff --git a/sip/qt/qframe.sip b/sip/qt/qframe.sip
index 9e2a4e2..1bc9308 100644
--- a/sip/qt/qframe.sip
+++ b/sip/qt/qframe.sip
@@ -1,70 +1,70 @@
-// This is the SIP interface definition for QFrame.
+// This is the SIP interface definition for TQFrame.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QFrame</Title>
+<Sect2><Title>TQFrame</Title>
 <Para>
-<Literal>QFrame</Literal> is fully implemented.
+<Literal>TQFrame</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QFrame : QWidget
+class TQFrame : TQWidget
 {
 %TypeHeaderCode
 #include <qframe.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QFrame(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
+%If (- TQt_3_0_0)
+	TQFrame(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
 	       bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	QFrame(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQFrame(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
 
 	int frameStyle() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFrameStyle(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setFrameStyle(int);
 %End
 
 	int frameWidth() const;
-	QRect contentsRect() const;
+	TQRect contentsRect() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool lineShapesOk() const;
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum {
 		NoFrame,
 		Box,
@@ -79,7 +79,7 @@ public:
 		MShadow
 	};
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum Shape {
 		NoFrame,
 		Box,
@@ -89,22 +89,22 @@ public:
 		VLine,
 		StyledPanel,
 		PopupPanel,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		MenuBarPanel,
 		ToolBarPanel,
 %End
-%If (Qt_3_0_1 -)
+%If (TQt_3_0_1 -)
 		LineEditPanel,
 		TabWidgetPanel,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		GroupBoxPanel,
 %End
 		MShape
 	};
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum Shadow {
 		Plain,
 		Raised,
@@ -113,68 +113,68 @@ public:
 	};
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int frameShape() const;
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	Shape frameShape() const;
 	void setFrameShape(Shape);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int frameShadow() const;
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	Shadow frameShadow() const;
 	void setFrameShadow(Shadow);
 %End
 
 	int lineWidth() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setLineWidth(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setLineWidth(int);
 %End
 
 	int margin() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMargin(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMargin(int);
 %End
 
 	int midLineWidth() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMidLineWidth(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMidLineWidth(int);
 %End
 
-	QRect frameRect() const;
-%If (Qt_2_00 -)
-	virtual void setFrameRect(const QRect &);
+	TQRect frameRect() const;
+%If (TQt_2_00 -)
+	virtual void setFrameRect(const TQRect &);
 %End
 
 protected:
-%If (- Qt_2_00)
-	void setFrameRect(const QRect &);
+%If (- TQt_2_00)
+	void setFrameRect(const TQRect &);
 %End
-	void paintEvent(QPaintEvent *);
-	void resizeEvent(QResizeEvent *);
-	virtual void drawFrame(QPainter *);
-	virtual void drawContents(QPainter *);
+	void paintEvent(TQPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+	virtual void drawFrame(TQPainter *);
+	virtual void drawContents(TQPainter *);
 	virtual void frameChanged();
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	void updateMask();
-	virtual void drawFrameMask(QPainter *);
-	virtual void drawContentsMask(QPainter *);
+	virtual void drawFrameMask(TQPainter *);
+	virtual void drawContentsMask(TQPainter *);
 %End
-%If (Qt_3_1_0 -)
-	void styleChange(QStyle &);
+%If (TQt_3_1_0 -)
+	void styleChange(TQStyle &);
 %End
 
 private:
-	QFrame(const QFrame &);
+	TQFrame(const TQFrame &);
 };
diff --git a/sip/qt/qglobal.sip b/sip/qt/qglobal.sip
index e2fb63a..a508f3f 100644
--- a/sip/qt/qglobal.sip
+++ b/sip/qt/qglobal.sip
@@ -1,22 +1,22 @@
-// This is the SIP interface definition for some Qt globals.
+// This is the SIP interface definition for some TQt globals.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -43,21 +43,21 @@ typedef unsigned short	Q_UINT16;
 typedef int		Q_INT32;
 typedef unsigned	Q_UINT32;
 
-%If (Qt_Q_LONG_IS_long)
+%If (TQt_Q_LONG_IS_long)
 typedef long		Q_LONG;
 typedef unsigned long	Q_ULONG;
 %End
-%If (!Qt_Q_LONG_IS_long)
+%If (!TQt_Q_LONG_IS_long)
 typedef long long	Q_LONG;
 typedef unsigned long long	Q_ULONG;
 %End
 
 const char *qVersion();
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 const char *qInstallPath();
 const char *qInstallPathDocs();
 const char *qInstallPathHeaders();
@@ -66,7 +66,7 @@ const char *qInstallPathBins();
 const char *qInstallPathPlugins();
 const char *qInstallPathData();
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 const char *qInstallPathTranslations();
 %If (!WS_WIN)
 const char *qInstallPathSysconf();
diff --git a/sip/qt/qgmanager.sip b/sip/qt/qgmanager.sip
index 5a194b8..9f81d48 100644
--- a/sip/qt/qgmanager.sip
+++ b/sip/qt/qgmanager.sip
@@ -1,53 +1,53 @@
-// This is the SIP interface definition for QGManager.
+// This is the SIP interface definition for TQGManager.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QGManager (Qt v1.x)</Title>
+<Sect2><Title>TQGManager (TQt v1.x)</Title>
 <Para>
-<Literal>QGManager</Literal> is fully implemented.
+<Literal>TQGManager</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QChain (Qt v1.x)</Title>
+<Sect2><Title>TQChain (TQt v1.x)</Title>
 <Para>
-<Literal>QChain</Literal> is implemented as an opaque class.
+<Literal>TQChain</Literal> is implemented as an opaque class.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QChain;
+class TQChain;
 
 
-class QGManager : QObject
+class TQGManager : TQObject
 {
 %TypeHeaderCode
 #include <qgmanager.h>
 %End
 
 public:
-	QGManager(QWidget *,const char * = 0);
+	TQGManager(TQWidget *,const char * = 0);
 
 	enum Direction {
 		LeftToRight,
@@ -57,32 +57,32 @@ public:
 	};
 
 	enum {
-		unlimited = QCOORD_MAX
+		unlimited = TQCOORD_MAX
 	};
 
 	void setBorder(int);
-	QChain *newSerChain(Direction);
-	QChain *newParChain(Direction);
-	bool add(QChain *,QChain *,int = 0);
-	bool addWidget(QChain *,QWidget *,int = 0);
-	bool addSpacing(QChain *,int,int = 0,int = unlimited);
-	bool addBranch(QChain *,QChain *,int,int);
-	void setStretch(QChain *,int);
+	TQChain *newSerChain(Direction);
+	TQChain *newParChain(Direction);
+	bool add(TQChain *,TQChain *,int = 0);
+	bool addWidget(TQChain *,TQWidget *,int = 0);
+	bool addSpacing(TQChain *,int,int = 0,int = unlimited);
+	bool addBranch(TQChain *,TQChain *,int,int);
+	void setStretch(TQChain *,int);
 	bool activate();
 	void freeze(int = 0,int = 0);
 	void unFreeze();
-	QChain *xChain();
-	QChain *yChain();
-	void setMenuBar(QWidget *);
-	QWidget *mainWidget();
-	void remove(QWidget *);
-	void setName(QChain *,const char *);
+	TQChain *xChain();
+	TQChain *yChain();
+	void setMenuBar(TQWidget *);
+	TQWidget *mainWidget();
+	void remove(TQWidget *);
+	void setName(TQChain *,const char *);
 
 protected:
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 private:
-	QGManager(const QGManager &);
+	TQGManager(const TQGManager &);
 };
 
 %End
diff --git a/sip/qt/qgrid.sip b/sip/qt/qgrid.sip
index f26acb3..3b52514 100644
--- a/sip/qt/qgrid.sip
+++ b/sip/qt/qgrid.sip
@@ -1,71 +1,71 @@
-// This is the SIP interface definition for QGrid.
+// This is the SIP interface definition for TQGrid.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QGrid (Qt v2+)</Title>
+<Sect2><Title>TQGrid (TQt v2+)</Title>
 <Para>
-<Literal>QGrid</Literal> is fully implemented.
+<Literal>TQGrid</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QGrid : QFrame
+class TQGrid : TQFrame
 {
 %TypeHeaderCode
 #include <qgrid.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum Direction {
 		Horizontal,
 		Vertical
 	};
 %End
 
-	QGrid(int,QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-%If (- Qt_3_0_0)
-	QGrid(int,Direction,QWidget * /TransferThis/ = 0,const char * = 0,
+	TQGrid(int,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (- TQt_3_0_0)
+	TQGrid(int,Direction,TQWidget * /TransferThis/ = 0,const char * = 0,
 	      WFlags = 0);
 %End
-%If (Qt_3_0_0 -)
-	QGrid(int,Orientation,QWidget * /TransferThis/ = 0,const char * = 0,
+%If (TQt_3_0_0 -)
+	TQGrid(int,Orientation,TQWidget * /TransferThis/ = 0,const char * = 0,
 	      WFlags = 0);
 %End
 
 	void setSpacing(int);
-%If (Qt_2_1_0 -)
-	QSize sizeHint() const;
+%If (TQt_2_1_0 -)
+	TQSize sizeHint() const;
 %End
 
 protected:
 	void frameChanged();
 
 private:
-%If (Qt_2_1_0 -)
-	QGrid(const QGrid &);
+%If (TQt_2_1_0 -)
+	TQGrid(const TQGrid &);
 %End
 };
 
diff --git a/sip/qt/qgridview.sip b/sip/qt/qgridview.sip
index d1ca16b..1afeeaa 100644
--- a/sip/qt/qgridview.sip
+++ b/sip/qt/qgridview.sip
@@ -1,44 +1,44 @@
-// This is the SIP interface definition for QGridView.
+// This is the SIP interface definition for TQGridView.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QGridView (Qt v3+)</Title>
+<Sect2><Title>TQGridView (TQt v3+)</Title>
 <Para>
-<Literal>QGridView</Literal> is fully implemented.
+<Literal>TQGridView</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QGridView : QScrollView
+class TQGridView : TQScrollView
 {
 %TypeHeaderCode
 #include <qgridview.h>
 %End
 
 public:
-	QGridView(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQGridView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
 	int numRows() const;
 	virtual void setNumRows(int);
@@ -50,9 +50,9 @@ public:
 	int cellHeight() const;
 	virtual void setCellHeight(int);
     
-	QRect cellRect() const;
-	QRect cellGeometry(int,int);
-	QSize gridSize() const;
+	TQRect cellRect() const;
+	TQRect cellGeometry(int,int);
+	TQSize gridSize() const;
 
 	int rowAt(int) const;
 	int columnAt(int) const;
@@ -62,15 +62,15 @@ public:
 	void ensureCellVisible(int,int);
 
 protected:
-	virtual void paintCell(QPainter *,int,int) = 0;
-	virtual void paintEmptyArea(QPainter *,int,int,int,int);
+	virtual void paintCell(TQPainter *,int,int) = 0;
+	virtual void paintEmptyArea(TQPainter *,int,int,int,int);
 
-	void drawContents(QPainter *,int,int,int,int);
+	void drawContents(TQPainter *,int,int,int,int);
 
 	virtual void dimensionChange(int,int);
 
 private:
-	QGridView(const QGridView &);
+	TQGridView(const TQGridView &);
 };
 
 %End
diff --git a/sip/qt/qgroupbox.sip b/sip/qt/qgroupbox.sip
index c420082..43e8f32 100644
--- a/sip/qt/qgroupbox.sip
+++ b/sip/qt/qgroupbox.sip
@@ -1,76 +1,76 @@
-// This is the SIP interface definition for QGroupBox.
+// This is the SIP interface definition for TQGroupBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QGroupBox</Title>
+<Sect2><Title>TQGroupBox</Title>
 <Para>
-<Literal>QGroupBox</Literal> is fully implemented.
+<Literal>TQGroupBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QGroupBox : QFrame
+class TQGroupBox : TQFrame
 {
 %TypeHeaderCode
 #include <qgroupbox.h>
 %End
 
 public:
-	QGroupBox(QWidget * /TransferThis/ = 0,const char * = 0);
-%If (- Qt_2_00)
-	QGroupBox(const char *,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQGroupBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQGroupBox(const char *,TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QGroupBox(const QString &,QWidget * /TransferThis/ = 0,
+%If (TQt_2_00 -)
+	TQGroupBox(const TQString &,TQWidget * /TransferThis/ = 0,
 		  const char * = 0);
-	QGroupBox(int,Orientation,QWidget * /TransferThis/ = 0,
+	TQGroupBox(int,Orientation,TQWidget * /TransferThis/ = 0,
 		  const char * = 0);
-	QGroupBox(int,Orientation,const QString &,QWidget * /TransferThis/ = 0,
+	TQGroupBox(int,Orientation,const TQString &,TQWidget * /TransferThis/ = 0,
 		  const char * = 0);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setColumnLayout(int,Orientation);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *title() const;
 	void setTitle(const char *);
 %End
-%If (Qt_2_00 -)
-	QString title() const;
-	virtual void setTitle(const QString &);
+%If (TQt_2_00 -)
+	TQString title() const;
+	virtual void setTitle(const TQString &);
 %End
 
 	int alignment() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAlignment(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAlignment(int);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int columns() const;
 	void setColumns(int);
 
@@ -78,25 +78,25 @@ public:
 	void setOrientation(Orientation);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int insideMargin() const;
 	int insideSpacing() const;
 	void setInsideMargin(int);
 	void setInsideSpacing(int);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void addSpace(int);
 %End
-%If (Qt_2_2_0 -)
-	QSize sizeHint() const;
+%If (TQt_2_2_0 -)
+	TQSize sizeHint() const;
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isFlat() const;
 	void setFlat(bool);
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool isCheckable() const;
 	void setCheckable(bool);
 	bool isChecked() const;
@@ -104,32 +104,32 @@ public:
 %End
 
 public slots:
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setChecked(bool);
 %End
 
 signals:
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void toggled(bool);
 %End
 
 protected:
-%If (Qt_2_2_0 -)
-	bool event(QEvent *);
+%If (TQt_2_2_0 -)
+	bool event(TQEvent *);
 %End
-%If (Qt_2_00 -)
-	void childEvent(QChildEvent *);
-	void resizeEvent(QResizeEvent *);
+%If (TQt_2_00 -)
+	void childEvent(TQChildEvent *);
+	void resizeEvent(TQResizeEvent *);
 %End
-	void paintEvent(QPaintEvent *);
-%If (Qt_2_00 - Qt_3_0_0)
+	void paintEvent(TQPaintEvent *);
+%If (TQt_2_00 - TQt_3_0_0)
 	void updateMask();
 %End
-%If (Qt_2_1_0 -)
-	void focusInEvent(QFocusEvent *);
-	void fontChange(const QFont &);
+%If (TQt_2_1_0 -)
+	void focusInEvent(TQFocusEvent *);
+	void fontChange(const TQFont &);
 %End
 
 private:
-	QGroupBox(const QGroupBox &);
+	TQGroupBox(const TQGroupBox &);
 };
diff --git a/sip/qt/qhbox.sip b/sip/qt/qhbox.sip
index 7e5b2ee..549dcdb 100644
--- a/sip/qt/qhbox.sip
+++ b/sip/qt/qhbox.sip
@@ -1,74 +1,74 @@
-// This is the SIP interface definition for QHBox.
+// This is the SIP interface definition for TQHBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QHBox (Qt v2+)</Title>
+<Sect2><Title>TQHBox (TQt v2+)</Title>
 <Para>
-<Literal>QHBox</Literal> is fully implemented.
+<Literal>TQHBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QHBox : QFrame
+class TQHBox : TQFrame
 {
 %TypeHeaderCode
 #include <qhbox.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QHBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
+%If (- TQt_3_0_0)
+	TQHBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
 	      bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	QHBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQHBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
 
 	void setSpacing(int);
-%If (Qt_2_1_0 -)
-	bool setStretchFactor(QWidget *,int);
-	QSize sizeHint() const;
+%If (TQt_2_1_0 -)
+	bool setStretchFactor(TQWidget *,int);
+	TQSize sizeHint() const;
 %End
 
 protected:
-%If (- Qt_3_0_0)
-	QHBox(bool,QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
+%If (- TQt_3_0_0)
+	TQHBox(bool,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
 	      bool = 1);
 %End
-%If (Qt_3_0_0 - Qt_3_2_0)
-	QHBox(bool,QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 - TQt_3_2_0)
+	TQHBox(bool,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
-%If (Qt_3_2_0 -)
-	QHBox(bool,QWidget * /TransferThis/,const char *,WFlags = 0);
+%If (TQt_3_2_0 -)
+	TQHBox(bool,TQWidget * /TransferThis/,const char *,WFlags = 0);
 %End
 
 	void frameChanged();
 
 private:
-%If (Qt_3_1_0 -)
-	QHBox(const QHBox &);
+%If (TQt_3_1_0 -)
+	TQHBox(const TQHBox &);
 %End
 };
 
diff --git a/sip/qt/qhbuttongroup.sip b/sip/qt/qhbuttongroup.sip
index 60cad68..3851609 100644
--- a/sip/qt/qhbuttongroup.sip
+++ b/sip/qt/qhbuttongroup.sip
@@ -1,48 +1,48 @@
-// This is the SIP interface definition for QHButtonGroup.
+// This is the SIP interface definition for TQHButtonGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QHButtonGroup (Qt v2+)</Title>
+<Sect2><Title>TQHButtonGroup (TQt v2+)</Title>
 <Para>
-<Literal>QHButtonGroup</Literal> is fully implemented.
+<Literal>TQHButtonGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QHButtonGroup : QButtonGroup
+class TQHButtonGroup : TQButtonGroup
 {
 %TypeHeaderCode
 #include <qhbuttongroup.h>
 %End
 
 public:
-	QHButtonGroup(QWidget * /TransferThis/ = 0,const char * = 0);
-	QHButtonGroup(const QString &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQHButtonGroup(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQHButtonGroup(const TQString &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 private:
-	QHButtonGroup(const QHButtonGroup &);
+	TQHButtonGroup(const TQHButtonGroup &);
 };
 
 %End
diff --git a/sip/qt/qheader.sip b/sip/qt/qheader.sip
index 3030208..c921a34 100644
--- a/sip/qt/qheader.sip
+++ b/sip/qt/qheader.sip
@@ -1,45 +1,45 @@
-// This is the SIP interface definition for QHeader.
+// This is the SIP interface definition for TQHeader.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QHeader</Title>
+<Sect2><Title>TQHeader</Title>
 <Para>
-<Literal>QHeader</Literal> is fully implemented.
+<Literal>TQHeader</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QHeader : QTableView
+class TQHeader : TQTableView
 {
 %TypeHeaderCode
 #include <qheader.h>
 %End
 
 public:
-	QHeader(QWidget * /TransferThis/ = 0,const char * = 0);
-	QHeader(int,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQHeader(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQHeader(int,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	enum Orientation {
 		Horizontal,
@@ -62,7 +62,7 @@ public:
 	int cellAt(int) const;
 	int count() const;
 	int offset() const;
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 	int mapToLogical(int) const;
 	int mapToActual(int) const;
 
@@ -75,45 +75,45 @@ signals:
 	void moved(int,int);
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	QRect sRect(int);
-	void paintCell(QPainter *,int,int);
-	void setupPainter(QPainter *);
+	void resizeEvent(TQResizeEvent *);
+	TQRect sRect(int);
+	void paintCell(TQPainter *,int,int);
+	void setupPainter(TQPainter *);
 	int cellHeight(int);
 	int cellWidth(int);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
 
 private:
-	QHeader(const QHeader &);
+	TQHeader(const TQHeader &);
 };
 
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QHeader : QWidget
+class TQHeader : TQWidget
 {
 %TypeHeaderCode
 #include <qheader.h>
 %End
 
 public:
-	QHeader(QWidget * /TransferThis/ = 0,const char * = 0);
-	QHeader(int,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQHeader(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQHeader(int,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	int addLabel(const QString &,int = -1);
-	int addLabel(const QIconSet &,const QString &,int = -1);
-%If (Qt_2_1_0 -)
+	int addLabel(const TQString &,int = -1);
+	int addLabel(const TQIconSet &,const TQString &,int = -1);
+%If (TQt_2_1_0 -)
 	void removeLabel(int);
 %End
-	virtual void setLabel(int,const QString &,int = -1);
-	virtual void setLabel(int,const QIconSet &,const QString &,int = -1);
+	virtual void setLabel(int,const TQString &,int = -1);
+	virtual void setLabel(int,const TQIconSet &,const TQString &,int = -1);
 
-	QString label(int) const;
-	QIconSet *iconSet(int) const;
+	TQString label(int) const;
+	TQIconSet *iconSet(int) const;
 
 	virtual void setOrientation(Orientation);
 	Orientation orientation() const;
@@ -123,32 +123,32 @@ public:
 	virtual void setClickEnabled(bool,int = -1);
 	virtual void setResizeEnabled(bool,int = -1);
 	virtual void setMovingEnabled(bool);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setStretchEnabled(bool,int);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool isClickEnabled(int = -1) const;
 	bool isResizeEnabled(int = -1) const;
 	bool isMovingEnabled() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isStretchEnabled() const;
 	bool isStretchEnabled(int) const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void resizeSection(int,int);
 	int sectionSize(int) const;
 	int sectionPos(int) const;
 	int sectionAt(int) const;
 %End
 	int count() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int headerWidth() const;
-	QRect sectionRect(int) const;
+	TQRect sectionRect(int) const;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void setCellSize(int,int);
 	int cellSize(int) const;
 	int cellPos(int) const;
@@ -157,28 +157,28 @@ public:
 
 	int offset() const;
 
-	QSize sizeHint() const;
-%If (- Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (- TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int mapToSection(int) const;
 	int mapToIndex(int) const;
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int mapToLogical(int) const;
 	int mapToActual(int) const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void moveSection(int,int);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void moveCell(int,int);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	// This is placed before the obsolete version below so that it has
 	// precedence.  It may still cause problems with old code until SIP
 	// distinguishes between bools and enums.
@@ -186,83 +186,83 @@ public:
 	int sortIndicatorSection() const;
 	SortOrder sortIndicatorOrder() const;
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	// Obsolete.
 	void setSortIndicator(int,bool = 1);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void adjustHeaderSize();
 %End
 
 public slots:
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setUpdatesEnabled(bool);
 %End
 	virtual void setOffset(int);
 
 signals:
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void clicked(int);
 	void pressed(int);
 	void released(int);
 %End
 	void sizeChange(int,int,int);
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void indexChange(int,int,int);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void sectionClicked(int);
 	void moved(int,int);
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void sectionHandleDoubleClicked(int);
 %End
 
 protected:
-%If (Qt_2_1_0 -)
-	void paintEvent(QPaintEvent *);
+%If (TQt_2_1_0 -)
+	void paintEvent(TQPaintEvent *);
 %End
-%If (Qt_2_2_0 -)
-	void showEvent(QShowEvent *);
+%If (TQt_2_2_0 -)
+	void showEvent(TQShowEvent *);
 %End
-%If (- Qt_2_1_0)
-	void resizeEvent(QResizeEvent *);
+%If (- TQt_2_1_0)
+	void resizeEvent(TQResizeEvent *);
 %End
-%If (Qt_3_0_0 -)
-	void resizeEvent(QResizeEvent *);
+%If (TQt_3_0_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
-	QRect sRect(int);
+	TQRect sRect(int);
 
-%If (- Qt_3_0_0)
-	void paintSection(QPainter *,int,QRect);
+%If (- TQt_3_0_0)
+	void paintSection(TQPainter *,int,TQRect);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void paintSectionLabel(QPainter *,int,const QRect &);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void paintSectionLabel(TQPainter *,int,const TQRect &);
 %End
-%If (Qt_3_0_0 -)
-	virtual void paintSection(QPainter *,int,const QRect &);
-	virtual void paintSectionLabel(QPainter *,int,const QRect &);
+%If (TQt_3_0_0 -)
+	virtual void paintSection(TQPainter *,int,const TQRect &);
+	virtual void paintSectionLabel(TQPainter *,int,const TQRect &);
 %End
 
-%If (Qt_3_1_0 -)
-	void fontChange(const QFont &);
+%If (TQt_3_1_0 -)
+	void fontChange(const TQFont &);
 %End
 
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-%If (Qt_3_2_0 -)
-	void mouseDoubleClickEvent(QMouseEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+%If (TQt_3_2_0 -)
+	void mouseDoubleClickEvent(TQMouseEvent *);
 %End
 
-%If (Qt_3_1_0 -)
-	void keyPressEvent(QKeyEvent *);
-	void keyReleaseEvent(QKeyEvent *);
+%If (TQt_3_1_0 -)
+	void keyPressEvent(TQKeyEvent *);
+	void keyReleaseEvent(TQKeyEvent *);
 %End
 
 private:
-	QHeader(const QHeader &);
+	TQHeader(const TQHeader &);
 };
 
 %End
diff --git a/sip/qt/qhgroupbox.sip b/sip/qt/qhgroupbox.sip
index c12059a..cfbdb3b 100644
--- a/sip/qt/qhgroupbox.sip
+++ b/sip/qt/qhgroupbox.sip
@@ -1,48 +1,48 @@
-// This is the SIP interface definition for QHGroupBox.
+// This is the SIP interface definition for TQHGroupBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QHGroupBox (Qt v2+)</Title>
+<Sect2><Title>TQHGroupBox (TQt v2+)</Title>
 <Para>
-<Literal>QHGroupBox</Literal> is fully implemented.
+<Literal>TQHGroupBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QHGroupBox : QGroupBox
+class TQHGroupBox : TQGroupBox
 {
 %TypeHeaderCode
 #include <qhgroupbox.h>
 %End
 
 public:
-	QHGroupBox(QWidget * /TransferThis/ = 0,const char * = 0);
-	QHGroupBox(const QString &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQHGroupBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQHGroupBox(const TQString &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 private:
-	QHGroupBox(const QHGroupBox &);
+	TQHGroupBox(const TQHGroupBox &);
 };
 
 %End
diff --git a/sip/qt/qiconset.sip b/sip/qt/qiconset.sip
index 4a55058..3dd2f3a 100644
--- a/sip/qt/qiconset.sip
+++ b/sip/qt/qiconset.sip
@@ -1,41 +1,41 @@
-// This is the SIP interface definition for QIconSet and QIconFactory.
+// This is the SIP interface definition for TQIconSet and TQIconFactory.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QIconSet</Title>
+<Sect2><Title>TQIconSet</Title>
 <Para>
-<Literal>QIconSet</Literal> is fully implemented.
+<Literal>TQIconSet</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIconFactory (Qt v3.1+)</Title>
+<Sect2><Title>TQIconFactory (TQt v3.1+)</Title>
 <Para>
-<Literal>QIconFactory</Literal> is fully implemented.
+<Literal>TQIconFactory</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QIconSet
+class TQIconSet
 {
 %TypeHeaderCode
 #include <qiconset.h>
@@ -54,93 +54,93 @@ public:
 		Active
 	};
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum State {
 		On,
 		Off
 	};
 %End
 
-%If (Qt_2_1_0 -)
-	QIconSet();
+%If (TQt_2_1_0 -)
+	TQIconSet();
 %End
-	QIconSet(const QPixmap &,Size = Automatic);
-%If (Qt_2_2_0 -)
-	QIconSet(const QPixmap &,const QPixmap &);
+	TQIconSet(const TQPixmap &,Size = Automatic);
+%If (TQt_2_2_0 -)
+	TQIconSet(const TQPixmap &,const TQPixmap &);
 %End
-	QIconSet(const QIconSet &);
+	TQIconSet(const TQIconSet &);
 
-	void reset(const QPixmap &,Size);
+	void reset(const TQPixmap &,Size);
 
-%If (- Qt_2_00)
-	void setPixmap(const QPixmap &,Size,Mode = Normal);
+%If (- TQt_2_00)
+	void setPixmap(const TQPixmap &,Size,Mode = Normal);
 	void setPixmap(const char *,Size,Mode = Normal);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual void setPixmap(const QPixmap &,Size,Mode = Normal);
-	virtual void setPixmap(const QString &,Size,Mode = Normal);
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual void setPixmap(const TQPixmap &,Size,Mode = Normal);
+	virtual void setPixmap(const TQString &,Size,Mode = Normal);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setPixmap(const QPixmap &,Size,Mode = Normal,State = Off);
-	virtual void setPixmap(const QString &,Size,Mode = Normal,State = Off);
+%If (TQt_3_0_0 -)
+	virtual void setPixmap(const TQPixmap &,Size,Mode = Normal,State = Off);
+	virtual void setPixmap(const TQString &,Size,Mode = Normal,State = Off);
 %End
-%If (- Qt_3_0_0)
-	QPixmap pixmap(Size,Mode) const;
-%If (Qt_2_1_0 -)
-//	QPixmap pixmap(Size,bool) const;
+%If (- TQt_3_0_0)
+	TQPixmap pixmap(Size,Mode) const;
+%If (TQt_2_1_0 -)
+//	TQPixmap pixmap(Size,bool) const;
 %End
 %End
-%If (Qt_3_0_0 -)
-	QPixmap pixmap(Size,Mode,State = Off) const;
-//	QPixmap pixmap(Size,bool,State = Off) const;
+%If (TQt_3_0_0 -)
+	TQPixmap pixmap(Size,Mode,State = Off) const;
+//	TQPixmap pixmap(Size,bool,State = Off) const;
 %End
-	QPixmap pixmap() const;
-%If (- Qt_3_0_0)
+	TQPixmap pixmap() const;
+%If (- TQt_3_0_0)
 	bool isGenerated(Size,Mode) const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isGenerated(Size,Mode,State = Off) const;
 	void clearGenerated();
 %End
-%If (Qt_3_1_0 -)
-	void installIconFactory(QIconFactory *);
+%If (TQt_3_1_0 -)
+	void installIconFactory(TQIconFactory *);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool isNull() const;
 %End
 
 	void detach();
 
-%If (Qt_3_0_0 -)
-	static void setIconSize(Size,const QSize &);
-	static const QSize &iconSize(Size);
+%If (TQt_3_0_0 -)
+	static void setIconSize(Size,const TQSize &);
+	static const TQSize &iconSize(Size);
 %End
 };
 
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 
-class QIconFactory
+class TQIconFactory
 {
 %TypeHeaderCode
 #include <qiconset.h>
 %End
 
 public:
-	QIconFactory();
+	TQIconFactory();
 
-	virtual QPixmap *createPixmap(const QIconSet &,QIconSet::Size,
-				      QIconSet::Mode,
-				      QIconSet::State) /Factory/;
+	virtual TQPixmap *createPixmap(const TQIconSet &,TQIconSet::Size,
+				      TQIconSet::Mode,
+				      TQIconSet::State) /Factory/;
 	void setAutoDelete(bool);
 	bool autoDelete() const;
 
-	static QIconFactory *defaultFactory();
-	static void installDefaultFactory(QIconFactory * /Transfer/);
+	static TQIconFactory *defaultFactory();
+	static void installDefaultFactory(TQIconFactory * /Transfer/);
 
 private:
-	QIconFactory(const QIconFactory &);
+	TQIconFactory(const TQIconFactory &);
 };
 
 %End
diff --git a/sip/qt/qiconview.sip b/sip/qt/qiconview.sip
index 122d2ec..bdc3bcb 100644
--- a/sip/qt/qiconview.sip
+++ b/sip/qt/qiconview.sip
@@ -1,31 +1,31 @@
-// This is the SIP interface definition for QIconView, QIconViewItem, QIconDrag
-// and QIconDragItem.
+// This is the SIP interface definition for TQIconView, TQIconViewItem, TQIconDrag
+// and TQIconDragItem.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QIconView (Qt v2.1+)</Title>
+<Sect2><Title>TQIconView (TQt v2.1+)</Title>
 <FuncSynopsis>
-        <FuncDef>QIconViewItem *<Function>makeRowLayout</Function></FuncDef>
-        <ParamDef>QIconViewItem *<Parameter>begin</Parameter></ParamDef>
+        <FuncDef>TQIconViewItem *<Function>makeRowLayout</Function></FuncDef>
+        <ParamDef>TQIconViewItem *<Parameter>begin</Parameter></ParamDef>
         <ParamDef>int &<Parameter>y</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -33,110 +33,110 @@ Not yet implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIconViewItem (Qt v2.1+)</Title>
+<Sect2><Title>TQIconViewItem (TQt v2.1+)</Title>
 <Para>
-<Literal>QIconViewItem</Literal> is fully implemented.
+<Literal>TQIconViewItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIconDrag (Qt v2.1+)</Title>
+<Sect2><Title>TQIconDrag (TQt v2.1+)</Title>
 <Para>
-<Literal>QIconDrag</Literal> is fully implemented.
+<Literal>TQIconDrag</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIconDragItem (Qt v2.1+)</Title>
+<Sect2><Title>TQIconDragItem (TQt v2.1+)</Title>
 <Para>
-<Literal>QIconDragItem</Literal> is fully implemented.
+<Literal>TQIconDragItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_ICONVIEW)
-%If (Qt_2_1_0 -)
+%If (TQt_ICONVIEW)
+%If (TQt_2_1_0 -)
 
-%If (Qt_DRAGANDDROP)
+%If (TQt_DRAGANDDROP)
 
-class QIconDragItem
+class TQIconDragItem
 {
 %TypeHeaderCode
 #include <qiconview.h>
 %End
 
 public:
-	QIconDragItem();
+	TQIconDragItem();
 
-	virtual QByteArray data() const;
-	virtual void setData(const QByteArray &);
+	virtual TQByteArray data() const;
+	virtual void setData(const TQByteArray &);
 };
 
  
-class QIconDrag : QDragObject
+class TQIconDrag : TQDragObject
 {
 %TypeHeaderCode
 #include <qiconview.h>
 %End
 
 public:
-	QIconDrag(QWidget * /TransferThis/,const char * = 0);
+	TQIconDrag(TQWidget * /TransferThis/,const char * = 0);
  
-	void append(const QIconDragItem &,const QRect &,const QRect &);
+	void append(const TQIconDragItem &,const TQRect &,const TQRect &);
  
 	virtual const char* format(int) const;
-	static bool canDecode(QMimeSource *);
-	virtual QByteArray encodedData(const char *) const;
+	static bool canDecode(TQMimeSource *);
+	virtual TQByteArray encodedData(const char *) const;
 
 private:
-%If (Qt_3_1_0 -)
-	QIconDrag(const QIconDrag &);
+%If (TQt_3_1_0 -)
+	TQIconDrag(const TQIconDrag &);
 %End
 };
 
 %End
 
 
-class QIconViewItem : Qt
+class TQIconViewItem : TQt
 {
 %TypeHeaderCode
 #include <qiconview.h>
 %End
 
 public:
-	QIconViewItem(QIconView * /TransferThis/);
-	QIconViewItem(QIconView * /TransferThis/,QIconViewItem *);
-	QIconViewItem(QIconView * /TransferThis/,const QString &);
-	QIconViewItem(QIconView * /TransferThis/,QIconViewItem *,
-		      const QString &);
-	QIconViewItem(QIconView * /TransferThis/,const QString &,
-		      const QPixmap &);
-	QIconViewItem(QIconView * /TransferThis/,QIconViewItem *,
-		      const QString &,const QPixmap &);
-%If (Qt_3_0_0 -)
-	QIconViewItem(QIconView * /TransferThis/,const QString &,
-		      const QPicture &);
-	QIconViewItem(QIconView * /TransferThis/,QIconViewItem *,
-		      const QString &,const QPicture &);
+	TQIconViewItem(TQIconView * /TransferThis/);
+	TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *);
+	TQIconViewItem(TQIconView * /TransferThis/,const TQString &);
+	TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *,
+		      const TQString &);
+	TQIconViewItem(TQIconView * /TransferThis/,const TQString &,
+		      const TQPixmap &);
+	TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *,
+		      const TQString &,const TQPixmap &);
+%If (TQt_3_0_0 -)
+	TQIconViewItem(TQIconView * /TransferThis/,const TQString &,
+		      const TQPicture &);
+	TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *,
+		      const TQString &,const TQPicture &);
 %End
 
 	virtual void setRenameEnabled(bool);
 	virtual void setDragEnabled(bool);
 	virtual void setDropEnabled(bool);
 
-	virtual QString text() const;
-	virtual QPixmap *pixmap() const;
-%If (Qt_3_0_0 -)
-	virtual QPicture *picture() const;
+	virtual TQString text() const;
+	virtual TQPixmap *pixmap() const;
+%If (TQt_3_0_0 -)
+	virtual TQPicture *picture() const;
 %End
-	virtual QString key() const;
+	virtual TQString key() const;
 
 	bool renameEnabled() const;
 	bool dragEnabled() const;
 	bool dropEnabled() const;
 
-	QIconView *iconView() const;
-	QIconViewItem *prevItem() const;
-	QIconViewItem *nextItem() const;
+	TQIconView *iconView() const;
+	TQIconViewItem *prevItem() const;
+	TQIconViewItem *nextItem() const;
 
 	int index() const;
 
@@ -149,79 +149,79 @@ public:
 
 	virtual void repaint();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void move(int,int);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual bool move(int,int);
 %End
 	virtual void moveBy(int,int);
-%If (- Qt_3_0_0)
-	virtual void move(const QPoint &);
+%If (- TQt_3_0_0)
+	virtual void move(const TQPoint &);
 %End
-%If (Qt_3_0_0 -)
-	virtual bool move(const QPoint &);
+%If (TQt_3_0_0 -)
+	virtual bool move(const TQPoint &);
 %End
-	virtual void moveBy(const QPoint &);
+	virtual void moveBy(const TQPoint &);
 
-	QRect rect() const;
+	TQRect rect() const;
 	int x() const;
 	int y() const;
 	int width() const;
 	int height() const;
-	QSize size() const;
-	QPoint pos() const;
-	QRect textRect(bool = 1) const;
-	QRect pixmapRect(bool = 1) const;
-%If (- Qt_3_0_0)
-	bool contains(QPoint) const;
-	bool intersects(QRect) const;
+	TQSize size() const;
+	TQPoint pos() const;
+	TQRect textRect(bool = 1) const;
+	TQRect pixmapRect(bool = 1) const;
+%If (- TQt_3_0_0)
+	bool contains(TQPoint) const;
+	bool intersects(TQRect) const;
 %End
-%If (Qt_3_0_0 -)
-	bool contains(const QPoint &) const;
-	bool intersects(const QRect &) const;
+%If (TQt_3_0_0 -)
+	bool contains(const TQPoint &) const;
+	bool intersects(const TQRect &) const;
 %End
 
-	virtual bool acceptDrop(const QMimeSource *) const;
+	virtual bool acceptDrop(const TQMimeSource *) const;
 
 	void rename();
 
-	virtual int compare(QIconViewItem *) const;
+	virtual int compare(TQIconViewItem *) const;
 
-	virtual void setText(const QString &);
-	virtual void setPixmap(const QPixmap &);
-%If (Qt_3_0_0 -)
-	virtual void setPicture(const QPicture &);
+	virtual void setText(const TQString &);
+	virtual void setPixmap(const TQPixmap &);
+%If (TQt_3_0_0 -)
+	virtual void setPicture(const TQPicture &);
 %End
-	virtual void setText(const QString &,bool,bool = 1);
-	virtual void setPixmap(const QPixmap &,bool,bool = 1);
-	virtual void setKey(const QString &);
+	virtual void setText(const TQString &,bool,bool = 1);
+	virtual void setPixmap(const TQPixmap &,bool,bool = 1);
+	virtual void setKey(const TQString &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual int rtti() const;
 %End
 
 protected:
 	virtual void removeRenameBox();
-	virtual void calcRect(const QString & = QString::null);
-	virtual void paintItem(QPainter *,const QColorGroup &);
-	virtual void paintFocus(QPainter *,const QColorGroup &);
-%If (Qt_DRAGANDDROP)
-	virtual void dropped(QDropEvent *,const QValueList<QIconDragItem> &);
+	virtual void calcRect(const TQString & = TQString::null);
+	virtual void paintItem(TQPainter *,const TQColorGroup &);
+	virtual void paintFocus(TQPainter *,const TQColorGroup &);
+%If (TQt_DRAGANDDROP)
+	virtual void dropped(TQDropEvent *,const TQValueList<TQIconDragItem> &);
 %End
 	virtual void dragEntered();
 	virtual void dragLeft();
-	void setItemRect(const QRect &);
-	void setTextRect(const QRect &);
-	void setPixmapRect(const QRect &);
+	void setItemRect(const TQRect &);
+	void setTextRect(const TQRect &);
+	void setPixmapRect(const TQRect &);
 	void calcTmpText();
-%If (Qt_3_1_0 -)
-	QString tempText() const;
+%If (TQt_3_1_0 -)
+	TQString tempText() const;
 %End
 };
 
 
-class QIconView : QScrollView
+class TQIconView : TQScrollView
 {
 %TypeHeaderCode
 #include <qiconview.h>
@@ -250,46 +250,46 @@ public:
 		Right
 	};
 
-	QIconView(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQIconView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
-	virtual void insertItem(QIconViewItem *,QIconViewItem * = 0);
-	virtual void takeItem(QIconViewItem *);
+	virtual void insertItem(TQIconViewItem *,TQIconViewItem * = 0);
+	virtual void takeItem(TQIconViewItem *);
 
-	int index(const QIconViewItem *) const;
+	int index(const TQIconViewItem *) const;
 
-	QIconViewItem *firstItem() const;
-	QIconViewItem *lastItem() const;
-	QIconViewItem *currentItem() const;
-	virtual void setCurrentItem(QIconViewItem *);
-	virtual void setSelected(QIconViewItem *,bool,bool = 0);
+	TQIconViewItem *firstItem() const;
+	TQIconViewItem *lastItem() const;
+	TQIconViewItem *currentItem() const;
+	virtual void setCurrentItem(TQIconViewItem *);
+	virtual void setSelected(TQIconViewItem *,bool,bool = 0);
 
 	uint count() const;
 
-	virtual void showEvent(QShowEvent *);
+	virtual void showEvent(TQShowEvent *);
 
 	virtual void setSelectionMode(SelectionMode);
 	SelectionMode selectionMode() const;
 
-	QIconViewItem *findItem(const QPoint &) const;
-%If (- Qt_3_0_0)
-	QIconViewItem *findItem(const QString &) const;
+	TQIconViewItem *findItem(const TQPoint &) const;
+%If (- TQt_3_0_0)
+	TQIconViewItem *findItem(const TQString &) const;
 %End
-%If (Qt_3_0_0 -)
-	QIconViewItem *findItem(const QString &,
+%If (TQt_3_0_0 -)
+	TQIconViewItem *findItem(const TQString &,
 				ComparisonFlags = BeginsWith) const;
 %End
 	virtual void selectAll(bool);
 	virtual void clearSelection();
 	virtual void invertSelection();
 
-	virtual void repaintItem(QIconViewItem *);
-%If (Qt_3_1_0 -)
+	virtual void repaintItem(TQIconViewItem *);
+%If (TQt_3_1_0 -)
 	void repaintSelectedItems();
 %End
 
-	void ensureItemVisible(QIconViewItem *);
-	QIconViewItem* findFirstVisibleItem(const QRect &) const;
-	QIconViewItem* findLastVisibleItem(const QRect &) const;
+	void ensureItemVisible(TQIconViewItem *);
+	TQIconViewItem* findFirstVisibleItem(const TQRect &) const;
+	TQIconViewItem* findLastVisibleItem(const TQRect &) const;
 
 	virtual void clear();
 
@@ -301,8 +301,8 @@ public:
 	int spacing() const;
 	virtual void setItemTextPos(ItemTextPos);
 	ItemTextPos itemTextPos() const;
-	virtual void setItemTextBackground(const QBrush &);
-	QBrush itemTextBackground() const;
+	virtual void setItemTextBackground(const TQBrush &);
+	TQBrush itemTextBackground() const;
 	virtual void setArrangement(Arrangement);
 	Arrangement arrangement() const;
 	virtual void setResizeMode(ResizeMode);
@@ -325,55 +325,55 @@ public:
 	virtual void setWordWrapIconText(bool);
 	bool wordWrapIconText() const;
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-	QSize minimumSizeHint() const;
-%If (- Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize minimumSizeHint() const;
+%If (- TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 	virtual void sort(bool = 1);
 
-	virtual void setFont(const QFont &);
-	virtual void setPalette(const QPalette &);
+	virtual void setFont(const TQFont &);
+	virtual void setPalette(const TQPalette &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isRenaming() const;
 %End
 
 public slots:
-	virtual void arrangeItemsInGrid(const QSize &,bool = 1);
+	virtual void arrangeItemsInGrid(const TQSize &,bool = 1);
 	virtual void arrangeItemsInGrid(bool = 1);
 	virtual void setContentsPos(int,int);
 	virtual void updateContents();
 
 signals:
 	void selectionChanged();
-	void selectionChanged(QIconViewItem *);
-	void currentChanged(QIconViewItem *);
-	void clicked(QIconViewItem *);
-	void clicked(QIconViewItem *,const QPoint &);
-	void pressed(QIconViewItem *);
-	void pressed(QIconViewItem *,const QPoint &);
-
-	void doubleClicked(QIconViewItem *);
-	void returnPressed(QIconViewItem *);
-	void rightButtonClicked(QIconViewItem *,const QPoint &);
-	void rightButtonPressed(QIconViewItem *,const QPoint &);
-	void mouseButtonPressed(int,QIconViewItem *,const QPoint &);
-	void mouseButtonClicked(int,QIconViewItem *,const QPoint &);
-%If (Qt_3_0_0 -)
-	void contextMenuRequested(QIconViewItem *,const QPoint &);
-%End
-%If (Qt_DRAGANDDROP)
-	void dropped(QDropEvent *,const QValueList<QIconDragItem> &);
+	void selectionChanged(TQIconViewItem *);
+	void currentChanged(TQIconViewItem *);
+	void clicked(TQIconViewItem *);
+	void clicked(TQIconViewItem *,const TQPoint &);
+	void pressed(TQIconViewItem *);
+	void pressed(TQIconViewItem *,const TQPoint &);
+
+	void doubleClicked(TQIconViewItem *);
+	void returnPressed(TQIconViewItem *);
+	void rightButtonClicked(TQIconViewItem *,const TQPoint &);
+	void rightButtonPressed(TQIconViewItem *,const TQPoint &);
+	void mouseButtonPressed(int,TQIconViewItem *,const TQPoint &);
+	void mouseButtonClicked(int,TQIconViewItem *,const TQPoint &);
+%If (TQt_3_0_0 -)
+	void contextMenuRequested(TQIconViewItem *,const TQPoint &);
+%End
+%If (TQt_DRAGANDDROP)
+	void dropped(TQDropEvent *,const TQValueList<TQIconDragItem> &);
 %End
 	void moved();
-	void onItem(QIconViewItem *);
+	void onItem(TQIconViewItem *);
 	void onViewport();
-	void itemRenamed(QIconViewItem *,const QString &);
-	void itemRenamed(QIconViewItem *);
+	void itemRenamed(TQIconViewItem *,const TQString &);
+	void itemRenamed(TQIconViewItem *);
 
 protected slots:
 	virtual void doAutoScroll();
@@ -381,76 +381,76 @@ protected slots:
 	virtual void slotUpdate();
 
 protected:
-%If (- Qt_3_0_0)
-	virtual void drawContents(QPainter *,int,int,int,int);
-	virtual void contentsMousePressEvent(QMouseEvent *);
-	virtual void contentsMouseReleaseEvent(QMouseEvent *);
-	virtual void contentsMouseMoveEvent(QMouseEvent *);
-	virtual void contentsMouseDoubleClickEvent(QMouseEvent *);
-%End
-%If (Qt_3_0_0 -)
-	void drawContents(QPainter *,int,int,int,int);
-	void contentsMousePressEvent(QMouseEvent *);
-	void contentsMouseReleaseEvent(QMouseEvent *);
-	void contentsMouseMoveEvent(QMouseEvent *);
-	void contentsMouseDoubleClickEvent(QMouseEvent *);
-	void contentsContextMenuEvent(QContextMenuEvent *);
-%End
-
-%If (- Qt_3_0_0)
-%If (Qt_DRAGANDDROP)
-	virtual void contentsDragEnterEvent(QDragEnterEvent *);
-	virtual void contentsDragMoveEvent(QDragMoveEvent *);
-	virtual void contentsDragLeaveEvent(QDragLeaveEvent *);
-	virtual void contentsDropEvent(QDropEvent *);
-%End
-
-	virtual void resizeEvent(QResizeEvent *);
-	virtual void keyPressEvent(QKeyEvent *);
-	virtual void focusInEvent(QFocusEvent *);
-	virtual void focusOutEvent(QFocusEvent *);
-	virtual void enterEvent(QEvent *);
-%End
-%If (Qt_3_0_0 -)
-%If (Qt_DRAGANDDROP)
-	void contentsDragEnterEvent(QDragEnterEvent *);
-	void contentsDragMoveEvent(QDragMoveEvent *);
-	void contentsDragLeaveEvent(QDragLeaveEvent *);
-	void contentsDropEvent(QDropEvent *);
-%End
-
-	void resizeEvent(QResizeEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void enterEvent(QEvent *);
-%End
-
-	virtual void drawRubber(QPainter *);
-%If (Qt_DRAGANDDROP)
-	virtual QDragObject *dragObject();
+%If (- TQt_3_0_0)
+	virtual void drawContents(TQPainter *,int,int,int,int);
+	virtual void contentsMousePressEvent(TQMouseEvent *);
+	virtual void contentsMouseReleaseEvent(TQMouseEvent *);
+	virtual void contentsMouseMoveEvent(TQMouseEvent *);
+	virtual void contentsMouseDoubleClickEvent(TQMouseEvent *);
+%End
+%If (TQt_3_0_0 -)
+	void drawContents(TQPainter *,int,int,int,int);
+	void contentsMousePressEvent(TQMouseEvent *);
+	void contentsMouseReleaseEvent(TQMouseEvent *);
+	void contentsMouseMoveEvent(TQMouseEvent *);
+	void contentsMouseDoubleClickEvent(TQMouseEvent *);
+	void contentsContextMenuEvent(TQContextMenuEvent *);
+%End
+
+%If (- TQt_3_0_0)
+%If (TQt_DRAGANDDROP)
+	virtual void contentsDragEnterEvent(TQDragEnterEvent *);
+	virtual void contentsDragMoveEvent(TQDragMoveEvent *);
+	virtual void contentsDragLeaveEvent(TQDragLeaveEvent *);
+	virtual void contentsDropEvent(TQDropEvent *);
+%End
+
+	virtual void resizeEvent(TQResizeEvent *);
+	virtual void keyPressEvent(TQKeyEvent *);
+	virtual void focusInEvent(TQFocusEvent *);
+	virtual void focusOutEvent(TQFocusEvent *);
+	virtual void enterEvent(TQEvent *);
+%End
+%If (TQt_3_0_0 -)
+%If (TQt_DRAGANDDROP)
+	void contentsDragEnterEvent(TQDragEnterEvent *);
+	void contentsDragMoveEvent(TQDragMoveEvent *);
+	void contentsDragLeaveEvent(TQDragLeaveEvent *);
+	void contentsDropEvent(TQDropEvent *);
+%End
+
+	void resizeEvent(TQResizeEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void enterEvent(TQEvent *);
+%End
+
+	virtual void drawRubber(TQPainter *);
+%If (TQt_DRAGANDDROP)
+	virtual TQDragObject *dragObject();
 	virtual void startDrag();
 %End
-	virtual void insertInGrid(QIconViewItem *);
-	virtual void drawBackground(QPainter *,const QRect &);
+	virtual void insertInGrid(TQIconViewItem *);
+	virtual void drawBackground(TQPainter *,const TQRect &);
 
-	void emitSelectionChanged(QIconViewItem * = 0);
-	void emitRenamed(QIconViewItem *);
+	void emitSelectionChanged(TQIconViewItem * = 0);
+	void emitRenamed(TQIconViewItem *);
 
-%If (- Qt_3_0_0)
-//	QIconViewItem *makeRowLayout(QIconViewItem *,int &);
+%If (- TQt_3_0_0)
+//	TQIconViewItem *makeRowLayout(TQIconViewItem *,int &);
 %End
-%If (Qt_3_0_0 -)
-//	QIconViewItem *makeRowLayout(QIconViewItem *,int &,bool &);
+%If (TQt_3_0_0 -)
+//	TQIconViewItem *makeRowLayout(TQIconViewItem *,int &,bool &);
 %End
 
-	void styleChange(QStyle &);
-%If (Qt_3_0_0 -)
+	void styleChange(TQStyle &);
+%If (TQt_3_0_0 -)
 	void windowActivationChange(bool);
 %End
 
 private:
-	QIconView(const QIconView &);
+	TQIconView(const TQIconView &);
 };
 
 %End
diff --git a/sip/qt/qimage.sip b/sip/qt/qimage.sip
index 5c9b0bb..7431f4d 100644
--- a/sip/qt/qimage.sip
+++ b/sip/qt/qimage.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QImage, QImageIO and
-// QImageTextKeyLang.
+// This is the SIP interface definition for TQImage, TQImageIO and
+// TQImageTextKeyLang.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QImage</Title>
+<Sect2><Title>TQImage</Title>
 <Para>
 The Python <Literal>==</Literal> and <Literal>!=</Literal> operators are
 supported.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QImage</Function></FuncDef>
+        <FuncDef><Function>TQImage</Function></FuncDef>
         <ParamDef>const char *<Parameter>xpm</Parameter>[]</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -37,18 +37,18 @@ This takes a list of strings as its parameter.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QImage</Function></FuncDef>
+        <FuncDef><Function>TQImage</Function></FuncDef>
         <ParamDef>uchar *<Parameter>data</Parameter></ParamDef>
         <ParamDef>int <Parameter>w</Parameter></ParamDef>
         <ParamDef>int <Parameter>h</Parameter></ParamDef>
         <ParamDef>int <Parameter>depth</Parameter></ParamDef>
-        <ParamDef>QRgb *<Parameter>colorTable</Parameter></ParamDef>
+        <ParamDef>TQRgb *<Parameter>colorTable</Parameter></ParamDef>
         <ParamDef>int <Parameter>numColors</Parameter></ParamDef>
         <ParamDef>Endian <Parameter>bitOrder</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-The <Literal>colorTable</Literal> parameter is a list of QRgb instances or
-None.  (Qt v2.1+)
+The <Literal>colorTable</Literal> parameter is a list of TQRgb instances or
+None.  (TQt v2.1+)
 </Para>
 
 <FuncSynopsis>
@@ -61,7 +61,7 @@ useful if passed to another Python module.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QRgb *<Function>colorTable</Function></FuncDef>
+        <FuncDef>TQRgb *<Function>colorTable</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -70,9 +70,9 @@ useful if passed to another Python module.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QImage <Function>convertDepthWithPalette</Function></FuncDef>
+        <FuncDef>TQImage <Function>convertDepthWithPalette</Function></FuncDef>
         <ParamDef>int</ParamDef>
-        <ParamDef>QRgb *<Parameter>p</Parameter></ParamDef>
+        <ParamDef>TQRgb *<Parameter>p</Parameter></ParamDef>
         <ParamDef>int <Parameter>pc</Parameter></ParamDef>
         <ParamDef>int <Parameter>cf</Parameter> = 0</ParamDef>
 </FuncSynopsis>
@@ -111,7 +111,7 @@ useful if passed to another Python module.
 </Para>
 </Sect2>
 
-<Sect2><Title>QImageIO</Title>
+<Sect2><Title>TQImageIO</Title>
 <FuncSynopsis>
 	<FuncDef>static void <Function>defineIOHandler</Function></FuncDef>
 	<ParamDef>const char *<Parameter>format</Parameter></ParamDef>
@@ -125,15 +125,15 @@ Not implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QImageTextKeyLang</Title>
+<Sect2><Title>TQImageTextKeyLang</Title>
 <Para>
-<Literal>QImageTextKeyLang</Literal> is fully implemented.
+<Literal>TQImageTextKeyLang</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QImage
+class TQImage
 {
 %TypeHeaderCode
 #include <qimage.h>
@@ -146,47 +146,47 @@ public:
 		LittleEndian
 	};
 
-	QImage();
-	QImage(int,int,int,int = 0,Endian = IgnoreEndian);
-	QImage(const QSize &,int,int = 0,Endian = IgnoreEndian);
-%If (- Qt_2_00)
-	QImage(const char *,char * = 0);
+	TQImage();
+	TQImage(int,int,int,int = 0,Endian = IgnoreEndian);
+	TQImage(const TQSize &,int,int = 0,Endian = IgnoreEndian);
+%If (- TQt_2_00)
+	TQImage(const char *,char * = 0);
 %End
-%If (Qt_2_00 -)
-	QImage(const QString &,char * = 0);
+%If (TQt_2_00 -)
+	TQImage(const TQString &,char * = 0);
 %End
 
-	QImage(SIP_PYLIST) [(const char **)];
+	TQImage(SIP_PYLIST) [(const char **)];
 %MethodCode
 		// The Python interface is a list of strings that make up the
 		// image.
 
 		const char **str;
 
-		if ((str = PyQt_qt_ListToArray(a0)) == NULL)
+		if ((str = PyTQt_qt_ListToArray(a0)) == NULL)
 			sipIsErr = 1;
 		else
 		{
-			// There is no wrapper class for QImage.
+			// There is no wrapper class for TQImage.
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new QImage(str);
+			sipCpp = new TQImage(str);
 			Py_END_ALLOW_THREADS
 
 			sipFree((ANY *)str);
 		}
 %End
 
-%If (Qt_2_00 -)
-	QImage(const QByteArray &);
+%If (TQt_2_00 -)
+	TQImage(const TQByteArray &);
 %End
 
-%If (Qt_2_1_0 -)
-	QImage(uchar *,int,int,int,SIP_PYLIST /AllowNone/,int,Endian) [(uchar *,int,int,int,int,QRgb *,int,Endian)];
+%If (TQt_2_1_0 -)
+	TQImage(uchar *,int,int,int,SIP_PYLIST /AllowNone/,int,Endian) [(uchar *,int,int,int,int,TQRgb *,int,Endian)];
 %MethodCode
-		// The Python interface takes a list of QRgb instances.
+		// The Python interface takes a list of TQRgb instances.
 
-		QRgb *coltab;
+		TQRgb *coltab;
 
 		if (a4 == Py_None)
 			coltab = 0;
@@ -197,7 +197,7 @@ public:
 			if (a5 > len)
 				a5 = len;
 
-			coltab = new QRgb[len];
+			coltab = new TQRgb[len];
 
 			PyErr_Clear();
 
@@ -216,14 +216,14 @@ public:
 
 		if (!sipIsErr)
 		{
-			// There is no wrapper class for QImage.
+			// There is no wrapper class for TQImage.
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new QImage(a0,a1,a2,a3,0,a5,(QImage::Endian)a6);
+			sipCpp = new TQImage(a0,a1,a2,a3,0,a5,(TQImage::Endian)a6);
 
 			if (coltab)
 			{
-				// Now set the colours using the QImage's self
+				// Now set the colours using the TQImage's self
 				// allocated colour table.  If we had passed in
 				// coltab as the colour table then we couldn't
 				// have freed it and it would leak.
@@ -237,35 +237,35 @@ public:
 %End
 %End
 
-	QImage(const QImage &);
+	TQImage(const TQImage &);
 
-	bool operator==(const QImage &) const;
-	bool operator!=(const QImage &) const;
+	bool operator==(const TQImage &) const;
+	bool operator!=(const TQImage &) const;
 
 	void detach();
-	QImage copy() const;
-	QImage copy(int,int,int,int,int = 0) const;
-%If (- Qt_3_0_0)
-	QImage copy(QRect &) const;
+	TQImage copy() const;
+	TQImage copy(int,int,int,int,int = 0) const;
+%If (- TQt_3_0_0)
+	TQImage copy(TQRect &) const;
 %End
-%If (Qt_3_0_0 -)
-	QImage copy(const QRect &) const;
+%If (TQt_3_0_0 -)
+	TQImage copy(const TQRect &) const;
 %End
-%If (Qt_3_1_0 -)
-	static QImage fromMimeSource(const QString &);
+%If (TQt_3_1_0 -)
+	static TQImage fromMimeSource(const TQString &);
 %End
 	bool isNull() const;
 
 	int width() const;
 	int height() const;
-	QSize size() const;
-	QRect rect() const;
+	TQSize size() const;
+	TQRect rect() const;
 	int depth() const;
 	int numColors() const;
 	Endian bitOrder() const;
 
-	QRgb color(int) const;
-	void setColor(int,QRgb);
+	TQRgb color(int) const;
+	void setColor(int,TQRgb);
 	void setNumColors(int);
 
 	bool hasAlphaBuffer() const;
@@ -280,225 +280,225 @@ public:
 	void *scanLine(int) const;
 	// Actually returns uchar **.
 	void *jumpTable() const;
-	// Actually returns QRgb *.
+	// Actually returns TQRgb *.
 	void *colorTable() const;
 	int numBytes() const;
 	int bytesPerLine() const;
 
 	bool create(int,int,int,int = 0,Endian = IgnoreEndian);
-	bool create(const QSize &,int,int = 0,Endian = IgnoreEndian);
+	bool create(const TQSize &,int,int = 0,Endian = IgnoreEndian);
 	void reset();
 
 	void fill(uint);
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void invertPixels(bool = 1);
 %End
 
-	QImage convertDepth(int) const;
-//	QImage convertDepthWithPalette(int,QRgb *,int,int = 0) const;
-	QImage convertDepth(int,int) const;
-	QImage convertBitOrder(Endian) const;
+	TQImage convertDepth(int) const;
+//	TQImage convertDepthWithPalette(int,TQRgb *,int,int = 0) const;
+	TQImage convertDepth(int,int) const;
+	TQImage convertBitOrder(Endian) const;
 
-%If (- Qt_3_0_0)
-	QImage smoothScale(int,int) const;
+%If (- TQt_3_0_0)
+	TQImage smoothScale(int,int) const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum ScaleMode {
 		ScaleFree,
 		ScaleMin,
 		ScaleMax
 	};
 
-	QImage smoothScale(int,int,ScaleMode = ScaleFree) const;
-	QImage smoothScale(const QSize &,ScaleMode = ScaleFree) const;
-	QImage scale(int,int,ScaleMode = ScaleFree) const;
-	QImage scale(const QSize &,ScaleMode = ScaleFree) const;
-	QImage scaleWidth(int) const;
-	QImage scaleHeight(int) const;
-	QImage xForm(const QWMatrix &) const;
+	TQImage smoothScale(int,int,ScaleMode = ScaleFree) const;
+	TQImage smoothScale(const TQSize &,ScaleMode = ScaleFree) const;
+	TQImage scale(int,int,ScaleMode = ScaleFree) const;
+	TQImage scale(const TQSize &,ScaleMode = ScaleFree) const;
+	TQImage scaleWidth(int) const;
+	TQImage scaleHeight(int) const;
+	TQImage xForm(const TQWMatrix &) const;
 %End
 
-%If (- Qt_2_00)
-	QImage createAlphaMask(bool = 0) const;
-	QImage createAlphaMask(int) const;
+%If (- TQt_2_00)
+	TQImage createAlphaMask(bool = 0) const;
+	TQImage createAlphaMask(int) const;
 %End
-%If (Qt_2_00 -)
-	QImage createAlphaMask(int = 0) const;
+%If (TQt_2_00 -)
+	TQImage createAlphaMask(int = 0) const;
 %End
-	QImage createHeuristicMask(bool = 1) const;
-%If (Qt_2_00 -)
-	QImage mirror() const;
+	TQImage createHeuristicMask(bool = 1) const;
+%If (TQt_2_00 -)
+	TQImage mirror() const;
 %End
-%If (Qt_2_1_0 -)
-	QImage mirror(bool,bool) const;
+%If (TQt_2_1_0 -)
+	TQImage mirror(bool,bool) const;
 %End
-%If (Qt_2_00 -)
-	QImage swapRGB() const;
+%If (TQt_2_00 -)
+	TQImage swapRGB() const;
 %End
 
 	static Endian systemBitOrder();
 	static Endian systemByteOrder();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	static const char *imageFormat(const char *);
 %End
-%If (Qt_2_00 -)
-	static const char *imageFormat(const QString &);
+%If (TQt_2_00 -)
+	static const char *imageFormat(const TQString &);
 %End
-	static QStrList inputFormats();
-	static QStrList outputFormats();
-%If (Qt_2_1_0 -)
-	static QStringList inputFormatList();
-	static QStringList outputFormatList();
+	static TQStrList inputFormats();
+	static TQStrList outputFormats();
+%If (TQt_2_1_0 -)
+	static TQStringList inputFormatList();
+	static TQStringList outputFormatList();
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool load(const char *,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	bool load(const QString &,const char * = 0);
+%If (TQt_2_00 -)
+	bool load(const TQString &,const char * = 0);
 %End
 	bool loadFromData(const uchar * /Array/,uint /ArraySize/,
 			  const char * = 0);
-	bool loadFromData(QByteArray,char * = 0);
-%If (- Qt_2_00)
+	bool loadFromData(TQByteArray,char * = 0);
+%If (- TQt_2_00)
 	bool save(const char *,const char *) const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	bool save(const QString &,const char *) const;
+%If (TQt_2_00 - TQt_3_0_0)
+	bool save(const TQString &,const char *) const;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
-	bool save(const QString &,const char *,int) const;
+%If (TQt_2_2_0 - TQt_3_0_0)
+	bool save(const TQString &,const char *,int) const;
 %End
-%If (Qt_3_0_0 -)
-	bool save(const QString &,const char *,int = -1) const;
+%If (TQt_3_0_0 -)
+	bool save(const TQString &,const char *,int = -1) const;
 %End
-%If (Qt_3_2_0 -)
-	bool save(QIODevice *,const char *,int = -1) const;
+%If (TQt_3_2_0 -)
+	bool save(TQIODevice *,const char *,int = -1) const;
 %End
 
 	bool valid(int,int) const;
 	int pixelIndex(int,int) const;
-	QRgb pixel(int,int) const;
+	TQRgb pixel(int,int) const;
 	void setPixel(int,int,uint);
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int dotsPerMeterX() const;
 	int dotsPerMeterY() const;
 	void setDotsPerMeterX(int);
 	void setDotsPerMeterY(int);
-	QPoint offset() const;
-	void setOffset(const QPoint &);
-%If (Qt_IMAGE_TEXT)
-	QValueList<QImageTextKeyLang> textList() const;
-	QStringList textLanguages() const;
-	QStringList textKeys() const;
-	QString text(const char *,const char * = 0) const;
-	QString text(const QImageTextKeyLang &) const;
-	void setText(const char *,const char *,const QString &);
+	TQPoint offset() const;
+	void setOffset(const TQPoint &);
+%If (TQt_IMAGE_TEXT)
+	TQValueList<TQImageTextKeyLang> textList() const;
+	TQStringList textLanguages() const;
+	TQStringList textKeys() const;
+	TQString text(const char *,const char * = 0) const;
+	TQString text(const TQImageTextKeyLang &) const;
+	void setText(const char *,const char *,const TQString &);
 %End
 %End
 };
 
 
-void bitBlt(QImage *,int,int,const QImage *,int = 0,int = 0,int = -1,int = -1,
+void bitBlt(TQImage *,int,int,const TQImage *,int = 0,int = 0,int = -1,int = -1,
 	    int = 0);
 
 
-class QImageIO
+class TQImageIO
 {
 %TypeHeaderCode
 #include <qimage.h>
 %End
 
 public:
-	QImageIO();
-	QImageIO(QIODevice *,const char *);
-%If (Qt_2_00 -)
-	QImageIO(const QString &,const char *);
+	TQImageIO();
+	TQImageIO(TQIODevice *,const char *);
+%If (TQt_2_00 -)
+	TQImageIO(const TQString &,const char *);
 %End
-%If (- Qt_2_00)
-	QImageIO(const char *,const char *);
+%If (- TQt_2_00)
+	TQImageIO(const char *,const char *);
 %End
 
-	const QImage &image() const;
+	const TQImage &image() const;
 	int status() const;
 	const char *format() const;
-	QIODevice *ioDevice() const;
-%If (Qt_2_00 -)
-	QString fileName() const;
+	TQIODevice *ioDevice() const;
+%If (TQt_2_00 -)
+	TQString fileName() const;
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *fileName() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int quality() const;
 %End
-%If (Qt_2_00 -)
-	QString description() const;
+%If (TQt_2_00 -)
+	TQString description() const;
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *description() const;
 %End
 	const char *parameters() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	float gamma() const;
 %End
 
-	void setImage(const QImage &);
+	void setImage(const TQImage &);
 	void setStatus(int);
 	void setFormat(const char *);
-	void setIODevice(QIODevice *);
-%If (Qt_2_00 -)
-	void setFileName(const QString &);
+	void setIODevice(TQIODevice *);
+%If (TQt_2_00 -)
+	void setFileName(const TQString &);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFileName(const char *);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setQuality(int);
 %End
-%If (Qt_2_00 -)
-	void setDescription(const QString &);
+%If (TQt_2_00 -)
+	void setDescription(const TQString &);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDescription(const char *);
 %End
 	void setParameters(const char *);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setGamma(float);
 %End
 
 	bool read();
 	bool write();
 
-	static const char *imageFormat(const QString &);
-	static const char *imageFormat(QIODevice *);
-	static QStrList inputFormats();
-	static QStrList outputFormats();
+	static const char *imageFormat(const TQString &);
+	static const char *imageFormat(TQIODevice *);
+	static TQStrList inputFormats();
+	static TQStrList outputFormats();
 
 //	static void defineIOHandler(const char *,const char *,const char *,
 //				    image_io_handler,image_io_handler);
 
 private:
-	QImageIO(const QImageIO &);
+	TQImageIO(const TQImageIO &);
 };
 
 
-%If (Qt_2_1_0 -)
-%If (Qt_IMAGE_TEXT)
+%If (TQt_2_1_0 -)
+%If (TQt_IMAGE_TEXT)
 
-class QImageTextKeyLang
+class TQImageTextKeyLang
 {
 %TypeHeaderCode
 #include <qimage.h>
 %End
 
 public:
-	QImageTextKeyLang(const char *,const char *);
-	QImageTextKeyLang();
+	TQImageTextKeyLang(const char *,const char *);
+	TQImageTextKeyLang();
 
-	QCString key;
-	QCString lang;
+	TQCString key;
+	TQCString lang;
 };
 
 %End
@@ -506,14 +506,14 @@ public:
 
 
 %ModuleHeaderCode
-const char **PyQt_qt_ListToArray(PyObject *lst);
+const char **PyTQt_qt_ListToArray(PyObject *lst);
 %End
 
 
 %ModuleCode
 // Convert a list of strings to an array of strings on the heap.  Also used by
-// QPixmap.
-const char **PyQt_qt_ListToArray(PyObject *lst)
+// TQPixmap.
+const char **PyTQt_qt_ListToArray(PyObject *lst)
 {
 	int nstr;
 	const char **str, **sp;
diff --git a/sip/qt/qinputdialog.sip b/sip/qt/qinputdialog.sip
index 80a5394..55f50d3 100644
--- a/sip/qt/qinputdialog.sip
+++ b/sip/qt/qinputdialog.sip
@@ -1,84 +1,84 @@
-// This is the SIP interface definition for QInputDialog.
+// This is the SIP interface definition for TQInputDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QInputDialog (Qt v2.1+)</Title>
+<Sect2><Title>TQInputDialog (TQt v2.1+)</Title>
 <FuncSynopsis>
-	<FuncDef>static QString <Function>getText</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>text</Parameter> = QString::null</ParamDef>
+	<FuncDef>static TQString <Function>getText</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>text</Parameter> = TQString::null</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QString</Literal> result and the <Literal>ok</Literal> flag.
-(Qt v2.1 - v2.3.1)
+the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
+(TQt v2.1 - v2.3.1)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>static QString <Function>getText</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
-	<ParamDef>QLineEdit::EchoMode<Parameter>echo</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>text</Parameter> = QString::null</ParamDef>
+	<FuncDef>static TQString <Function>getText</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>TQLineEdit::EchoMode<Parameter>echo</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>text</Parameter> = TQString::null</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QString</Literal> result and the <Literal>ok</Literal> flag.
-(Qt v2.2 - v2.3.1)
+the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
+(TQt v2.2 - v2.3.1)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>static QString <Function>getText</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
-	<ParamDef>QLineEdit::EchoMode<Parameter>echo</Parameter> = QLineEdit::Normal</ParamDef>
-	<ParamDef>const QString &amp;<Parameter>text</Parameter> = QString::null</ParamDef>
+	<FuncDef>static TQString <Function>getText</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>TQLineEdit::EchoMode<Parameter>echo</Parameter> = TQLineEdit::Normal</ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>text</Parameter> = TQString::null</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QString</Literal> result and the <Literal>ok</Literal> flag.
-(Qt v3+)
+the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
+(TQt v3+)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>static int <Function>getInteger</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
 	<ParamDef>int <Parameter>num</Parameter> = 0</ParamDef>
 	<ParamDef>int <Parameter>from</Parameter> = -2147483647</ParamDef>
 	<ParamDef>int <Parameter>to</Parameter> = 2147483647</ParamDef>
 	<ParamDef>int <Parameter>step</Parameter> = 1</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -88,14 +88,14 @@ the <Literal>int</Literal> result and the <Literal>ok</Literal> flag.
 
 <FuncSynopsis>
 	<FuncDef>static double <Function>getDouble</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
 	<ParamDef>double <Parameter>num</Parameter> = 0</ParamDef>
 	<ParamDef>double <Parameter>from</Parameter> = -2147483647</ParamDef>
 	<ParamDef>double <Parameter>to</Parameter> = 2147483647</ParamDef>
 	<ParamDef>int <Parameter>step</Parameter> = 1</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -104,70 +104,70 @@ the <Literal>double</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>static QString <Function>getItem</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>caption</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>label</Parameter></ParamDef>
-	<ParamDef>const QStringList &<Parameter>list</Parameter></ParamDef>
+	<FuncDef>static TQString <Function>getItem</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>caption</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>label</Parameter></ParamDef>
+	<ParamDef>const TQStringList &<Parameter>list</Parameter></ParamDef>
 	<ParamDef>int <Parameter>current</Parameter> = 0</ParamDef>
 	<ParamDef>bool <Parameter>editable</Parameter> = TRUE</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
-	<ParamDef>QWidget *<Parameter>parent</Parameter> = 0</ParamDef>
+	<ParamDef>TQWidget *<Parameter>parent</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>name</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QString</Literal> result and the <Literal>ok</Literal> flag.
+the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_1_0 -)
-%If (Qt_INPUTDIALOG)
+%If (TQt_2_1_0 -)
+%If (TQt_INPUTDIALOG)
 
-class QInputDialog : QDialog
+class TQInputDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qinputdialog.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	static QString getText(const QString &,const QString &,
-			       QLineEdit::EchoMode = QLineEdit::Normal,
-			       const QString & = QString::null,
-			       bool * = 0,QWidget * = 0,const char * = 0);
+%If (TQt_3_0_0 -)
+	static TQString getText(const TQString &,const TQString &,
+			       TQLineEdit::EchoMode = TQLineEdit::Normal,
+			       const TQString & = TQString::null,
+			       bool * = 0,TQWidget * = 0,const char * = 0);
 %End
 
-%If (- Qt_3_0_0)
-	static QString getText(const QString &,const QString &,
-			       const QString & = QString::null,
-			       bool * = 0,QWidget * = 0,const char * = 0);
+%If (- TQt_3_0_0)
+	static TQString getText(const TQString &,const TQString &,
+			       const TQString & = TQString::null,
+			       bool * = 0,TQWidget * = 0,const char * = 0);
 %End
 
-%If (Qt_2_2_0 - Qt_3_0_0)
-	static QString getText(const QString &,const QString &,
-			       QLineEdit::EchoMode,
-			       const QString & = QString::null,
-			       bool * = 0,QWidget * = 0,const char * = 0);
+%If (TQt_2_2_0 - TQt_3_0_0)
+	static TQString getText(const TQString &,const TQString &,
+			       TQLineEdit::EchoMode,
+			       const TQString & = TQString::null,
+			       bool * = 0,TQWidget * = 0,const char * = 0);
 %End
 
-	static int getInteger(const QString &,const QString &,int = 0,
+	static int getInteger(const TQString &,const TQString &,int = 0,
 			      int = -2147483647,int = 2147483647,int = 1,
-			      bool * = 0,QWidget * = 0,const char * = 0);
+			      bool * = 0,TQWidget * = 0,const char * = 0);
 
-	static double getDouble(const QString &,const QString &,
+	static double getDouble(const TQString &,const TQString &,
 				double = 0,double = -2147483647,
 				double = 2147483647,int = 1,
-				bool * = 0,QWidget * = 0,const char * = 0);
+				bool * = 0,TQWidget * = 0,const char * = 0);
 
-	static QString getItem(const QString &,const QString &,
-			       const QStringList &,int = 0,bool = TRUE,
-			       bool * = 0,QWidget * = 0,const char * = 0);
+	static TQString getItem(const TQString &,const TQString &,
+			       const TQStringList &,int = 0,bool = TRUE,
+			       bool * = 0,TQWidget * = 0,const char * = 0);
 
 private:
-	QInputDialog(const QInputDialog &);
-	~QInputDialog();
+	TQInputDialog(const TQInputDialog &);
+	~TQInputDialog();
 };
 
 %End
diff --git a/sip/qt/qinterlacestyle.sip b/sip/qt/qinterlacestyle.sip
index 5455b2f..97f4e19 100644
--- a/sip/qt/qinterlacestyle.sip
+++ b/sip/qt/qinterlacestyle.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QInterlaceStyle.
+// This is the SIP interface definition for TQInterlaceStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QInterlaceStyle (Qt v2.3.1+)</Title>
+<Sect2><Title>TQInterlaceStyle (TQt v2.3.1+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderLength</Parameter></ParamDef>
@@ -39,63 +39,63 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 %End
  
  
-// Temporary until it is ported to Qt3.
-%If (Qt_STYLE_INTERLACE)
-%If (Qt_2_3_1 - Qt_3_0_0)
+// Temporary until it is ported to TQt3.
+%If (TQt_STYLE_INTERLACE)
+%If (TQt_2_3_1 - TQt_3_0_0)
 
-class QInterlaceStyle : QMotifStyle
+class TQInterlaceStyle : TQMotifStyle
 {
 %TypeHeaderCode
 #include <qinterlacestyle.h>
 %End
 
 public:
-	QInterlaceStyle();
+	TQInterlaceStyle();
 
-	void polish(QApplication *);
-	void unPolish(QApplication *);
-	void polish(QWidget *);
-	void unPolish(QWidget *);
+	void polish(TQApplication *);
+	void unPolish(TQApplication *);
+	void polish(TQWidget *);
+	void unPolish(TQWidget *);
 	int defaultFrameWidth() const;
-	QRect pushButtonContentsRect(QPushButton *);
-	void drawFocusRect(QPainter *,const QRect &,const QColorGroup &,
-			   const QColor * = 0,bool = 0);
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,
-			bool = 0,const QBrush * = 0);
-	void drawButtonMask(QPainter *,int,int,int,int);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
+	TQRect pushButtonContentsRect(TQPushButton *);
+	void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &,
+			   const TQColor * = 0,bool = 0);
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			bool = 0,const TQBrush * = 0);
+	void drawButtonMask(TQPainter *,int,int,int,int);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
 
-	void drawPushButton(QPushButton *,QPainter *);
-	QSize indicatorSize() const;
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawPushButton(TQPushButton *,TQPainter *);
+	TQSize indicatorSize() const;
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,
 			   int,bool = 0,bool = 1);
-	void drawIndicatorMask(QPainter *,int,int,int,int,int);
-	QSize exclusiveIndicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,
+	void drawIndicatorMask(TQPainter *,int,int,int,int,int);
+	TQSize exclusiveIndicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,
 				    bool = 1);
-	void drawExclusiveIndicatorMask(QPainter *,int,int,int,int,bool);
-	QRect comboButtonRect(int,int,int,int);
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool,bool,bool,const QBrush *);
-	void drawPushButtonLabel(QPushButton *,QPainter *);
-	void drawPanel(QPainter *,int,int,int,int,const QColorGroup &,bool,int,
-		       const QBrush *);
+	void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool);
+	TQRect comboButtonRect(int,int,int,int);
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool,bool,bool,const TQBrush *);
+	void drawPushButtonLabel(TQPushButton *,TQPainter *);
+	void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool,int,
+		       const TQBrush *);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,
 				   uint);
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderMask(QPainter *,int,int,int,int,Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
-	void drawSliderGrooveMask(QPainter *,int,int,int,int,QCOORD,
+	void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
+	void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD,
 				  Orientation);
 	int splitterWidth() const;
-	void drawSplitter(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &,
 			  Orientation);
 };
 
diff --git a/sip/qt/qiodevice.sip b/sip/qt/qiodevice.sip
index 32079d2..6d44689 100644
--- a/sip/qt/qiodevice.sip
+++ b/sip/qt/qiodevice.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QIODevice.
+// This is the SIP interface definition for TQIODevice.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QIODevice</Title>
+<Sect2><Title>TQIODevice</Title>
 <Para>
-<Literal>QIODevice</Literal> is fully implemented.
+<Literal>TQIODevice</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
@@ -72,23 +72,23 @@ const int IO_OpenError;
 const int IO_ConnectError;
 const int IO_AbortError;
 const int IO_TimeOutError;
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 const int IO_UnspecifiedError;
 %End
 
 
-class QIODevice
+class TQIODevice
 {
 %TypeHeaderCode
 #include <qiodevice.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	typedef Q_ULONG Offset;
 %End
 
-	QIODevice();
+	TQIODevice();
 
 	int flags() const;
 	int mode() const;
@@ -114,12 +114,12 @@ public:
 	virtual void close() = 0;
 	virtual void flush() = 0 /ReleaseGIL/;
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual uint size() const = 0;
 	virtual int at() const;
 	virtual bool at(int);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual Offset size() const = 0;
 	virtual Offset at() const;
 	virtual bool at(Offset);
@@ -127,7 +127,7 @@ public:
 	virtual bool atEnd() const;
 	bool reset();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual SIP_PYOBJECT readBlock(uint) = 0 /ReleaseGIL/ [int (char *,uint)];
 %MethodCode
 		char *buf;
@@ -187,7 +187,7 @@ public:
 		}
 %End
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual SIP_PYOBJECT readBlock(Q_ULONG) = 0 /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
 %MethodCode
 		char *buf;
@@ -248,16 +248,16 @@ public:
 %End
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual int writeBlock(const char * /Array/,
 			       uint /ArraySize/) = 0 /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual Q_LONG writeBlock(const char * /Array/,
 				  Q_ULONG /ArraySize/) = 0 /ReleaseGIL/;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)];
 %MethodCode
 		char *buf;
@@ -269,7 +269,7 @@ public:
 			int actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0);
+			actlen = sipSelfWasArg ? sipCpp->TQIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -317,7 +317,7 @@ public:
 		}
 %End
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual SIP_PYOBJECT readLine(Q_ULONG) /ReleaseGIL/ [Q_LONG (char *,Q_ULONG)];
 %MethodCode
 		char *buf;
@@ -329,7 +329,7 @@ public:
 			Q_LONG actlen;
 
 			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->QIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0);
+			actlen = sipSelfWasArg ? sipCpp->TQIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0);
 			Py_END_ALLOW_THREADS
 
 			if (actlen < 0)
@@ -378,18 +378,18 @@ public:
 %End
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	int writeBlock(const QByteArray &) /ReleaseGIL/;
+%If (TQt_2_00 - TQt_3_0_0)
+	int writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	Q_LONG writeBlock(const QByteArray &) /ReleaseGIL/;
+%If (TQt_3_0_0 -)
+	Q_LONG writeBlock(const TQByteArray &) /ReleaseGIL/;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
-	QByteArray readAll() /ReleaseGIL/;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQByteArray readAll() /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	virtual QByteArray readAll() /ReleaseGIL/;
+%If (TQt_3_0_0 -)
+	virtual TQByteArray readAll() /ReleaseGIL/;
 %End
 
 	virtual int getch() = 0 /ReleaseGIL/;
@@ -404,5 +404,5 @@ protected:
 	void setStatus(int);
 
 private:
-	QIODevice(const QIODevice &);
+	TQIODevice(const TQIODevice &);
 };
diff --git a/sip/qt/qkeycode.sip b/sip/qt/qkeycode.sip
index 72c0a25..cdd5bfb 100644
--- a/sip/qt/qkeycode.sip
+++ b/sip/qt/qkeycode.sip
@@ -3,24 +3,24 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 %ModuleHeaderCode
 #include <qkeycode.h>
@@ -107,7 +107,7 @@ const int Key_F35;
 const int Key_Super_L;
 const int Key_Super_R;
 const int Key_Menu;
-%If (Qt_1_43 -)
+%If (TQt_1_43 -)
 const int Key_Hyper_L;
 const int Key_Hyper_R;
 %End
diff --git a/sip/qt/qkeysequence.sip b/sip/qt/qkeysequence.sip
index c7800f9..327d6e6 100644
--- a/sip/qt/qkeysequence.sip
+++ b/sip/qt/qkeysequence.sip
@@ -1,64 +1,64 @@
-// This is the SIP interface definition for QKeySequence.
+// This is the SIP interface definition for TQKeySequence.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QKeySequence (Qt v3+)</Title>
+<Sect2><Title>TQKeySequence (TQt v3+)</Title>
 <Para>
-<Literal>QKeySequence</Literal> is fully implemented including the operators
-<Literal>==</Literal>, <Literal>!=</Literal>, <Literal>QString()</Literal> and
-<Literal>int()</Literal>.  A <Literal>QString</Literal> instance or a Python
-integer may be used whenever a <Literal>QKeySequence</Literal> can be used.
+<Literal>TQKeySequence</Literal> is fully implemented including the operators
+<Literal>==</Literal>, <Literal>!=</Literal>, <Literal>TQString()</Literal> and
+<Literal>int()</Literal>.  A <Literal>TQString</Literal> instance or a Python
+integer may be used whenever a <Literal>TQKeySequence</Literal> can be used.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QKeySequence : Qt
+class TQKeySequence : TQt
 {
 %TypeHeaderCode
 #include <qkeysequence.h>
 %End
 
 public:
-	QKeySequence();
-	QKeySequence(const QString &);
-	QKeySequence(int);
-%If (Qt_3_1_0 -)
-	QKeySequence(int,int,int = 0,int = 0);
+	TQKeySequence();
+	TQKeySequence(const TQString &);
+	TQKeySequence(int);
+%If (TQt_3_1_0 -)
+	TQKeySequence(int,int,int = 0,int = 0);
 
-	bool operator==(const QKeySequence &) const;
-	bool operator!=(const QKeySequence &) const;
+	bool operator==(const TQKeySequence &) const;
+	bool operator!=(const TQKeySequence &) const;
 
 	uint count() const;
 	bool isEmpty() const;
-	Qt::SequenceMatch matches(const QKeySequence &) const;
+	TQt::SequenceMatch matches(const TQKeySequence &) const;
 %End
 
 	int __int__() const;
 
 %ConvertToTypeCode
-	// Allow a QString or a Python integer whenever a QKeySequence is
+	// Allow a TQString or a Python integer whenever a TQKeySequence is
 	// expected.
 
 	if (sipIsErr == NULL)
@@ -81,7 +81,7 @@ public:
 
 	if (sipCanConvertToInstance(sipPy,sipClass_QKeySequence,SIP_NO_CONVERTORS))
 	{
-		*sipCppPtr = reinterpret_cast<QKeySequence *>(sipConvertToInstance(sipPy,sipClass_QKeySequence,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
+		*sipCppPtr = reinterpret_cast<TQKeySequence *>(sipConvertToInstance(sipPy,sipClass_QKeySequence,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
 
 		return 0;
 	}
@@ -89,7 +89,7 @@ public:
 	if (sipCanConvertToInstance(sipPy,sipClass_QString,0))
 	{
 		int state;
-		QString *s = reinterpret_cast<QString *>(sipConvertToInstance(sipPy,sipClass_QString,0,0,&state,sipIsErr));
+		TQString *s = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,0,0,&state,sipIsErr));
 
 		if (*sipIsErr)
 		{
@@ -98,7 +98,7 @@ public:
 		}
 
 		Py_BEGIN_ALLOW_THREADS
-		*sipCppPtr = new QKeySequence(*s);
+		*sipCppPtr = new TQKeySequence(*s);
 		Py_END_ALLOW_THREADS
 
 		sipReleaseInstance(s,sipClass_QString,state);
@@ -109,7 +109,7 @@ public:
 	int key = PyInt_AsLong(sipPy);
 
 	Py_BEGIN_ALLOW_THREADS
-	*sipCppPtr = new QKeySequence(key);
+	*sipCppPtr = new TQKeySequence(key);
 	Py_END_ALLOW_THREADS
 
 	return sipGetState(sipTransferObj);
diff --git a/sip/qt/qlabel.sip b/sip/qt/qlabel.sip
index 62655e6..f12e572 100644
--- a/sip/qt/qlabel.sip
+++ b/sip/qt/qlabel.sip
@@ -1,157 +1,157 @@
-// This is the SIP interface definition for QLabel.
+// This is the SIP interface definition for TQLabel.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLabel</Title>
+<Sect2><Title>TQLabel</Title>
 <Para>
-<Literal>QLabel</Literal> is fully implemented.
+<Literal>TQLabel</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QLabel : QFrame
+class TQLabel : TQFrame
 {
 %TypeHeaderCode
 #include <qlabel.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QLabel(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-	QLabel(const char *,QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-	QLabel(QWidget *,const char *,QWidget * /TransferThis/,const char * = 0,WFlags = 0);
+%If (- TQt_2_00)
+	TQLabel(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQLabel(const char *,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQLabel(TQWidget *,const char *,TQWidget * /TransferThis/,const char * = 0,WFlags = 0);
 %End
-%If (Qt_2_00 -)
-	QLabel(QWidget * /TransferThis/,const char * = 0,WFlags = 0);
-	QLabel(const QString &,QWidget * /TransferThis/,const char * = 0,WFlags = 0);
-	QLabel(QWidget *,const QString &,QWidget * /TransferThis/,const char * = 0,WFlags = 0);
+%If (TQt_2_00 -)
+	TQLabel(TQWidget * /TransferThis/,const char * = 0,WFlags = 0);
+	TQLabel(const TQString &,TQWidget * /TransferThis/,const char * = 0,WFlags = 0);
+	TQLabel(TQWidget *,const TQString &,TQWidget * /TransferThis/,const char * = 0,WFlags = 0);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text() const;
 %End
-%If (Qt_2_00 -)
-	QString text() const;
+%If (TQt_2_00 -)
+	TQString text() const;
 %End
-	QPixmap *pixmap() const;
-%If (Qt_3_0_0 -)
-	QPicture *picture() const;
+	TQPixmap *pixmap() const;
+%If (TQt_3_0_0 -)
+	TQPicture *picture() const;
 %End
-	QMovie *movie() const;
+	TQMovie *movie() const;
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	TextFormat textFormat() const;
 	void setTextFormat(TextFormat);
 %End
 
 	int alignment() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAlignment(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAlignment(int);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int margin() const;
 	void setMargin(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int indent() const;
 	void setIndent(int);
 %End
 
 	bool autoResize() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoResize(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAutoResize(bool);
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool hasScaledContents() const;
 	void setScaledContents(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
-	QSize sizeHint() const;
-%If (Qt_2_1_0 -)
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+%If (TQt_2_1_0 -)
+	TQSize minimumSizeHint() const;
 %End
-%If (- Qt_2_00)
-	void setBuddy(QWidget *);
+%If (- TQt_2_00)
+	void setBuddy(TQWidget *);
 %End
-%If (Qt_2_00 -)
-	virtual void setBuddy(QWidget *);
+%If (TQt_2_00 -)
+	virtual void setBuddy(TQWidget *);
 %End
-	QWidget *buddy() const;
-%If (Qt_2_00 - Qt_3_0_0)
+	TQWidget *buddy() const;
+%If (TQt_2_00 - TQt_3_0_0)
 	void setAutoMask(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int heightForWidth(int) const;
 %End
 
-%If (Qt_3_0_0 -)
-	void setFont(const QFont &);
+%If (TQt_3_0_0 -)
+	void setFont(const TQFont &);
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setText(const char *);
-	void setPixmap(const QPixmap &);
+	void setPixmap(const TQPixmap &);
 %End
-%If (Qt_2_00 -)
-	virtual void setText(const QString &);
-	virtual void setPixmap(const QPixmap &);
+%If (TQt_2_00 -)
+	virtual void setText(const TQString &);
+	virtual void setPixmap(const TQPixmap &);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setPicture(const QPicture &);
+%If (TQt_3_0_0 -)
+	virtual void setPicture(const TQPicture &);
 %End
-%If (- Qt_2_00)
-	void setMovie(const QMovie &);
+%If (- TQt_2_00)
+	void setMovie(const TQMovie &);
 	void setNum(int /Constrained/);
 	void setNum(double);
 %End
-%If (Qt_2_00 -)
-	virtual void setMovie(const QMovie &);
+%If (TQt_2_00 -)
+	virtual void setMovie(const TQMovie &);
 	virtual void setNum(int /Constrained/);
 	virtual void setNum(double);
 %End
 	void clear();
 
 protected:
-	void drawContents(QPainter *);
-%If (Qt_2_00 - Qt_3_0_0)
-	void drawContentsMask(QPainter *);
+	void drawContents(TQPainter *);
+%If (TQt_2_00 - TQt_3_0_0)
+	void drawContentsMask(TQPainter *);
 %End
-%If (Qt_2_1_0 -)
-	void fontChange(const QFont &);
+%If (TQt_2_1_0 -)
+	void fontChange(const TQFont &);
 %End
-%If (Qt_2_2_0 -)
-	void resizeEvent(QResizeEvent *);
+%If (TQt_2_2_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
 
 private:
-	QLabel(const QLabel &);
+	TQLabel(const TQLabel &);
 };
diff --git a/sip/qt/qlayout.sip b/sip/qt/qlayout.sip
index 4270e1e..41fc23b 100644
--- a/sip/qt/qlayout.sip
+++ b/sip/qt/qlayout.sip
@@ -1,106 +1,106 @@
-// This is the SIP interface definition for QBoxLayout, QGLayoutIterator,
-// QGridLayout, QHBoxLayout, QLayout, QLayoutItem, QLayoutIterator,
-// QSpacerItem, QVBoxLayout and QWidgetItem.
+// This is the SIP interface definition for TQBoxLayout, TQGLayoutIterator,
+// TQGridLayout, TQHBoxLayout, TQLayout, TQLayoutItem, TQLayoutIterator,
+// TQSpacerItem, TQVBoxLayout and TQWidgetItem.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLayout</Title>
+<Sect2><Title>TQLayout</Title>
 <Para>
-<Literal>QLayout</Literal> is fully implemented.
+<Literal>TQLayout</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QBoxLayout</Title>
+<Sect2><Title>TQBoxLayout</Title>
 <Para>
-<Literal>QBoxLayout</Literal> is fully implemented.
+<Literal>TQBoxLayout</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QGLayoutIterator (Qt v2+)</Title>
+<Sect2><Title>TQGLayoutIterator (TQt v2+)</Title>
 <Para>
-<Literal>QGLayoutIterator</Literal> is fully implemented.
+<Literal>TQGLayoutIterator</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QGridLayout</Title>
+<Sect2><Title>TQGridLayout</Title>
 <FuncSynopsis>
 	<FuncDef>bool <Function>findWidget</Function></FuncDef>
-	<ParamDef>QWidget *<Parameter>w</Parameter></ParamDef>
+	<ParamDef>TQWidget *<Parameter>w</Parameter></ParamDef>
 	<ParamDef>int *<Parameter>row</Parameter></ParamDef>
 	<ParamDef>int *<Parameter>col</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes the <Literal>w</Literal> parameter and returns a tuple containing
 the <Literal>bool</Literal> result, <Literal>row</Literal> and
-<Literal>col</Literal>. (Qt v2+)
+<Literal>col</Literal>. (TQt v2+)
 </Para>
 </Sect2>
 
-<Sect2><Title>QHBoxLayout</Title>
+<Sect2><Title>TQHBoxLayout</Title>
 <Para>
-<Literal>QHBoxLayout</Literal> is fully implemented.
+<Literal>TQHBoxLayout</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QLayoutItem (Qt v2+)</Title>
+<Sect2><Title>TQLayoutItem (TQt v2+)</Title>
 <Para>
-<Literal>QLayoutItem</Literal> is fully implemented.
+<Literal>TQLayoutItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QLayoutIterator (Qt v2+)</Title>
+<Sect2><Title>TQLayoutIterator (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef>QLayoutItem *<Function>next</Function></FuncDef>
+	<FuncDef>TQLayoutItem *<Function>next</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-This is a wrapper around the <Literal>QLayoutIterator</Literal>
+This is a wrapper around the <Literal>TQLayoutIterator</Literal>
 <Literal>++</Literal> operator.
 </Para>
 </Sect2>
 
-<Sect2><Title>QSpacerItem (Qt v2+)</Title>
+<Sect2><Title>TQSpacerItem (TQt v2+)</Title>
 <Para>
-<Literal>QSpacerItem</Literal> is fully implemented.
+<Literal>TQSpacerItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QVBoxLayout</Title>
+<Sect2><Title>TQVBoxLayout</Title>
 <Para>
-<Literal>QVBoxLayout</Literal> is fully implemented.
+<Literal>TQVBoxLayout</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QWidgetItem (Qt v2+)</Title>
+<Sect2><Title>TQWidgetItem (TQt v2+)</Title>
 <Para>
-<Literal>QWidgetItem</Literal> is fully implemented.
+<Literal>TQWidgetItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QLayout : QObject
+class TQLayout : TQObject
 {
 %TypeHeaderCode
 #include <qlayout.h>
@@ -109,82 +109,82 @@ class QLayout : QObject
 public:
 	enum
 	{
-		unlimited = QCOORD_MAX
+		unlimited = TQCOORD_MAX
 	};
 
 	int defaultBorder() const;
 	virtual bool activate();
 	void freeze(int,int);
 	void freeze();
-	void setMenuBar(QMenuBar *);
-	QWidget *mainWidget();
+	void setMenuBar(TQMenuBar *);
+	TQWidget *mainWidget();
 
 protected:
-	QLayout(QWidget * /TransferThis/,int,int,const char *);
-	QLayout(int = -1,const char * = 0);
+	TQLayout(TQWidget * /TransferThis/,int,int,const char *);
+	TQLayout(int = -1,const char * = 0);
 
-	QGManager *basicManager();
-	virtual QChain *mainVerticalChain() = 0;
-	virtual QChain *mainHorizontalChain() = 0;
+	TQGManager *basicManager();
+	virtual TQChain *mainVerticalChain() = 0;
+	virtual TQChain *mainHorizontalChain() = 0;
 	virtual void initGM() = 0;
-	void addChildLayout(QLayout *);
+	void addChildLayout(TQLayout *);
 
 private:
-	QLayout(const QLayout &);
+	TQLayout(const TQLayout &);
 };
 
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QGLayoutIterator
+class TQGLayoutIterator
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
 %End
 
 public:
-	virtual QLayoutItem *next() = 0;
-	virtual QLayoutItem *current() = 0;
-	virtual QLayoutItem *takeCurrent() = 0 /TransferBack/;
+	virtual TQLayoutItem *next() = 0;
+	virtual TQLayoutItem *current() = 0;
+	virtual TQLayoutItem *takeCurrent() = 0 /TransferBack/;
 };
 
 
-class QLayoutIterator
+class TQLayoutIterator
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
 %End
 
 public:
-	QLayoutIterator(QGLayoutIterator *) /Default/;
-	QLayoutIterator(const QLayoutIterator &);
+	TQLayoutIterator(TQGLayoutIterator *) /Default/;
+	TQLayoutIterator(const TQLayoutIterator &);
 
-	QLayoutItem *next();
+	TQLayoutItem *next();
 %MethodCode
 		Py_BEGIN_ALLOW_THREADS
 		sipRes = ++(*sipCpp);
 		Py_END_ALLOW_THREADS
 %End
 
-	QLayoutItem *current();
-	QLayoutItem *takeCurrent() /TransferBack/;
+	TQLayoutItem *current();
+	TQLayoutItem *takeCurrent() /TransferBack/;
 	void deleteCurrent();
 };
 
 
-class QLayoutItem
+class TQLayoutItem
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
 %End
 
 public:
-	QLayoutItem(int = 0 );
+	TQLayoutItem(int = 0 );
 
 %ConvertToSubClassCode
-    // Note that we let the QObject sub-class code handle QLayout and it's
+    // Note that we let the TQObject sub-class code handle TQLayout and it's
     // sub-classes.
 	if (sipCpp->widget())
 		sipClass = sipClass_QWidgetItem;
@@ -194,74 +194,74 @@ public:
 		sipClass = NULL;
 %End
 
-	virtual QSize sizeHint() const = 0;
-	virtual QSize minimumSize() const = 0;
-	virtual QSize maximumSize() const = 0;
-	virtual QSizePolicy::ExpandData expanding() const = 0;
-	virtual void setGeometry(const QRect &) = 0;
-	virtual QRect geometry() const = 0;
+	virtual TQSize sizeHint() const = 0;
+	virtual TQSize minimumSize() const = 0;
+	virtual TQSize maximumSize() const = 0;
+	virtual TQSizePolicy::ExpandData expanding() const = 0;
+	virtual void setGeometry(const TQRect &) = 0;
+	virtual TQRect geometry() const = 0;
 	virtual bool isEmpty() const = 0;
 	virtual bool hasHeightForWidth() const;
 	virtual int heightForWidth(int) const;
 	virtual void invalidate();
 
-	virtual QWidget *widget();
-	virtual QLayoutIterator iterator();
-	virtual QLayout *layout();
-	virtual QSpacerItem *spacerItem();
+	virtual TQWidget *widget();
+	virtual TQLayoutIterator iterator();
+	virtual TQLayout *layout();
+	virtual TQSpacerItem *spacerItem();
 
 	int alignment() const;
 	virtual void setAlignment(int);
 };
 
 
-class QSpacerItem : QLayoutItem
+class TQSpacerItem : TQLayoutItem
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
 %End
 
 public:
-	QSpacerItem(int,int,QSizePolicy::SizeType = QSizePolicy::Minimum,
-		    QSizePolicy::SizeType = QSizePolicy::Minimum);
-
-	void changeSize(int,int,QSizePolicy::SizeType = QSizePolicy::Minimum,
-			QSizePolicy::SizeType = QSizePolicy::Minimum);
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
-	QSizePolicy::ExpandData expanding() const;
+	TQSpacerItem(int,int,TQSizePolicy::SizeType = TQSizePolicy::Minimum,
+		    TQSizePolicy::SizeType = TQSizePolicy::Minimum);
+
+	void changeSize(int,int,TQSizePolicy::SizeType = TQSizePolicy::Minimum,
+			TQSizePolicy::SizeType = TQSizePolicy::Minimum);
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
+	TQSizePolicy::ExpandData expanding() const;
 	bool isEmpty() const;
-	void setGeometry(const QRect &);
-	QRect geometry() const;
-	QSpacerItem *spacerItem();
+	void setGeometry(const TQRect &);
+	TQRect geometry() const;
+	TQSpacerItem *spacerItem();
 };
  
  
-class QWidgetItem : QLayoutItem
+class TQWidgetItem : TQLayoutItem
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
 %End
 
 public:
-	QWidgetItem(QWidget *);
+	TQWidgetItem(TQWidget *);
 
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
-	QSizePolicy::ExpandData expanding() const;
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
+	TQSizePolicy::ExpandData expanding() const;
 	bool isEmpty() const;
-	void setGeometry(const QRect &) ;
-	QRect geometry() const;
-	virtual QWidget *widget();
+	void setGeometry(const TQRect &) ;
+	TQRect geometry() const;
+	virtual TQWidget *widget();
 
 	bool hasHeightForWidth() const;
 	int heightForWidth(int) const;
 };
 
 
-class QLayout : QObject, QLayoutItem
+class TQLayout : TQObject, TQLayoutItem
 {
 %TypeHeaderCode
 #include <qabstractlayout.h>
@@ -272,14 +272,14 @@ public:
 		FreeResize,
 		Minimum,
 		Fixed,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		Auto
 %End
 	};
 
-	QLayout(QWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
-	QLayout(QLayout * /TransferThis/,int = -1,const char * = 0);
-	QLayout(int = -1,const char * = 0);
+	TQLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
+	TQLayout(TQLayout * /TransferThis/,int = -1,const char * = 0);
+	TQLayout(int = -1,const char * = 0);
 
 	int margin() const;
 	int spacing() const;
@@ -287,13 +287,13 @@ public:
 	virtual void setMargin(int);
 	virtual void setSpacing(int);
 
-%If (- Qt_3_1_0)
+%If (- TQt_3_1_0)
 	enum {
 		unlimited
 	};
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int defaultBorder() const;
 	void freeze(int,int);
 	void freeze();
@@ -302,111 +302,111 @@ public:
 	void setResizeMode(ResizeMode);
 	ResizeMode resizeMode() const;
 
-	virtual void setMenuBar(QMenuBar *);
-	QMenuBar *menuBar() const;
+	virtual void setMenuBar(TQMenuBar *);
+	TQMenuBar *menuBar() const;
 
-	QWidget *mainWidget();
+	TQWidget *mainWidget();
 	bool isTopLevel() const;
 
 	virtual void setAutoAdd(bool);
 	bool autoAdd() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void invalidate();
 %End
-	QRect geometry() const;
+	TQRect geometry() const;
 	bool activate();
 
-	void add(QWidget *);
-	virtual void addItem(QLayoutItem * /Transfer/) = 0;
+	void add(TQWidget *);
+	virtual void addItem(TQLayoutItem * /Transfer/) = 0;
 
-%If (Qt_3_1_0 -)
-	void remove(QWidget *);
-	void removeItem(QLayoutItem * /TransferBack/);
+%If (TQt_3_1_0 -)
+	void remove(TQWidget *);
+	void removeItem(TQLayoutItem * /TransferBack/);
 %End
 
-	QSizePolicy::ExpandData expanding() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
-	void setGeometry(const QRect &) = 0;
-	QLayoutIterator iterator() = 0;
+	TQSizePolicy::ExpandData expanding() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
+	void setGeometry(const TQRect &) = 0;
+	TQLayoutIterator iterator() = 0;
 	bool isEmpty() const;
 
 	int totalHeightForWidth(int) const;
-	QSize totalMinimumSize() const;
-	QSize totalMaximumSize() const;
-	QSize totalSizeHint() const;
-	QLayout *layout();
+	TQSize totalMinimumSize() const;
+	TQSize totalMaximumSize() const;
+	TQSize totalSizeHint() const;
+	TQLayout *layout();
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool supportsMargin() const;
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setEnabled(bool);
 	bool isEnabled() const;
 %End
 
 protected:
-	bool eventFilter(QObject *,QEvent *);
-%If (Qt_3_0_0 -)
-	void childEvent(QChildEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
+%If (TQt_3_0_0 -)
+	void childEvent(TQChildEvent *);
 %End
-	void addChildLayout(QLayout *);
+	void addChildLayout(TQLayout *);
 	void deleteAllItems();
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setSupportsMargin(bool);
-	QRect alignmentRect(const QRect &) const;
+	TQRect alignmentRect(const TQRect &) const;
 %End
 
 private:
-	QLayout(const QLayout &);
+	TQLayout(const TQLayout &);
 };
 
 %End
 
 
-class QGridLayout : QLayout
+class TQGridLayout : TQLayout
 {
 %TypeHeaderCode
 #include <qlayout.h>
 %End
 
 public:
-%If (- Qt_2_1_0)
-	QGridLayout(QWidget * /TransferThis/,int,int,int = 0,int = -1,const char * = 0);
-	QGridLayout(int,int,int = -1,const char * = 0);
+%If (- TQt_2_1_0)
+	TQGridLayout(TQWidget * /TransferThis/,int,int,int = 0,int = -1,const char * = 0);
+	TQGridLayout(int,int,int = -1,const char * = 0);
 %End
-%If (Qt_2_00 - Qt_2_1_0)
-	QGridLayout(QLayout * /TransferThis/,int,int,int = -1,const char * = 0);
+%If (TQt_2_00 - TQt_2_1_0)
+	TQGridLayout(TQLayout * /TransferThis/,int,int,int = -1,const char * = 0);
 %End
-%If (Qt_2_1_0 -)
-	QGridLayout(QWidget * /TransferThis/,int = 1,int = 1,int = 0,int = -1,const char * = 0);
-	QGridLayout(int = 1,int = 1,int = -1,const char * = 0);
-	QGridLayout(QLayout * /TransferThis/,int = 1,int = 1,int = -1,const char * = 0);
+%If (TQt_2_1_0 -)
+	TQGridLayout(TQWidget * /TransferThis/,int = 1,int = 1,int = 0,int = -1,const char * = 0);
+	TQGridLayout(int = 1,int = 1,int = -1,const char * = 0);
+	TQGridLayout(TQLayout * /TransferThis/,int = 1,int = 1,int = -1,const char * = 0);
 %End
 
-%If (Qt_2_00 -)
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
+%If (TQt_2_00 -)
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setRowStretch(int,int);
 	void setColStretch(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setRowStretch(int,int);
 	virtual void setColStretch(int,int);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int rowStretch(int) const;
 	int colStretch(int) const;
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setRowSpacing(int,int);
 	void setColSpacing(int,int);
 	int rowSpacing(int) const;
@@ -415,40 +415,40 @@ public:
 
 	int numRows() const;
 	int numCols() const;
-%If (Qt_2_1_0 -)
-	QRect cellGeometry(int,int) const;
+%If (TQt_2_1_0 -)
+	TQRect cellGeometry(int,int) const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool hasHeightForWidth() const;
 	int heightForWidth(int) const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int minimumHeightForWidth(int) const;
 %End
 
-	QSizePolicy::ExpandData expanding() const;
+	TQSizePolicy::ExpandData expanding() const;
 	void invalidate();
 
-	void addItem(QLayoutItem * /Transfer/);
+	void addItem(TQLayoutItem * /Transfer/);
 %End
-%If (Qt_2_1_0 -)
-	void addItem(QLayoutItem * /Transfer/,int,int);
+%If (TQt_2_1_0 -)
+	void addItem(TQLayoutItem * /Transfer/,int,int);
 %End
-%If (Qt_2_00 -)
-	void addMultiCell(QLayoutItem * /Transfer/,int,int,int,int,int = 0);
+%If (TQt_2_00 -)
+	void addMultiCell(TQLayoutItem * /Transfer/,int,int,int,int,int = 0);
 %End
 
-	void addWidget(QWidget *,int,int,int = 0);
-	void addMultiCellWidget(QWidget *,int,int,int,int,int = 0);
-	void addLayout(QLayout * /Transfer/,int,int);
-%If (Qt_2_2_0 -)
-	void addMultiCellLayout(QLayout * /Transfer/,int,int,int,int,int = 0);
+	void addWidget(TQWidget *,int,int,int = 0);
+	void addMultiCellWidget(TQWidget *,int,int,int,int,int = 0);
+	void addLayout(TQLayout * /Transfer/,int,int);
+%If (TQt_2_2_0 -)
+	void addMultiCellLayout(TQLayout * /Transfer/,int,int,int,int,int = 0);
 %End
 	void addRowSpacing(int,int);
 	void addColSpacing(int,int);
 	void expand(int,int);
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum Corner {
 		TopLeft,
 		TopRight,
@@ -458,32 +458,32 @@ public:
 
 	void setOrigin(Corner);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	Corner origin() const;
 %End
-%If (Qt_2_00 -)
-	QLayoutIterator iterator();
-	void setGeometry(const QRect &);
+%If (TQt_2_00 -)
+	TQLayoutIterator iterator();
+	void setGeometry(const TQRect &);
 %End
 
 protected:
-%If (- Qt_2_00)
-	QChain *mainVerticalChain();
-	QChain *mainHorizontalChain();
+%If (- TQt_2_00)
+	TQChain *mainVerticalChain();
+	TQChain *mainHorizontalChain();
 	void initGM();
 %End
 
-%If (Qt_2_00 -)
-	bool findWidget(QWidget *,int *,int *);
-	void add(QLayoutItem * /Transfer/,int,int);
+%If (TQt_2_00 -)
+	bool findWidget(TQWidget *,int *,int *);
+	void add(TQLayoutItem * /Transfer/,int,int);
 %End
 
 private:
-	QGridLayout(const QGridLayout &);
+	TQGridLayout(const TQGridLayout &);
 };
 
 
-class QBoxLayout : QLayout
+class TQBoxLayout : TQLayout
 {
 %TypeHeaderCode
 #include <qlayout.h>
@@ -499,99 +499,99 @@ public:
 		Up = BottomToTop
 	};
 
-	QBoxLayout(QWidget * /TransferThis/,Direction,int = 0,int = -1,const char * = 0);
-%If (Qt_2_00 -)
-	QBoxLayout(QLayout * /TransferThis/,Direction,int = -1,const char * = 0);
+	TQBoxLayout(TQWidget * /TransferThis/,Direction,int = 0,int = -1,const char * = 0);
+%If (TQt_2_00 -)
+	TQBoxLayout(TQLayout * /TransferThis/,Direction,int = -1,const char * = 0);
 %End
-	QBoxLayout(Direction,int = -1,const char * = 0);
+	TQBoxLayout(Direction,int = -1,const char * = 0);
 
 	Direction direction() const;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setDirection(Direction);
 %End
 	void addSpacing(int);
 	void addStretch(int = 0);
-%If (- Qt_2_00)
-	void addWidget(QWidget *,int = 0,int = AlignCenter);
+%If (- TQt_2_00)
+	void addWidget(TQWidget *,int = 0,int = AlignCenter);
 %End
-	void addLayout(QLayout * /Transfer/,int = 0);
+	void addLayout(TQLayout * /Transfer/,int = 0);
 	void addStrut(int);
-%If (Qt_2_00 -)
-	void addItem(QLayoutItem * /Transfer/);
-	void addWidget(QWidget *,int = 0,int = 0);
-%If (Qt_2_1_0 -)
+%If (TQt_2_00 -)
+	void addItem(TQLayoutItem * /Transfer/);
+	void addWidget(TQWidget *,int = 0,int = 0);
+%If (TQt_2_1_0 -)
 	void insertSpacing(int,int);
 	void insertStretch(int,int = 0);
-	void insertWidget(int,QWidget *,int = 0,int = 0);
-	void insertLayout(int,QLayout * /Transfer/,int = 0);
-	int findWidget(QWidget *);
-%End
-	bool setStretchFactor(QWidget *,int);
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
+	void insertWidget(int,TQWidget *,int = 0,int = 0);
+	void insertLayout(int,TQLayout * /Transfer/,int = 0);
+	int findWidget(TQWidget *);
+%End
+	bool setStretchFactor(TQWidget *,int);
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
 	bool hasHeightForWidth() const;
 	int heightForWidth(int) const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int minimumHeightForWidth(int) const;
 %End
 
-	QSizePolicy::ExpandData expanding() const;
+	TQSizePolicy::ExpandData expanding() const;
 	void invalidate();
-	QLayoutIterator iterator();
-	void setGeometry(const QRect &);
+	TQLayoutIterator iterator();
+	void setGeometry(const TQRect &);
 %End
 
 protected:
-%If (- Qt_2_00)
-	QChain *mainVerticalChain();
-	QChain *mainHorizontalChain();
+%If (- TQt_2_00)
+	TQChain *mainVerticalChain();
+	TQChain *mainHorizontalChain();
 	void initGM();
 %End
-%If (Qt_2_1_0 -)
-	void insertItem(int,QLayoutItem * /Transfer/);
+%If (TQt_2_1_0 -)
+	void insertItem(int,TQLayoutItem * /Transfer/);
 %End
 
 private:
-	QBoxLayout(const QBoxLayout &);
+	TQBoxLayout(const TQBoxLayout &);
 };
 
 
-class QHBoxLayout : QBoxLayout
+class TQHBoxLayout : TQBoxLayout
 {
 %TypeHeaderCode
 #include <qlayout.h>
 %End
 
 public:
-	QHBoxLayout(QWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
-%If (Qt_2_00 -)
-	QHBoxLayout(QLayout * /TransferThis/,int = -1,const char * = 0);
+	TQHBoxLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
+%If (TQt_2_00 -)
+	TQHBoxLayout(TQLayout * /TransferThis/,int = -1,const char * = 0);
 %End
-	QHBoxLayout(int = -1,const char * = 0);
+	TQHBoxLayout(int = -1,const char * = 0);
 
 private:
-%If (Qt_3_1_0 -)
-	QHBoxLayout(const QHBoxLayout &);
+%If (TQt_3_1_0 -)
+	TQHBoxLayout(const TQHBoxLayout &);
 %End
 };
 
 
-class QVBoxLayout : QBoxLayout
+class TQVBoxLayout : TQBoxLayout
 {
 %TypeHeaderCode
 #include <qlayout.h>
 %End
 
 public:
-	QVBoxLayout(QWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
-%If (Qt_2_00 -)
-	QVBoxLayout(QLayout * /TransferThis/,int = -1,const char * = 0);
+	TQVBoxLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0);
+%If (TQt_2_00 -)
+	TQVBoxLayout(TQLayout * /TransferThis/,int = -1,const char * = 0);
 %End
-	QVBoxLayout(int = -1,const char * = 0);
+	TQVBoxLayout(int = -1,const char * = 0);
 
 private:
-%If (Qt_3_1_0 -)
-	QVBoxLayout(const QVBoxLayout &);
+%If (TQt_3_1_0 -)
+	TQVBoxLayout(const TQVBoxLayout &);
 %End
 };
diff --git a/sip/qt/qlcdnumber.sip b/sip/qt/qlcdnumber.sip
index ae250fd..4515a68 100644
--- a/sip/qt/qlcdnumber.sip
+++ b/sip/qt/qlcdnumber.sip
@@ -1,45 +1,45 @@
-// This is the SIP interface definition for QLCDNumber.
+// This is the SIP interface definition for TQLCDNumber.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLCDNumber</Title>
+<Sect2><Title>TQLCDNumber</Title>
 <Para>
-<Literal>QLCDNumber</Literal> is fully implemented.
+<Literal>TQLCDNumber</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QLCDNumber : QFrame
+class TQLCDNumber : TQFrame
 {
 %TypeHeaderCode
 #include <qlcdnumber.h>
 %End
 
 public:
-	QLCDNumber(QWidget * /TransferThis/ = 0,const char * = 0);
-	QLCDNumber(uint,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQLCDNumber(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQLCDNumber(uint,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum Mode {
 		HEX,
 		DEC,
@@ -47,7 +47,7 @@ public:
 		BIN
 	};
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	enum Mode {
 		Hex, HEX = Hex,
 		Dec, DEC = Dec,
@@ -65,10 +65,10 @@ public:
 	bool smallDecimalPoint() const;
 
 	int numDigits() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setNumDigits(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setNumDigits(int);
 %End
 
@@ -76,46 +76,46 @@ public:
 	bool checkOverflow(double) const;
 
 	Mode mode() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMode(Mode);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMode(Mode);
 %End
 
 	SegmentStyle segmentStyle() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSegmentStyle(SegmentStyle);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setSegmentStyle(SegmentStyle);
 %End
 
 	double value() const;
 	int intValue() const;
 
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void display(const char *);
 %End
-%If (Qt_2_00 -)
-	void display(const QString &);
+%If (TQt_2_00 -)
+	void display(const TQString &);
 %End
 	void display(int /Constrained/);
 	void display(double);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setHexMode();
 	void setDecMode();
 	void setOctMode();
 	void setBinMode();
 	void setSmallDecimalPoint(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setHexMode();
 	virtual void setDecMode();
 	virtual void setOctMode();
@@ -127,11 +127,11 @@ signals:
 	void overflow();
 
 protected:
-%If (- Qt_2_00)
-	void resizeEvent(QResizeEvent *);
+%If (- TQt_2_00)
+	void resizeEvent(TQResizeEvent *);
 %End
-	void drawContents(QPainter *);
+	void drawContents(TQPainter *);
 
 private:
-	QLCDNumber(const QLCDNumber &);
+	TQLCDNumber(const TQLCDNumber &);
 };
diff --git a/sip/qt/qlibrary.sip b/sip/qt/qlibrary.sip
index cb9813a..89ce16a 100644
--- a/sip/qt/qlibrary.sip
+++ b/sip/qt/qlibrary.sip
@@ -1,47 +1,47 @@
-// This is the SIP interface definition for QLibrary.
+// This is the SIP interface definition for TQLibrary.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLibrary (Qt v3+)</Title>
+<Sect2><Title>TQLibrary (TQt v3+)</Title>
 <Para>
-<Literal>QLibrary</Literal> is fully implemented.
+<Literal>TQLibrary</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QLibrary
+class TQLibrary
 {
 %TypeHeaderCode
 #include <qlibrary.h>
 %End
 
 public:
-	QLibrary(const QString &);
+	TQLibrary(const TQString &);
 
 	void *resolve(const char *);
-	static void *resolve(const QString &,const char *);
+	static void *resolve(const TQString &,const char *);
 
 	bool load();
 	virtual bool unload();
@@ -50,10 +50,10 @@ public:
 	bool autoUnload() const;
 	void setAutoUnload(bool);
 
-	QString library() const;
+	TQString library() const;
 
 private:
-	QLibrary(const QLibrary &);
+	TQLibrary(const TQLibrary &);
 };
 
 %End
diff --git a/sip/qt/qlineedit.sip b/sip/qt/qlineedit.sip
index 47bd3fa..dfe7880 100644
--- a/sip/qt/qlineedit.sip
+++ b/sip/qt/qlineedit.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QLineEdit.
+// This is the SIP interface definition for TQLineEdit.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLineEdit</Title>
+<Sect2><Title>TQLineEdit</Title>
 <FuncSynopsis>
 	<FuncDef>int <Function>characterAt</Function></FuncDef>
 	<ParamDef>int <Parameter>xpos</Parameter></ParamDef>
-	<ParamDef>QChar *<Parameter>chr</Parameter></ParamDef>
+	<ParamDef>TQChar *<Parameter>chr</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes only the <Literal>xpos</Literal> parameter and returns the int
-result and the <Literal>chr</Literal> value as a tuple.  (Qt v3+)
+result and the <Literal>chr</Literal> value as a tuple.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
@@ -37,7 +37,7 @@ result and the <Literal>chr</Literal> value as a tuple.  (Qt v3+)
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-This has been renamed <Literal>delChar</Literal> in Python.  (Qt v2+)
+This has been renamed <Literal>delChar</Literal> in Python.  (TQt v2+)
 </Para>
 
 <FuncSynopsis>
@@ -48,31 +48,31 @@ This has been renamed <Literal>delChar</Literal> in Python.  (Qt v2+)
 <Para>
 This takes no parameters and returns the bool result and the
 <Literal>start</Literal> and <Literal>end</Literal> values as a tuple.
-(Qt v3+)
+(TQt v3+)
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QLineEdit : QFrame
+class TQLineEdit : TQFrame
 {
 %TypeHeaderCode
 #include <qlineedit.h>
 %End
 
 public:
-	QLineEdit(QWidget * /TransferThis/,const char * = 0);
-	QLineEdit(const QString &,QWidget * /TransferThis/,const char * = 0);
-%If (Qt_3_2_0 -)
-	QLineEdit(const QString &,const QString &,QWidget * /TransferThis/,
+	TQLineEdit(TQWidget * /TransferThis/,const char * = 0);
+	TQLineEdit(const TQString &,TQWidget * /TransferThis/,const char * = 0);
+%If (TQt_3_2_0 -)
+	TQLineEdit(const TQString &,const TQString &,TQWidget * /TransferThis/,
 		  const char * = 0);
 %End
 
-	QString text() const;
+	TQString text() const;
 
-	QString displayText() const;
+	TQString displayText() const;
 
 	int maxLength() const;
 
@@ -88,14 +88,14 @@ public:
 
 	bool isReadOnly() const;
 
-	const QValidator *validator() const;
+	const TQValidator *validator() const;
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 	int cursorPosition() const;
 	// Obsolete.
-	bool validateAndSet(const QString &,int,int,int);
+	bool validateAndSet(const TQString &,int,int,int);
 
 	int alignment() const;
 
@@ -108,7 +108,7 @@ public:
 	void home(bool);
 	void end(bool);
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool isModified() const;
 	void clearModified();
 %End
@@ -119,8 +119,8 @@ public:
 	void setEdited(bool);
 
 	bool hasSelectedText() const;
-	QString selectedText() const;
-%If (Qt_3_2_0 -)
+	TQString selectedText() const;
+%If (TQt_3_2_0 -)
 	int selectionStart() const;
 %End
 
@@ -129,18 +129,18 @@ public:
 
 	bool dragEnabled() const;
 
-%If (Qt_3_2_0 -)
-	QString inputMask() const;
-	void setInputMask(const QString &);
+%If (TQt_3_2_0 -)
+	TQString inputMask() const;
+	void setInputMask(const TQString &);
 	bool hasAcceptableInput() const;
 %End
 
 public slots:
-	virtual void setText(const QString &);
+	virtual void setText(const TQString &);
 	virtual void selectAll();
 	virtual void deselect();
 	virtual void clearValidator();
-	virtual void insert(const QString &);
+	virtual void insert(const TQString &);
 	virtual void clear();
 	virtual void undo();
 	virtual void redo();
@@ -148,13 +148,13 @@ public slots:
 	virtual void setFrame(bool);
 	virtual void setEchoMode(EchoMode);
 	virtual void setReadOnly(bool);
-	virtual void setValidator(const QValidator *);
-	virtual void setFont(const QFont &);
-	virtual void setPalette(const QPalette &);
+	virtual void setValidator(const TQValidator *);
+	virtual void setFont(const TQFont &);
+	virtual void setPalette(const TQPalette &);
 	virtual void setSelection(int,int);
 	virtual void setCursorPosition(int);
 	virtual void setAlignment(int);
-%If (Qt_CLIPBOARD)
+%If (TQt_CLIPBOARD)
 	virtual void cut();
 	virtual void copy() const;
 	virtual void paste();
@@ -162,53 +162,53 @@ public slots:
 	virtual void setDragEnabled(bool);
 
 signals:
-	void textChanged(const QString &);
+	void textChanged(const TQString &);
 	void returnPressed();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void lostFocus();
 %End
 	void selectionChanged();
 
 protected:
-	bool event(QEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void imStartEvent(QIMEvent *);
-	void imComposeEvent(QIMEvent *);
-	void imEndEvent(QIMEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void resizeEvent(QResizeEvent *);
-	void drawContents(QPainter *);
-%If (Qt_DRAGANDDROP)
-	void dragEnterEvent(QDragEnterEvent *);
-	void dragMoveEvent(QDragMoveEvent *);
-	void dragLeaveEvent(QDragLeaveEvent *);
-	void dropEvent(QDropEvent *);
-%End
-	void contextMenuEvent(QContextMenuEvent *);
-	virtual QPopupMenu *createPopupMenu() /Factory/;
+	bool event(TQEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void imStartEvent(TQIMEvent *);
+	void imComposeEvent(TQIMEvent *);
+	void imEndEvent(TQIMEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void drawContents(TQPainter *);
+%If (TQt_DRAGANDDROP)
+	void dragEnterEvent(TQDragEnterEvent *);
+	void dragMoveEvent(TQDragMoveEvent *);
+	void dragLeaveEvent(TQDragLeaveEvent *);
+	void dropEvent(TQDropEvent *);
+%End
+	void contextMenuEvent(TQContextMenuEvent *);
+	virtual TQPopupMenu *createPopupMenu() /Factory/;
 	void windowActivationChange(bool);
 
 public:
 	// These appeared in v3.0.2 but defined as incompatible 3.0 addons,
 	// until v3.1.0.  v3.2.0 then defined them as internal and obsolete.
-%If (Qt_3_1_0 -)
-	void setPasswordChar(QChar);
-	QChar passwordChar() const;
+%If (TQt_3_1_0 -)
+	void setPasswordChar(TQChar);
+	TQChar passwordChar() const;
 %End
 
 	// Obsolete.
 	SIP_PYTUPLE characterAt(int) const;
 %MethodCode
 		int res;
-		QChar *chr;
+		TQChar *chr;
  
 		Py_BEGIN_ALLOW_THREADS
-		chr = new QChar();
+		chr = new TQChar();
 		res = sipCpp -> characterAt(a0,chr);
 		Py_END_ALLOW_THREADS
  
@@ -219,50 +219,50 @@ public:
 	bool getSelection(int *,int *);
 
 private:
-	QLineEdit(const QLineEdit &);
+	TQLineEdit(const TQLineEdit &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QLineEdit : QWidget
+class TQLineEdit : TQWidget
 {
 %TypeHeaderCode
 #include <qlineedit.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QLineEdit(QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQLineEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QLineEdit(QWidget * /TransferThis/,const char * = 0);
-	QLineEdit(const QString &,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQLineEdit(TQWidget * /TransferThis/,const char * = 0);
+	TQLineEdit(const TQString &,TQWidget * /TransferThis/,const char * = 0);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text() const;
 %End
-%If (Qt_2_00 -)
-	QString text() const;
+%If (TQt_2_00 -)
+	TQString text() const;
 
-	QString displayText() const;
+	TQString displayText() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMaxLength(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMaxLength(int);
 %End
 	int maxLength() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFrame(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setFrame(bool);
 %End
 	bool frame() const;
@@ -273,59 +273,59 @@ public:
 		Password
 	};
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setEchoMode(EchoMode);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setEchoMode(EchoMode);
 %End
 	EchoMode echoMode() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setReadOnly(bool);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool isReadOnly() const;
 %End
 
-%If (- Qt_2_00)
-	void setValidator(QValidator *);
-	QValidator *validator() const;
+%If (- TQt_2_00)
+	void setValidator(TQValidator *);
+	TQValidator *validator() const;
 %End
-%If (Qt_2_00 -)
-	virtual void setValidator(QValidator *);
+%If (TQt_2_00 -)
+	virtual void setValidator(TQValidator *);
 %End
-%If (Qt_2_00 -)
-	const QValidator *validator() const;
+%If (TQt_2_00 -)
+	const TQValidator *validator() const;
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 -)
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 -)
+	TQSize minimumSizeHint() const;
 %End
-%If (Qt_2_00 -)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 -)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setCursorPosition(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setCursorPosition(int);
 %End
 	int cursorPosition() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool validateAndSet(const char *,int,int,int);
 %End
-%If (Qt_2_00 -)
-	bool validateAndSet(const QString &,int,int,int);
+%If (TQt_2_00 -)
+	bool validateAndSet(const TQString &,int,int,int);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int alignment() const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void cursorLeft(bool,int = 1);
 	void cursorRight(bool,int = 1);
 	void cursorWordForward(bool);
@@ -339,89 +339,89 @@ public:
 	bool edited() const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool hasMarkedText() const;
-	QString markedText() const;
+	TQString markedText() const;
 %End
 
-%If (Qt_CLIPBOARD)
+%If (TQt_CLIPBOARD)
 	void cut();
 	void copy() const;
 	void paste();
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setEnabled(bool);
-	void setFont(const QFont &);
-	void setPalette(const QPalette &);
+	void setFont(const TQFont &);
+	void setPalette(const TQPalette &);
 	void setSelection(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setEnabled(bool);
-	virtual void setFont(const QFont &);
-	virtual void setPalette(const QPalette &);
+	virtual void setFont(const TQFont &);
+	virtual void setPalette(const TQPalette &);
 	virtual void setSelection(int,int);
 
 	void setAlignment(int);
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setText(const char *);
 %End
-%If (Qt_2_00 -)
-	virtual void setText(const QString &);
+%If (TQt_2_00 -)
+	virtual void setText(const TQString &);
 %End
 	void selectAll();
 	void deselect();
 	void clearValidator();
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void insert(const char *);
 %End
-%If (Qt_2_00 -)
-	void insert(const QString &);
+%If (TQt_2_00 -)
+	void insert(const TQString &);
 %End
 	void clear();
 
 signals:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void textChanged(const char *);
 %End
-%If (Qt_2_00 -)
-	void textChanged(const QString &);
+%If (TQt_2_00 -)
+	void textChanged(const TQString &);
 %End
 	void returnPressed();
 
 protected:
-%If (Qt_2_2_0 -)
-	bool event(QEvent *);
-%End
-	void mousePressEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void paintEvent(QPaintEvent *);
-	void resizeEvent(QResizeEvent *);
-	void leaveEvent(QEvent *);
+%If (TQt_2_2_0 -)
+	bool event(TQEvent *);
+%End
+	void mousePressEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void paintEvent(TQPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void leaveEvent(TQEvent *);
 	void repaintArea(int,int);
-%If (- Qt_2_00)
-	void timerEvent(QTimerEvent *);
-	bool event(QEvent *);
+%If (- TQt_2_00)
+	void timerEvent(TQTimerEvent *);
+	bool event(TQEvent *);
 	bool hasMarkedText() const;
-	QString markedText() const;
+	TQString markedText() const;
 %End
-%If (Qt_2_00 -)
-%If (Qt_DRAGANDDROP)
-	void dragEnterEvent(QDragEnterEvent *);
-	void dropEvent(QDropEvent *);
+%If (TQt_2_00 -)
+%If (TQt_DRAGANDDROP)
+	void dragEnterEvent(TQDragEnterEvent *);
+	void dropEvent(TQDropEvent *);
 %End
 %End
 
 private:
-	QLineEdit(const QLineEdit &);
+	TQLineEdit(const TQLineEdit &);
 };
 
 %End
diff --git a/sip/qt/qlist.sip b/sip/qt/qlist.sip
index 8b5750c..3b17360 100644
--- a/sip/qt/qlist.sip
+++ b/sip/qt/qlist.sip
@@ -1,40 +1,40 @@
-// This is the SIP interface definition for all types based on the QList
+// This is the SIP interface definition for all types based on the TQList
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QList&lt;type&gt; (Qt v2)</Title>
+<Sect2><Title>TQList&lt;type&gt; (TQt v2)</Title>
 <Para>
-Types based on the <Literal>QList</Literal> template are automatically
+Types based on the <Literal>TQList</Literal> template are automatically
 converted to and from Python lists of the type.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 
 template<Type>
-%MappedType QList<Type>
+%MappedType TQList<Type>
 {
 %TypeHeaderCode
 #include <qlist.h>
@@ -85,7 +85,7 @@ template<Type>
 		return 1;
 	}
 
-	QList<Type> *ql = new QList<Type>;
+	TQList<Type> *ql = new TQList<Type>;
  
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
diff --git a/sip/qt/qlistbox.sip b/sip/qt/qlistbox.sip
index 1f755d8..e19d8ea 100644
--- a/sip/qt/qlistbox.sip
+++ b/sip/qt/qlistbox.sip
@@ -1,28 +1,28 @@
-// This is the SIP interface definition for QListBox, QListBoxItem,
-// QListBoxPixmap and QListBoxText.
+// This is the SIP interface definition for TQListBox, TQListBoxItem,
+// TQListBoxPixmap and TQListBoxText.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QListBox</Title>
+<Sect2><Title>TQListBox</Title>
 <FuncSynopsis>
         <FuncDef>bool <Function>itemYPos</Function></FuncDef>
         <ParamDef>int <Parameter>index</Parameter></ParamDef>
@@ -31,31 +31,31 @@
 <Para>
 This takes the <Literal>index</Literal> parameter and returns a tuple
 containing the <Literal>bool</Literal> result and <Literal>yPos</Literal>.
-(Qt v1.x)
+(TQt v1.x)
 </Para>
 </Sect2>
 
-<Sect2><Title>QListBoxItem</Title>
+<Sect2><Title>TQListBoxItem</Title>
 <Para>
-<Literal>QListBoxItem</Literal> is fully implemented.
+<Literal>TQListBoxItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QListBoxPixmap</Title>
+<Sect2><Title>TQListBoxPixmap</Title>
 <Para>
-<Literal>QListBoxPixmap</Literal> is fully implemented.
+<Literal>TQListBoxPixmap</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QListBoxText</Title>
+<Sect2><Title>TQListBoxText</Title>
 <Para>
-<Literal>QListBoxText</Literal> is fully implemented.
+<Literal>TQListBoxText</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 %ModuleHeaderCode
 #include <qlistbox.h>
@@ -68,31 +68,31 @@ const int LBI_Pixmap;
 const int LBI_UserDefined;
 
 
-class QListBox : QTableView
+class TQListBox : TQTableView
 {
 %TypeHeaderCode
 #include <qlistbox.h>
 %End
 
 public:
-	QListBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQListBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 	uint count() const;
-	void insertStrList(const QStrList *,int = -1);
+	void insertStrList(const TQStrList *,int = -1);
 //	void insertStrList(const char **,int = -1,int = -1);
-	void insertItem(const QListBoxItem * /Transfer/,int = -1);
+	void insertItem(const TQListBoxItem * /Transfer/,int = -1);
 	void insertItem(const char *,int = -1);
-	void insertItem(const QPixmap &,int = -1);
-	void inSort(const QListBoxItem *);
+	void insertItem(const TQPixmap &,int = -1);
+	void inSort(const TQListBoxItem *);
 	void inSort(const char *);
 	void removeItem(int);
 	void clear();
 	const char *text(int) const;
-	const QPixmap *pixmap(int) const;
-	void changeItem(const QListBoxItem * /Transfer/,int);
+	const TQPixmap *pixmap(int) const;
+	void changeItem(const TQListBoxItem * /Transfer/,int);
 	void changeItem(const char *,int);
-	void changeItem(const QPixmap &,int);
+	void changeItem(const TQPixmap &,int);
 	bool autoUpdate() const;
 	void setAutoUpdate(bool);
 	int numItemsVisible() const;
@@ -124,7 +124,7 @@ public:
 	void setMultiSelection(bool);
 	void setSelected(int,bool);
 	bool isSelected(int) const;
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 public slots:
 	void clearSelection();
@@ -137,19 +137,19 @@ signals:
 	void selectionChanged();
 
 protected:
-	QListBoxItem *item(int) const;
+	TQListBoxItem *item(int) const;
 	bool itemVisible(int);
 	int cellHeight(int = 0);
-	void paintCell(QPainter *,int,int);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void resizeEvent(QResizeEvent *);
-	void timerEvent(QTimerEvent *);
+	void paintCell(TQPainter *,int,int);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void timerEvent(TQTimerEvent *);
 	int findItem(int) const;
 	bool itemYPos(int,int *) const;
 	void updateItem(int,bool = 1);
@@ -158,67 +158,67 @@ protected:
 	void toggleCurrentItem();
 
 private:
-	QListBox(const QListBox &);
+	TQListBox(const TQListBox &);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QListBox : QScrollView
+class TQListBox : TQScrollView
 {
 %TypeHeaderCode
 #include <qlistbox.h>
 %End
 
 public:
-	QListBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQListBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
-	virtual void setFont(const QFont &);
+	virtual void setFont(const TQFont &);
 
 	uint count() const;
 
-	void insertStringList(const QStringList &,int = -1);
-	void insertStrList(const QStrList *,int = -1);
-//	void insertStrList(const QStrList &,int = -1);
+	void insertStringList(const TQStringList &,int = -1);
+	void insertStrList(const TQStrList *,int = -1);
+//	void insertStrList(const TQStrList &,int = -1);
 //	void insertStrList(const char **,int = -1,int = -1);
 
-	void insertItem(const QListBoxItem * /Transfer/,int = -1);
-%If (Qt_2_1_0 -)
-	void insertItem(const QListBoxItem * /Transfer/,const QListBoxItem *);
+	void insertItem(const TQListBoxItem * /Transfer/,int = -1);
+%If (TQt_2_1_0 -)
+	void insertItem(const TQListBoxItem * /Transfer/,const TQListBoxItem *);
 %End
-	void insertItem(const QString &,int = -1);
-	void insertItem(const QPixmap &,int = -1);
-%If (Qt_2_1_0 -)
-	void insertItem(const QPixmap &,const QString &,int = -1);
+	void insertItem(const TQString &,int = -1);
+	void insertItem(const TQPixmap &,int = -1);
+%If (TQt_2_1_0 -)
+	void insertItem(const TQPixmap &,const TQString &,int = -1);
 %End
 
 	void removeItem(int);
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void clear();
 %End
 
-	QString text(int) const;
-	const QPixmap *pixmap(int) const;
+	TQString text(int) const;
+	const TQPixmap *pixmap(int) const;
 
-	void changeItem(const QListBoxItem * /Transfer/,int);
-	void changeItem(const QString &,int);
-	void changeItem(const QPixmap &,int);
-%If (Qt_2_1_0 -)
-	void changeItem(const QPixmap &,const QString &,int);
+	void changeItem(const TQListBoxItem * /Transfer/,int);
+	void changeItem(const TQString &,int);
+	void changeItem(const TQPixmap &,int);
+%If (TQt_2_1_0 -)
+	void changeItem(const TQPixmap &,const TQString &,int);
 %End
 
-	void takeItem(const QListBoxItem * /TransferBack/);
+	void takeItem(const TQListBoxItem * /TransferBack/);
 
 	int numItemsVisible() const;
 
 	int currentItem() const;
-%If (Qt_2_1_0 -)
-	QString currentText() const;
+%If (TQt_2_1_0 -)
+	TQString currentText() const;
 %End
 	virtual void setCurrentItem(int);
-	virtual void setCurrentItem(QListBoxItem *);
+	virtual void setCurrentItem(TQListBoxItem *);
 	void centerCurrentItem();
 	int topItem() const;
 	virtual void setTopItem(int);
@@ -226,14 +226,14 @@ public:
 
 	long maxItemWidth() const;
 
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 	enum SelectionMode {
 		Single,
 		Multi,
 		Extended
 	};
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum SelectionMode {
 		Single,
 		Multi,
@@ -248,31 +248,31 @@ public:
 	void setMultiSelection(bool);
 	bool isMultiSelection() const;
 
-	virtual void setSelected(QListBoxItem *,bool);
+	virtual void setSelected(TQListBoxItem *,bool);
 	void setSelected(int,bool);
 	bool isSelected(int) const;
-	bool isSelected(QListBoxItem *) const;
-%If (Qt_3_1_0 -)
-	QListBoxItem *selectedItem() const;
+	bool isSelected(TQListBoxItem *) const;
+%If (TQt_3_1_0 -)
+	TQListBoxItem *selectedItem() const;
 %End
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
-	QListBoxItem *item(int) const;
-	int index(const QListBoxItem *) const;
-%If (Qt_2_1_0 - Qt_3_0_0)
-	QListBoxItem *findItem(const QString &) const;
+	TQListBoxItem *item(int) const;
+	int index(const TQListBoxItem *) const;
+%If (TQt_2_1_0 - TQt_3_0_0)
+	TQListBoxItem *findItem(const TQString &) const;
 %End
-%If (Qt_3_0_0 -)
-	QListBoxItem *findItem(const QString &,
+%If (TQt_3_0_0 -)
+	TQListBoxItem *findItem(const TQString &,
 			       ComparisonFlags = BeginsWith) const;
 %End
 
 	void triggerUpdate(bool);
 
 	bool itemVisible(int);
-	bool itemVisible(const QListBoxItem *);
+	bool itemVisible(const TQListBoxItem *);
 
 	enum LayoutMode {
 		FixedNumber,
@@ -298,30 +298,30 @@ public:
 	bool variableHeight() const;
 	virtual void setVariableHeight(bool);
 
-	void viewportPaintEvent(QPaintEvent *);
+	void viewportPaintEvent(TQPaintEvent *);
 
 	int itemHeight(int = 0) const;
-	QListBoxItem *itemAt(QPoint) const;
+	TQListBoxItem *itemAt(TQPoint) const;
 
-	QRect itemRect(QListBoxItem *) const;
+	TQRect itemRect(TQListBoxItem *) const;
 
-%If (Qt_2_1_0 -)
-	QListBoxItem *firstItem() const;
+%If (TQt_2_1_0 -)
+	TQListBoxItem *firstItem() const;
 
 	void sort(bool = 1);
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void clear();
 %End
 	virtual void ensureCurrentVisible();
 	virtual void clearSelection();
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void selectAll(bool);
 	void invertSelection();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void selectAll(bool);
 	virtual void invertSelection();
 %End
@@ -329,243 +329,243 @@ public slots:
 signals:
 	void highlighted(int);
 	void selected(int);
-	void highlighted(const QString &);
-	void selected(const QString &);
-	void highlighted(QListBoxItem *);
-	void selected(QListBoxItem *);
+	void highlighted(const TQString &);
+	void selected(const TQString &);
+	void highlighted(TQListBoxItem *);
+	void selected(TQListBoxItem *);
 
 	void selectionChanged();
-%If (Qt_2_1_0 -)
-	void selectionChanged(QListBoxItem *);
-	void currentChanged(QListBoxItem *);
-	void clicked(QListBoxItem *);
-	void clicked(QListBoxItem *,const QPoint &);
-	void pressed(QListBoxItem *);
-	void pressed(QListBoxItem *,const QPoint &);
+%If (TQt_2_1_0 -)
+	void selectionChanged(TQListBoxItem *);
+	void currentChanged(TQListBoxItem *);
+	void clicked(TQListBoxItem *);
+	void clicked(TQListBoxItem *,const TQPoint &);
+	void pressed(TQListBoxItem *);
+	void pressed(TQListBoxItem *,const TQPoint &);
 
-	void doubleClicked(QListBoxItem *);
-	void returnPressed(QListBoxItem *);
-	void rightButtonClicked(QListBoxItem *,const QPoint &);
-	void rightButtonPressed(QListBoxItem *,const QPoint &);
-	void mouseButtonPressed(int,QListBoxItem *,const QPoint &);
-	void mouseButtonClicked(int,QListBoxItem *,const QPoint &);
+	void doubleClicked(TQListBoxItem *);
+	void returnPressed(TQListBoxItem *);
+	void rightButtonClicked(TQListBoxItem *,const TQPoint &);
+	void rightButtonPressed(TQListBoxItem *,const TQPoint &);
+	void mouseButtonPressed(int,TQListBoxItem *,const TQPoint &);
+	void mouseButtonClicked(int,TQListBoxItem *,const TQPoint &);
 %End
 
-%If (Qt_3_0_0 -)
-	void contextMenuRequested(QListBoxItem *,const QPoint &);
+%If (TQt_3_0_0 -)
+	void contextMenuRequested(TQListBoxItem *,const TQPoint &);
 %End
 
-%If (Qt_2_1_0 -)
-	void onItem(QListBoxItem *);
+%If (TQt_2_1_0 -)
+	void onItem(TQListBoxItem *);
 	void onViewport();
 %End
 
 protected:
-%If (- Qt_3_0_0)
-	void viewportMousePressEvent(QMouseEvent *);
-	void viewportMouseReleaseEvent(QMouseEvent *);
-	void viewportMouseDoubleClickEvent(QMouseEvent *);
-	void viewportMouseMoveEvent(QMouseEvent *);
+%If (- TQt_3_0_0)
+	void viewportMousePressEvent(TQMouseEvent *);
+	void viewportMouseReleaseEvent(TQMouseEvent *);
+	void viewportMouseDoubleClickEvent(TQMouseEvent *);
+	void viewportMouseMoveEvent(TQMouseEvent *);
 %End
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-%If (Qt_3_0_0 -)
-	void contentsContextMenuEvent(QContextMenuEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+%If (TQt_3_0_0 -)
+	void contentsContextMenuEvent(TQContextMenuEvent *);
 %End
 
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void resizeEvent(QResizeEvent *);
-	void showEvent(QShowEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void showEvent(TQShowEvent *);
 
-%If (Qt_3_0_0 -)
-	bool eventFilter(QObject *,QEvent *);
+%If (TQt_3_0_0 -)
+	bool eventFilter(TQObject *,TQEvent *);
 %End
 
 	void updateItem(int);
-	void updateItem(QListBoxItem *);
+	void updateItem(TQListBoxItem *);
 
-	virtual void paintCell(QPainter *,int,int);
+	virtual void paintCell(TQPainter *,int,int);
 
 	void toggleCurrentItem();
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool isRubberSelecting() const;
 %End
 
 	void doLayout() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void windowActivationChange(bool);
 %End
 
 protected slots:
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void clearInputString();
 %End
 
 private:
-	QListBox(const QListBox &);
+	TQListBox(const TQListBox &);
 };
 
 %End
 
 
-class QListBoxItem
+class TQListBoxItem
 {
 %TypeHeaderCode
 #include <qlistbox.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QListBoxItem();
+%If (- TQt_2_00)
+	TQListBoxItem();
 %End
-%If (Qt_2_00 -)
-	QListBoxItem(QListBox * /TransferThis/ = 0);
+%If (TQt_2_00 -)
+	TQListBoxItem(TQListBox * /TransferThis/ = 0);
 %End
-%If (Qt_2_1_0 -)
-	QListBoxItem(QListBox * /TransferThis/,QListBoxItem *);
+%If (TQt_2_1_0 -)
+	TQListBoxItem(TQListBox * /TransferThis/,TQListBoxItem *);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual const char *text() const;
 %End
-%If (Qt_2_00 -)
-	virtual QString text() const;
+%If (TQt_2_00 -)
+	virtual TQString text() const;
 %End
-	virtual const QPixmap *pixmap() const;
+	virtual const TQPixmap *pixmap() const;
 
-%If (- Qt_2_00)
-	virtual int height(const QListBox *) const = 0;
-	virtual int width(const QListBox *) const = 0;
+%If (- TQt_2_00)
+	virtual int height(const TQListBox *) const = 0;
+	virtual int width(const TQListBox *) const = 0;
 %End
-%If (Qt_2_00 -)
-	virtual int height(const QListBox *) const;
-	virtual int width(const QListBox *) const;
+%If (TQt_2_00 -)
+	virtual int height(const TQListBox *) const;
+	virtual int width(const TQListBox *) const;
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
         bool selected() const;
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	bool current() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
         bool isSelected() const;
 	bool isCurrent() const;
 %End
 
-%If (Qt_2_00 -)
-	QListBox *listBox() const;
+%If (TQt_2_00 -)
+	TQListBox *listBox() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setSelectable(bool);
 	bool isSelectable() const;
 
-	QListBoxItem *next() const;
-	QListBoxItem *prev() const;
+	TQListBoxItem *next() const;
+	TQListBoxItem *prev() const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual int rtti() const;
 %End
 
 protected:
-	virtual void paint(QPainter *) = 0;
-%If (- Qt_2_00)
+	virtual void paint(TQPainter *) = 0;
+%If (- TQt_2_00)
 	void setText(const char *);
 %End
-%If (Qt_2_00 -)
-	virtual void setText(const QString &);
+%If (TQt_2_00 -)
+	virtual void setText(const TQString &);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setCustomHighlighting(bool);
 %End
 
 private:
-	QListBoxItem(const QListBoxItem &);
+	TQListBoxItem(const TQListBoxItem &);
 };
 
-class QListBoxText : QListBoxItem
+class TQListBoxText : TQListBoxItem
 {
 %TypeHeaderCode
 #include <qlistbox.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QListBoxText(const char * = 0);
+%If (- TQt_2_00)
+	TQListBoxText(const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QListBoxText(QListBox * /TransferThis/,
-		     const QString & = QString::null);
-	QListBoxText(const QString & = QString::null);
+%If (TQt_2_00 -)
+	TQListBoxText(TQListBox * /TransferThis/,
+		     const TQString & = TQString::null);
+	TQListBoxText(const TQString & = TQString::null);
 %End
-%If (Qt_2_1_0 -)
-	QListBoxText(QListBox * /TransferThis/,const QString &,QListBoxItem *);
+%If (TQt_2_1_0 -)
+	TQListBoxText(TQListBox * /TransferThis/,const TQString &,TQListBoxItem *);
 %End
 
-%If (- Qt_2_00)
-	void paint(QPainter *);
+%If (- TQt_2_00)
+	void paint(TQPainter *);
 %End
-	int height(const QListBox *) const;
-	int width(const QListBox *) const;
+	int height(const TQListBox *) const;
+	int width(const TQListBox *) const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int rtti() const;
 %End
 
 protected:
-%If (Qt_2_00 -)
-	void paint(QPainter *);
+%If (TQt_2_00 -)
+	void paint(TQPainter *);
 %End
 
 private:
-	QListBoxText(const QListBoxText &);
+	TQListBoxText(const TQListBoxText &);
 };
 
-class QListBoxPixmap : QListBoxItem
+class TQListBoxPixmap : TQListBoxItem
 {
 %TypeHeaderCode
 #include <qlistbox.h>
 %End
 
 public:
-%If (Qt_2_00 -)
-	QListBoxPixmap(QListBox * /TransferThis/,const QPixmap &);
+%If (TQt_2_00 -)
+	TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &);
 %End
-	QListBoxPixmap(const QPixmap &);
-%If (Qt_2_1_0 -)
-	QListBoxPixmap(QListBox * /TransferThis/,const QPixmap &,
-		       QListBoxItem *);
-	QListBoxPixmap(QListBox * /TransferThis/,const QPixmap &,
-		       const QString &);
-	QListBoxPixmap(const QPixmap &,const QString &);
-	QListBoxPixmap(QListBox * /TransferThis/,const QPixmap &,
-		       const QString &,QListBoxItem *);
+	TQListBoxPixmap(const TQPixmap &);
+%If (TQt_2_1_0 -)
+	TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &,
+		       TQListBoxItem *);
+	TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &,
+		       const TQString &);
+	TQListBoxPixmap(const TQPixmap &,const TQString &);
+	TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &,
+		       const TQString &,TQListBoxItem *);
 %End
 
-	const QPixmap *pixmap() const;
-%If (Qt_2_00 -)
-	int height(const QListBox *) const;
-	int width(const QListBox *) const;
+	const TQPixmap *pixmap() const;
+%If (TQt_2_00 -)
+	int height(const TQListBox *) const;
+	int width(const TQListBox *) const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int rtti() const;
 %End
 
 protected:
-	void paint(QPainter *);
-%If (- Qt_2_00)
-	int height(const QListBox *) const;
-	int width(const QListBox *) const;
+	void paint(TQPainter *);
+%If (- TQt_2_00)
+	int height(const TQListBox *) const;
+	int width(const TQListBox *) const;
 %End
 
 private:
-	QListBoxPixmap(const QListBoxPixmap &);
+	TQListBoxPixmap(const TQListBoxPixmap &);
 };
diff --git a/sip/qt/qlistview.sip b/sip/qt/qlistview.sip
index 2028d1e..d4e1698 100644
--- a/sip/qt/qlistview.sip
+++ b/sip/qt/qlistview.sip
@@ -1,111 +1,111 @@
-// This is the SIP interface definition for QListView, QListViewItem,
-// QCheckListItem and QListViewItemIterator.
+// This is the SIP interface definition for TQListView, TQListViewItem,
+// TQCheckListItem and TQListViewItemIterator.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QListView</Title>
+<Sect2><Title>TQListView</Title>
 <Para>
-<Literal>QListView</Literal> is fully implemented.
+<Literal>TQListView</Literal> is fully implemented.
 </Para>
 <Para>
-Note that to remove a child <Literal>QListViewItem</Literal> you must first
+Note that to remove a child <Literal>TQListViewItem</Literal> you must first
 call <Literal>takeItem()</Literal> and then <Literal>del()</Literal>.
 </Para>
 </Sect2>
 
-<Sect2><Title>QListViewItem</Title>
+<Sect2><Title>TQListViewItem</Title>
 <Para>
-<Literal>QListViewItem</Literal> is fully implemented.
+<Literal>TQListViewItem</Literal> is fully implemented.
 </Para>
 <Para>
-Note that to remove a child <Literal>QListViewItem</Literal> you must first
+Note that to remove a child <Literal>TQListViewItem</Literal> you must first
 call <Literal>takeItem()</Literal> and then <Literal>del()</Literal>.
 </Para>
 </Sect2>
 
-<Sect2><Title>QCheckListItem</Title>
+<Sect2><Title>TQCheckListItem</Title>
 <Para>
-<Literal>QCheckListItem</Literal> is fully implemented.
+<Literal>TQCheckListItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QListViewItemIterator (Qt v2+)</Title>
+<Sect2><Title>TQListViewItemIterator (TQt v2+)</Title>
 <Para>
-<Literal>QListViewItemIterator</Literal> is fully implemented.
+<Literal>TQListViewItemIterator</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QListViewItem
+class TQListViewItem
 {
 %TypeHeaderCode
 #include <qlistview.h>
 %End
 
 public:
-	QListViewItem(QListView * /TransferThis/);
-	QListViewItem(QListViewItem * /TransferThis/);
-	QListViewItem(QListView * /TransferThis/,QListViewItem *);
-	QListViewItem(QListViewItem * /TransferThis/,QListViewItem *);
+	TQListViewItem(TQListView * /TransferThis/);
+	TQListViewItem(TQListViewItem * /TransferThis/);
+	TQListViewItem(TQListView * /TransferThis/,TQListViewItem *);
+	TQListViewItem(TQListViewItem * /TransferThis/,TQListViewItem *);
 
-	QListViewItem(QListView * /TransferThis/,
+	TQListViewItem(TQListView * /TransferThis/,
 		const char *,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0);
 
-	QListViewItem(QListViewItem * /TransferThis/,
+	TQListViewItem(TQListViewItem * /TransferThis/,
 		const char *,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0);
 
-	QListViewItem(QListView * /TransferThis/,QListViewItem *,
+	TQListViewItem(TQListView * /TransferThis/,TQListViewItem *,
 		const char *,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0);
 
-	QListViewItem(QListViewItem * /TransferThis/,QListViewItem *,
+	TQListViewItem(TQListViewItem * /TransferThis/,TQListViewItem *,
 		const char *,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0,
 		const char * = 0,const char * = 0);
 
-	virtual void insertItem(QListViewItem * /Transfer/);
-	virtual void removeItem(QListViewItem * /TransferBack/);
+	virtual void insertItem(TQListViewItem * /Transfer/);
+	virtual void removeItem(TQListViewItem * /TransferBack/);
 	int height() const;
 	virtual void invalidateHeight();
 	int totalHeight() const;
-	virtual int width(const QFontMetrics &,const QListView *,int) const;
+	virtual int width(const TQFontMetrics &,const TQListView *,int) const;
 	void widthChanged(int = -1) const;
 	int depth() const;
 	virtual void setText(int,const char *);
 	virtual const char *text(int) const;
-	virtual void setPixmap(int,const QPixmap &);
-	virtual const QPixmap *pixmap(int) const;
+	virtual void setPixmap(int,const TQPixmap &);
+	virtual const TQPixmap *pixmap(int) const;
 	virtual const char *key(int,bool) const;
 	virtual void sortChildItems(int,bool);
 	int childCount() const;
@@ -114,17 +114,17 @@ public:
 	virtual void setup();
 	virtual void setSelected(bool);
 	bool isSelected() const;
-	virtual void paintCell(QPainter *,const QColorGroup &,int,int,int);
-	virtual void paintBranches(QPainter *,const QColorGroup &,int,int,int,
+	virtual void paintCell(TQPainter *,const TQColorGroup &,int,int,int);
+	virtual void paintBranches(TQPainter *,const TQColorGroup &,int,int,int,
 				   GUIStyle);
-	virtual void paintFocus(QPainter *,const QColorGroup &,const QRect &);
-	QListViewItem *firstChild() const;
-	QListViewItem *nextSibling() const;
-	QListViewItem *parent() const;
-	QListViewItem *itemAbove();
-	QListViewItem *itemBelow();
+	virtual void paintFocus(TQPainter *,const TQColorGroup &,const TQRect &);
+	TQListViewItem *firstChild() const;
+	TQListViewItem *nextSibling() const;
+	TQListViewItem *parent() const;
+	TQListViewItem *itemAbove();
+	TQListViewItem *itemBelow();
 	int itemPos() const;
-	QListView *listView() const;
+	TQListView *listView() const;
 	virtual void setSelectable(bool);
 	bool isSelectable() const;
 	virtual void setExpandable(bool);
@@ -139,63 +139,63 @@ protected:
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QListViewItem : Qt
+class TQListViewItem : TQt
 {
 %TypeHeaderCode
 #include <qlistview.h>
 %End
 
 public:
-	QListViewItem(QListView * /TransferThis/);
-	QListViewItem(QListViewItem * /TransferThis/);
-	QListViewItem(QListView * /TransferThis/,QListViewItem *);
-	QListViewItem(QListViewItem * /TransferThis/,QListViewItem *);
-
-	QListViewItem(QListView * /TransferThis/,
-		QString,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null);
-
-	QListViewItem(QListViewItem * /TransferThis/,
-		QString,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null);
-
-	QListViewItem(QListView * /TransferThis/,QListViewItem *,
-		QString,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null);
-
-	QListViewItem(QListViewItem * /TransferThis/,QListViewItem *,
-		QString,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null,
-		QString = QString::null,QString = QString::null);
-
-	virtual void insertItem(QListViewItem * /Transfer/);
-	virtual void takeItem(QListViewItem * /TransferBack/);
+	TQListViewItem(TQListView * /TransferThis/);
+	TQListViewItem(TQListViewItem * /TransferThis/);
+	TQListViewItem(TQListView * /TransferThis/,TQListViewItem *);
+	TQListViewItem(TQListViewItem * /TransferThis/,TQListViewItem *);
+
+	TQListViewItem(TQListView * /TransferThis/,
+		TQString,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null);
+
+	TQListViewItem(TQListViewItem * /TransferThis/,
+		TQString,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null);
+
+	TQListViewItem(TQListView * /TransferThis/,TQListViewItem *,
+		TQString,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null);
+
+	TQListViewItem(TQListViewItem * /TransferThis/,TQListViewItem *,
+		TQString,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null,
+		TQString = TQString::null,TQString = TQString::null);
+
+	virtual void insertItem(TQListViewItem * /Transfer/);
+	virtual void takeItem(TQListViewItem * /TransferBack/);
 
 	int height() const;
 	virtual void invalidateHeight();
 	int totalHeight() const;
-	virtual int width(const QFontMetrics &,const QListView *,int) const;
+	virtual int width(const TQFontMetrics &,const TQListView *,int) const;
 	void widthChanged(int = -1) const;
 	int depth() const;
 
-	virtual void setText(int,const QString &);
-	virtual QString text(int) const;
+	virtual void setText(int,const TQString &);
+	virtual TQString text(int) const;
 
-	virtual void setPixmap(int,const QPixmap &);
-	virtual const QPixmap *pixmap(int) const;
+	virtual void setPixmap(int,const TQPixmap &);
+	virtual const TQPixmap *pixmap(int) const;
 
-	virtual QString key(int,bool) const;
-%If (Qt_3_0_0 -)
-	virtual int compare(QListViewItem *,int,bool) const;
+	virtual TQString key(int,bool) const;
+%If (TQt_3_0_0 -)
+	virtual int compare(TQListViewItem *,int,bool) const;
 %End
 	virtual void sortChildItems(int,bool);
 
@@ -208,26 +208,26 @@ public:
 	virtual void setSelected(bool);
 	bool isSelected() const;
 
-	virtual void paintCell(QPainter *,const QColorGroup &,int,int,int);
-%If (- Qt_3_0_0)
-	virtual void paintBranches(QPainter *,const QColorGroup &,int,int,int,
+	virtual void paintCell(TQPainter *,const TQColorGroup &,int,int,int);
+%If (- TQt_3_0_0)
+	virtual void paintBranches(TQPainter *,const TQColorGroup &,int,int,int,
 				   GUIStyle);
 %End
-%If (Qt_3_0_0 -)
-	virtual void paintBranches(QPainter *,const QColorGroup &,int,int,int);
+%If (TQt_3_0_0 -)
+	virtual void paintBranches(TQPainter *,const TQColorGroup &,int,int,int);
 %End
-	virtual void paintFocus(QPainter *,const QColorGroup &,const QRect &);
+	virtual void paintFocus(TQPainter *,const TQColorGroup &,const TQRect &);
 
-	QListViewItem *firstChild() const;
-	QListViewItem *nextSibling() const;
-	QListViewItem *parent() const;
+	TQListViewItem *firstChild() const;
+	TQListViewItem *nextSibling() const;
+	TQListViewItem *parent() const;
 
-	QListViewItem *itemAbove();
-	QListViewItem *itemBelow();
+	TQListViewItem *itemAbove();
+	TQListViewItem *itemBelow();
 
 	int itemPos() const;
 
-	QListView *listView() const;
+	TQListView *listView() const;
 
 	virtual void setSelectable(bool);
 	bool isSelectable() const;
@@ -237,22 +237,22 @@ public:
 
 	void repaint() const;
 
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void sort();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void sort();
 %End
-%If (Qt_2_2_0 -)
-	void moveItem(QListViewItem *);
+%If (TQt_2_2_0 -)
+	void moveItem(TQListViewItem *);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setDragEnabled(bool);
 	virtual void setDropEnabled(bool);
 	bool dragEnabled() const;
 	bool dropEnabled() const;
-	virtual bool acceptDrop(const QMimeSource *) const;
+	virtual bool acceptDrop(const TQMimeSource *) const;
  
 	void setVisible(bool);
 	bool isVisible() const;
@@ -275,11 +275,11 @@ protected:
 	virtual void setHeight(int);
 	virtual void activate();
 
-%If (Qt_2_1_0 -)
-	bool activatedPos(QPoint &);
+%If (TQt_2_1_0 -)
+	bool activatedPos(TQPoint &);
 %End
-%If (Qt_3_0_0 -)
-	virtual void dropped(QDropEvent *);
+%If (TQt_3_0_0 -)
+	virtual void dropped(TQDropEvent *);
 	virtual void dragEntered();
 	virtual void dragLeft();
 	virtual void okRename(int);
@@ -292,50 +292,50 @@ protected:
 %End
 
 
-class QListView : QScrollView
+class TQListView : TQScrollView
 {
 %TypeHeaderCode
 #include <qlistview.h>
 %End
 
 public:
-%If (Qt_2_2_0 - Qt_3_0_0)
-	QListView(QWidget * /TransferThis/,const char *,WFlags);
+%If (TQt_2_2_0 - TQt_3_0_0)
+	TQListView(TQWidget * /TransferThis/,const char *,WFlags);
 %End
-%If (- Qt_3_0_0)
-	QListView(QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_3_0_0)
+	TQListView(TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_3_0_0 -)
-	QListView(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQListView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
 
 	int treeStepSize() const;
 	virtual void setTreeStepSize(int);
 
-	virtual void insertItem(QListViewItem * /Transfer/);
-%If (Qt_2_00 -)
-	virtual void takeItem(QListViewItem * /TransferBack/);
+	virtual void insertItem(TQListViewItem * /Transfer/);
+%If (TQt_2_00 -)
+	virtual void takeItem(TQListViewItem * /TransferBack/);
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void clear();
 %End
-	QHeader *header() const;
+	TQHeader *header() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual int addColumn(const char *,int = -1);
 	virtual void setColumnText(int,const char *);
 	const char *columnText(int) const;
 %End
-%If (Qt_2_00 -)
-	virtual int addColumn(const QString &,int = -1);
-	virtual int addColumn(const QIconSet &,const QString &,int = -1);
-%If (Qt_2_1_0 -)
+%If (TQt_2_00 -)
+	virtual int addColumn(const TQString &,int = -1);
+	virtual int addColumn(const TQIconSet &,const TQString &,int = -1);
+%If (TQt_2_1_0 -)
 	void removeColumn(int);
 %End
-	virtual void setColumnText(int,const QString &);
-	virtual void setColumnText(int,const QIconSet &,const QString &);
-	QString columnText(int) const;
+	virtual void setColumnText(int,const TQString &);
+	virtual void setColumnText(int,const TQIconSet &,const TQString &);
+	TQString columnText(int) const;
 %End
 	virtual void setColumnWidth(int,int);
 	int columnWidth(int) const;
@@ -348,7 +348,7 @@ public:
 
 	virtual void setColumnWidthMode(int,WidthMode);
 	WidthMode columnWidthMode(int) const;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int columns() const;
 %End
 
@@ -357,18 +357,18 @@ public:
 
 	void show();
 
-	QListViewItem *itemAt(const QPoint &) const;
-	QRect itemRect(const QListViewItem *) const;
-	int itemPos(const QListViewItem *);
+	TQListViewItem *itemAt(const TQPoint &) const;
+	TQRect itemRect(const TQListViewItem *) const;
+	int itemPos(const TQListViewItem *);
 
-	void ensureItemVisible(const QListViewItem *);
+	void ensureItemVisible(const TQListViewItem *);
 
-	void repaintItem(const QListViewItem *) const;
+	void repaintItem(const TQListViewItem *) const;
 
 	virtual void setMultiSelection(bool);
 	bool isMultiSelection() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum SelectionMode {
 		Single,
 		Multi,
@@ -380,26 +380,26 @@ public:
 	SelectionMode selectionMode() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	virtual void clearSelection();
 %End
-	virtual void setSelected(QListViewItem *,bool);
-%If (Qt_3_2_0 -)
-	void setSelectionAnchor(QListViewItem *);
+	virtual void setSelected(TQListViewItem *,bool);
+%If (TQt_3_2_0 -)
+	void setSelectionAnchor(TQListViewItem *);
 %End
-	bool isSelected(QListViewItem *) const;
-%If (Qt_2_1_0 -)
-	QListViewItem *selectedItem() const;
+	bool isSelected(TQListViewItem *) const;
+%If (TQt_2_1_0 -)
+	TQListViewItem *selectedItem() const;
 %End
-	virtual void setOpen(QListViewItem *,bool);
-	bool isOpen(QListViewItem *) const;
+	virtual void setOpen(TQListViewItem *,bool);
+	bool isOpen(TQListViewItem *) const;
 
-	virtual void setCurrentItem(QListViewItem *);
-	QListViewItem *currentItem() const;
+	virtual void setCurrentItem(TQListViewItem *);
+	TQListViewItem *currentItem() const;
 
-	QListViewItem *firstChild() const;
-%If (Qt_3_0_0 -)
-	QListViewItem *lastItem() const;
+	TQListViewItem *firstChild() const;
+%If (TQt_3_0_0 -)
+	TQListViewItem *lastItem() const;
 %End
 
 	int childCount() const;
@@ -414,43 +414,43 @@ public:
 	bool rootIsDecorated() const;
 
 	virtual void setSorting(int,bool = 1);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int sortColumn() const;
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setSortColumn(int);
 	SortOrder sortOrder() const;
 	void setSortOrder(SortOrder);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void sort();
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void sort();
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setStyle(GUIStyle);
-	void setFont(const QFont &);
-	void setPalette(const QPalette &);
+	void setFont(const TQFont &);
+	void setPalette(const TQPalette &);
 %End
-%If (Qt_2_00 -)
-	virtual void setFont(const QFont &);
-	virtual void setPalette(const QPalette &);
+%If (TQt_2_00 -)
+	virtual void setFont(const TQFont &);
+	virtual void setPalette(const TQPalette &);
 %End
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-	QSize sizeHint() const;
-%If (Qt_2_00 -)
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 -)
+	TQSize minimumSizeHint() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setShowSortIndicator(bool);
 	bool showSortIndicator() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setShowToolTips(bool);
 	bool showToolTips() const;
  
@@ -463,7 +463,7 @@ public:
 	virtual void setResizeMode(ResizeMode);
 	ResizeMode resizeMode() const;
  
-	QListViewItem *findItem(const QString &,int,
+	TQListViewItem *findItem(const TQString &,int,
 				ComparisonFlags = ExactMatch | CaseSensitive) const;
  
 	enum RenameAction {
@@ -476,131 +476,131 @@ public:
 	bool isRenaming() const;
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void hideColumn(int);
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void clear();
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void invertSelection();
 	void selectAll(bool);
 	void setContentsPos(int,int);
 %End
 	void triggerUpdate();
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void adjustColumn(int);
 %End
 
 signals:
 	void selectionChanged();
-	void selectionChanged(QListViewItem *);
-	void currentChanged(QListViewItem *);
-%If (Qt_2_1_0 -)
-	void clicked(QListViewItem *);
-	void clicked(QListViewItem *,const QPoint &,int);
-	void pressed(QListViewItem *);
-	void pressed(QListViewItem *,const QPoint &,int);
+	void selectionChanged(TQListViewItem *);
+	void currentChanged(TQListViewItem *);
+%If (TQt_2_1_0 -)
+	void clicked(TQListViewItem *);
+	void clicked(TQListViewItem *,const TQPoint &,int);
+	void pressed(TQListViewItem *);
+	void pressed(TQListViewItem *,const TQPoint &,int);
 %End
 
-	void doubleClicked(QListViewItem *);
-%If (Qt_3_2_0 -)
-	void doubleClicked(QListViewItem *,const QPoint &,int);
+	void doubleClicked(TQListViewItem *);
+%If (TQt_3_2_0 -)
+	void doubleClicked(TQListViewItem *,const TQPoint &,int);
 %End
-	void returnPressed(QListViewItem *);
-%If (Qt_3_0_0 -)
-	void spacePressed(QListViewItem *);
+	void returnPressed(TQListViewItem *);
+%If (TQt_3_0_0 -)
+	void spacePressed(TQListViewItem *);
 %End
-	void rightButtonClicked(QListViewItem *,const QPoint &,int);
-	void rightButtonPressed(QListViewItem *,const QPoint &,int);
-%If (Qt_2_1_0 -)
-	void mouseButtonPressed(int,QListViewItem *,const QPoint &,int);
-	void mouseButtonClicked(int,QListViewItem *,const QPoint &,int);
+	void rightButtonClicked(TQListViewItem *,const TQPoint &,int);
+	void rightButtonPressed(TQListViewItem *,const TQPoint &,int);
+%If (TQt_2_1_0 -)
+	void mouseButtonPressed(int,TQListViewItem *,const TQPoint &,int);
+	void mouseButtonClicked(int,TQListViewItem *,const TQPoint &,int);
 %End
 
-%If (Qt_3_0_0 -)
-	void contextMenuRequested(QListViewItem *,const QPoint &,int);
+%If (TQt_3_0_0 -)
+	void contextMenuRequested(TQListViewItem *,const TQPoint &,int);
 %End
 
-%If (Qt_2_1_0 -)
-	void onItem(QListViewItem *);
+%If (TQt_2_1_0 -)
+	void onItem(TQListViewItem *);
 	void onViewport();
 
-	void expanded(QListViewItem *);
-	void collapsed(QListViewItem *);
+	void expanded(TQListViewItem *);
+	void collapsed(TQListViewItem *);
 %End
-%If (Qt_3_0_0 -)
-	void dropped(QDropEvent *);
-	void itemRenamed(QListViewItem *,int,const QString &);
-	void itemRenamed(QListViewItem *,int);
+%If (TQt_3_0_0 -)
+	void dropped(TQDropEvent *);
+	void itemRenamed(TQListViewItem *,int,const TQString &);
+	void itemRenamed(TQListViewItem *,int);
 %End
 
 protected:
-%If (- Qt_2_00)
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-%End
-%If (Qt_2_00 -)
-	void contentsMousePressEvent(QMouseEvent *);
-	void contentsMouseReleaseEvent(QMouseEvent *);
-	void contentsMouseMoveEvent(QMouseEvent *);
-	void contentsMouseDoubleClickEvent(QMouseEvent *);
-%End
-%If (Qt_3_0_0 -)
-	void contentsContextMenuEvent(QContextMenuEvent *);
-	void contentsDragEnterEvent(QDragEnterEvent *);
-	void contentsDragMoveEvent(QDragMoveEvent *);
-	void contentsDragLeaveEvent(QDragLeaveEvent *);
-	void contentsDropEvent(QDropEvent *);
-	virtual QDragObject *dragObject();
+%If (- TQt_2_00)
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+%End
+%If (TQt_2_00 -)
+	void contentsMousePressEvent(TQMouseEvent *);
+	void contentsMouseReleaseEvent(TQMouseEvent *);
+	void contentsMouseMoveEvent(TQMouseEvent *);
+	void contentsMouseDoubleClickEvent(TQMouseEvent *);
+%End
+%If (TQt_3_0_0 -)
+	void contentsContextMenuEvent(TQContextMenuEvent *);
+	void contentsDragEnterEvent(TQDragEnterEvent *);
+	void contentsDragMoveEvent(TQDragMoveEvent *);
+	void contentsDragLeaveEvent(TQDragLeaveEvent *);
+	void contentsDropEvent(TQDropEvent *);
+	virtual TQDragObject *dragObject();
 	virtual void startDrag();
 %End
 
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 
-	void keyPressEvent(QKeyEvent *);
+	void keyPressEvent(TQKeyEvent *);
 
-	void resizeEvent(QResizeEvent *);
-%If (Qt_3_0_0 -)
-	void viewportResizeEvent(QResizeEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (TQt_3_0_0 -)
+	void viewportResizeEvent(TQResizeEvent *);
 %End
 
-%If (Qt_2_00 -)
-	void showEvent(QShowEvent *);
+%If (TQt_2_00 -)
+	void showEvent(TQShowEvent *);
 %End
 
-	void drawContentsOffset(QPainter *,int,int,int,int,int,int);
+	void drawContentsOffset(TQPainter *,int,int,int,int,int,int);
 
-	virtual void paintEmptyArea(QPainter *,const QRect &);
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+	virtual void paintEmptyArea(TQPainter *,const TQRect &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void enabledChange(bool);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void windowActivationChange(bool);
 %End
 
 protected slots:
 	void updateContents();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void doAutoScroll();
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QListView(const QWidget &);
+%If (TQt_2_1_0 -)
+	TQListView(const TQWidget &);
 %End
 };
 
 
-class QCheckListItem : QListViewItem
+class TQCheckListItem : TQListViewItem
 {
 %TypeHeaderCode
 #include <qlistview.h>
@@ -611,13 +611,13 @@ public:
 		RadioButton,
 		CheckBox,
 		Controller,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		RadioButtonController,
 		CheckBoxController,
 %End
 	};
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum ToggleState {
 		Off,
 		NoChange,
@@ -625,95 +625,95 @@ public:
 	};
 %End
 
-%If (Qt_3_2_0 -)
-	QCheckListItem(QCheckListItem * /TransferThis/,const QString &,
+%If (TQt_3_2_0 -)
+	TQCheckListItem(TQCheckListItem * /TransferThis/,const TQString &,
 		       Type = RadioButtonController);
-	QCheckListItem(QCheckListItem * /TransferThis/,QListViewItem *,
-		       const QString &,Type = RadioButtonController);
-	QCheckListItem(QListViewItem * /TransferThis/,const QString &,
+	TQCheckListItem(TQCheckListItem * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = RadioButtonController);
+	TQCheckListItem(TQListViewItem * /TransferThis/,const TQString &,
 		       Type = RadioButtonController);
-	QCheckListItem(QListViewItem * /TransferThis/,QListViewItem *,
-		       const QString &,Type = RadioButtonController);
-	QCheckListItem(QListView * /TransferThis/,const QString &,
+	TQCheckListItem(TQListViewItem * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = RadioButtonController);
+	TQCheckListItem(TQListView * /TransferThis/,const TQString &,
 		       Type = RadioButtonController);
-	QCheckListItem(QListView * /TransferThis/,QListViewItem *,
-		       const QString &,Type = RadioButtonController);
+	TQCheckListItem(TQListView * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = RadioButtonController);
 %End
-%If (Qt_2_00 - Qt_3_2_0)
-	QCheckListItem(QCheckListItem * /TransferThis/,const QString &,
+%If (TQt_2_00 - TQt_3_2_0)
+	TQCheckListItem(TQCheckListItem * /TransferThis/,const TQString &,
 		       Type = Controller);
-%If (Qt_3_1_0 -)
-	QCheckListItem(QCheckListItem * /TransferThis/,QListViewItem *,
-		       const QString &,Type = Controller);
+%If (TQt_3_1_0 -)
+	TQCheckListItem(TQCheckListItem * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = Controller);
 %End
-	QCheckListItem(QListViewItem * /TransferThis/,const QString &,
+	TQCheckListItem(TQListViewItem * /TransferThis/,const TQString &,
 		       Type = Controller);
-%If (Qt_3_1_0 -)
-	QCheckListItem(QListViewItem * /TransferThis/,QListViewItem *,
-		       const QString &,Type = Controller);
+%If (TQt_3_1_0 -)
+	TQCheckListItem(TQListViewItem * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = Controller);
 %End
-	QCheckListItem(QListView * /TransferThis/,const QString &,
+	TQCheckListItem(TQListView * /TransferThis/,const TQString &,
 		       Type = Controller);
-%If (Qt_3_1_0 -)
-	QCheckListItem(QListView * /TransferThis/,QListViewItem *,
-		       const QString &,Type = Controller);
+%If (TQt_3_1_0 -)
+	TQCheckListItem(TQListView * /TransferThis/,TQListViewItem *,
+		       const TQString &,Type = Controller);
 %End
 %End
-%If (Qt_2_00 -)
-	QCheckListItem(QListViewItem * /TransferThis/,const QString &,
-		       const QPixmap &);
-	QCheckListItem(QListView * /TransferThis/,const QString &,
-		       const QPixmap &);
+%If (TQt_2_00 -)
+	TQCheckListItem(TQListViewItem * /TransferThis/,const TQString &,
+		       const TQPixmap &);
+	TQCheckListItem(TQListView * /TransferThis/,const TQString &,
+		       const TQPixmap &);
 %End
-%If (- Qt_2_00)
-	QCheckListItem(QCheckListItem * /TransferThis/,const char *,
+%If (- TQt_2_00)
+	TQCheckListItem(TQCheckListItem * /TransferThis/,const char *,
 		       Type = Controller);
-	QCheckListItem(QListView * /TransferThis/,const char *,
+	TQCheckListItem(TQListView * /TransferThis/,const char *,
 		       Type = Controller);
-	QCheckListItem(QListViewItem * /TransferThis/,const char *,
-		       const QPixmap &);
-	QCheckListItem(QListView * /TransferThis/,const char *,
-		       const QPixmap &);
+	TQCheckListItem(TQListViewItem * /TransferThis/,const char *,
+		       const TQPixmap &);
+	TQCheckListItem(TQListView * /TransferThis/,const char *,
+		       const TQPixmap &);
 %End
 
-	void paintCell(QPainter *,const QColorGroup &,int,int,int);
-%If (Qt_2_00 -)
-	virtual void paintFocus(QPainter *,const QColorGroup &,const QRect &);
+	void paintCell(TQPainter *,const TQColorGroup &,int,int,int);
+%If (TQt_2_00 -)
+	virtual void paintFocus(TQPainter *,const TQColorGroup &,const TQRect &);
 %End
-	int width(const QFontMetrics &,const QListView *,int) const;
+	int width(const TQFontMetrics &,const TQListView *,int) const;
 	void setup();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOn(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOn(bool);
 %End
 	bool isOn() const;
 	Type type() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text() const;
 	const char *text(int) const;
 %End
-%If (Qt_2_00 -)
-	QString text() const;
-	QString text(int) const;
+%If (TQt_2_00 -)
+	TQString text() const;
+	TQString text(int) const;
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setTristate(bool);
 	bool isTristate() const;
 	ToggleState state() const;
 	void setState(ToggleState);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int rtti() const;
 %End
 
 protected:
-%If (- Qt_3_0_0)
-	void paintBranches(QPainter *,const QColorGroup &,int,int,int,GUIStyle);
+%If (- TQt_3_0_0)
+	void paintBranches(TQPainter *,const TQColorGroup &,int,int,int,GUIStyle);
 %End
 	void activate();
 	void turnOffChild();
@@ -721,16 +721,16 @@ protected:
 };
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QListViewItemIterator
+class TQListViewItemIterator
 {
 %TypeHeaderCode
 #include <qlistview.h>
 %End
 
 public:
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum IteratorFlag {
 		Visible,
 		Invisible,
@@ -749,22 +749,22 @@ public:
 	};
 %End
 
-	QListViewItemIterator();
-	QListViewItemIterator(QListViewItem *);
-%If (Qt_3_2_0 -)
-	QListViewItemIterator(QListViewItem *,int);
+	TQListViewItemIterator();
+	TQListViewItemIterator(TQListViewItem *);
+%If (TQt_3_2_0 -)
+	TQListViewItemIterator(TQListViewItem *,int);
 %End
 
-	QListViewItemIterator(const QListViewItemIterator &);
-	QListViewItemIterator(QListView *);
-%If (Qt_3_2_0 -)
-	QListViewItemIterator(QListView *,int);
+	TQListViewItemIterator(const TQListViewItemIterator &);
+	TQListViewItemIterator(TQListView *);
+%If (TQt_3_2_0 -)
+	TQListViewItemIterator(TQListView *,int);
 %End
 
-	QListViewItemIterator &operator+=(int);
-	QListViewItemIterator &operator-=(int);
+	TQListViewItemIterator &operator+=(int);
+	TQListViewItemIterator &operator-=(int);
 
-	QListViewItem *current() const;
+	TQListViewItem *current() const;
 };
 
 %End
diff --git a/sip/qt/qlocale.sip b/sip/qt/qlocale.sip
index 71f3e6d..c68c1d1 100644
--- a/sip/qt/qlocale.sip
+++ b/sip/qt/qlocale.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QLocale.
+// This is the SIP interface definition for TQLocale.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QLocale (Qt v3.3+)</Title>
+<Sect2><Title>TQLocale (TQt v3.3+)</Title>
 <FuncSynopsis>
 	<FuncDef>short <Function>toShort</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
@@ -97,9 +97,9 @@ This returns a tuple of the <Literal>double</Literal> result and the
 %End
 
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 
-class QLocale
+class TQLocale
 {
 %TypeHeaderCode
 #include <qlocale.h>
@@ -495,43 +495,43 @@ public:
 		LastCountry
 	};
 
-	QLocale();
-	QLocale(const QString &);
-	QLocale(Language,Country = AnyCountry);
-	QLocale(const QLocale &);
+	TQLocale();
+	TQLocale(const TQString &);
+	TQLocale(Language,Country = AnyCountry);
+	TQLocale(const TQLocale &);
 
 	Language language() const;
 	Country country() const;
-	QString name() const;
+	TQString name() const;
 
-	short toShort(const QString &,bool * = 0) const;
-	ushort toUShort(const QString &,bool * = 0) const;
-	int toInt(const QString &,bool * = 0) const;
-	uint toUInt(const QString &,bool * = 0) const;
-	Q_LONG toLong(const QString &,bool * = 0) const;
-	Q_ULONG toULong(const QString &,bool * = 0) const;
-	//Q_LLONG toLongLong(const QString &,bool * = 0) const;
-	//Q_ULLONG toULongLong(const QString &,bool * = 0) const;
-	float toFloat(const QString &,bool * = 0) const;
-	double toDouble(const QString &,bool * = 0) const;
+	short toShort(const TQString &,bool * = 0) const;
+	ushort toUShort(const TQString &,bool * = 0) const;
+	int toInt(const TQString &,bool * = 0) const;
+	uint toUInt(const TQString &,bool * = 0) const;
+	Q_LONG toLong(const TQString &,bool * = 0) const;
+	Q_ULONG toULong(const TQString &,bool * = 0) const;
+	//Q_LLONG toLongLong(const TQString &,bool * = 0) const;
+	//Q_ULLONG toULongLong(const TQString &,bool * = 0) const;
+	float toFloat(const TQString &,bool * = 0) const;
+	double toDouble(const TQString &,bool * = 0) const;
 
-	//QString toString(short) const;
-	//QString toString(ushort) const;
-	QString toString(int /Constrained/) const;
-	//QString toString(uint) const;
-	//QString toString(Q_LONG) const;
-	//QString toString(Q_ULONG) const;
-	//QString toString(Q_LLONG) const;
-	//QString toString(Q_ULLONG) const;
-	//QString toString(float,char = 'g',int = 6) const;
-	QString toString(double,char = 'g',int = 6) const;
+	//TQString toString(short) const;
+	//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(Q_LLONG) const;
+	//TQString toString(Q_ULLONG) const;
+	//TQString toString(float,char = 'g',int = 6) const;
+	TQString toString(double,char = 'g',int = 6) const;
 
-	static QString languageToString(Language);
-	static QString countryToString(Country);
-	static void setDefault(const QLocale &);
+	static TQString languageToString(Language);
+	static TQString countryToString(Country);
+	static void setDefault(const TQLocale &);
 
-	static QLocale c();
-	static QLocale system();
+	static TQLocale c();
+	static TQLocale system();
 };
 
 %End
diff --git a/sip/qt/qmainwindow.sip b/sip/qt/qmainwindow.sip
index 11a2f12..f582ce5 100644
--- a/sip/qt/qmainwindow.sip
+++ b/sip/qt/qmainwindow.sip
@@ -1,48 +1,48 @@
-// This is the SIP interface definition for QMainWindow.
+// This is the SIP interface definition for TQMainWindow.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMainWindow</Title>
+<Sect2><Title>TQMainWindow</Title>
 <FuncSynopsis>
-	<FuncDef>QTextStream &amp;<Function>operator&lt&lt;</Function></FuncDef>
-	<ParamDef>QTextStream &amp;<Parameter></Parameter></ParamDef>
-	<ParamDef>const QMainWindow &amp;<Parameter></Parameter></ParamDef>
+	<FuncDef>TQTextStream &amp;<Function>operator&lt&lt;</Function></FuncDef>
+	<ParamDef>TQTextStream &amp;<Parameter></Parameter></ParamDef>
+	<ParamDef>const TQMainWindow &amp;<Parameter></Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-This operator is fully implemented.  (Qt v3+)
+This operator is fully implemented.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QTextStream &amp;<Function>operator&gt&gt;</Function></FuncDef>
-	<ParamDef>QTextStream &amp;<Parameter></Parameter></ParamDef>
-	<ParamDef>QMainWindow &amp;<Parameter></Parameter></ParamDef>
+	<FuncDef>TQTextStream &amp;<Function>operator&gt&gt;</Function></FuncDef>
+	<ParamDef>TQTextStream &amp;<Parameter></Parameter></ParamDef>
+	<ParamDef>TQMainWindow &amp;<Parameter></Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-This operator is fully implemented.  (Qt v3+)
+This operator is fully implemented.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>bool <Function>getLocation</Function></FuncDef>
-	<ParamDef>QToolBar *<Parameter>tb</Parameter></ParamDef>
+	<ParamDef>TQToolBar *<Parameter>tb</Parameter></ParamDef>
 	<ParamDef>ToolBarDock &amp;<Parameter>dock</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>index</Parameter></ParamDef>
 	<ParamDef>bool &amp;<Parameter>nl</Parameter></ParamDef>
@@ -51,41 +51,41 @@ This operator is fully implemented.  (Qt v3+)
 <Para>
 This takes only the <Literal>tb</Literal> parameter and returns a tuple of the
 result, <Literal>dock</Literal>, <Literal>index</Literal>,
-<Literal>nl</Literal> and <Literal>extraOffset</Literal> values.  (Qt v2.1.0+)
+<Literal>nl</Literal> and <Literal>extraOffset</Literal> values.  (TQt v2.1.0+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QList&lt;QToolBar&gt; <Function>toolBars</Function></FuncDef>
+	<FuncDef>TQList&lt;TQToolBar&gt; <Function>toolBars</Function></FuncDef>
 	<ParamDef>ToolBarDock <Parameter>dock</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-This returns a list of <Literal>QToolBar</Literal> instances.  (Qt v2.1.0+)
+This returns a list of <Literal>TQToolBar</Literal> instances.  (TQt v2.1.0+)
 </Para>
 </Sect2>
 %End
 
 
-class QMainWindow : QWidget
+class TQMainWindow : TQWidget
 {
 %TypeHeaderCode
 #include <qmainwindow.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QMainWindow(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (- TQt_2_00)
+	TQMainWindow(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
-%If (Qt_2_00 -)
-	QMainWindow(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = WType_TopLevel);
+%If (TQt_2_00 -)
+	TQMainWindow(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = WType_TopLevel);
 %End
 
-	QMenuBar *menuBar() const;
-	QStatusBar *statusBar() const;
-	QToolTipGroup *toolTipGroup() const;
-	virtual void setCentralWidget(QWidget *);
-	QWidget *centralWidget() const;
+	TQMenuBar *menuBar() const;
+	TQStatusBar *statusBar() const;
+	TQToolTipGroup *toolTipGroup() const;
+	virtual void setCentralWidget(TQWidget *);
+	TQWidget *centralWidget() const;
 
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 	enum ToolBarDock {
 		Unmanaged,
 		TornOff,
@@ -95,7 +95,7 @@ public:
 		Left
 	};
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	enum ToolBarDock {
 		Unmanaged,
 		TornOff,
@@ -107,102 +107,102 @@ public:
 	};
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDockEnabled(ToolBarDock,bool);
-	void addToolBar(QToolBar *,const char *,ToolBarDock = Top,bool = 0);
+	void addToolBar(TQToolBar *,const char *,ToolBarDock = Top,bool = 0);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setDockEnabled(ToolBarDock,bool);
-	void addToolBar(QToolBar *,ToolBarDock = Top,bool = 0);
-	void addToolBar(QToolBar *,const QString &,ToolBarDock = Top,bool = 0);
-	void moveToolBar(QToolBar *,ToolBarDock = Top);
-%End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void setDockEnabled(QToolBar *,ToolBarDock,bool);
-	bool isDockEnabled(QToolBar *,ToolBarDock) const;
-	void moveToolBar(QToolBar *,ToolBarDock,bool,int,int = -1);
+	void addToolBar(TQToolBar *,ToolBarDock = Top,bool = 0);
+	void addToolBar(TQToolBar *,const TQString &,ToolBarDock = Top,bool = 0);
+	void moveToolBar(TQToolBar *,ToolBarDock = Top);
+%End
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void setDockEnabled(TQToolBar *,ToolBarDock,bool);
+	bool isDockEnabled(TQToolBar *,ToolBarDock) const;
+	void moveToolBar(TQToolBar *,ToolBarDock,bool,int,int = -1);
 	bool toolBarsMovable() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setDockEnabled(Dock,bool);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool isDockEnabled(ToolBarDock) const;
-	void removeToolBar(QToolBar *);
+	void removeToolBar(TQToolBar *);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isDockEnabled(Dock) const;
-	bool isDockEnabled(QDockArea *) const;
-	virtual void setDockEnabled(QDockWindow *,Dock,bool);
-	bool isDockEnabled(QDockWindow *,Dock) const;
-	bool isDockEnabled(QDockWindow *,QDockArea *) const;
+	bool isDockEnabled(TQDockArea *) const;
+	virtual void setDockEnabled(TQDockWindow *,Dock,bool);
+	bool isDockEnabled(TQDockWindow *,Dock) const;
+	bool isDockEnabled(TQDockWindow *,TQDockArea *) const;
  
-	virtual void addDockWindow(QDockWindow *,Dock = DockTop,bool = 0);
-	virtual void addDockWindow(QDockWindow *,const QString &,
+	virtual void addDockWindow(TQDockWindow *,Dock = DockTop,bool = 0);
+	virtual void addDockWindow(TQDockWindow *,const TQString &,
 				   Dock = DockTop,bool = 0);
-	virtual void moveDockWindow(QDockWindow *,Dock = DockTop);
-	virtual void moveDockWindow(QDockWindow *,Dock,bool,int,int = -1);
-	virtual void removeDockWindow(QDockWindow *);
+	virtual void moveDockWindow(TQDockWindow *,Dock = DockTop);
+	virtual void moveDockWindow(TQDockWindow *,Dock,bool,int,int = -1);
+	virtual void removeDockWindow(TQDockWindow *);
 %End
 
 	void show();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void hide();
 %End
-%If (Qt_2_1_0 -)
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+%If (TQt_2_1_0 -)
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 %End
 
 	bool rightJustification() const;
 	bool usesBigPixmaps() const;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool usesTextLabel() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool dockWindowsMovable() const;
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool opaqueMoving() const;
 %End
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-%If (Qt_3_0_0 -)
-	bool getLocation(QDockWindow *,Dock &,int &,bool &,int &) const;
+%If (TQt_3_0_0 -)
+	bool getLocation(TQDockWindow *,Dock &,int &,bool &,int &) const;
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	bool getLocation(QToolBar *,ToolBarDock &,int &,bool &,int &) const;
+%If (TQt_2_1_0 - TQt_3_0_0)
+	bool getLocation(TQToolBar *,ToolBarDock &,int &,bool &,int &) const;
 %End
  
-%If (Qt_2_1_0 - Qt_3_0_0)
-	QList<QToolBar> toolBars(ToolBarDock) const;
+%If (TQt_2_1_0 - TQt_3_0_0)
+	TQList<TQToolBar> toolBars(ToolBarDock) const;
 %End
-%If (Qt_3_0_0 -)
-	QPtrList<QDockWindow> dockWindows(Dock) const;
-	QPtrList<QDockWindow> dockWindows() const;
+%If (TQt_3_0_0 -)
+	TQPtrList<TQDockWindow> dockWindows(Dock) const;
+	TQPtrList<TQDockWindow> dockWindows() const;
 	void lineUpDockWindows(bool = 0);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void lineUpToolBars(bool = 0);
 	bool isDockMenuEnabled() const;
 %End
 
-%If (Qt_3_0_0 -)
-	bool hasDockWindow(QDockWindow *);
-	QPtrList<QToolBar> toolBars(Dock) const;
+%If (TQt_3_0_0 -)
+	bool hasDockWindow(TQDockWindow *);
+	TQPtrList<TQToolBar> toolBars(Dock) const;
 
-	// The following one is in Qt3 but not documented.
-	//virtual QDockArea *dockingArea(const QPoint &);
-	QDockArea *leftDock() const;
-	QDockArea *rightDock() const;
-	QDockArea *topDock() const;
-	QDockArea *bottomDock() const;
+	// The following one is in TQt3 but not documented.
+	//virtual TQDockArea *dockingArea(const TQPoint &);
+	TQDockArea *leftDock() const;
+	TQDockArea *rightDock() const;
+	TQDockArea *topDock() const;
+	TQDockArea *bottomDock() const;
  
 	virtual bool isCustomizable() const;
  
-	bool appropriate(QDockWindow *) const;
+	bool appropriate(TQDockWindow *) const;
  
 	enum DockWindows {
 		OnlyToolBars,
@@ -210,80 +210,80 @@ public:
 		AllDockWindows
 	};
 
-	QPopupMenu *createDockWindowMenu(DockWindows = AllDockWindows) const;
+	TQPopupMenu *createDockWindowMenu(DockWindows = AllDockWindows) const;
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setRightJustification(bool);
 	void setUsesBigPixmaps(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setRightJustification(bool);
 	virtual void setUsesBigPixmaps(bool);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void setUsesTextLabel(bool);
 	void setToolBarsMovable(bool);
 	void setOpaqueMoving(bool);
 	void setDockMenuEnabled(bool);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setUsesTextLabel(bool);
 	virtual void setDockWindowsMovable(bool);
 	virtual void setOpaqueMoving(bool);
 	virtual void setDockMenuEnabled(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	void whatsThis();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void whatsThis();
-	virtual void setAppropriate(QDockWindow *,bool);
+	virtual void setAppropriate(TQDockWindow *,bool);
 	virtual void customize();
 %End
 
 signals:
 	void pixmapSizeChanged(bool);
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void usesTextLabelChanged(bool);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void startMovingToolBar(QToolBar *);
-	void endMovingToolBar(QToolBar *);
-	void toolBarPositionChanged(QToolBar *);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void startMovingToolBar(TQToolBar *);
+	void endMovingToolBar(TQToolBar *);
+	void toolBarPositionChanged(TQToolBar *);
 %End
-%If (Qt_3_0_0 -)
-	void dockWindowPositionChanged(QDockWindow *);
+%If (TQt_3_0_0 -)
+	void dockWindowPositionChanged(TQDockWindow *);
 %End
 
 protected slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setUpLayout();
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setUpLayout();
 %End
-%If (Qt_3_0_0 -)
-	virtual bool showDockMenu(const QPoint &);
+%If (TQt_3_0_0 -)
+	virtual bool showDockMenu(const TQPoint &);
 	void menuAboutToShow();
 %End
 
 protected:
-	void paintEvent(QPaintEvent *);
-%If (Qt_2_00 -)
-	void childEvent(QChildEvent *);
+	void paintEvent(TQPaintEvent *);
+%If (TQt_2_00 -)
+	void childEvent(TQChildEvent *);
 %End
-	bool event(QEvent *);
-%If (Qt_2_00 - Qt_3_0_0)
-	void resizeEvent(QResizeEvent *);
+	bool event(TQEvent *);
+%If (TQt_2_00 - TQt_3_0_0)
+	void resizeEvent(TQResizeEvent *);
 %End
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
 
 private:
-%If (Qt_2_00 -)
-	QMainWindow(const QMainWindow &);
+%If (TQt_2_00 -)
+	TQMainWindow(const TQMainWindow &);
 %End
 };
diff --git a/sip/qt/qmemarray.sip b/sip/qt/qmemarray.sip
index 9415a57..04a174e 100644
--- a/sip/qt/qmemarray.sip
+++ b/sip/qt/qmemarray.sip
@@ -1,39 +1,39 @@
-// This is the SIP interface definition for all types based on the QMemArray
+// This is the SIP interface definition for all types based on the TQMemArray
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QMemArray&lt;type&gt; (Qt v3+)</Title>
+<Sect2><Title>TQMemArray&lt;type&gt; (TQt v3+)</Title>
 <Para>
-Types based on the <Literal>QMemArray</Literal> template are automatically
+Types based on the <Literal>TQMemArray</Literal> template are automatically
 converted to and from Python lists of the type.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-%MappedType QMemArray<int>
+%MappedType TQMemArray<int>
 {
 %TypeHeaderCode
 #include <qmemarray.h>
@@ -61,12 +61,12 @@ converted to and from Python lists of the type.
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of integers to a QMemArray<int> on the heap.
+	// Convert a Python list of integers to a TQMemArray<int> on the heap.
 
 	if (sipIsErr == NULL)
 		return PyList_Check(sipPy);
 
-	QMemArray<int> *qma = new QMemArray<int>(PyList_GET_SIZE(sipPy));
+	TQMemArray<int> *qma = new TQMemArray<int>(PyList_GET_SIZE(sipPy));
  
 	PyErr_Clear();
 
@@ -90,7 +90,7 @@ converted to and from Python lists of the type.
 };
 
 template<TYPE>
-%MappedType QMemArray<TYPE>
+%MappedType TQMemArray<TYPE>
 {
 %TypeHeaderCode
 #include <qmemarray.h>
@@ -124,7 +124,7 @@ template<TYPE>
 %End
 
 %ConvertToTypeCode
-    // Check the type if that is all that is required.
+    // Check the type if that is all that is retquired.
     if (sipIsErr == NULL)
     {
         if (!PyList_Check(sipPy))
@@ -137,7 +137,7 @@ template<TYPE>
         return 1;
     }
 
-    QMemArray<TYPE> *ql = new QMemArray<TYPE>;
+    TQMemArray<TYPE> *ql = new TQMemArray<TYPE>;
 
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
     {
diff --git a/sip/qt/qmenubar.sip b/sip/qt/qmenubar.sip
index 5f61458..b0bb9fa 100644
--- a/sip/qt/qmenubar.sip
+++ b/sip/qt/qmenubar.sip
@@ -1,49 +1,49 @@
-// This is the SIP interface definition for QMenuBar.
+// This is the SIP interface definition for TQMenuBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMenuBar</Title>
+<Sect2><Title>TQMenuBar</Title>
 <Para>
-<Literal>QMenuBar</Literal> is fully implemented.
+<Literal>TQMenuBar</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QMenuBar : QFrame, QMenuData
+class TQMenuBar : TQFrame, TQMenuData
 {
 %TypeHeaderCode
 #include <qmenubar.h>
 %End
 
 public:
-	QMenuBar(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQMenuBar(TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	void updateItem(int);
 
 	void show();
 	void hide();
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 	int heightForWidth(int) const;
 
@@ -53,29 +53,29 @@ public:
 	};
 
 	Separator separator() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSeparator(Separator);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setSeparator(Separator);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setDefaultUp(bool);
 	bool isDefaultUp() const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool customWhatsThis() const;
 %End
 
-%If (Qt_2_1_0 -)
-	QSize sizeHint() const;
-	QSize minimumSize() const;
-	QSize minimumSizeHint() const;
+%If (TQt_2_1_0 -)
+	TQSize sizeHint() const;
+	TQSize minimumSize() const;
+	TQSize minimumSizeHint() const;
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void activateItemAt(int);
 %End
 
@@ -84,35 +84,35 @@ signals:
 	void highlighted(int);
 
 protected:
-	void drawContents(QPainter *);
-	void fontChange(const QFont &);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_1_0 -)
-	void focusInEvent(QFocusEvent *);
+	void drawContents(TQPainter *);
+	void fontChange(const TQFont &);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_1_0 -)
+	void focusInEvent(TQFocusEvent *);
 %End
-%If (Qt_2_00 -)
-	void focusOutEvent(QFocusEvent *);
+%If (TQt_2_00 -)
+	void focusOutEvent(TQFocusEvent *);
 %End
-	void resizeEvent(QResizeEvent *);
-	void leaveEvent(QEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void leaveEvent(TQEvent *);
 	void menuContentsChanged();
 	void menuStateChanged();
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
-%If (Qt_3_0_0 -)
-	int itemAtPos(const QPoint &);
+%If (TQt_3_0_0 -)
+	int itemAtPos(const TQPoint &);
 	void hidePopups();
-	QRect itemRect(int);
+	TQRect itemRect(int);
 %End
 
 private:
-	void menuInsPopup(QPopupMenu *);
-	void menuDelPopup(QPopupMenu *);
+	void menuInsPopup(TQPopupMenu *);
+	void menuDelPopup(TQPopupMenu *);
 	void frameChanged();
 
-	QMenuBar(const QMenuBar &);
+	TQMenuBar(const TQMenuBar &);
 };
diff --git a/sip/qt/qmenudata.sip b/sip/qt/qmenudata.sip
index ac5dab0..c72151a 100644
--- a/sip/qt/qmenudata.sip
+++ b/sip/qt/qmenudata.sip
@@ -1,168 +1,168 @@
-// This is the SIP interface definition for QMenuData, QCustomMenuItem and
-// QMenuItem.
+// This is the SIP interface definition for TQMenuData, TQCustomMenuItem and
+// TQMenuItem.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMenuData</Title>
+<Sect2><Title>TQMenuData</Title>
 <FuncSynopsis>
-        <FuncDef>QMenuItem *<Function>findItem</Function></FuncDef>
+        <FuncDef>TQMenuItem *<Function>findItem</Function></FuncDef>
         <ParamDef>int <Parameter>id</Parameter></ParamDef>
-        <ParamDef>QMenuData **<Parameter>parent</Parameter></ParamDef>
+        <ParamDef>TQMenuData **<Parameter>parent</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QCustomMenuItem (Qt v2.1+)</Title>
+<Sect2><Title>TQCustomMenuItem (TQt v2.1+)</Title>
 <Para>
-<Literal>QCustomMenuItem</Literal> is fully implemented.
+<Literal>TQCustomMenuItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMenuItem</Title>
+<Sect2><Title>TQMenuItem</Title>
 <Para>
-<Literal>QMenuItem</Literal> is an internal Qt class.
+<Literal>TQMenuItem</Literal> is an internal TQt class.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-// Even though this is an internal class, uic for Qt v3.1.0 generates code that
+// Even though this is an internal class, uic for TQt v3.1.0 generates code that
 // uses it.
-class QMenuItem
+class TQMenuItem
 {
 %TypeHeaderCode
 #include <qmenudata.h>
 %End
 
 public:
-	QMenuItem();
+	TQMenuItem();
 
-	void setText(const QString &);
+	void setText(const TQString &);
 
 private:
-	QMenuItem(const QMenuItem &);
+	TQMenuItem(const TQMenuItem &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QMenuItem;
+class TQMenuItem;
 
 %End
 
 
-class QMenuData
+class TQMenuData
 {
 %TypeHeaderCode
 #include <qmenudata.h>
 %End
 
 public:
-	QMenuData();
+	TQMenuData();
 
 	uint count();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int insertItem(const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0);
-	int insertItem(const QPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0);
-	int insertItem(const QPixmap &,const char *,SIP_RXOBJ_CON,
+	int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0);
+	int insertItem(const TQPixmap &,const char *,SIP_RXOBJ_CON,
 		       SIP_SLOT_CON(int),int = 0);
 	int insertItem(const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int,int,
 		       int = -1);
-	int insertItem(const QPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int,int,
+	int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int,int,
 		       int = -1);
-	int insertItem(const QPixmap&,const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
+	int insertItem(const TQPixmap&,const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
 		       int,int,int = -1);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	int insertItem(const QString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0,
+%If (TQt_2_00 - TQt_3_0_0)
+	int insertItem(const TQString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0,
 		       int = -1,int = -1);
-	int insertItem(const QIconSet &,const QString &,SIP_RXOBJ_CON,
+	int insertItem(const TQIconSet &,const TQString &,SIP_RXOBJ_CON,
 		       SIP_SLOT_CON(int),int = 0,int = -1,int = -1);
-	int insertItem(const QPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0,
+	int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0,
 		       int = -1,int = -1);
-	int insertItem(const QIconSet &,const QPixmap &,SIP_RXOBJ_CON,
+	int insertItem(const TQIconSet &,const TQPixmap &,SIP_RXOBJ_CON,
 		       SIP_SLOT_CON(int),int = 0,int = -1,int = -1);
 %End
-%If (Qt_3_0_0 -)
-	int insertItem(const QString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
-		       const QKeySequence & = QKeySequence(0),int = -1,
+%If (TQt_3_0_0 -)
+	int insertItem(const TQString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
+		       const TQKeySequence & = TQKeySequence(0),int = -1,
 		       int = -1);
-	int insertItem(const QIconSet &,const QString &,SIP_RXOBJ_CON,
+	int insertItem(const TQIconSet &,const TQString &,SIP_RXOBJ_CON,
 		       SIP_SLOT_CON(int),
-		       const QKeySequence & = QKeySequence(0),int = -1,
+		       const TQKeySequence & = TQKeySequence(0),int = -1,
 		       int = -1);
-	int insertItem(const QPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
-		       const QKeySequence & = QKeySequence(0),int = -1,
+	int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),
+		       const TQKeySequence & = TQKeySequence(0),int = -1,
 		       int = -1);
-	int insertItem(const QIconSet &,const QPixmap &,SIP_RXOBJ_CON,
+	int insertItem(const TQIconSet &,const TQPixmap &,SIP_RXOBJ_CON,
 		       SIP_SLOT_CON(int),
-		       const QKeySequence & = QKeySequence(0),int = -1,
+		       const TQKeySequence & = TQKeySequence(0),int = -1,
 		       int = -1);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int insertItem(const char *,int = -1,int = -1);
-	int insertItem(const char *,QPopupMenu *,int = -1,int = -1);
-	int insertItem(const QPixmap &,const char *,int = -1,int = -1);
-	int insertItem(const QPixmap &,const char *,QPopupMenu *,int = -1,
+	int insertItem(const char *,TQPopupMenu *,int = -1,int = -1);
+	int insertItem(const TQPixmap &,const char *,int = -1,int = -1);
+	int insertItem(const TQPixmap &,const char *,TQPopupMenu *,int = -1,
 		       int = -1);
 %End
-%If (Qt_2_00 -)
-	int insertItem(const QString &,int = -1,int = -1);
-	int insertItem(const QIconSet &,const QString &,int = -1,int = -1);
+%If (TQt_2_00 -)
+	int insertItem(const TQString &,int = -1,int = -1);
+	int insertItem(const TQIconSet &,const TQString &,int = -1,int = -1);
 
-	int insertItem(const QString &,QPopupMenu *,int = -1,int = -1);
-	int insertItem(const QIconSet &,const QString &,QPopupMenu *,int = -1,
+	int insertItem(const TQString &,TQPopupMenu *,int = -1,int = -1);
+	int insertItem(const TQIconSet &,const TQString &,TQPopupMenu *,int = -1,
 		       int = -1);
 %End
 
-	int insertItem(const QPixmap &,int = -1,int = -1);
-%If (Qt_2_00 -)
-	int insertItem(const QIconSet &,const QPixmap &,int = -1,int = -1);
+	int insertItem(const TQPixmap &,int = -1,int = -1);
+%If (TQt_2_00 -)
+	int insertItem(const TQIconSet &,const TQPixmap &,int = -1,int = -1);
 %End
-	int insertItem(const QPixmap &,QPopupMenu *,int = -1,int = -1);
-%If (Qt_2_00 -)
-	int insertItem(const QIconSet &,const QPixmap &,QPopupMenu *,int = -1,
+	int insertItem(const TQPixmap &,TQPopupMenu *,int = -1,int = -1);
+%If (TQt_2_00 -)
+	int insertItem(const TQIconSet &,const TQPixmap &,TQPopupMenu *,int = -1,
 		       int = -1);
 %End
 
-%If (Qt_2_1_0 -)
-	int insertItem(QWidget * /Transfer/,int = -1,int = -1);
-	int insertItem(const QIconSet &,QCustomMenuItem * /Transfer/,int = -1,
+%If (TQt_2_1_0 -)
+	int insertItem(TQWidget * /Transfer/,int = -1,int = -1);
+	int insertItem(const TQIconSet &,TQCustomMenuItem * /Transfer/,int = -1,
 		       int = -1);
-	int insertItem(QCustomMenuItem * /Transfer/,int = -1,int = -1);
+	int insertItem(TQCustomMenuItem * /Transfer/,int = -1,int = -1);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int insertSeparator(int = -1);
 %End
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 	void insertSeparator(int = -1);
 %End
 
@@ -170,42 +170,42 @@ public:
 	void removeItemAt(int);
 	void clear();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int accel(int) const;
 	void setAccel(int,int);
 %End
-%If (Qt_3_0_0 -)
-	QKeySequence accel(int) const;
-	void setAccel(const QKeySequence &,int);
+%If (TQt_3_0_0 -)
+	TQKeySequence accel(int) const;
+	void setAccel(const TQKeySequence &,int);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text(int) const;
 %End
-%If (Qt_2_00 -)
-	QIconSet *iconSet(int) const;
-	QString text(int) const;
+%If (TQt_2_00 -)
+	TQIconSet *iconSet(int) const;
+	TQString text(int) const;
 %End
-	QPixmap *pixmap(int) const;
+	TQPixmap *pixmap(int) const;
 
-%If (Qt_2_00 -)
-	void setWhatsThis(int,const QString &);
-	QString whatsThis(int) const;
+%If (TQt_2_00 -)
+	void setWhatsThis(int,const TQString &);
+	TQString whatsThis(int) const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void changeItem(const char *,int);
-	void changeItem(const QPixmap &,int);
-	void changeItem(const QPixmap &,const char *,int);
+	void changeItem(const TQPixmap &,int);
+	void changeItem(const TQPixmap &,const char *,int);
 %End
-%If (Qt_2_00 -)
-	void changeItem(int,const QString &);
-	void changeItem(int,const QPixmap &);
-	void changeItem(int,const QIconSet &,const QString &);
-	void changeItem(int,const QIconSet &,const QPixmap &);
+%If (TQt_2_00 -)
+	void changeItem(int,const TQString &);
+	void changeItem(int,const TQPixmap &);
+	void changeItem(int,const TQIconSet &,const TQString &);
+	void changeItem(int,const TQIconSet &,const TQPixmap &);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isItemActive(int) const;
 %End
 
@@ -215,7 +215,7 @@ public:
 	bool isItemChecked(int) const;
 	void setItemChecked(int,bool);
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isItemVisible(int) const;
 	void setItemVisible(int,bool);
 %End
@@ -224,68 +224,68 @@ public:
 
 	int indexOf(int) const;
 	int idAt(int) const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setId(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setId(int,int);
 %End
 
 	bool connectItem(int,SIP_RXOBJ_CON,SIP_SLOT_CON(int));
 	bool disconnectItem(int,SIP_RXOBJ_DIS,SIP_SLOT_DIS(int));
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool setItemParameter(int,int);
 	int itemParameter(int) const;
 %End
 
-	QMenuItem *findItem(int) const;
-//	QMenuItem *findItem(int,QMenuData **) const;
-%If (Qt_3_0_0 -)
-//	Not documented in the Qt3 API (the similar findPopup() was internal in
-//	Qt2).
-//	QMenuItem *findItem(QPopupMenu *,int * = 0) const;
+	TQMenuItem *findItem(int) const;
+//	TQMenuItem *findItem(int,TQMenuData **) const;
+%If (TQt_3_0_0 -)
+//	Not documented in the TQt3 API (the similar findPopup() was internal in
+//	TQt2).
+//	TQMenuItem *findItem(TQPopupMenu *,int * = 0) const;
 %End
 
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	void activateItemAt(int);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void activateItemAt(int);
 %End
 
 protected:
 	virtual void menuContentsChanged();
 	virtual void menuStateChanged();
-	virtual void menuInsPopup(QPopupMenu *);
-	virtual void menuDelPopup(QPopupMenu *);
-%If (- Qt_3_0_0)
-//	Documented as internal in the Qt2 API.
-//	QMenuItem *findPopup(QPopupMenu *,int * = 0);
+	virtual void menuInsPopup(TQPopupMenu *);
+	virtual void menuDelPopup(TQPopupMenu *);
+%If (- TQt_3_0_0)
+//	Documented as internal in the TQt2 API.
+//	TQMenuItem *findPopup(TQPopupMenu *,int * = 0);
 %End
 
 private:
-	QMenuData(const QMenuData &);
+	TQMenuData(const TQMenuData &);
 };
 
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 
-class QCustomMenuItem : Qt
+class TQCustomMenuItem : TQt
 {
 %TypeHeaderCode
 #include <qmenudata.h>
 %End
 
 public:
-	QCustomMenuItem();
+	TQCustomMenuItem();
 
 	virtual bool fullSpan() const;
 	virtual bool isSeparator() const;
-	virtual void setFont(const QFont &);
-	virtual void paint(QPainter *,const QColorGroup &,bool,bool,int,int,
+	virtual void setFont(const TQFont &);
+	virtual void paint(TQPainter *,const TQColorGroup &,bool,bool,int,int,
 			   int,int) = 0;
-	virtual QSize sizeHint() = 0;
+	virtual TQSize sizeHint() = 0;
 };
 
 %End
diff --git a/sip/qt/qmessagebox.sip b/sip/qt/qmessagebox.sip
index 16e635e..a847d84 100644
--- a/sip/qt/qmessagebox.sip
+++ b/sip/qt/qmessagebox.sip
@@ -1,37 +1,37 @@
-// This is the SIP interface definition for QMessageBox.
+// This is the SIP interface definition for TQMessageBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMessageBox</Title>
+<Sect2><Title>TQMessageBox</Title>
 <Para>
-<Literal>QMessageBox</Literal> is fully implemented.
+<Literal>TQMessageBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_MESSAGEBOX)
+%If (TQt_MESSAGEBOX)
 
-class QMessageBox : QDialog
+class TQMessageBox : TQDialog
 {
 %TypeHeaderCode
 #include <qmessagebox.h>
@@ -43,20 +43,20 @@ public:
 		Information,
 		Warning,
 		Critical,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		Question,
 %End
 	};
 
-	QMessageBox(QWidget * /TransferThis/ = 0,const char * = 0);
-%If (- Qt_2_00)
-	QMessageBox(const char *,const char *,Icon,int,int,int,
-		    QWidget * /TransferThis/ = 0,const char * = 0,bool = 1,
+	TQMessageBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQMessageBox(const char *,const char *,Icon,int,int,int,
+		    TQWidget * /TransferThis/ = 0,const char * = 0,bool = 1,
 		    WFlags = 0);
 %End
-%If (Qt_2_00 -)
-	QMessageBox(const QString &,const QString &,Icon,int,int,int,
-		    QWidget * /TransferThis/ = 0,const char * = 0,bool = 1,
+%If (TQt_2_00 -)
+	TQMessageBox(const TQString &,const TQString &,Icon,int,int,int,
+		    TQWidget * /TransferThis/ = 0,const char * = 0,bool = 1,
 		    WFlags = WStyle_DialogBorder);
 %End
 
@@ -68,7 +68,7 @@ public:
 		Abort,
 		Retry,
 		Ignore,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		YesAll,
 		NoAll,
 %End
@@ -78,127 +78,127 @@ public:
 		FlagMask
 	};
 
-%If (- Qt_2_00)
-	static int information(QWidget *,const char *,const char *,int,int = 0,
+%If (- TQt_2_00)
+	static int information(TQWidget *,const char *,const char *,int,int = 0,
 			       int = 0) /ReleaseGIL/;
-	static int information(QWidget *,const char *,const char *,
+	static int information(TQWidget *,const char *,const char *,
 			       const char * = "OK",const char * = 0,
 			       const char * = 0,int = 0,int = -1) /ReleaseGIL/;
 
-	static int warning(QWidget *,const char *,const char *,int,int,
+	static int warning(TQWidget *,const char *,const char *,int,int,
 			   int = 0) /ReleaseGIL/;
-	static int warning(QWidget *,const char *,const char *,
+	static int warning(TQWidget *,const char *,const char *,
 			   const char * = "OK",const char * = 0,
 			   const char * = 0,int = 0,int = -1) /ReleaseGIL/;
 
-	static int critical(QWidget *,const char *,const char *,int,int,
+	static int critical(TQWidget *,const char *,const char *,int,int,
 			    int = 0) /ReleaseGIL/;
-	static int critical(QWidget *,const char *,const char *,
+	static int critical(TQWidget *,const char *,const char *,
 			    const char * = "OK",const char * = 0,
 			    const char * = 0,int = 0,int = -1) /ReleaseGIL/;
 
-	static void about(QWidget *,const char *,const char *) /ReleaseGIL/;
-	static void aboutQt(QWidget *,const char * = 0) /ReleaseGIL/;
+	static void about(TQWidget *,const char *,const char *) /ReleaseGIL/;
+	static void aboutTQt(TQWidget *,const char * = 0) /ReleaseGIL/;
 
 	const char *text() const;
 	void setText(const char *);
 %End
-%If (Qt_2_00 -)
-	static int information(QWidget *,const QString &,const QString &,int,
+%If (TQt_2_00 -)
+	static int information(TQWidget *,const TQString &,const TQString &,int,
 			       int = 0,int = 0) /ReleaseGIL/;
-	static int information(QWidget *,const QString &,const QString &,
-			       const QString & = QString::null,
-			       const QString & = QString::null,
-			       const QString & = QString::null,
+	static int information(TQWidget *,const TQString &,const TQString &,
+			       const TQString & = TQString::null,
+			       const TQString & = TQString::null,
+			       const TQString & = TQString::null,
 			       int = 0,int = -1) /ReleaseGIL/;
 
-%If (Qt_3_2_0 -)
-	static int question(QWidget *,const QString &,const QString &,int,
+%If (TQt_3_2_0 -)
+	static int question(TQWidget *,const TQString &,const TQString &,int,
 			    int = 0,int = 0) /ReleaseGIL/;
-	static int question(QWidget *,const QString &,const QString &,
-			    const QString & = QString::null,
-			    const QString & = QString::null,
-			    const QString & = QString::null,
+	static int question(TQWidget *,const TQString &,const TQString &,
+			    const TQString & = TQString::null,
+			    const TQString & = TQString::null,
+			    const TQString & = TQString::null,
 			    int = 0,int = -1) /ReleaseGIL/;
 %End
 
-	static int warning(QWidget *,const QString &,const QString &,int,
+	static int warning(TQWidget *,const TQString &,const TQString &,int,
 			   int = 0,int = 0) /ReleaseGIL/;
-	static int warning(QWidget *,const QString &,const QString &,
-			   const QString & = QString::null,
-			   const QString & = QString::null,
-			   const QString & = QString::null,int = 0,
+	static int warning(TQWidget *,const TQString &,const TQString &,
+			   const TQString & = TQString::null,
+			   const TQString & = TQString::null,
+			   const TQString & = TQString::null,int = 0,
 			   int = -1) /ReleaseGIL/;
 
-	static int critical(QWidget *,const QString &,const QString &,int,
+	static int critical(TQWidget *,const TQString &,const TQString &,int,
 			    int = 0,int = 0) /ReleaseGIL/;
-	static int critical(QWidget *,const QString &,const QString &,
-			    const QString & = QString::null,
-			    const QString & = QString::null,
-			    const QString & = QString::null,int = 0,
+	static int critical(TQWidget *,const TQString &,const TQString &,
+			    const TQString & = TQString::null,
+			    const TQString & = TQString::null,
+			    const TQString & = TQString::null,int = 0,
 			    int = -1) /ReleaseGIL/;
 
-	static void about(QWidget *,const QString &,
-			  const QString &) /ReleaseGIL/;
-	static void aboutQt(QWidget *,
-			    const QString & = QString::null) /ReleaseGIL/;
+	static void about(TQWidget *,const TQString &,
+			  const TQString &) /ReleaseGIL/;
+	static void aboutTQt(TQWidget *,
+			    const TQString & = TQString::null) /ReleaseGIL/;
 
-	QString text() const;
-	void setText(const QString &);
+	TQString text() const;
+	void setText(const TQString &);
 %End
 
 	Icon icon() const;
 
 	void setIcon(Icon);
-%If (Qt_2_00 -)
-	void setIcon(const QPixmap &);
+%If (TQt_2_00 -)
+	void setIcon(const TQPixmap &);
 %End
 
-	const QPixmap *iconPixmap() const;
-	void setIconPixmap(const QPixmap &);
+	const TQPixmap *iconPixmap() const;
+	void setIconPixmap(const TQPixmap &);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *buttonText(int) const;
 	void setButtonText(int,const char *);
 %End
-%If (Qt_2_00 -)
-	QString buttonText(int) const;
-	void setButtonText(int,const QString &);
+%If (TQt_2_00 -)
+	TQString buttonText(int) const;
+	void setButtonText(int,const TQString &);
 %End
 
 	void adjustSize();
 
-%If (- Qt_3_0_0)
-	static QPixmap standardIcon(Icon,GUIStyle);
+%If (- TQt_3_0_0)
+	static TQPixmap standardIcon(Icon,GUIStyle);
 %End
-%If (Qt_3_0_0 -)
-	static QPixmap standardIcon(Icon);
+%If (TQt_3_0_0 -)
+	static TQPixmap standardIcon(Icon);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	TextFormat textFormat() const;
 	void setTextFormat(TextFormat);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setStyle(GUIStyle);
 %End
 
 protected:
-	void resizeEvent(QResizeEvent *);
-%If (Qt_3_0_0 -)
-	void showEvent(QShowEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (TQt_3_0_0 -)
+	void showEvent(TQShowEvent *);
 %End
-%If (Qt_3_2_0 -)
-	void closeEvent(QCloseEvent *);
+%If (TQt_3_2_0 -)
+	void closeEvent(TQCloseEvent *);
 %End
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_00 -)
-	void styleChanged(QStyle &);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_00 -)
+	void styleChanged(TQStyle &);
 %End
 
 private:
-	QMessageBox(const QMessageBox &);
+	TQMessageBox(const TQMessageBox &);
 };
 
 %End
diff --git a/sip/qt/qmetaobject.sip b/sip/qt/qmetaobject.sip
index 5cf7703..b4cb53c 100644
--- a/sip/qt/qmetaobject.sip
+++ b/sip/qt/qmetaobject.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QMetaObject and QMetaProperty.
+// This is the SIP interface definition for TQMetaObject and TQMetaProperty.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMetaObject</Title>
+<Sect2><Title>TQMetaObject</Title>
 <FuncSynopsis>
 	<FuncDef>int <Function>numClassInfo</Function> const</FuncDef>
 	<ParamDef>bool <Parameter>super</Parameter> = FALSE</ParamDef>
@@ -31,7 +31,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>const QClassInfo *<Function>classInfo</Function> const</FuncDef>
+	<FuncDef>const TQClassInfo *<Function>classInfo</Function> const</FuncDef>
 	<ParamDef>bool <Parameter>super</Parameter> = FALSE</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -39,15 +39,15 @@ Not implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMetaProperty</Title>
+<Sect2><Title>TQMetaProperty</Title>
 <Para>
-<Literal>QMetaProperty</Literal> is fully implemented.
+<Literal>TQMetaProperty</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QMetaObject
+class TQMetaObject
 {
 %TypeHeaderCode
 #include <qmetaobject.h>
@@ -56,44 +56,44 @@ class QMetaObject
 public:
 	const char *className() const;
 	const char *superClassName() const;
-	QMetaObject *superClass() const;
+	TQMetaObject *superClass() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool inherits(const char *) const;
 
 	int numSlots(bool = 0) const;
 	int numSignals(bool = 0) const;
 
-	QStrList slotNames(bool = 0) const;
-	QStrList signalNames(bool = 0) const;
+	TQStrList slotNames(bool = 0) const;
+	TQStrList signalNames(bool = 0) const;
 
 	//int numClassInfo(bool = 0) const;
-	//QClassInfo *classInfo(int,bool = 0) const;
+	//TQClassInfo *classInfo(int,bool = 0) const;
 	const char *classInfo(const char *,bool = 0) const;
 
-%If (Qt_PROPERTIES)
-%If (Qt_3_0_0 -)
-	const QMetaProperty *property(int,bool = 0) const;
+%If (TQt_PROPERTIES)
+%If (TQt_3_0_0 -)
+	const TQMetaProperty *property(int,bool = 0) const;
 	int findProperty(const char *,bool = 0) const;
 	int numProperties(bool = 0) const;
 %End
-%If (- Qt_3_0_0)
-	const QMetaProperty *property(const char *,bool = 0) const;
+%If (- TQt_3_0_0)
+	const TQMetaProperty *property(const char *,bool = 0) const;
 %End
 
-	QStrList propertyNames(bool = 0) const;
+	TQStrList propertyNames(bool = 0) const;
 %End
 %End
 
 private:
-	QMetaObject(const QMetaObject &);
+	TQMetaObject(const TQMetaObject &);
 };
 
 
-%If (Qt_PROPERTIES)
-%If (Qt_2_1_0 -)
+%If (TQt_PROPERTIES)
+%If (TQt_2_1_0 -)
 
-class QMetaProperty
+class TQMetaProperty
 {
 %TypeHeaderCode
 #include <qmetaobject.h>
@@ -103,40 +103,40 @@ public:
 	const char *type() const;
 	const char *name() const;
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool writable() const;
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool writeable() const;
 %End
 	bool isValid() const;
 
 	bool isSetType() const;
 	bool isEnumType() const;
-	QStrList enumKeys() const;
+	TQStrList enumKeys() const;
 
 	int keyToValue(const char *) const;
 	const char *valueToKey(int) const;
-	int keysToValue(const QStrList &) const;
-	QStrList valueToKeys(int) const;
+	int keysToValue(const TQStrList &) const;
+	TQStrList valueToKeys(int) const;
 
-%If (Qt_3_1_0 -)
-	bool designable(QObject * = 0) const;
-	bool scriptable(QObject * = 0) const;
-	bool stored(QObject * = 0) const;
+%If (TQt_3_1_0 -)
+	bool designable(TQObject * = 0) const;
+	bool scriptable(TQObject * = 0) const;
+	bool stored(TQObject * = 0) const;
 %End
-%If (Qt_3_0_0 - Qt_3_1_0)
-	bool designable(QObject *) const;
-	bool scriptable(QObject *) const;
-	bool stored(QObject *) const;
+%If (TQt_3_0_0 - TQt_3_1_0)
+	bool designable(TQObject *) const;
+	bool scriptable(TQObject *) const;
+	bool stored(TQObject *) const;
 %End
 
-%If (Qt_3_0_0 -)
-	bool reset(QObject *) const;
+%If (TQt_3_0_0 -)
+	bool reset(TQObject *) const;
 %End
 
-%If (- Qt_3_0_0)
-	bool stored(QObject *) const;
+%If (- TQt_3_0_0)
+	bool stored(TQObject *) const;
 	bool designable() const;
 
 	enum Specification {
@@ -155,7 +155,7 @@ public:
 		UnresolvedDesignable,
 		NotDesignable,
 		NotStored,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		StdSet,
 %End
 	};
diff --git a/sip/qt/qmime.sip b/sip/qt/qmime.sip
index cb5abd8..53d48fe 100644
--- a/sip/qt/qmime.sip
+++ b/sip/qt/qmime.sip
@@ -1,104 +1,104 @@
-// This is the SIP interface definition for the Qt v2+ QMimeSource,
-// QMimeSourceFactory and QWindowsMime classes.
+// This is the SIP interface definition for the TQt v2+ TQMimeSource,
+// TQMimeSourceFactory and TQWindowsMime classes.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QMimeSource (Qt v2+)</Title>
+<Sect2><Title>TQMimeSource (TQt v2+)</Title>
 <Para>
-<Literal>QMimeSource</Literal> is fully implemented.
+<Literal>TQMimeSource</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMimeSourceFactory (Qt v2+)</Title>
+<Sect2><Title>TQMimeSourceFactory (TQt v2+)</Title>
 <Para>
-<Literal>QMimeSourceFactory</Literal> is fully implemented.
+<Literal>TQMimeSourceFactory</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QWindowsMime (Qt v3+)</Title>
+<Sect2><Title>TQWindowsMime (TQt v3+)</Title>
 <Para>
-<Literal>QWindowsMime</Literal> is fully implemented.
+<Literal>TQWindowsMime</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QMimeSource
+class TQMimeSource
 {
 %TypeHeaderCode
 #include <qmime.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	QMimeSource();
+%If (TQt_3_0_0 -)
+	TQMimeSource();
 %End
 
 	virtual const char *format(int = 0) const = 0;
 	virtual bool provides(const char *) const;
-	virtual QByteArray encodedData(const char *) const = 0;
-%If (Qt_3_0_0 -)
+	virtual TQByteArray encodedData(const char *) const = 0;
+%If (TQt_3_0_0 -)
 	int serialNumber() const;
 %End
 };
 
 
-class QMimeSourceFactory
+class TQMimeSourceFactory
 {
 %TypeHeaderCode
 #include <qmime.h>
 %End
 
 public:
-	QMimeSourceFactory();
+	TQMimeSourceFactory();
 
-	static QMimeSourceFactory *defaultFactory();
-	static void setDefaultFactory(QMimeSourceFactory * /Transfer/);
-%If (Qt_3_0_0 -)
-	static QMimeSourceFactory *takeDefaultFactory() /TransferBack/;
-	static void addFactory(QMimeSourceFactory *);
-	static void removeFactory(QMimeSourceFactory *);
+	static TQMimeSourceFactory *defaultFactory();
+	static void setDefaultFactory(TQMimeSourceFactory * /Transfer/);
+%If (TQt_3_0_0 -)
+	static TQMimeSourceFactory *takeDefaultFactory() /TransferBack/;
+	static void addFactory(TQMimeSourceFactory *);
+	static void removeFactory(TQMimeSourceFactory *);
 %End
 
-	virtual const QMimeSource *data(const QString &) const;
-	virtual QString makeAbsolute(const QString &,const QString &) const;
-	const QMimeSource *data(const QString &,const QString &) const;
+	virtual const TQMimeSource *data(const TQString &) const;
+	virtual TQString makeAbsolute(const TQString &,const TQString &) const;
+	const TQMimeSource *data(const TQString &,const TQString &) const;
 
-	virtual void setText(const QString &,const QString &);
-	virtual void setImage(const QString &,const QImage &);
-	virtual void setPixmap(const QString &,const QPixmap &);
-	virtual void setData(const QString &,QMimeSource * /Transfer/);
-	virtual void setFilePath(const QStringList &);
-%If (Qt_2_1_0 -)
-	virtual QStringList filePath() const;
-	void addFilePath(const QString &);
+	virtual void setText(const TQString &,const TQString &);
+	virtual void setImage(const TQString &,const TQImage &);
+	virtual void setPixmap(const TQString &,const TQPixmap &);
+	virtual void setData(const TQString &,TQMimeSource * /Transfer/);
+	virtual void setFilePath(const TQStringList &);
+%If (TQt_2_1_0 -)
+	virtual TQStringList filePath() const;
+	void addFilePath(const TQString &);
 %End
-	virtual void setExtensionType(const QString &,const char *);
+	virtual void setExtensionType(const TQString &,const char *);
 };
 
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 %End
diff --git a/sip/qt/qmotifplusstyle.sip b/sip/qt/qmotifplusstyle.sip
index 18aaa3e..910cfdb 100644
--- a/sip/qt/qmotifplusstyle.sip
+++ b/sip/qt/qmotifplusstyle.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QMotifPlusStyle.
+// This is the SIP interface definition for TQMotifPlusStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QMotifPlusStyle (Qt v2.2+)</Title>
+<Sect2><Title>TQMotifPlusStyle (TQt v2.2+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>getButtonShift</Function></FuncDef>
 	<ParamDef>int &amp;<Parameter>x</Parameter></ParamDef>
@@ -29,12 +29,12 @@
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>x</Literal> and
-<Literal>y</Literal> values.  (Qt v2)
+<Literal>y</Literal> values.  (TQt v2)
 </Para>
  
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QScrollBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQScrollBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderLength</Parameter></ParamDef>
@@ -44,106 +44,106 @@ This takes no parameters and returns a tuple of the <Literal>x</Literal> and
 This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_STYLE_MOTIFPLUS)
-%If (Qt_2_2_0 -)
+%If (TQt_STYLE_MOTIFPLUS)
+%If (TQt_2_2_0 -)
 
-class QMotifPlusStyle : QMotifStyle
+class TQMotifPlusStyle : TQMotifStyle
 {
 %TypeHeaderCode
 #include <qmotifplusstyle.h>
 %End
 
 public:
-%If (- Qt_3_0_5)
-	QMotifPlusStyle(bool = 0);
+%If (- TQt_3_0_5)
+	TQMotifPlusStyle(bool = 0);
 %End
-%If (Qt_3_0_5 -)
-	QMotifPlusStyle(bool = 1);
+%If (TQt_3_0_5 -)
+	TQMotifPlusStyle(bool = 1);
 %End
 
-	void polish(QPalette &);
-	void polish(QWidget *);
-	void unPolish(QWidget *);
+	void polish(TQPalette &);
+	void polish(TQWidget *);
+	void unPolish(TQWidget *);
 
-	void polish(QApplication *);
-	void unPolish(QApplication *);
+	void polish(TQApplication *);
+	void unPolish(TQApplication *);
 
-%If (- Qt_3_0_0)
-	void polishPopupMenu(QPopupMenu *);
+%If (- TQt_3_0_0)
+	void polishPopupMenu(TQPopupMenu *);
 	int defaultFrameWidth() const;
-	void drawArrow(QPainter *,ArrowType,bool,int,int,int,int,
-		       const QColorGroup &,bool,const QBrush * = 0);
-	void drawMenuBarItem(QPainter *,int,int,int,int,QMenuItem *,
-			     QColorGroup &,bool,bool);
-	void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-			       const QPalette &,bool,bool,int,int,int,int);
-	void drawPushButton(QPushButton *,QPainter *);
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-			const QBrush * = 0);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
+	void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int,
+		       const TQColorGroup &,bool,const TQBrush * = 0);
+	void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *,
+			     TQColorGroup &,bool,bool);
+	void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+			       const TQPalette &,bool,bool,int,int,int,int);
+	void drawPushButton(TQPushButton *,TQPainter *);
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+			const TQBrush * = 0);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
 
 	void getButtonShift(int &,int &);
 
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,int,
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int,
 			   bool = 0,bool = 1);
-	QSize indicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
-	QSize exclusiveIndicatorSize() const;
-	void drawPanel(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		       int = 1,const QBrush * = 0);
+	TQSize indicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
+	TQSize exclusiveIndicatorSize() const;
+	void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		       int = 1,const TQBrush * = 0);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,uint);
-	void drawTab(QPainter *,const QTabBar *,QTab *,bool);
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint);
+	void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool);
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
 %End
-%If (Qt_3_0_0 -)
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+%If (TQt_3_0_0 -)
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	QRect subRect(SubRect,const QWidget *) const;
+	TQRect subRect(SubRect,const TQWidget *) const;
  
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const; 
+				const TQStyleOption & = TQStyleOption()) const; 
 
-	QRect querySubControlMetrics(ComplexControl,const QWidget *,
+	TQRect querySubControlMetrics(ComplexControl,const TQWidget *,
 				     SubControl,
-				     const QStyleOption & = QStyleOption()) const;
+				     const TQStyleOption & = TQStyleOption()) const;
  
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
  
-	int styleHint(StyleHint,const QWidget *,
-		      const QStyleOption & = QStyleOption(),
-		      QStyleHintReturn * = 0) const;
+	int styleHint(StyleHint,const TQWidget *,
+		      const TQStyleOption & = TQStyleOption(),
+		      TQStyleHintReturn * = 0) const;
 %End
 
 protected:
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 };
 
 %End
diff --git a/sip/qt/qmotifstyle.sip b/sip/qt/qmotifstyle.sip
index d749745..9e20296 100644
--- a/sip/qt/qmotifstyle.sip
+++ b/sip/qt/qmotifstyle.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QMotifStyle.
+// This is the SIP interface definition for TQMotifStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QMotifStyle (Qt v2+)</Title>
+<Sect2><Title>TQMotifStyle (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderLength</Parameter></ParamDef>
@@ -34,12 +34,12 @@
 This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>void <Function>tabbarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>t</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>t</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>hframe</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>vframe</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>overlap</Parameter></ParamDef>
@@ -47,120 +47,120 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Para>
 This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 <Literal>hframe</Literal>, <Literal>vframe</Literal> and
-<Literal>overlap</Literal> values.  (Qt v2)
+<Literal>overlap</Literal> values.  (TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_2_00 -)
-%If (Qt_STYLE_MOTIF)
+%If (TQt_2_00 -)
+%If (TQt_STYLE_MOTIF)
 
-class QMotifStyle : QCommonStyle
+class TQMotifStyle : TQCommonStyle
 {
 %TypeHeaderCode
 #include <qmotifstyle.h>
 %End
 
 public:
-	QMotifStyle(bool = 0);
+	TQMotifStyle(bool = 0);
 
 	void setUseHighlightColors(bool);
 	bool useHighlightColors() const;
 
-	void polish(QPalette &);
-	void polish(QWidget *);
-	void polish(QApplication *);
-
-%If (- Qt_3_0_0)
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-			const QBrush * = 0);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
-	void drawFocusRect(QPainter *,const QRect &,const QColorGroup &,
-			   const QColor * =0,bool = 0);
-
-%If (Qt_2_1_0 -)
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
+	void polish(TQPalette &);
+	void polish(TQWidget *);
+	void polish(TQApplication *);
+
+%If (- TQt_3_0_0)
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+			const TQBrush * = 0);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
+	void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &,
+			   const TQColor * =0,bool = 0);
+
+%If (TQt_2_1_0 -)
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
 %End
 
-	void drawPushButton(QPushButton *,QPainter *);
-	void drawArrow(QPainter *,ArrowType,bool,int,int,int,int,
-		       const QColorGroup &,bool,const QBrush * = 0);
-	QSize indicatorSize() const;
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,int,
+	void drawPushButton(TQPushButton *,TQPainter *);
+	void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int,
+		       const TQColorGroup &,bool,const TQBrush * = 0);
+	TQSize indicatorSize() const;
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int,
 			   bool = 0,bool = 1);
-	QSize exclusiveIndicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
-	void drawExclusiveIndicatorMask(QPainter *,int,int,int,int,bool);
+	TQSize exclusiveIndicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
+	void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool);
 
-	void tabbarMetrics(const QTabBar *,int &,int &,int &);
+	void tabbarMetrics(const TQTabBar *,int &,int &,int &);
 
-	void drawTab(QPainter *,const QTabBar *,QTab *,bool);
-	void drawTabMask(QPainter *,const QTabBar *,QTab *,bool);
+	void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool);
+	void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,uint);
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint);
 	int sliderLength() const;
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
 	int splitterWidth() const;
-	void drawSplitter(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &,
 			  Orientation);
-	void drawCheckMark(QPainter *,int,int,int,int,const QColorGroup &,bool,
+	void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,bool,
 			   bool);
-	void polishPopupMenu(QPopupMenu *);
-	int extraPopupMenuItemWidth(bool,int,QMenuItem *,const QFontMetrics &);
-	int popupMenuItemHeight(bool,QMenuItem *,const QFontMetrics &);
-	void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-			       const QPalette &,bool,bool,int,int,int,int);
+	void polishPopupMenu(TQPopupMenu *);
+	int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &);
+	int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &);
+	void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+			       const TQPalette &,bool,bool,int,int,int,int);
 %End
-%If (Qt_3_0_0 -)
-	void polishPopupMenu(QPopupMenu *);
+%If (TQt_3_0_0 -)
+	void polishPopupMenu(TQPopupMenu *);
 
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const;
+				const TQStyleOption & = TQStyleOption()) const;
  
-	QRect querySubControlMetrics(ComplexControl,const QWidget *,SubControl,
-				     const QStyleOption & = QStyleOption()) const;
+	TQRect querySubControlMetrics(ComplexControl,const TQWidget *,SubControl,
+				     const TQStyleOption & = TQStyleOption()) const;
  
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
  
-	QSize sizeFromContents(ContentsType,const QWidget *,const QSize &,
-			       const QStyleOption & = QStyleOption()) const; 
+	TQSize sizeFromContents(ContentsType,const TQWidget *,const TQSize &,
+			       const TQStyleOption & = TQStyleOption()) const; 
 
-	QRect subRect(SubRect,const QWidget *) const;
+	TQRect subRect(SubRect,const TQWidget *) const;
  
-	QPixmap stylePixmap(StylePixmap,const QWidget * = 0,
-			    const QStyleOption & = QStyleOption()) const;
+	TQPixmap stylePixmap(StylePixmap,const TQWidget * = 0,
+			    const TQStyleOption & = TQStyleOption()) const;
  
-	int styleHint(StyleHint,const QWidget *,
-		      const QStyleOption & = QStyleOption(),
-		      QStyleHintReturn * = 0) const;
+	int styleHint(StyleHint,const TQWidget *,
+		      const TQStyleOption & = TQStyleOption(),
+		      TQStyleHintReturn * = 0) const;
 %End
 
 private:
-%If (Qt_3_0_0 -)
-	QMotifStyle(const QMotifStyle &);
+%If (TQt_3_0_0 -)
+	TQMotifStyle(const TQMotifStyle &);
 %End
 };
 
diff --git a/sip/qt/qmovie.sip b/sip/qt/qmovie.sip
index ba4f3e9..3b79830 100644
--- a/sip/qt/qmovie.sip
+++ b/sip/qt/qmovie.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QMovie.
+// This is the SIP interface definition for TQMovie.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMovie</Title>
+<Sect2><Title>TQMovie</Title>
 <FuncSynopsis>
-        <FuncDef><Function>QMovie</Function></FuncDef>
-        <ParamDef>QDataSource *<Parameter>src</Parameter></ParamDef>
+        <FuncDef><Function>TQMovie</Function></FuncDef>
+        <ParamDef>TQDataSource *<Parameter>src</Parameter></ParamDef>
         <ParamDef>int <Parameter>bufsize</Parameter> = 1024</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -38,43 +38,43 @@ Not implemented.
 </FuncSynopsis>
 <Para>
 <Literal>length</Literal> is derived from <Literal>data</Literal> and not
-passed as a parameter. (Qt v2.2.0+)
+passed as a parameter. (TQt v2.2.0+)
 </Para>
 </Sect2>
 %End
 
 
-class QMovie
+class TQMovie
 {
 %TypeHeaderCode
 #include <qmovie.h>
 %End
 
 public:
-	QMovie();
-%If (Qt_2_2_0 -)
-	QMovie(int);
+	TQMovie();
+%If (TQt_2_2_0 -)
+	TQMovie(int);
 %End
-//	QMovie(QDataSource *,int = 1024);
-%If (- Qt_2_00)
-	QMovie(const char *,int = 1024);
+//	TQMovie(TQDataSource *,int = 1024);
+%If (- TQt_2_00)
+	TQMovie(const char *,int = 1024);
 %End
-%If (Qt_2_00 -)
-	QMovie(const QString &,int = 1024);
+%If (TQt_2_00 -)
+	TQMovie(const TQString &,int = 1024);
 %End
-	QMovie(QByteArray,int = 1024);
-	QMovie(const QMovie &);
+	TQMovie(TQByteArray,int = 1024);
+	TQMovie(const TQMovie &);
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	int pushSpace() const;
 	void pushData(const uchar * /Array/,int /ArraySize/);
 %End
-	const QColor &backgroundColor() const;
-	void setBackgroundColor(const QColor &);
-	const QRect &getValidRect() const;
-	const QPixmap &framePixmap() const;
-%If (Qt_2_2_0 -)
-	const QImage &frameImage() const;
+	const TQColor &backgroundColor() const;
+	void setBackgroundColor(const TQColor &);
+	const TQRect &getValidRect() const;
+	const TQPixmap &framePixmap() const;
+%If (TQt_2_2_0 -)
+	const TQImage &frameImage() const;
 %End
 	bool isNull() const;
 	int frameNumber() const;
@@ -89,10 +89,10 @@ public:
 	void restart();
 	int speed() const;
 	void setSpeed(int);
-	void connectResize(SIP_RXOBJ_CON,SIP_SLOT_CON(const QSize &));
-	void disconnectResize(SIP_RXOBJ_DIS,SIP_SLOT_DIS(const QSize &));
-	void connectUpdate(SIP_RXOBJ_CON,SIP_SLOT_CON(const QRect &));
-	void disconnectUpdate(SIP_RXOBJ_DIS,SIP_SLOT_DIS(const QRect &));
+	void connectResize(SIP_RXOBJ_CON,SIP_SLOT_CON(const TQSize &));
+	void disconnectResize(SIP_RXOBJ_DIS,SIP_SLOT_DIS(const TQSize &));
+	void connectUpdate(SIP_RXOBJ_CON,SIP_SLOT_CON(const TQRect &));
+	void disconnectUpdate(SIP_RXOBJ_DIS,SIP_SLOT_DIS(const TQRect &));
 
 	enum Status {
 		SourceEmpty = -2,
diff --git a/sip/qt/qmultilinedit.sip b/sip/qt/qmultilinedit.sip
index 1d407ba..cc462be 100644
--- a/sip/qt/qmultilinedit.sip
+++ b/sip/qt/qmultilinedit.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QMultiLineEdit.
+// This is the SIP interface definition for TQMultiLineEdit.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMultiLineEdit</Title>
+<Sect2><Title>TQMultiLineEdit</Title>
 <FuncSynopsis>
         <FuncDef>void <Function>cursorPosition</Function> const</FuncDef>
         <ParamDef>int *<Parameter>line</Parameter></ParamDef>
@@ -29,7 +29,7 @@
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>line</Literal> and
-<Literal>col</Literal> values.  (Qt v1.x, Qt v2.x)
+<Literal>col</Literal> values.  (TQt v1.x, TQt v2.x)
 </Para>
 
 <FuncSynopsis>
@@ -37,7 +37,7 @@ This takes no parameters and returns a tuple of the <Literal>line</Literal> and
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-This has been renamed <Literal>delChar</Literal> in Python.  (Qt v1.x, Qt v2.x)
+This has been renamed <Literal>delChar</Literal> in Python.  (TQt v1.x, TQt v2.x)
 </Para>
 
 <FuncSynopsis>
@@ -47,7 +47,7 @@ This has been renamed <Literal>delChar</Literal> in Python.  (Qt v1.x, Qt v2.x)
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>line</Literal> and
-<Literal>col</Literal> values.  (Qt v1.x, Qt v2.x)
+<Literal>col</Literal> values.  (TQt v1.x, TQt v2.x)
 </Para>
 
 <FuncSynopsis>
@@ -66,35 +66,35 @@ This takes no parameters and returns a tuple of the bool result and the
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QMultiLineEdit : QTextEdit
+class TQMultiLineEdit : TQTextEdit
 {
 %TypeHeaderCode
 #include <qmultilineedit.h>
 %End
 
 public:
-	QMultiLineEdit(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQMultiLineEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	QString textLine(int) const;
+	TQString textLine(int) const;
 	int numLines() const;
 
-	virtual void insertLine(const QString &,int = -1);
-%If (Qt_3_1_0 -)
-	virtual void insertAt(const QString &,int,int);
-	virtual void insertAt(const QString &,int,int,bool);
+	virtual void insertLine(const TQString &,int = -1);
+%If (TQt_3_1_0 -)
+	virtual void insertAt(const TQString &,int,int);
+	virtual void insertAt(const TQString &,int,int,bool);
 %End
-%If (- Qt_3_1_0)
-	virtual void insertAt(const QString &,int,int,bool = 0);
+%If (- TQt_3_1_0)
+	virtual void insertAt(const TQString &,int,int,bool = 0);
 %End
 	virtual void removeLine(int);
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	virtual void setCursorPosition(int,int);
 	virtual void setCursorPosition(int,int,bool);
 %End
-%If (- Qt_3_1_0)
+%If (- TQt_3_1_0)
 	virtual void setCursorPosition(int,int,bool = 0);
 %End
 	bool atBeginning() const;
@@ -107,7 +107,7 @@ public:
 	bool edited() const;
 
 	bool hasMarkedText() const;
-	QString markedText() const;
+	TQString markedText() const;
 
 	void cursorWordForward(bool);
 	void cursorWordBackward(bool);
@@ -125,8 +125,8 @@ public slots:
 	void deselect();
 
 protected:
-	QPoint cursorPoint() const;
-	virtual void insertAndMark(const QString &,bool);
+	TQPoint cursorPoint() const;
+	virtual void insertAndMark(const TQString &,bool);
 	virtual void newLine();
 	virtual void killLine();
 	virtual void pageUp(bool = 0);
@@ -142,22 +142,22 @@ protected:
 	int lineLength(int) const;
 
 private:
-	QMultiLineEdit(const QMultiLineEdit &);
+	TQMultiLineEdit(const TQMultiLineEdit &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QMultiLineEdit : QTableView
+class TQMultiLineEdit : TQTableView
 {
 %TypeHeaderCode
 #include <qmultilinedit.h>
 %End
 
 public:
-	QMultiLineEdit(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQMultiLineEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	int numLines() const;
 	virtual void removeLine(int);
@@ -171,11 +171,11 @@ public:
 	bool autoUpdate() const;
 	bool isReadOnly() const;
 	bool isOverwriteMode() const;
-	QString text() const;
+	TQString text() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *textLine(int) const;
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 	virtual void insertLine(const char *,int = -1);
 	virtual void insertAt(const char *,int,int);
 	void setCursorPosition(int,int,bool = 0);
@@ -183,20 +183,20 @@ public:
 	void setAutoUpdate(bool);
 %End
 
-%If (Qt_2_00 -)
-	QString textLine(int) const;
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
-	QSizePolicy sizePolicy() const;
-	virtual void setFont(const QFont &);
-	virtual void insertLine(const QString &,int = -1);
-	virtual void insertAt(const QString &,int,int,bool = 0);
+%If (TQt_2_00 -)
+	TQString textLine(int) const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
+	TQSizePolicy sizePolicy() const;
+	virtual void setFont(const TQFont &);
+	virtual void insertLine(const TQString &,int = -1);
+	virtual void insertAt(const TQString &,int,int,bool = 0);
 	virtual void setCursorPosition(int,int,bool = 0);
 	virtual void setFixedVisibleLines(int);
 	void setAlignment(int);
 	int alignment() const;
-	virtual void setValidator(const QValidator *);
-	const QValidator *validator() const;
+	virtual void setValidator(const TQValidator *);
+	const TQValidator *validator() const;
 	void setEdited(bool);
 	bool edited() const;
 	void cursorWordForward(bool);
@@ -221,7 +221,7 @@ public:
 	virtual void setAutoUpdate(bool);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setMaxLength(int);
 	int maxLength() const;
 
@@ -257,32 +257,32 @@ public slots:
 	void clear();
 	void deselect();
 	void selectAll();
-%If (Qt_CLIPBOARD)
+%If (TQt_CLIPBOARD)
 	void paste();
-%If (Qt_2_2_0 -)
-	void pasteSubType(const QCString &);
+%If (TQt_2_2_0 -)
+	void pasteSubType(const TQCString &);
 %End
 	void cut();
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setText(const char *);
 	void setReadOnly(bool);
 	void setOverwriteMode(bool);
 	void append(const char *);
 	void copyText();
 %End
-%If (Qt_2_00 -)
-	virtual void setText(const QString &);
+%If (TQt_2_00 -)
+	virtual void setText(const TQString &);
 	virtual void setReadOnly(bool);
 	virtual void setOverwriteMode(bool);
-	void append(const QString &);
-%If (Qt_CLIPBOARD)
+	void append(const TQString &);
+%If (TQt_CLIPBOARD)
 	void copyText() const;
 	void copy() const;
 %End
-	void insert(const QString &);
+	void insert(const TQString &);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void undo();
 	void redo();
 %End
@@ -290,59 +290,59 @@ public slots:
 signals:
 	void textChanged();
 	void returnPressed();
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void undoAvailable(bool);
 	void redoAvailable(bool);
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void copyAvailable(bool);
 %End
 
 protected:
-	void paintCell(QPainter *,int,int);
-%If (Qt_2_2_0 -)
-	bool event(QEvent *);
-%End
-	void mousePressEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-%If (Qt_2_00 -)
-	void wheelEvent(QWheelEvent *);
-%End
-	void keyPressEvent(QKeyEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
-	void timerEvent(QTimerEvent *);
-	void leaveEvent(QEvent *);
-	void resizeEvent(QResizeEvent *);
-%If (Qt_DRAGANDDROP)
-%If (Qt_2_00 -)
-	void dragMoveEvent(QDragMoveEvent *);
-%End
-%If (Qt_2_1_0 -)
-	void dragEnterEvent(QDragEnterEvent *);
-%End
-%If (Qt_2_00 -)
-	void dropEvent(QDropEvent *);
-	void dragLeaveEvent(QDragLeaveEvent *);
+	void paintCell(TQPainter *,int,int);
+%If (TQt_2_2_0 -)
+	bool event(TQEvent *);
+%End
+	void mousePressEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+%If (TQt_2_00 -)
+	void wheelEvent(TQWheelEvent *);
+%End
+	void keyPressEvent(TQKeyEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
+	void timerEvent(TQTimerEvent *);
+	void leaveEvent(TQEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (TQt_DRAGANDDROP)
+%If (TQt_2_00 -)
+	void dragMoveEvent(TQDragMoveEvent *);
+%End
+%If (TQt_2_1_0 -)
+	void dragEnterEvent(TQDragEnterEvent *);
+%End
+%If (TQt_2_00 -)
+	void dropEvent(TQDropEvent *);
+	void dragLeaveEvent(TQDragLeaveEvent *);
 %End
 %End
 	bool hasMarkedText() const;
-	QString markedText() const;
+	TQString markedText() const;
 	int textWidth(int);
-%If (- Qt_2_00)
-	int textWidth(QString *);
+%If (- TQt_2_00)
+	int textWidth(TQString *);
 %End
-%If (Qt_2_00 -)
-	int textWidth(const QString &);
+%If (TQt_2_00 -)
+	int textWidth(const TQString &);
 %End
-	QPoint cursorPoint() const;
-%If (- Qt_2_00)
+	TQPoint cursorPoint() const;
+%If (- TQt_2_00)
 	virtual void insertChar(char);
 %End
-%If (Qt_2_00 -)
-	virtual void insert(const QString &,bool);
+%If (TQt_2_00 -)
+	virtual void insert(const TQString &,bool);
 %End
 	virtual void newLine();
 	virtual void killLine();
@@ -358,17 +358,17 @@ protected:
 	virtual void end(bool = 0);
 	bool getMarkedRegion(int *,int *,int *,int *) const;
 	int lineLength(int) const;
-	QString *getString(int) const;
-%If (Qt_2_1_0 -)
+	TQString *getString(int) const;
+%If (TQt_2_1_0 -)
 	bool isEndOfParagraph(int) const;
 %End
-%If (Qt_2_00 -)
-	QString stringShown(int) const;
-	void insertChar(QChar);
+%If (TQt_2_00 -)
+	TQString stringShown(int) const;
+	void insertChar(TQChar);
 %End
 
 private:
-	QMultiLineEdit(const QMultiLineEdit &);
+	TQMultiLineEdit(const TQMultiLineEdit &);
 };
 
 %End
diff --git a/sip/qt/qmutex.sip b/sip/qt/qmutex.sip
index 1f9ff86..3bf03bc 100644
--- a/sip/qt/qmutex.sip
+++ b/sip/qt/qmutex.sip
@@ -1,52 +1,52 @@
-// This is the SIP interface definition for QMutex and QMutexLocker.
+// This is the SIP interface definition for TQMutex and TQMutexLocker.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QMutex (Qt v2.2+)</Title>
+<Sect2><Title>TQMutex (TQt v2.2+)</Title>
 <Para>
-<Literal>QMutex</Literal> is fully implemented.
+<Literal>TQMutex</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QMutexLocker (Qt v3.1+)</Title>
+<Sect2><Title>TQMutexLocker (TQt v3.1+)</Title>
 <Para>
-<Literal>QMutexLocker</Literal> is fully implemented.
+<Literal>TQMutexLocker</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_THREAD_SUPPORT)
+%If (TQt_THREAD_SUPPORT)
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QMutex
+class TQMutex
 {
 %TypeHeaderCode
 #include <qmutex.h>
 %End
 
 public:
-	QMutex(bool = 0);
+	TQMutex(bool = 0);
 
 	void lock() /ReleaseGIL/;
 	void unlock();
@@ -54,49 +54,49 @@ public:
 	bool tryLock();
 
 private:
-	QMutex(const QMutex &);
+	TQMutex(const TQMutex &);
 };
 
 %End
 
 
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 
-class QMutex : Qt
+class TQMutex : TQt
 {
 %TypeHeaderCode
 #include <qthread.h>
 %End
 
 public:
-	QMutex(bool = 0);
+	TQMutex(bool = 0);
 
 	void lock() /ReleaseGIL/;
 	void unlock();
 	bool locked();
 
 private:
-	QMutex(const QMutex &);
+	TQMutex(const TQMutex &);
 };
 
 %End
 
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 
-class QMutexLocker
+class TQMutexLocker
 {
 %TypeHeaderCode
 #include <qmutex.h>
 %End
 
 public:
-	QMutexLocker(QMutex *) /ReleaseGIL/;
+	TQMutexLocker(TQMutex *) /ReleaseGIL/;
 
-	QMutex *mutex() const;
+	TQMutex *mutex() const;
 
 private:
-	QMutexLocker(const QMutexLocker &);
+	TQMutexLocker(const TQMutexLocker &);
 };
 
 %End
diff --git a/sip/qt/qnamespace.sip b/sip/qt/qnamespace.sip
index cddd3b5..7bd009c 100644
--- a/sip/qt/qnamespace.sip
+++ b/sip/qt/qnamespace.sip
@@ -1,62 +1,62 @@
-// This is the SIP interface definition for the Qt v2+ Qt class.
+// This is the SIP interface definition for the TQt v2+ TQt class.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>Qt (Qt v2+)</Title>
+<Sect2><Title>TQt (TQt v2+)</Title>
 <Para>
-<Literal>Qt</Literal> is fully implemented.
+<Literal>TQt</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class Qt
+class TQt
 {
 %TypeHeaderCode
 #include <qnamespace.h>
 %End
 
 public:
-	static const QColor &color0;
-	static const QColor &color1;
-	static const QColor &black;
-	static const QColor &white;
-	static const QColor &darkGray;
-	static const QColor &gray;
-	static const QColor &lightGray;
-	static const QColor &red;
-	static const QColor &green;
-	static const QColor &blue;
-	static const QColor &cyan;
-	static const QColor &magenta;
-	static const QColor &yellow;
-	static const QColor &darkRed;
-	static const QColor &darkGreen;
-	static const QColor &darkBlue;
-	static const QColor &darkCyan;
-	static const QColor &darkMagenta;
-	static const QColor &darkYellow;
+	static const TQColor &color0;
+	static const TQColor &color1;
+	static const TQColor &black;
+	static const TQColor &white;
+	static const TQColor &darkGray;
+	static const TQColor &gray;
+	static const TQColor &lightGray;
+	static const TQColor &red;
+	static const TQColor &green;
+	static const TQColor &blue;
+	static const TQColor &cyan;
+	static const TQColor &magenta;
+	static const TQColor &yellow;
+	static const TQColor &darkRed;
+	static const TQColor &darkGreen;
+	static const TQColor &darkBlue;
+	static const TQColor &darkCyan;
+	static const TQColor &darkMagenta;
+	static const TQColor &darkYellow;
 
 	enum ButtonState {
 		NoButton,
@@ -67,11 +67,11 @@ public:
 		ShiftButton,
 		ControlButton,
 		AltButton,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		MetaButton,
 %End
 		KeyButtonMask,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		Keypad,
 %End
 	};
@@ -81,14 +81,14 @@ public:
 		Vertical
 	};
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum SortOrder {
 		Ascending,
 		Descending
 	};
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum AlignmentFlags {
 		AlignLeft,
 		AlignRight,
@@ -106,7 +106,7 @@ public:
 	};
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum AlignmentFlags {
 		AlignAuto,
 		AlignLeft,
@@ -135,7 +135,7 @@ public:
 	typedef uint WState;
 
 	// WidgetState isn't part of the public API but is used in code
-	// generated by uic/pyuic, so we implement the minimum required.
+	// generated by uic/pyuic, so we implement the minimum retquired.
 	enum WidgetState {
 		WState_Polished
 	};
@@ -145,10 +145,10 @@ public:
 
 	enum WidgetFlags {
 		WType_TopLevel,
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		WType_Modal,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WType_Dialog,
 %End
 		WType_Popup,
@@ -166,20 +166,20 @@ public:
 		WStyle_MinMax,
 		WStyle_Tool,
 		WStyle_StaysOnTop,
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		WStyle_Dialog,
 %End
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 		WStyle_Reserved2,
 		WStyle_Reserved3,
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		WStyle_ContextHelp,
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 		WStyle_NoBorderEx,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WStyle_Reserved,
 %End
 		WStyle_Mask,
@@ -190,37 +190,37 @@ public:
 		WPaintClever,
 		WResizeNoErase,		// Obsolete
 		WMouseNoMask,
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		WNorthWestGravity,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WStaticContents,
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		WRepaintNoErase,	// Obsolete
 		WX11BypassWM,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WWinOwnDC,
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		WGroupLeader,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WShowModal,
 		WNoMousePropagation,
 		WSubWindow,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		WStyle_Splash,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		WNoAutoErase,
 %End
 	};
 
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 
 	enum WindowState {
 		WindowNoState,
@@ -259,7 +259,7 @@ public:
 		OpaqueMode
 	};
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum PaintUnit {
 		PixelUnit,
 		LoMetricUnit,
@@ -271,18 +271,18 @@ public:
 %End
 
 	enum GUIStyle {
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		MacStyle,
 %End
 		WindowsStyle,
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		Win3Style,
 		PMStyle,
 %End
 		MotifStyle
 	};
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum SequenceMatch {
 		NoMatch,
 		PartialMatch,
@@ -291,7 +291,7 @@ public:
 %End
 
 	enum Modifier {
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		META,
 %End
 		SHIFT,
@@ -316,7 +316,7 @@ public:
 		Key_Pause,
 		Key_Print,
 		Key_SysReq,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		Key_Clear,
 %End
 
@@ -380,7 +380,7 @@ public:
 		Key_Menu,
 		Key_Hyper_L,
 		Key_Hyper_R,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		Key_Help,
 		Key_Direction_L,
 		Key_Direction_R,
@@ -554,7 +554,7 @@ public:
 		Key_thorn,
 		Key_ydiaeresis,
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		Key_Back,
 		Key_Forward,
 		Key_Stop,
@@ -642,12 +642,12 @@ public:
 		DotLine,
 		DashDotLine,
 		DashDotDotLine,
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		MPenStyle
 %End
 	};
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum PenCapStyle {
 		FlatCap,
 		SquareCap,
@@ -682,32 +682,32 @@ public:
 		CustomPattern
 	};
  
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum MacintoshVersion {
 		MV_Unknown,
 
 		MV_9,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		MV_10_DOT_0,
 %End
 		MV_10_DOT_1,
 		MV_10_DOT_2,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		MV_10_DOT_3,
 %End
-%If (Qt_3_3_5 -)
+%If (TQt_3_3_5 -)
 		MV_10_DOT_4,
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		MV_CHEETAH,
 		MV_PUMA,
 %End
 		MV_JAGUAR,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		MV_PANTHER,
 %End
-%If (Qt_3_3_5 -)
+%If (TQt_3_3_5 -)
 		MV_TIGER,
 %End
 	};
@@ -717,38 +717,38 @@ public:
 		WV_32s,
 		WV_95,
 		WV_98,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WV_Me,
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		WV_DOS_based,
 %End
 
 		WV_NT,
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		WV_2000,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WV_XP,
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		WV_2003,
 %End
-%If (Qt_3_3_6 -)
+%If (TQt_3_3_6 -)
 		WV_VISTA,
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		WV_NT_based,
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		WV_CE,
 		WV_CENET,
 		WV_CE_based,
 %End
 	};
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum UIEffect {
 		UI_General,
 		UI_AnimateMenu,
@@ -756,13 +756,13 @@ public:
 		UI_AnimateCombo,
 		UI_AnimateTooltip,
 		UI_FadeTooltip,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		UI_AnimateToolBox,
 %End
 	};
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum CursorShape {
 		ArrowCursor,
 		UpArrowCursor,
@@ -780,7 +780,7 @@ public:
 		PointingHandCursor,
 		ForbiddenCursor,
 		WhatsThisCursor,
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		BusyCursor,
 %End
 		LastCursor,
@@ -788,47 +788,47 @@ public:
 	};
 %End
 
-	static const QCursor &arrowCursor;
-	static const QCursor &upArrowCursor;
-	static const QCursor &crossCursor;
-	static const QCursor &waitCursor;
-	static const QCursor &ibeamCursor;
-	static const QCursor &sizeVerCursor;
-	static const QCursor &sizeHorCursor;
-	static const QCursor &sizeBDiagCursor;
-	static const QCursor &sizeFDiagCursor;
-	static const QCursor &sizeAllCursor;
-	static const QCursor &blankCursor;
-	static const QCursor &splitVCursor;
-	static const QCursor &splitHCursor;
-	static const QCursor &pointingHandCursor;
-%If (Qt_2_1_0 -)
-	static const QCursor &forbiddenCursor;
+	static const TQCursor &arrowCursor;
+	static const TQCursor &upArrowCursor;
+	static const TQCursor &crossCursor;
+	static const TQCursor &waitCursor;
+	static const TQCursor &ibeamCursor;
+	static const TQCursor &sizeVerCursor;
+	static const TQCursor &sizeHorCursor;
+	static const TQCursor &sizeBDiagCursor;
+	static const TQCursor &sizeFDiagCursor;
+	static const TQCursor &sizeAllCursor;
+	static const TQCursor &blankCursor;
+	static const TQCursor &splitVCursor;
+	static const TQCursor &splitHCursor;
+	static const TQCursor &pointingHandCursor;
+%If (TQt_2_1_0 -)
+	static const TQCursor &forbiddenCursor;
 %End
-%If (Qt_3_0_0 -)
-	static const QCursor &whatsThisCursor;
+%If (TQt_3_0_0 -)
+	static const TQCursor &whatsThisCursor;
 %End
-%If (Qt_3_3_0 -)
-	static const QCursor &busyCursor;
+%If (TQt_3_3_0 -)
+	static const TQCursor &busyCursor;
 %End
  
 	enum TextFormat {
 		PlainText,
 		RichText,
 		AutoText,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		LogText,
 %End
 	};
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum AnchorAttribute {
 		AnchorName,
 		AnchorHref
 	};
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Dock {
 		DockUnmanaged,
 		DockTornOff,
@@ -845,7 +845,7 @@ public:
 		LocalDate
 	};
  
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum TimeSpec {
 		LocalTime,
 		UTC
@@ -885,7 +885,7 @@ public:
 		ExactMatch
 	};
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum Corner {
 		TopLeft,
 		TopRight,
diff --git a/sip/qt/qnetworkprotocol.sip b/sip/qt/qnetworkprotocol.sip
index 6af512b..deee868 100644
--- a/sip/qt/qnetworkprotocol.sip
+++ b/sip/qt/qnetworkprotocol.sip
@@ -1,63 +1,63 @@
-// This is the SIP interface definition for QNetworkOperation, QNetworkProtocol
-// and QNetworkProtocolFactoryBase.
+// This is the SIP interface definition for TQNetworkOperation, TQNetworkProtocol
+// and TQNetworkProtocolFactoryBase.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QNetworkOperation (Qt v2.1+)</Title>
+<Sect2><Title>TQNetworkOperation (TQt v2.1+)</Title>
 <Para>
-<Literal>QNetworkOperation</Literal> is fully implemented.
+<Literal>TQNetworkOperation</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QNetworkProtocol (Qt v2.1+)</Title>
+<Sect2><Title>TQNetworkProtocol (TQt v2.1+)</Title>
 <Para>
-<Literal>QNetworkProtocol</Literal> is fully implemented.
+<Literal>TQNetworkProtocol</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QNetworkProtocolFactoryBase (Qt v2.1+)</Title>
+<Sect2><Title>TQNetworkProtocolFactoryBase (TQt v2.1+)</Title>
 <Para>
-<Literal>QNetworkProtocolFactoryBase</Literal> is fully implemented.
+<Literal>TQNetworkProtocolFactoryBase</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_NETWORKPROTOCOL)
-%If (Qt_2_1_0 -)
+%If (TQt_NETWORKPROTOCOL)
+%If (TQt_2_1_0 -)
 
-class QNetworkProtocolFactoryBase
+class TQNetworkProtocolFactoryBase
 {
 %TypeHeaderCode
 #include <qnetworkprotocol.h>
 %End
 
 public:
-	virtual QNetworkProtocol *createObject() = 0 /Factory/;
+	virtual TQNetworkProtocol *createObject() = 0 /Factory/;
 
 };
 
 
-class QNetworkProtocol : QObject
+class TQNetworkProtocol : TQObject
 {
 %TypeHeaderCode
 #include <qnetworkprotocol.h>
@@ -72,7 +72,7 @@ public:
 		StStopped
 	};
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum Operation {
 		OpListChildren,
 		OpMkdir,
@@ -82,7 +82,7 @@ public:
 		OpPut
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Operation {
 		OpListChildren,
 		OpMkDir,
@@ -99,7 +99,7 @@ public:
 		ConClosed
 	};
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum Error {
 		NoError,
 		ErrValid,
@@ -118,7 +118,7 @@ public:
 		ErrPermissionDenied
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Error {
 		NoError,
 		ErrValid,
@@ -138,88 +138,88 @@ public:
 	};
 %End
 
-	QNetworkProtocol();
+	TQNetworkProtocol();
 
-	virtual void setUrl(QUrlOperator *);
+	virtual void setUrl(TQUrlOperator *);
 
 	virtual void setAutoDelete(bool,int = 10000);
 	bool autoDelete() const;
 
-	static void registerNetworkProtocol(const QString &,
-					    QNetworkProtocolFactoryBase *);
-	static QNetworkProtocol *getNetworkProtocol(const QString &) /Factory/;
+	static void registerNetworkProtocol(const TQString &,
+					    TQNetworkProtocolFactoryBase *);
+	static TQNetworkProtocol *getNetworkProtocol(const TQString &) /Factory/;
 	static bool hasOnlyLocalFileSystem();
 
 	virtual int supportedOperations() const;
-	virtual void addOperation(QNetworkOperation *);
+	virtual void addOperation(TQNetworkOperation *);
 
-	QUrlOperator *url() const;
-	QNetworkOperation *operationInProgress() const;
+	TQUrlOperator *url() const;
+	TQNetworkOperation *operationInProgress() const;
 	virtual void clearOperationQueue();
 	virtual void stop();
 
 signals:
-	void data(const QByteArray &,QNetworkOperation *);
-	void connectionStateChanged(int,const QString &);
-	void finished(QNetworkOperation *);
-	void start(QNetworkOperation *);
-	void newChildren(const QValueList<QUrlInfo> &,QNetworkOperation *);
-	void newChild(const QUrlInfo &,QNetworkOperation *);
-	void createdDirectory(const QUrlInfo &,QNetworkOperation *);
-	void removed(QNetworkOperation *);
-	void itemChanged(QNetworkOperation *);
-	void dataTransferProgress(int,int,QNetworkOperation *);
+	void data(const TQByteArray &,TQNetworkOperation *);
+	void connectionStateChanged(int,const TQString &);
+	void finished(TQNetworkOperation *);
+	void start(TQNetworkOperation *);
+	void newChildren(const TQValueList<TQUrlInfo> &,TQNetworkOperation *);
+	void newChild(const TQUrlInfo &,TQNetworkOperation *);
+	void createdDirectory(const TQUrlInfo &,TQNetworkOperation *);
+	void removed(TQNetworkOperation *);
+	void itemChanged(TQNetworkOperation *);
+	void dataTransferProgress(int,int,TQNetworkOperation *);
 
 protected:
-	virtual void processOperation(QNetworkOperation *);
-	virtual void operationListChildren(QNetworkOperation *);
-	virtual void operationMkDir(QNetworkOperation *);
-	virtual void operationRemove(QNetworkOperation *);
-	virtual void operationRename(QNetworkOperation *);
-	virtual void operationGet(QNetworkOperation *);
-	virtual void operationPut(QNetworkOperation *);
-%If (Qt_3_0_0 -)
-	virtual void operationPutChunk(QNetworkOperation *);
+	virtual void processOperation(TQNetworkOperation *);
+	virtual void operationListChildren(TQNetworkOperation *);
+	virtual void operationMkDir(TQNetworkOperation *);
+	virtual void operationRemove(TQNetworkOperation *);
+	virtual void operationRename(TQNetworkOperation *);
+	virtual void operationGet(TQNetworkOperation *);
+	virtual void operationPut(TQNetworkOperation *);
+%If (TQt_3_0_0 -)
+	virtual void operationPutChunk(TQNetworkOperation *);
 %End
-	virtual bool checkConnection(QNetworkOperation *);
+	virtual bool checkConnection(TQNetworkOperation *);
 
 private:
-%If (Qt_3_1_0 -)
-	QNetworkProtocol(const QNetworkProtocol &);
+%If (TQt_3_1_0 -)
+	TQNetworkProtocol(const TQNetworkProtocol &);
 %End
 };
 
 
-class QNetworkOperation : QObject
+class TQNetworkOperation : TQObject
 {
 %TypeHeaderCode
 #include <qnetworkprotocol.h>
 %End
 
 public:
-	QNetworkOperation(QNetworkProtocol::Operation,const QString &,
-			  const QString &,const QString &);
-	QNetworkOperation(QNetworkProtocol::Operation,const QByteArray &,
-			  const QByteArray &,const QByteArray &);
+	TQNetworkOperation(TQNetworkProtocol::Operation,const TQString &,
+			  const TQString &,const TQString &);
+	TQNetworkOperation(TQNetworkProtocol::Operation,const TQByteArray &,
+			  const TQByteArray &,const TQByteArray &);
 
-	void setState(QNetworkProtocol::State);
-	void setProtocolDetail(const QString &);
+	void setState(TQNetworkProtocol::State);
+	void setProtocolDetail(const TQString &);
 	void setErrorCode(int);
-	void setArg(int,const QString &);
-	void setRawArg(int,const QByteArray &);
-
-	QNetworkProtocol::Operation operation() const;
-	QNetworkProtocol::State state() const;
-	QString arg(int) const;
-	QByteArray rawArg(int) const;
-	QString protocolDetail() const;
+	void setArg(int,const TQString &);
+	void setRawArg(int,const TQByteArray &);
+
+	TQNetworkProtocol::Operation operation() const;
+	TQNetworkProtocol::State state() const;
+	TQString arg(int) const;
+	TQByteArray rawArg(int) const;
+	TQString protocolDetail() const;
 	int errorCode() const;
 
 	void free();
 
 private:
-%If (Qt_3_1_0 -)
-	QNetworkOperation(const QNetworkOperation &);
+%If (TQt_3_1_0 -)
+	TQNetworkOperation(const TQNetworkOperation &);
 %End
 };
 
diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip
index 0129284..8131cf3 100644
--- a/sip/qt/qobject.sip
+++ b/sip/qt/qobject.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QObject.
+// This is the SIP interface definition for TQObject.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QObject</Title>
+<Sect2><Title>TQObject</Title>
 <FuncSynopsis>
 	<FuncDef>bool <Function>disconnect</Function></FuncDef>
-	<ParamDef>const QObject *<Parameter>receiver</Parameter></ParamDef>
+	<ParamDef>const TQObject *<Parameter>receiver</Parameter></ParamDef>
 	<ParamDef>const char *<Parameter>member</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -34,7 +34,7 @@ Not yet implemented.
 <FuncSynopsis>
 	<FuncDef>bool <Function>disconnect</Function></FuncDef>
 	<ParamDef>const char *<Parameter>signal</Parameter> = 0</ParamDef>
-	<ParamDef>const QObject *<Parameter>receiver</Parameter> = 0</ParamDef>
+	<ParamDef>const TQObject *<Parameter>receiver</Parameter> = 0</ParamDef>
 	<ParamDef>const char *<Parameter>member</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -43,13 +43,13 @@ Not yet implemented.
 
 <FuncSynopsis>
 	<FuncDef>static bool <Function>disconnect</Function></FuncDef>
-	<ParamDef>const QObject *<Parameter>sender</Parameter></ParamDef>
+	<ParamDef>const TQObject *<Parameter>sender</Parameter></ParamDef>
 	<ParamDef>const char *<Parameter>signal</Parameter></ParamDef>
-	<ParamDef>const QObject *<Parameter>receiver</Parameter></ParamDef>
+	<ParamDef>const TQObject *<Parameter>receiver</Parameter></ParamDef>
 	<ParamDef>const char *<Parameter>member</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-At the moment PyQt does not support the full behaviour of the corresponding Qt
+At the moment PyTQt does not support the full behaviour of the corresponding TQt
 method. In particular, specifying None (ie. 0 in C++) for the
 <Literal>signal</Literal> and <Literal>receiver</Literal> parameters is not yet
 supported.
@@ -58,9 +58,9 @@ supported.
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QObject : Qt
+class TQObject : TQt
 {
 %TypeHeaderCode
 #include <qobject.h>
@@ -68,7 +68,7 @@ class QObject : Qt
 %End
 
 public:
-	QObject(QObject * /TransferThis/ = 0,const char * = 0);
+	TQObject(TQObject * /TransferThis/ = 0,const char * = 0);
 
 %ConvertToSubClassCode
 	static struct class_graph {
@@ -77,7 +77,7 @@ public:
 		int yes, no;
 	} graph[] = {
 		{sipName_QWidget,	&sipClass_QWidget,	25, 1},
-#if QT_VERSION >= 0x030100 && defined(SIP_FEATURE_Qt_ASSISTANTCLIENT)
+#if QT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT)
 		{sipName_QAssistantClient,	&sipClass_QAssistantClient,	-1, 2},
 #else
 		{NULL,				NULL,				-1, 2},
@@ -90,12 +90,12 @@ public:
 		{NULL,			NULL,			-1, 5},
 #endif
 		{sipName_QToolTipGroup,	&sipClass_QToolTipGroup,	-1, 6},
-#if defined(SIP_FEATURE_Qt_FILEDIALOG)
+#if defined(SIP_FEATURE_TQt_FILEDIALOG)
 		{sipName_QFileIconProvider,	&sipClass_QFileIconProvider,	-1, 7},
 #else
 		{NULL,				NULL,				-1, 7},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_ACTION)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
 		{sipName_QAction,	&sipClass_QAction,	89, 8},
 #else
 		{NULL,			NULL,			-1, 8},
@@ -107,14 +107,14 @@ public:
 #endif
 		{sipName_QTimer,	&sipClass_QTimer,	-1, 10},
 		{sipName_QLayout,	&sipClass_QLayout,	90, 11},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_NETWORKPROTOCOL)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_QUrlOperator,	&sipClass_QUrlOperator,	-1, 12},
 #else
 		{NULL,			NULL,			-1, 12},
 #endif
 		{sipName_QStyleSheet,	&sipClass_QStyleSheet,	-1, 13},
 		{sipName_QValidator,	&sipClass_QValidator,	94, 14},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_NETWORKPROTOCOL)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_QNetworkOperation,	&sipClass_QNetworkOperation,	-1, 15},
 #else
 		{NULL,				NULL,				-1, 15},
@@ -125,12 +125,12 @@ public:
 #else
 		{NULL,			NULL,			-1, 17},
 #endif
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_NETWORKPROTOCOL)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL)
 		{sipName_QNetworkProtocol,	&sipClass_QNetworkProtocol,	-1, 18},
 #else
 		{NULL,				NULL,				-1, 18},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_SOUND)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND)
 		{sipName_QSound,	&sipClass_QSound,	-1, 19},
 #else
 		{NULL,			NULL,			-1, 19},
@@ -140,13 +140,13 @@ public:
 		{sipName_QSocketNotifier,	&sipClass_QSocketNotifier,	-1, 22},
 		{sipName_QStyle,	&sipClass_QStyle,	103, 23},
 		{sipName_QSignalMapper,	&sipClass_QSignalMapper,	-1, 24},
-#if defined(SIP_FEATURE_Qt_CLIPBOARD)
+#if defined(SIP_FEATURE_TQt_CLIPBOARD)
 		{sipName_QClipboard,	&sipClass_QClipboard,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
 #endif
 		{sipName_QStatusBar,	&sipClass_QStatusBar,	-1, 26},
-#if defined(SIP_FEATURE_Qt_SIZEGRIP)
+#if defined(SIP_FEATURE_TQt_SIZEGRIP)
 		{sipName_QSizeGrip,	&sipClass_QSizeGrip,	-1, 27},
 #else
 		{NULL,			NULL,			-1, 27},
@@ -170,7 +170,7 @@ public:
 #endif
 		{sipName_QFrame,	&sipClass_QFrame,	46, 33},
 		{sipName_QScrollBar,	&sipClass_QScrollBar,	-1, 34},
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_DIAL)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL)
 		{sipName_QDial,		&sipClass_QDial,	-1, 35},
 #else
 		{NULL,			NULL,			-1, 35},
@@ -192,7 +192,7 @@ public:
 #endif
 		{sipName_QSlider,	&sipClass_QSlider,	-1, 43},
 		{sipName_QSpinBox,	&sipClass_QSpinBox,	-1, 44},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_WORKSPACE)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE)
 		{sipName_QWorkspace,	&sipClass_QWorkspace,	-1, 45},
 #else
 		{NULL,			NULL,			-1, 45},
@@ -219,7 +219,7 @@ public:
 		{sipName_QLabel,	&sipClass_QLabel,	-1, 53},
 		{sipName_QGroupBox,	&sipClass_QGroupBox,	61, 54},
 		{sipName_QPopupMenu,	&sipClass_QPopupMenu,	-1, 55},
-#if defined(SIP_FEATURE_Qt_SPLITTER)
+#if defined(SIP_FEATURE_TQt_SPLITTER)
 		{sipName_QSplitter,	&sipClass_QSplitter,	-1, 56},
 #else
 		{NULL,			NULL,			-1, 56},
@@ -234,7 +234,7 @@ public:
 		{sipName_QVGroupBox,	&sipClass_QVGroupBox,	-1, -1},
 		{sipName_QVButtonGroup,	&sipClass_QVButtonGroup,	-1, 65},
 		{sipName_QHButtonGroup,	&sipClass_QHButtonGroup,	-1, -1},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_ICONVIEW)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW)
 		{sipName_QIconView,	&sipClass_QIconView,	-1, 67},
 #else
 		{NULL,			NULL,			-1, 67},
@@ -259,7 +259,7 @@ public:
 		{sipName_QRadioButton,	&sipClass_QRadioButton,	-1, 77},
 		{sipName_QPushButton,	&sipClass_QPushButton,	-1, 78},
 		{sipName_QCheckBox,	&sipClass_QCheckBox,	-1, -1},
-#if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG)
+#if defined(WS_X11) && defined(SIP_FEATURE_TQt_PRINTDIALOG)
 		{sipName_QPrintDialog,	&sipClass_QPrintDialog,	-1, 80},
 #else
 		{NULL,			NULL,			-1, 80},
@@ -269,47 +269,47 @@ public:
 #else
 		{NULL,			NULL,				-1, 81},
 #endif
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_INPUTDIALOG)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG)
 		{sipName_QInputDialog,	&sipClass_QInputDialog,	-1, 82},
 #else
 		{NULL,			NULL,			-1, 82},
 #endif
-#if defined(SIP_FEATURE_Qt_MESSAGEBOX)
+#if defined(SIP_FEATURE_TQt_MESSAGEBOX)
 		{sipName_QMessageBox,	&sipClass_QMessageBox,	-1, 83},
 #else
 		{NULL,			NULL,			-1, 83},
 #endif
-#if defined(SIP_FEATURE_Qt_WIZARD)
+#if defined(SIP_FEATURE_TQt_WIZARD)
 		{sipName_QWizard,	&sipClass_QWizard,	-1, 84},
 #else
 		{NULL,			NULL,			-1, 84},
 #endif
-#if defined(SIP_FEATURE_Qt_COLORDIALOG)
+#if defined(SIP_FEATURE_TQt_COLORDIALOG)
 		{sipName_QColorDialog,	&sipClass_QColorDialog,	-1, 85},
 #else
 		{NULL,			NULL,			-1, 85},
 #endif
-#if defined(SIP_FEATURE_Qt_FONTDIALOG)
+#if defined(SIP_FEATURE_TQt_FONTDIALOG)
 		{sipName_QFontDialog,	&sipClass_QFontDialog,	-1, 86},
 #else
 		{NULL,			NULL,			-1, 86},
 #endif
-#if defined(SIP_FEATURE_Qt_FILEDIALOG)
+#if defined(SIP_FEATURE_TQt_FILEDIALOG)
 		{sipName_QFileDialog,	&sipClass_QFileDialog,	-1, 87},
 #else
 		{NULL,			NULL,			-1, 87},
 #endif
-#if defined(SIP_FEATURE_Qt_PROGRESSDIALOG)
+#if defined(SIP_FEATURE_TQt_PROGRESSDIALOG)
 		{sipName_QProgressDialog,	&sipClass_QProgressDialog,	-1, 88},
 #else
 		{NULL,				NULL,				-1, 88},
 #endif
-#if defined(SIP_FEATURE_Qt_TABDIALOG)
+#if defined(SIP_FEATURE_TQt_TABDIALOG)
 		{sipName_QTabDialog,	&sipClass_QTabDialog,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_ACTION)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION)
 		{sipName_QActionGroup,	&sipClass_QActionGroup,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
@@ -327,7 +327,7 @@ public:
 #endif
 		{sipName_QTextDrag,	&sipClass_QTextDrag,	-1, 98},
 		{sipName_QStoredDrag,	&sipClass_QStoredDrag,	101, 99},
-#if QT_VERSION >= 210 && defined(SIP_FEATURE_Qt_ICONVIEW) && defined(SIP_FEATURE_Qt_DRAGANDDROP)
+#if QT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP)
 		{sipName_QIconDrag,	&sipClass_QIconDrag,	-1, 100},
 #else
 		{NULL,			NULL,			-1, 100},
@@ -340,32 +340,32 @@ public:
 #endif
 		{sipName_QUriDrag,	&sipClass_QUriDrag,	-1, -1},
 		{sipName_QCommonStyle,	&sipClass_QCommonStyle,	104, -1},
-#if defined(SIP_FEATURE_Qt_STYLE_WINDOWS)
+#if defined(SIP_FEATURE_TQt_STYLE_WINDOWS)
 		{sipName_QWindowsStyle,	&sipClass_QWindowsStyle,	106, 105},
 #else
 		{NULL,			NULL,				-1, 105},
 #endif
-#if defined(SIP_FEATURE_Qt_STYLE_MOTIF)
+#if defined(SIP_FEATURE_TQt_STYLE_MOTIF)
 		{sipName_QMotifStyle,	&sipClass_QMotifStyle,	107, -1},
 #else
 		{NULL,			NULL,			-1, -1},
 #endif
-#if defined(SIP_FEATURE_Qt_STYLE_PLATINUM)
+#if defined(SIP_FEATURE_TQt_STYLE_PLATINUM)
 		{sipName_QPlatinumStyle,	&sipClass_QPlatinumStyle,	-1, 110},
 #else
 		{NULL,				NULL,				-1, 110},
 #endif
-#if defined(SIP_FEATURE_Qt_STYLE_CDE)
+#if defined(SIP_FEATURE_TQt_STYLE_CDE)
 		{sipName_QCDEStyle,	&sipClass_QCDEStyle,	-1, 108},
 #else
 		{NULL,			NULL,			-1, 108},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_MOTIFPLUS)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS)
 		{sipName_QMotifPlusStyle,	&sipClass_QMotifPlusStyle,	-1, 109},
 #else
 		{NULL,				NULL,				-1, 109},
 #endif
-#if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI)
+#if QT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI)
 		{sipName_QSGIStyle,	&sipClass_QSGIStyle,	-1, -1},
 #else
 		{NULL,			NULL,			-1, -1},
@@ -406,26 +406,26 @@ public:
 		sipRes = sipClassName(sipSelf);
 %End
 
-%If (- Qt_3_0_0)
-	static QString tr(const char *) /AutoGen=Qt_TRANSLATION/;
+%If (- TQt_3_0_0)
+	static TQString tr(const char *) /AutoGen=TQt_TRANSLATION/;
 %End
-%If (Qt_2_2_0 - Qt_2_3_1)
-	// There was an apparent bug in moc prior to Qt v2.3.1 where this
+%If (TQt_2_2_0 - TQt_2_3_1)
+	// There was an apparent bug in moc prior to TQt v2.3.1 where this
 	// method wasn't automatically generated.
 
-	static QString tr(const char *,const char *);
+	static TQString tr(const char *,const char *);
 %End
-%If (Qt_2_3_1 - Qt_3_0_0)
-	static QString tr(const char *,const char *) /AutoGen=Qt_TRANSLATION/;
+%If (TQt_2_3_1 - TQt_3_0_0)
+	static TQString tr(const char *,const char *) /AutoGen=TQt_TRANSLATION/;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	// Note that tr() and trUtf8() are really static methods.  We pretend
 	// they aren't so that we can use self to get hold of the class name.
 	// We could mimic moc's behaviour more accurately by creating tr() and
 	// trUtf8() methods for a Python sub-class instance in the sub-class's
 	// ctor.
 
-	QString tr(const char *,const char * = 0);
+	TQString tr(const char *,const char * = 0);
 %MethodCode
 		PyObject *nmobj;
 
@@ -438,9 +438,9 @@ public:
 			Py_BEGIN_ALLOW_THREADS
 
 			if (cname && qApp)
-				sipRes = new QString(qApp -> translate(cname,a0,a1,QApplication::DefaultCodec));
+				sipRes = new TQString(qApp -> translate(cname,a0,a1,TQApplication::DefaultCodec));
 			else
-				sipRes = new QString(QString::fromLatin1(a0));
+				sipRes = new TQString(TQString::fromLatin1(a0));
 
 			Py_END_ALLOW_THREADS
 
@@ -448,7 +448,7 @@ public:
 		}
 %End
 
-	QString trUtf8(const char *,const char * = 0);
+	TQString trUtf8(const char *,const char * = 0);
 %MethodCode
 		PyObject *nmobj;
 
@@ -461,9 +461,9 @@ public:
 			Py_BEGIN_ALLOW_THREADS
 
 			if (cname && qApp)
-				sipRes = new QString(qApp -> translate(cname,a0,a1,QApplication::UnicodeUTF8));
+				sipRes = new TQString(qApp -> translate(cname,a0,a1,TQApplication::UnicodeUTF8));
 			else
-				sipRes = new QString(QString::fromUtf8(a0));
+				sipRes = new TQString(TQString::fromUtf8(a0));
 
 			Py_END_ALLOW_THREADS
 
@@ -471,31 +471,31 @@ public:
 		}
 %End
 %End
-	virtual QMetaObject *metaObject() const /AutoGen/;
-	virtual bool event(QEvent *);
-	virtual bool eventFilter(QObject *,QEvent *);
+	virtual TQMetaObject *metaObject() const /AutoGen/;
+	virtual bool event(TQEvent *);
+	virtual bool eventFilter(TQObject *,TQEvent *);
 
 	bool isA(const char *) const;
 %MethodCode
-		// The Qt implementation doesn't know anything about Python
+		// The TQt implementation doesn't know anything about Python
 		// sub-classes.  For SIP v4 we use the Python type's name.  For
-		// SIP v3 we use the broken Qt behaviour as it's deprecated and
+		// SIP v3 we use the broken TQt behaviour as it's deprecated and
 		// we want to keep things simple.
 
 #if SIP_VERSION >= 0x040000
 		sipRes = (strcmp(sipSelf -> ob_type -> tp_name,a0) == 0);
 #else
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp -> QObject::isA(a0);
+		sipRes = sipCpp -> TQObject::isA(a0);
 		Py_END_ALLOW_THREADS
 #endif
 %End
 
 	bool inherits(const char *) const;
 %MethodCode
-		// The Qt implementation doesn't know anything about Python
+		// The TQt implementation doesn't know anything about Python
 		// sub-classes.  For SIP v4 we use the Python type's MRO.  For
-		// SIP v3 we use the broken Qt behaviour as it's deprecated and
+		// SIP v3 we use the broken TQt behaviour as it's deprecated and
 		// we want to keep things simple.
 
 #if SIP_VERSION >= 0x040000
@@ -511,13 +511,13 @@ public:
 			}
 #else
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp -> QObject::inherits(a0);
+		sipRes = sipCpp -> TQObject::inherits(a0);
 		Py_END_ALLOW_THREADS
 #endif
 %End
 
-%If (- Qt_3_0_0)
-	QStringList superClasses(bool = 0) const;
+%If (- TQt_3_0_0)
+	TQStringList superClasses(bool = 0) const;
 %End
 	const char *name() const;
 	const char *name(const char *) const;
@@ -529,35 +529,35 @@ public:
 	int startTimer(int);
 	void killTimer(int);
 	void killTimers();
-%If (- Qt_3_0_0)
-	QObject *child(const char *,const char * = 0);
+%If (- TQt_3_0_0)
+	TQObject *child(const char *,const char * = 0);
 %End
-%If (Qt_3_0_0 -)
-	QObject *child(const char *,const char * = 0,bool = 1);
+%If (TQt_3_0_0 -)
+	TQObject *child(const char *,const char * = 0,bool = 1);
 %End
-	const QObjectList *children() const;
-%If (Qt_2_1_0 -)
-	static const QObjectList *objectTrees();
+	const TQObjectList *children() const;
+%If (TQt_2_1_0 -)
+	static const TQObjectList *objectTrees();
 %End
-%If (- Qt_3_0_0)
-	QObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1);
+%If (- TQt_3_0_0)
+	TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1);
 %End
 
-%If (Qt_3_0_0 -)
-	QObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1) const;
+%If (TQt_3_0_0 -)
+	TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1) const;
 %MethodCode
-		// The Qt implementation doesn't know anything about Python
+		// The TQt implementation doesn't know anything about Python
 		// sub-classes.  For SIP v4 we get all classes and then use the
 		// Python type's MRO to weed out those we don't want.  For SIP
-		// v3 we use the broken Qt behaviour as it's deprecated and we
+		// v3 we use the broken TQt behaviour as it's deprecated and we
 		// want to keep things simple.
 
 #if SIP_VERSION >= 0x040000
-		sipRes = sipCpp -> QObject::queryList(0, a1, a2, a3);
+		sipRes = sipCpp -> TQObject::queryList(0, a1, a2, a3);
 
 		if (a0 && sipRes)
 		{
-			QObject *o = sipRes -> first();
+			TQObject *o = sipRes -> first();
 
 			while (o)
 			{
@@ -589,16 +589,16 @@ public:
 		}
 #else
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp -> QObject::queryList(a0, a1, a2, a3);
+		sipRes = sipCpp -> TQObject::queryList(a0, a1, a2, a3);
 		Py_END_ALLOW_THREADS
 #endif
 %End
 %End
 
-	virtual void insertChild(QObject * /Transfer/);
-	virtual void removeChild(QObject * /TransferBack/);
-	void installEventFilter(const QObject *);
-	void removeEventFilter(const QObject *);
+	virtual void insertChild(TQObject * /Transfer/);
+	virtual void removeChild(TQObject * /TransferBack/);
+	void installEventFilter(const TQObject *);
+	void removeEventFilter(const TQObject *);
 
 	static SIP_PYOBJECT connect(SIP_QOBJECT,SIP_SIGNAL,SIP_QOBJECT,SIP_SLOT);
 %MethodCode
@@ -625,11 +625,11 @@ public:
 		sipRes = sipDisconnectRx(a0,a1,a2,0);
 %End
 
-//	bool disconnect(const char * = 0,const QObject * = 0,const char * = 0);
-//	bool disconnect(const QObject *,const char * = 0);
+//	bool disconnect(const char * = 0,const TQObject * = 0,const char * = 0);
+//	bool disconnect(const TQObject *,const char * = 0);
 	void dumpObjectTree();
 	void dumpObjectInfo();
-	QObject *parent() const;
+	TQObject *parent() const;
 
 	void emit(SIP_SIGNAL,SIP_PYTUPLE);
 %MethodCode
@@ -637,25 +637,25 @@ public:
 			sipIsErr = 1;
 %End
 
-%If (Qt_PROPERTIES)
-%If (Qt_2_1_0 - Qt_3_0_0)
-	bool setProperty(const char *,const QVariant &);
-	QVariant property(const char *) const;
+%If (TQt_PROPERTIES)
+%If (TQt_2_1_0 - TQt_3_0_0)
+	bool setProperty(const char *,const TQVariant &);
+	TQVariant property(const char *) const;
 %End
-%If (Qt_3_0_0 -)
-	virtual bool setProperty(const char *,const QVariant &);
-	virtual QVariant property(const char *) const;
+%If (TQt_3_0_0 -)
+	virtual bool setProperty(const char *,const TQVariant &);
+	virtual TQVariant property(const char *) const;
 %End
 %End
 
 signals:
 	void destroyed();
-%If (Qt_3_0_0 -)
-	void destroyed(QObject *);
+%If (TQt_3_0_0 -)
+	void destroyed(TQObject *);
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void deleteLater();
 %End
 
@@ -668,14 +668,14 @@ public:
 %End
 
 protected:
-	virtual void timerEvent(QTimerEvent *);
-	virtual void childEvent(QChildEvent *);
-%If (Qt_3_0_0 -)
-	virtual void customEvent(QCustomEvent *);
+	virtual void timerEvent(TQTimerEvent *);
+	virtual void childEvent(TQChildEvent *);
+%If (TQt_3_0_0 -)
+	virtual void customEvent(TQCustomEvent *);
 %End
 
 private:
-	QObject(const QObject &);
+	TQObject(const TQObject &);
 };
 
 
@@ -695,16 +695,16 @@ SIP_PYOBJECT QT_TRANSLATE_NOOP(SIP_PYOBJECT,SIP_PYOBJECT);
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QObject
+class TQObject
 {
 %TypeHeaderCode
 #include <qobject.h>
 %End
 
 public:
-	QObject(QObject * /TransferThis/ = 0,const char * = 0);
+	TQObject(TQObject * /TransferThis/ = 0,const char * = 0);
 
 %ConvertToSubClassCode
 	// The table of Python class objects indexed by their names.  The table
@@ -717,14 +717,14 @@ public:
 		{sipName_QButton,		&sipClass_QButton},
 		{sipName_QButtonGroup,		&sipClass_QButtonGroup},
 		{sipName_QCheckBox,		&sipClass_QCheckBox},
-#if defined(SIP_FEATURE_Qt_CLIPBOARD)
+#if defined(SIP_FEATURE_TQt_CLIPBOARD)
 		{sipName_QClipboard,		&sipClass_QClipboard},
 #endif
 		{sipName_QComboBox,		&sipClass_QComboBox},
 		{sipName_QDialog,		&sipClass_QDialog},
 		{sipName_QDoubleValidator,	&sipClass_QDoubleValidator},
 		{sipName_QDragObject,		&sipClass_QDragObject},
-#if defined(SIP_FEATURE_Qt_FILEDIALOG)
+#if defined(SIP_FEATURE_TQt_FILEDIALOG)
 		{sipName_QFileDialog,		&sipClass_QFileDialog},
 		{sipName_QFileIconProvider,	&sipClass_QFileIconProvider},
 #endif
@@ -743,16 +743,16 @@ public:
 		{sipName_QListView,		&sipClass_QListView},
 		{sipName_QMainWindow,		&sipClass_QMainWindow},
 		{sipName_QMenuBar,		&sipClass_QMenuBar},
-#if defined(SIP_FEATURE_Qt_MESSAGEBOX)
+#if defined(SIP_FEATURE_TQt_MESSAGEBOX)
 		{sipName_QMessageBox,		&sipClass_QMessageBox},
 #endif
 		{sipName_QMultiLineEdit,	&sipClass_QMultiLineEdit},
 		{sipName_QPopupMenu,		&sipClass_QPopupMenu},
-#if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG)
+#if defined(WS_X11) && defined(SIP_FEATURE_TQt_PRINTDIALOG)
 		{sipName_QPrintDialog,		&sipClass_QPrintDialog},
 #endif
 		{sipName_QProgressBar,		&sipClass_QProgressBar},
-#if defined(SIP_FEATURE_Qt_PROGRESSDIALOG)
+#if defined(SIP_FEATURE_TQt_PROGRESSDIALOG)
 		{sipName_QProgressDialog,	&sipClass_QProgressDialog},
 #endif
 		{sipName_QPushButton,		&sipClass_QPushButton},
@@ -762,7 +762,7 @@ public:
 		{sipName_QSlider,		&sipClass_QSlider},
 		{sipName_QSocketNotifier,	&sipClass_QSocketNotifier},
 		{sipName_QSpinBox,		&sipClass_QSpinBox},
-#if defined(SIP_FEATURE_Qt_SPLITTER)
+#if defined(SIP_FEATURE_TQt_SPLITTER)
 		{sipName_QSplitter,		&sipClass_QSplitter},
 #endif
 		{sipName_QStatusBar,		&sipClass_QStatusBar},
@@ -802,10 +802,10 @@ public:
 		sipRes = sipDisconnectRx(a0,a1,a2,0);
 %End
 
-	virtual bool event(QEvent *);
-	virtual bool eventFilter(QObject *,QEvent *);
+	virtual bool event(TQEvent *);
+	virtual bool eventFilter(TQObject *,TQEvent *);
 	const char *tr(const char *) const;
-	virtual QMetaObject *metaObject() const /AutoGen/;
+	virtual TQMetaObject *metaObject() const /AutoGen/;
 
 	// This is actually virtual.  However, with the way we are implementing
 	// it we can ignore it.
@@ -826,18 +826,18 @@ public:
 	int startTimer(int);
 	void killTimer(int);
 	void killTimers();
-	const QObjectList *children() const;
-	QObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1);
-	void insertChild(QObject * /Transfer/);
-	void removeChild(QObject * /TransferBack/);
-	void installEventFilter(const QObject *);
-	void removeEventFilter(const QObject *);
-//	bool connect(QObject *,const char *,const char *);
-//	bool disconnect(const char * = 0,const QObject * = 0,const char * = 0);
-//	bool disconnect(const QObject *,const char * = 0);
+	const TQObjectList *children() const;
+	TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1);
+	void insertChild(TQObject * /Transfer/);
+	void removeChild(TQObject * /TransferBack/);
+	void installEventFilter(const TQObject *);
+	void removeEventFilter(const TQObject *);
+//	bool connect(TQObject *,const char *,const char *);
+//	bool disconnect(const char * = 0,const TQObject * = 0,const char * = 0);
+//	bool disconnect(const TQObject *,const char * = 0);
 	void dumpObjectTree();
 	void dumpObjectInfo();
-	QObject *parent() const;
+	TQObject *parent() const;
 
 	void emit(SIP_SIGNAL,SIP_PYTUPLE);
 %MethodCode
@@ -857,10 +857,10 @@ public:
 %End
 
 protected:
-	virtual void timerEvent(QTimerEvent *);
+	virtual void timerEvent(TQTimerEvent *);
 
 private:
-	QObject(const QObject &);
+	TQObject(const TQObject &);
 };
 
 %End
@@ -949,7 +949,7 @@ PyObject *pyqt3GetSender();
 %End
 
 
-// This is the Qt support code for SIP v4.4 and later.
+// This is the TQt support code for SIP v4.4 and later.
 %ModuleCode
 
 #include <string.h>
@@ -961,36 +961,36 @@ PyObject *pyqt3GetSender();
 #include <private/qucomextra_p.h>
 
 
-// These optional parts of the legacy Qt support API for SIP are implemented.
-#undef sipQtEmitSignal
-#undef sipQtConnectPySignal
-#undef sipQtDisconnectPySignal
+// These optional parts of the legacy TQt support API for SIP are implemented.
+#undef sipTQtEmitSignal
+#undef sipTQtConnectPySignal
+#undef sipTQtDisconnectPySignal
 
 
 // Declare explicit C linkage.
 extern "C"
 {
-	static void *sipQtCreateUniversalSlot(sipWrapper *, const char *,
+	static void *sipTQtCreateUniversalSlot(sipWrapper *, const char *,
             PyObject *, const char *, const char **, int);
-	static void sipQtDestroyUniversalSlot(void *);
-	static void *sipQtFindSlot(void *, const char *, PyObject *, const char *,
+	static void sipTQtDestroyUniversalSlot(void *);
+	static void *sipTQtFindSlot(void *, const char *, PyObject *, const char *,
             const char **);
-	static int sipQtConnect(void *, const char *, void *, const char *, int);
-	static int sipQtDisconnect(void *, const char *, void *, const char *);
-	static int sipQtSameSignalSlotName(const char *, const char *);
-    static sipSlot *sipQtFindSipslot(void *, void **);
-    static int sipQtEmitSignal(PyObject *, const char *, PyObject *);
-    static int sipQtConnectPySignal(PyObject *, const char *, PyObject *,
+	static int sipTQtConnect(void *, const char *, void *, const char *, int);
+	static int sipTQtDisconnect(void *, const char *, void *, const char *);
+	static int sipTQtSameSignalSlotName(const char *, const char *);
+    static sipSlot *sipTQtFindSipslot(void *, void **);
+    static int sipTQtEmitSignal(PyObject *, const char *, PyObject *);
+    static int sipTQtConnectPySignal(PyObject *, const char *, PyObject *,
             const char *);
-    static void sipQtDisconnectPySignal(PyObject *, const char *,
+    static void sipTQtDisconnectPySignal(PyObject *, const char *,
             PyObject *, const char *);
 }
 
 
 extern "C" {
 
-// The meta-type for PyQt classes.  It is just a marker type so that we can
-// safely cast to get access to PyQt3-specific data structures.
+// The meta-type for PyTQt classes.  It is just a marker type so that we can
+// safely cast to get access to PyTQt3-specific data structures.
 PyTypeObject pyqtWrapperType_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                      /* ob_size */
@@ -1073,7 +1073,7 @@ typedef struct _pyqt3PySig {
 
 
 /*
- * The C++ wrapper object used by PyQt3.
+ * The C++ wrapper object used by PyTQt3.
  */
 typedef struct _pyqtWrapper {
     /* The super-type. */
@@ -1109,7 +1109,7 @@ static pyqt3PySig *find_py_signal(pyqtWrapper *pw, const char *sig)
     pyqt3PySig *ps;
 
     for (ps = pw->pySigList; ps != NULL; ps = ps->next)
-        if (sipQtSameSignalSlotName(ps->name, sig))
+        if (sipTQtSameSignalSlotName(ps->name, sig))
             return ps;
 
     return 0;
@@ -1219,7 +1219,7 @@ static sipWrapperType pyqtWrapper_Type = {
             Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,  /* tp_flags */
             0,              /* tp_doc */
             (traverseproc)pyqtWrapper_traverse, /* tp_traverse */
-            (inquiry)pyqtWrapper_clear, /* tp_clear */
+            (intquiry)pyqtWrapper_clear, /* tp_clear */
             0,              /* tp_richcompare */
             0,              /* tp_weaklistoffset */
             0,              /* tp_iter */
@@ -1330,7 +1330,7 @@ struct pyqt3Signature {
 // A connection to a universal slot.
 struct pyqt3SlotConnection
 {
-    // The transmitter QObject.
+    // The transmitter TQObject.
     void *sc_transmitter;
 
     // The parsed signature.
@@ -1342,46 +1342,46 @@ struct pyqt3SlotConnection
 
 
 // This class is used as a slot on behalf of connections to a Python callable.
-// It is derived from QObject but is not run through moc.  Instead the normal
+// It is derived from TQObject but is not run through moc.  Instead the normal
 // moc-generated methods are handwritten in order to implement a universal
-// slot.  This requires some knowledge of the internal implementation of
+// slot.  This retquires some knowledge of the internal implementation of
 // signals and slots but it is likely that they will only change between major
-// Qt versions.
-class UniversalSlot : public QObject
+// TQt versions.
+class UniversalSlot : public TQObject
 {
 public:
-	UniversalSlot(QObject *qtx, pyqt3SlotConnection *conn, const char **member);
+	UniversalSlot(TQObject *qtx, pyqt3SlotConnection *conn, const char **member);
 	~UniversalSlot();
 
-	virtual QMetaObject *metaObject() const
+	virtual TQMetaObject *metaObject() const
 	{
 		return staticMetaObject();
 	}
 
-	virtual bool qt_invoke(int, QUObject *args);
-	static QMetaObject *staticMetaObject();
+	virtual bool qt_invoke(int, TQUObject *args);
+	static TQMetaObject *staticMetaObject();
 
-	static QObject *lastSender;
+	static TQObject *lastSender;
 
 	static UniversalSlot *unislots;
 	UniversalSlot *nextus, *prevus;
 	pyqt3SlotConnection conn;
 
 private:
-	static QMetaObject *metaObj;
+	static TQMetaObject *metaObj;
 };
 
 
 // Create a universal slot.  Note that this will leak if there is no signal
-// transmitter (ie. no parent) - QTimer.singleShot() for example.
-UniversalSlot::UniversalSlot(QObject *qtx, pyqt3SlotConnection *connection, const char **member) : QObject()
+// transmitter (ie. no parent) - TQTimer.singleShot() for example.
+UniversalSlot::UniversalSlot(TQObject *qtx, pyqt3SlotConnection *connection, const char **member) : TQObject()
 {
 	// Save the connection.
 	conn = *connection;
 
 	// Detect when the transmitter is destroyed.
 	if (qtx)
-		connect(qtx, SIGNAL(destroyed(QObject *)), SLOT(deleteLater()));
+		connect(qtx, SIGNAL(destroyed(TQObject *)), SLOT(deleteLater()));
 
 	// Return the slot to connect to.
 	*member = SLOT(unislot());
@@ -1419,32 +1419,32 @@ UniversalSlot::~UniversalSlot()
 static PyObject *py_sender = 0;
 
 
-QMetaObject *UniversalSlot::metaObj = 0;
+TQMetaObject *UniversalSlot::metaObj = 0;
 
 #if QT_VERSION >= 0x030100
-static QMetaObjectCleanUp cleanUp_UniversalSlot("UniversalSlot", &UniversalSlot::staticMetaObject);
+static TQMetaObjectCleanUp cleanUp_UniversalSlot("UniversalSlot", &UniversalSlot::staticMetaObject);
 #else
-static QMetaObjectCleanUp cleanUp_UniversalSlot;
+static TQMetaObjectCleanUp cleanUp_UniversalSlot;
 #endif
 
-QObject *UniversalSlot::lastSender = 0;
+TQObject *UniversalSlot::lastSender = 0;
 UniversalSlot *UniversalSlot::unislots = 0;
 
 
-QMetaObject *UniversalSlot::staticMetaObject()
+TQMetaObject *UniversalSlot::staticMetaObject()
 {
 	if (metaObj)
 		return metaObj;
 
 	// Define a single slot that takes no arguments and so will accept any
 	// connection.
-	static const QUMethod slot = {"unislot", 0, 0};
-	static const QMetaData slot_tbl[] = {
-		{"unislot()", &slot, QMetaData::Public}
+	static const TQUMethod slot = {"unislot", 0, 0};
+	static const TQMetaData slot_tbl[] = {
+		{"unislot()", &slot, TQMetaData::Public}
 	};
 
-	metaObj = QMetaObject::new_metaobject(
-			"UniversalSlot", QObject::staticMetaObject(),
+	metaObj = TQMetaObject::new_metaobject(
+			"UniversalSlot", TQObject::staticMetaObject(),
 			slot_tbl, 1,
 			0, 0,
 #ifndef QT_NO_PROPERTIES
@@ -1459,23 +1459,23 @@ QMetaObject *UniversalSlot::staticMetaObject()
 }
 
 
-bool UniversalSlot::qt_invoke(int id, QUObject *qargs)
+bool UniversalSlot::qt_invoke(int id, TQUObject *qargs)
 {
 	if (id - staticMetaObject()->slotOffset() != 0)
-		return QObject::qt_invoke(id, qargs);
+		return TQObject::qt_invoke(id, qargs);
 
 	bool ok = TRUE;
 	const pyqt3Signature *psig = conn.sc_signature;
-	QVariant *qv;
+	TQVariant *qv;
 
 	// Save in case it is asked for later.
-	lastSender = const_cast<QObject *>(sender());
+	lastSender = const_cast<TQObject *>(sender());
 
-	// If the sender was a QSignal then the single argument will be wrapped
-	// in a QVariant instance.  At the moment we handle int argument as
-	// that is all that is needed by PyQt (and PyKDE).
-	if (lastSender->inherits("QSignal"))
-		qv = &static_QUType_QVariant.get(qargs + 1);
+	// If the sender was a TQSignal then the single argument will be wrapped
+	// in a TQVariant instance.  At the moment we handle int argument as
+	// that is all that is needed by PyTQt (and PyKDE).
+	if (lastSender->inherits("TQSignal"))
+		qv = &static_QUType_TQVariant.get(qargs + 1);
 	else
 		qv = 0;
 
@@ -1576,7 +1576,7 @@ bool UniversalSlot::qt_invoke(int id, QUObject *qargs)
 
 			case qvariant_sat:
 			case qvariantp_sat:
-				arg = sipConvertFromInstance((void *)&static_QUType_QVariant.get(qargs),sipClass_QVariant,0);
+				arg = sipConvertFromInstance((void *)&static_QUType_TQVariant.get(qargs),sipClass_QVariant,0);
 				break;
 
 			case pyobject_sat:
@@ -1622,7 +1622,7 @@ static void parseType(const char *type, pyqt3SigArg *arg);
 
 // Factory function to create a universal slot instance.  Returns a pointer to
 // the instance or 0 if there was an error.
-static void *sipQtCreateUniversalSlot(sipWrapper *tx, const char *sig,
+static void *sipTQtCreateUniversalSlot(sipWrapper *tx, const char *sig,
         PyObject *rxObj, const char *slot, const char **member, int)
 {
     pyqt3SlotConnection conn;
@@ -1641,16 +1641,16 @@ static void *sipQtCreateUniversalSlot(sipWrapper *tx, const char *sig,
         return 0;
     }
 
-	QObject *qtx = 0;
+	TQObject *qtx = 0;
 
-	// See if the transmitter is a QObject in which case we will connect
+	// See if the transmitter is a TQObject in which case we will connect
 	// to it's destroyed signal so that the universal slot can be destroyed
 	// at the same time.  (Note that we used to do this by making the
 	// universal slot a child of the transmitter.  This doesn't work as
-	// expected because QWidget destroys its children before emitting the
+	// expected because TQWidget destroys its children before emitting the
 	// destroyed signal.)
 	if (tx && PyObject_TypeCheck((PyObject *)tx, (PyTypeObject *)sipClass_QObject))
-		qtx = reinterpret_cast<QObject *>(conn.sc_transmitter);
+		qtx = reinterpret_cast<TQObject *>(conn.sc_transmitter);
 
 	return new UniversalSlot(qtx, &conn, member);
 }
@@ -1669,7 +1669,7 @@ static pyqt3Signature *parseSignature(const char *sig)
     // could be more clever, the most saving is when repeatedly emitting a
     // signal for which this is sufficient.
     for (psig = psig_list; psig != NULL; psig = psig->sg_next)
-        if (sipQtSameSignalSlotName(psig->sg_signature, sig))
+        if (sipTQtSameSignalSlotName(psig->sg_signature, sig))
             return psig;
 
     // Create a new one including space for the copy of the signature.
@@ -1684,7 +1684,7 @@ static pyqt3Signature *parseSignature(const char *sig)
     sp = strchr(sig, '(');
     ep = strrchr(sig, ')');
 
-    // If the signal isn't well formed we assume Qt will pick it up.
+    // If the signal isn't well formed we assume TQt will pick it up.
     if (sp && ep && sp < ep)
     {
         // Copy the signature arguments while counting them and removing
@@ -1890,7 +1890,7 @@ static void parseType(const char *type, pyqt3SigArg *arg)
     case 8:
         if (strcmp(type, "unsigned") == 0)
             sat = uint_sat;
-        else if (strcmp(type, "QVariant") == 0)
+        else if (strcmp(type, "TQVariant") == 0)
         {
             if (indir == 0)
             {
@@ -1931,7 +1931,7 @@ static void parseType(const char *type, pyqt3SigArg *arg)
             sat = (indir ? ustring_sat : uchar_sat);
             unsup = (isref || indir > 1);
         }
-        else if (strcmp(type, "PyQt_PyObject") == 0 && indir == 0)
+        else if (strcmp(type, "PyTQt_PyObject") == 0 && indir == 0)
         {
             sat = pyobject_sat;
             unsup = FALSE;
@@ -1995,10 +1995,10 @@ static void parseType(const char *type, pyqt3SigArg *arg)
 
 
 // Dispose of a receiver that might be a universal slot.
-static void sipQtDestroyUniversalSlot(void *rx)
+static void sipTQtDestroyUniversalSlot(void *rx)
 {
 	for (UniversalSlot *us = UniversalSlot::unislots; us; us = us->nextus)
-		if (us == reinterpret_cast<QObject *>(rx))
+		if (us == reinterpret_cast<TQObject *>(rx))
 		{
 			delete us;
 			break;
@@ -2006,8 +2006,8 @@ static void sipQtDestroyUniversalSlot(void *rx)
 }
 
 
-// Search for the universal slot connected to a particular Qt signal.
-static void *sipQtFindSlot(void *tx, const char *sig, PyObject *rxObj,
+// Search for the universal slot connected to a particular TQt signal.
+static void *sipTQtFindSlot(void *tx, const char *sig, PyObject *rxObj,
         const char *slot, const char **member)
 {
 	for (UniversalSlot *us = UniversalSlot::unislots; us; us = us->nextus)
@@ -2017,7 +2017,7 @@ static void *sipQtFindSlot(void *tx, const char *sig, PyObject *rxObj,
         if (conn->sc_transmitter != tx)
             continue;
 
-        if (!sipQtSameSignalSlotName(conn->sc_signature->sg_signature, sig))
+        if (!sipTQtSameSignalSlotName(conn->sc_signature->sg_signature, sig))
             continue;
 
 		if (sipSameSlot(&conn->sc_slot, rxObj, slot))
@@ -2031,24 +2031,24 @@ static void *sipQtFindSlot(void *tx, const char *sig, PyObject *rxObj,
 }
 
 
-// Connect a Qt signal to a Qt slot.
-static int sipQtConnect(void *tx, const char *sig, void *rx, const char *slot, int)
+// Connect a TQt signal to a TQt slot.
+static int sipTQtConnect(void *tx, const char *sig, void *rx, const char *slot, int)
 {
-	return QObject::connect(reinterpret_cast<QObject *>(tx), sig,
-				reinterpret_cast<QObject *>(rx), slot);
+	return TQObject::connect(reinterpret_cast<TQObject *>(tx), sig,
+				reinterpret_cast<TQObject *>(rx), slot);
 }
 
 
-// Disconnect a Qt signal from a Qt slot.
-static int sipQtDisconnect(void *tx, const char *sig, void *rx, const char *slot)
+// Disconnect a TQt signal from a TQt slot.
+static int sipTQtDisconnect(void *tx, const char *sig, void *rx, const char *slot)
 {
-	return QObject::disconnect(reinterpret_cast<QObject *>(tx), sig,
-				   reinterpret_cast<QObject *>(rx), slot);
+	return TQObject::disconnect(reinterpret_cast<TQObject *>(tx), sig,
+				   reinterpret_cast<TQObject *>(rx), slot);
 }
 
 
 // See if two signal or slot names are the same.
-static int sipQtSameSignalSlotName(const char *s1, const char *s2)
+static int sipTQtSameSignalSlotName(const char *s1, const char *s2)
 {
 	// moc formats signal names, so we should first convert the supplied
 	// string to the same format before comparing them.  Instead we just
@@ -2075,7 +2075,7 @@ static int sipQtSameSignalSlotName(const char *s1, const char *s2)
 
 // Return the next slot for a particular transmitter.  This will be called with
 // the GIL locked.
-static sipSlot *sipQtFindSipslot(void *tx, void **context)
+static sipSlot *sipTQtFindSipslot(void *tx, void **context)
 {
     UniversalSlot *us = *reinterpret_cast<UniversalSlot **>(context);
 
@@ -2104,7 +2104,7 @@ static sipSlot *sipQtFindSipslot(void *tx, void **context)
 
 
 // Connect a slot from a Python signal.
-static int sipQtConnectPySignal(PyObject *txObj, const char *sig,
+static int sipTQtConnectPySignal(PyObject *txObj, const char *sig,
         PyObject *rxObj, const char *slot)
 {
     pyqt3PySig *ps;
@@ -2149,7 +2149,7 @@ static int sipQtConnectPySignal(PyObject *txObj, const char *sig,
 
 
 // Disconnect a slot from a Python signal.
-static void sipQtDisconnectPySignal(PyObject *txObj, const char *sig,
+static void sipTQtDisconnectPySignal(PyObject *txObj, const char *sig,
         PyObject *rxObj, const char *slot)
 {
     pyqt3PySig *ps;
@@ -2174,29 +2174,29 @@ static void sipQtDisconnectPySignal(PyObject *txObj, const char *sig,
 
 
 // Emit a signal for the sip module.
-static int sipQtEmitSignal(PyObject *self, const char *sig, PyObject *sigargs)
+static int sipTQtEmitSignal(PyObject *self, const char *sig, PyObject *sigargs)
 {
     return pyqt3EmitSignal(self, sig, sigargs);
 }
 
 
-// Emit a Python or Qt signal.
+// Emit a Python or TQt signal.
 int pyqt3EmitSignal(PyObject *self, const char *sig, PyObject *sigargs)
 {
-    // Don't do anything if signals are blocked.  Qt signals would be blocked
+    // Don't do anything if signals are blocked.  TQt signals would be blocked
     // anyway, but this blocks Python signals as well.
     void *tx = sipGetCppPtr((sipSimpleWrapper *)self, sipType_QObject);
 
     if (!tx)
         return 0;
 
-	if (reinterpret_cast<QObject *>(tx)->signalsBlocked())
+	if (reinterpret_cast<TQObject *>(tx)->signalsBlocked())
         return 0;
 
-    // See if it is a Qt signal.
+    // See if it is a TQt signal.
     if (*sig == '2')
     {
-        pyqt3QtSignal *tab;
+        pyqt3TQtSignal *tab;
 
         // Search the table.
         for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab)
@@ -2234,7 +2234,7 @@ int pyqt3EmitSignal(PyObject *self, const char *sig, PyObject *sigargs)
         int rc = 0;
         pyqt3SlotList *rxlist = ps->rxlist;
 
-        // Forget the last Qt sender and remember this one.
+        // Forget the last TQt sender and remember this one.
 	    UniversalSlot::lastSender = 0;
         py_sender = self;
 
@@ -2274,7 +2274,7 @@ PyObject *pyqt3GetSender()
 {
     PyObject *sender;
 
-    // If there is a Qt sender then it is more recent than the last Python
+    // If there is a TQt sender then it is more recent than the last Python
     // sender, so use it instead.
     if (UniversalSlot::lastSender)
     {
diff --git a/sip/qt/qobjectcleanuphandler.sip b/sip/qt/qobjectcleanuphandler.sip
index 0828fc7..f3ddf16 100644
--- a/sip/qt/qobjectcleanuphandler.sip
+++ b/sip/qt/qobjectcleanuphandler.sip
@@ -1,47 +1,47 @@
-// This is the SIP interface definition for QObjectCleanupHandler.
+// This is the SIP interface definition for TQObjectCleanupHandler.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QObjectCleanupHandler (Qt v3+)</Title>
+<Sect2><Title>TQObjectCleanupHandler (TQt v3+)</Title>
 <Para>
-<Literal>QObjectCleanupHandler</Literal> is fully implemented.
+<Literal>TQObjectCleanupHandler</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QObjectCleanupHandler : QObject
+class TQObjectCleanupHandler : TQObject
 {
 %TypeHeaderCode
 #include <qobjectcleanuphandler.h>
 %End
 
 public:
-	QObjectCleanupHandler();
+	TQObjectCleanupHandler();
 
-	QObject *add(QObject *);
-	void remove(QObject *);
+	TQObject *add(TQObject *);
+	void remove(TQObject *);
 	bool isEmpty() const;
 	void clear();
 };
diff --git a/sip/qt/qobjectlist.sip b/sip/qt/qobjectlist.sip
index 6fe34fc..2c528b0 100644
--- a/sip/qt/qobjectlist.sip
+++ b/sip/qt/qobjectlist.sip
@@ -1,37 +1,37 @@
-// This is the SIP interface definition for QObjectList.
+// This is the SIP interface definition for TQObjectList.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QObjectList</Title>
+<Sect2><Title>TQObjectList</Title>
 <Para>
-This class isn't implemented.  Whenever a <Literal>QObjectList</Literal> is the
+This class isn't implemented.  Whenever a <Literal>TQObjectList</Literal> is the
 return type of a function or the type of an argument, a Python list of
-<Literal>QObject</Literal> instances is used instead.
+<Literal>TQObject</Literal> instances is used instead.
 </Para>
 </Sect2>
 %End
 
 
-%MappedType QObjectList
+%MappedType TQObjectList
 {
 %TypeHeaderCode
 #include <qobjectlist.h>
@@ -41,12 +41,12 @@ return type of a function or the type of an argument, a Python list of
 	// Convert the list.
 
 	PyObject *pl;
-	QObject *obj;
+	TQObject *obj;
 
 	if ((pl = PyList_New(0)) == NULL)
 		return NULL;
 
-	for (QObjectListIt it(*sipCpp); (obj = it.current()) != NULL; ++it)
+	for (TQObjectListIt it(*sipCpp); (obj = it.current()) != NULL; ++it)
 	{
 		PyObject *inst;
 
@@ -65,7 +65,7 @@ return type of a function or the type of an argument, a Python list of
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of QObject instances to a QObjectList on the
+	// Convert a Python list of TQObject instances to a TQObjectList on the
 	// heap.
 
 	if (sipIsErr == NULL)
@@ -80,16 +80,16 @@ return type of a function or the type of an argument, a Python list of
 		return 1;
 	}
 
-	QObjectList *qol = new QObjectList;
+	TQObjectList *qol = new TQObjectList;
 
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
-		QObject *qobj;
+		TQObject *qobj;
 
 		// We apply the transfer to the list itself, not the elements.
 		// Note that any temporary element will never be destroyed.
 		// There is nothing that can be done about this.
-		qobj = reinterpret_cast<QObject *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QObject,0,0,0,sipIsErr));
+		qobj = reinterpret_cast<TQObject *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QObject,0,0,0,sipIsErr));
 
 		if (*sipIsErr)
 		{
diff --git a/sip/qt/qpaintdevice.sip b/sip/qt/qpaintdevice.sip
index 52b78f2..89bddbb 100644
--- a/sip/qt/qpaintdevice.sip
+++ b/sip/qt/qpaintdevice.sip
@@ -1,32 +1,32 @@
-// This is the SIP interface definition for QPaintDevice.
+// This is the SIP interface definition for TQPaintDevice.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPaintDevice</Title>
+<Sect2><Title>TQPaintDevice</Title>
 <FuncSynopsis>
         <FuncDef>virtual bool <Function>cmd</Function></FuncDef>
         <ParamDef>int</ParamDef>
-        <ParamDef>QPainter *</ParamDef>
-        <ParamDef>QPDevCmdParam *</ParamDef>
+        <ParamDef>TQPainter *</ParamDef>
+        <ParamDef>TQPDevCmdParam *</ParamDef>
 </FuncSynopsis>
 <Para>
 Not implemented.
@@ -40,7 +40,7 @@ Not implemented.
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 // Painter device types.
 
@@ -57,29 +57,29 @@ const int PDF_EXTDEV;
 const int PDF_PAINTACTIVE;
 
 
-void bitBlt(QPaintDevice *,int,int,const QPaintDevice *,int = 0,int = 0,
+void bitBlt(TQPaintDevice *,int,int,const TQPaintDevice *,int = 0,int = 0,
 	    int = -1,int = -1,RasterOp = CopyROP,bool = 0);
-void bitBlt(QPaintDevice *,int,int,const QImage *,int = 0,int = 0,int = -1,
+void bitBlt(TQPaintDevice *,int,int,const TQImage *,int = 0,int = 0,int = -1,
 	    int = -1,int = 0);
-void bitBlt(QPaintDevice *,const QPoint &,const QPaintDevice *,
-	    const QRect & = QRect(0,0,-1,-1),RasterOp = CopyROP,bool = 0);
+void bitBlt(TQPaintDevice *,const TQPoint &,const TQPaintDevice *,
+	    const TQRect & = TQRect(0,0,-1,-1),RasterOp = CopyROP,bool = 0);
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-void bitBlt(QPaintDevice *,int,int,const QPaintDevice *,int = 0,int = 0,
-	    int = -1,int = -1,Qt::RasterOp = Qt::CopyROP,bool = 0);
-void bitBlt(QPaintDevice *,int,int,const QImage *,int = 0,int = 0,int = -1,
+void bitBlt(TQPaintDevice *,int,int,const TQPaintDevice *,int = 0,int = 0,
+	    int = -1,int = -1,TQt::RasterOp = TQt::CopyROP,bool = 0);
+void bitBlt(TQPaintDevice *,int,int,const TQImage *,int = 0,int = 0,int = -1,
 	    int = -1,int = 0);
-void bitBlt(QPaintDevice *,const QPoint &,const QPaintDevice *,
-	    const QRect & = QRect(0,0,-1,-1),Qt::RasterOp = Qt::CopyROP,
+void bitBlt(TQPaintDevice *,const TQPoint &,const TQPaintDevice *,
+	    const TQRect & = TQRect(0,0,-1,-1),TQt::RasterOp = TQt::CopyROP,
 	    bool = 0);
 
 %End
 
 
-class QPaintDevice
+class TQPaintDevice
 {
 %TypeHeaderCode
 #include <qpaintdevice.h>
@@ -90,12 +90,12 @@ public:
 	bool isExtDev() const;
 	bool paintingActive() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setResolution(int);
 	virtual int resolution() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	HANDLE handle() const;
 %If (WS_X11)
 	Display *x11Display() const;
@@ -109,24 +109,24 @@ public:
 %End
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 %If (WS_X11)
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	HANDLE handle() const;
 %End
-%If (Qt_3_0_0 -)
-	Qt::HANDLE handle() const;
-	Qt::HANDLE x11RenderHandle() const;
+%If (TQt_3_0_0 -)
+	TQt::HANDLE handle() const;
+	TQt::HANDLE x11RenderHandle() const;
 %End
 	Display *x11Display() const;
 	int x11Screen() const;
 	int x11Depth() const;
 	int x11Cells() const;
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	HANDLE x11Colormap() const;
 %End
-%If (Qt_3_0_0 -)
-	Qt::HANDLE x11Colormap() const;
+%If (TQt_3_0_0 -)
+	TQt::HANDLE x11Colormap() const;
 %End
 	bool x11DefaultColormap() const;
 	void *x11Visual() const;
@@ -137,30 +137,30 @@ public:
 
 	static int x11AppDpiX();
 	static int x11AppDpiY();
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	static void x11SetAppDpiX(int);
 	static void x11SetAppDpiY(int);
 %End
 	static int x11AppDepth();
 	static int x11AppCells();
-%If (Qt_3_1_0 -)
-	static Qt::HANDLE x11AppRootWindow();
+%If (TQt_3_1_0 -)
+	static TQt::HANDLE x11AppRootWindow();
 %End
-%If (Qt_3_0_0 -)
-	static Qt::HANDLE x11AppColormap();
+%If (TQt_3_0_0 -)
+	static TQt::HANDLE x11AppColormap();
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	static HANDLE x11AppColormap();
 %End
 	static bool x11AppDefaultColormap();
 	static void *x11AppVisual();
 	static bool x11AppDefaultVisual();
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	static int x11AppDepth(int);
 	static int x11AppCells(int);
-	static Qt::HANDLE x11AppRootWindow(int);
-	static Qt::HANDLE x11AppColormap(int);
+	static TQt::HANDLE x11AppRootWindow(int);
+	static TQt::HANDLE x11AppColormap(int);
 	static void *x11AppVisual(int);
 	static bool x11AppDefaultColormap(int);
 	static bool x11AppDefaultVisual(int);
@@ -188,10 +188,10 @@ public:
 		PdcDrawLineSegments,
 		PdcDrawPolyline,
 		PdcDrawPolygon,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		PdcDrawCubicBezier,
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		PdcDrawQuadBezier,
 %End
 		PdcDrawText,
@@ -200,7 +200,7 @@ public:
 		PdcDrawImage,
 		PdcDrawText2,
 		PdcDrawText2Formatted,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		PdcDrawTextItem,
 %End
 		PdcDrawLast,
@@ -236,12 +236,12 @@ public:
 %End
 
 protected:
-	QPaintDevice(uint);
-//	virtual bool cmd(int,QPainter *,QPDevCmdParam *);
+	TQPaintDevice(uint);
+//	virtual bool cmd(int,TQPainter *,TQPDevCmdParam *);
 //	virtual int metric(int) const;
-//	virtual int fontMet(QFont *,int,const char *,int = 0) const;
-//	virtual int fontInf(QFont *,int) const;
+//	virtual int fontMet(TQFont *,int,const char *,int = 0) const;
+//	virtual int fontInf(TQFont *,int) const;
 
 private:
-	QPaintDevice(const QPaintDevice &);
+	TQPaintDevice(const TQPaintDevice &);
 };
diff --git a/sip/qt/qpaintdevicemetrics.sip b/sip/qt/qpaintdevicemetrics.sip
index ece9356..04500c8 100644
--- a/sip/qt/qpaintdevicemetrics.sip
+++ b/sip/qt/qpaintdevicemetrics.sip
@@ -1,52 +1,52 @@
-// This is the SIP interface definition for QPaintDeviceMetrics.
+// This is the SIP interface definition for TQPaintDeviceMetrics.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPaintDeviceMetrics</Title>
+<Sect2><Title>TQPaintDeviceMetrics</Title>
 <Para>
-<Literal>QPaintDeviceMetrics</Literal> is fully implemented.
+<Literal>TQPaintDeviceMetrics</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QPaintDeviceMetrics
+class TQPaintDeviceMetrics
 {
 %TypeHeaderCode
 #include <qpaintdevicemetrics.h>
 %End
 
 public:
-	QPaintDeviceMetrics(const QPaintDevice *);
+	TQPaintDeviceMetrics(const TQPaintDevice *);
 
 	int width() const;
 	int height() const;
 	int widthMM() const;
 	int heightMM() const;
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int logicalDpiX() const;
 	int logicalDpiY() const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int physicalDpiX() const;
 	int physicalDpiY() const;
 %End
diff --git a/sip/qt/qpainter.sip b/sip/qt/qpainter.sip
index f9b1fca..5d42678 100644
--- a/sip/qt/qpainter.sip
+++ b/sip/qt/qpainter.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QPainter.
+// This is the SIP interface definition for TQPainter.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPainter</Title>
+<Sect2><Title>TQPainter</Title>
 <FuncSynopsis>
-        <FuncDef>QRect <Function>boundingRect</Function></FuncDef>
+        <FuncDef>TQRect <Function>boundingRect</Function></FuncDef>
         <ParamDef>int <Parameter>x</Parameter></ParamDef>
         <ParamDef>int <Parameter>y</Parameter></ParamDef>
         <ParamDef>int <Parameter>w</Parameter></ParamDef>
@@ -38,8 +38,8 @@ The <Literal>intern</Literal> parameter is not supported.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QRect <Function>boundingRect</Function></FuncDef>
-        <ParamDef>const QRect&</ParamDef>
+        <FuncDef>TQRect <Function>boundingRect</Function></FuncDef>
+        <ParamDef>const TQRect&</ParamDef>
         <ParamDef>int <Parameter>flags</Parameter></ParamDef>
         <ParamDef>const char *<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>len</Parameter> = -1</ParamDef>
@@ -58,7 +58,7 @@ The <Literal>intern</Literal> parameter is not supported.
         <ParamDef>int <Parameter>flags</Parameter></ParamDef>
         <ParamDef>const char *<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>len</Parameter> = -1</ParamDef>
-        <ParamDef>QRect *<Parameter>br</Parameter> = 0</ParamDef>
+        <ParamDef>TQRect *<Parameter>br</Parameter> = 0</ParamDef>
         <ParamDef>char **<Parameter>intern</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -67,11 +67,11 @@ The <Literal>intern</Literal> parameter is not supported.
 
 <FuncSynopsis>
         <FuncDef>void <Function>drawText</Function></FuncDef>
-        <ParamDef>const QRect&</ParamDef>
+        <ParamDef>const TQRect&</ParamDef>
         <ParamDef>int <Parameter>flags</Parameter></ParamDef>
         <ParamDef>const char *<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>len</Parameter> = -1</ParamDef>
-        <ParamDef>QRect *<Parameter>br</Parameter> = 0</ParamDef>
+        <ParamDef>TQRect *<Parameter>br</Parameter> = 0</ParamDef>
         <ParamDef>char **<Parameter>intern</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -97,7 +97,7 @@ This returns a list of tab stops.
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 %ModuleHeaderCode
 #include <qpainter.h>
@@ -118,67 +118,67 @@ enum PaintUnit {
 };
 
 
-class QPainter
+class TQPainter
 {
 %TypeHeaderCode
 #include <qpainter.h>
 %End
 
 public:
-	QPainter();
-	QPainter(const QPaintDevice *);
-	QPainter(const QPaintDevice *,const QWidget *);
+	TQPainter();
+	TQPainter(const TQPaintDevice *);
+	TQPainter(const TQPaintDevice *,const TQWidget *);
 
-	bool begin(const QPaintDevice *);
-	bool begin(const QPaintDevice *,const QWidget *);
+	bool begin(const TQPaintDevice *);
+	bool begin(const TQPaintDevice *,const TQWidget *);
 	bool end();
-	QPaintDevice *device() const;
+	TQPaintDevice *device() const;
 
-	static void redirect(QPaintDevice *,QPaintDevice *);
-%If (Qt_3_2_0 -)
-	static QPaintDevice *redirect(QPaintDevice *);
+	static void redirect(TQPaintDevice *,TQPaintDevice *);
+%If (TQt_3_2_0 -)
+	static TQPaintDevice *redirect(TQPaintDevice *);
 %End
 
 	bool isActive() const;
 	void flush();
 	void save();
 	void restore();
-	QFontMetrics fontMetrics() const;
-	QFontInfo fontInfo() const;
-	const QFont &font() const;
-	void setFont(const QFont&);
-	const QPen &pen() const;
-	void setPen(const QPen &);
+	TQFontMetrics fontMetrics() const;
+	TQFontInfo fontInfo() const;
+	const TQFont &font() const;
+	void setFont(const TQFont&);
+	const TQPen &pen() const;
+	void setPen(const TQPen &);
 	void setPen(PenStyle);
-	void setPen(const QColor &);
-	const QBrush &brush() const;
-	void setBrush(const QBrush &);
+	void setPen(const TQColor &);
+	const TQBrush &brush() const;
+	void setBrush(const TQBrush &);
 	void setBrush(BrushStyle);
-	void setBrush(const QColor &);
-	const QColor &backgroundColor() const;
-	void setBackgroundColor(const QColor &);
+	void setBrush(const TQColor &);
+	const TQColor &backgroundColor() const;
+	void setBackgroundColor(const TQColor &);
 	BGMode backgroundMode() const;
 	void setBackgroundMode(BGMode);
 	RasterOp rasterOp() const;
 	void setRasterOp(RasterOp);
-	const QPoint &brushOrigin() const;
+	const TQPoint &brushOrigin() const;
 	void setBrushOrigin(int,int);
-	void setBrushOrigin(const QPoint &);
+	void setBrushOrigin(const TQPoint &);
 
 	bool hasViewXForm() const;
 	bool hasWorldXForm() const;
 
 	void setViewXForm(bool);
-	QRect window() const;
-	void setWindow(const QRect &);
+	TQRect window() const;
+	void setWindow(const TQRect &);
 	void setWindow(int,int,int,int);
-	QRect viewport() const;
-	void setViewport(const QRect &);
+	TQRect viewport() const;
+	void setViewport(const TQRect &);
 	void setViewport(int,int,int,int);
 
 	void setWorldXForm(bool);
-	const QWMatrix &worldMatrix() const;
-	void setWorldMatrix(const QWMatrix &,bool = 0);
+	const TQWMatrix &worldMatrix() const;
+	void setWorldMatrix(const TQWMatrix &,bool = 0);
 
 	void scale(float,float);
 	void shear(float,float);
@@ -187,75 +187,75 @@ public:
 	void translate(float,float);
 	void resetXForm();
 
-	QPoint xForm(QPoint &) const;
-	QRect xForm(QRect &) const;
-	QPointArray xForm(QPointArray &) const;
-	QPointArray xForm(QPointArray &,int,int) const;
-	QPoint xFormDev(QPoint &) const;
-	QRect xFormDev(QRect &) const;
-	QPointArray xFormDev(QPointArray &) const;
-	QPointArray xFormDev(QPointArray &,int,int) const;
+	TQPoint xForm(TQPoint &) const;
+	TQRect xForm(TQRect &) const;
+	TQPointArray xForm(TQPointArray &) const;
+	TQPointArray xForm(TQPointArray &,int,int) const;
+	TQPoint xFormDev(TQPoint &) const;
+	TQRect xFormDev(TQRect &) const;
+	TQPointArray xFormDev(TQPointArray &) const;
+	TQPointArray xFormDev(TQPointArray &,int,int) const;
 	void setClipping(bool);
 	bool hasClipping() const;
-	const QRegion &clipRegion() const;
-	void setClipRect(const QRect &);
+	const TQRegion &clipRegion() const;
+	void setClipRect(const TQRect &);
 	void setClipRect(int,int,int,int);
-	void setClipRegion(const QRegion &);
+	void setClipRegion(const TQRegion &);
 	void drawPoint(int,int);
-	void drawPoint(const QPoint &);
-	void drawPoints(const QPointArray &,int,int = -1);
+	void drawPoint(const TQPoint &);
+	void drawPoints(const TQPointArray &,int,int = -1);
 	void moveTo(int,int);
-	void moveTo(const QPoint &);
+	void moveTo(const TQPoint &);
 	void lineTo(int,int);
-	void lineTo(const QPoint &);
+	void lineTo(const TQPoint &);
 	void drawLine(int,int,int,int);
-	void drawLine(const QPoint &,const QPoint &);
+	void drawLine(const TQPoint &,const TQPoint &);
 	void drawRect(int,int,int,int);
-	void drawRect(const QRect &);
+	void drawRect(const TQRect &);
 	void drawWinFocusRect(int,int,int,int);
-	void drawWinFocusRect(int,int,int,int,const QColor &);
-	void drawWinFocusRect(const QRect &);
-	void drawWinFocusRect(const QRect &,const QColor &);
+	void drawWinFocusRect(int,int,int,int,const TQColor &);
+	void drawWinFocusRect(const TQRect &);
+	void drawWinFocusRect(const TQRect &,const TQColor &);
 	void drawRoundRect(int,int,int,int,int,int);
-	void drawRoundRect(const QRect &,int,int);
+	void drawRoundRect(const TQRect &,int,int);
 	void drawEllipse(int,int,int,int);
-	void drawEllipse(const QRect &);
+	void drawEllipse(const TQRect &);
 	void drawArc(int,int,int,int,int,int);
-	void drawArc(const QRect &,int,int);
+	void drawArc(const TQRect &,int,int);
 	void drawPie(int,int,int,int,int,int);
-	void drawPie(const QRect &,int,int);
+	void drawPie(const TQRect &,int,int);
 	void drawChord(int,int,int,int,int,int);
-	void drawChord(const QRect &,int,int);
-	void drawLineSegments(const QPointArray &,int = 0,int = -1);
-	void drawPolyline(const QPointArray &,int = 0,int = -1);
-	void drawPolygon(const QPointArray &,bool = 0,int = 0,int = -1);
-	void drawQuadBezier(const QPointArray &,int = 0);
-	void drawPixmap(int,int,const QPixmap &,int = 0,int = 0,int = -1,int = -1);
-	void drawPixmap(const QPoint &,const QPixmap &,const QRect &);
-	void drawPixmap(const QPoint &,const QPixmap &);
-	void drawImage(int,int,const QImage &,int = 0,int = 0,int = -1,int = -1);
-	void drawImage(const QPoint &,const QImage &,const QRect &);
-	void drawImage(const QPoint &,const QImage &);
-	void drawTiledPixmap(int,int,int,int,const QPixmap &,int = 0,int = 0);
-	void drawTiledPixmap(const QRect &,const QPixmap &,const QPoint &);
-	void drawTiledPixmap(const QRect &,const QPixmap &);
-	void drawPicture(const QPicture &);
-	void fillRect(int,int,int,int,const QBrush &);
-	void fillRect(const QRect &,const QBrush &);
+	void drawChord(const TQRect &,int,int);
+	void drawLineSegments(const TQPointArray &,int = 0,int = -1);
+	void drawPolyline(const TQPointArray &,int = 0,int = -1);
+	void drawPolygon(const TQPointArray &,bool = 0,int = 0,int = -1);
+	void drawQuadBezier(const TQPointArray &,int = 0);
+	void drawPixmap(int,int,const TQPixmap &,int = 0,int = 0,int = -1,int = -1);
+	void drawPixmap(const TQPoint &,const TQPixmap &,const TQRect &);
+	void drawPixmap(const TQPoint &,const TQPixmap &);
+	void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1,int = -1);
+	void drawImage(const TQPoint &,const TQImage &,const TQRect &);
+	void drawImage(const TQPoint &,const TQImage &);
+	void drawTiledPixmap(int,int,int,int,const TQPixmap &,int = 0,int = 0);
+	void drawTiledPixmap(const TQRect &,const TQPixmap &,const TQPoint &);
+	void drawTiledPixmap(const TQRect &,const TQPixmap &);
+	void drawPicture(const TQPicture &);
+	void fillRect(int,int,int,int,const TQBrush &);
+	void fillRect(const TQRect &,const TQBrush &);
 	void eraseRect(int,int,int,int);
-	void eraseRect(const QRect &);
+	void eraseRect(const TQRect &);
 	void drawText(int,int,char *,int = -1);
-	void drawText(const QPoint &,const char *,int = -1);
-	void drawText(int,int,int,int,int,const char *,int = -1,QRect * = 0);
-	void drawText(const QRect &,int,const char *,int = -1,QRect * = 0);
+	void drawText(const TQPoint &,const char *,int = -1);
+	void drawText(int,int,int,int,int,const char *,int = -1,TQRect * = 0);
+	void drawText(const TQRect &,int,const char *,int = -1,TQRect * = 0);
 
-%If (Qt_3_2_0 -)
-	void drawTextItem(int,int,const QTextItem &,int = 0);
-	void drawTextItem(const QPoint &,const QTextItem &,int = 0);
+%If (TQt_3_2_0 -)
+	void drawTextItem(int,int,const TQTextItem &,int = 0);
+	void drawTextItem(const TQPoint &,const TQTextItem &,int = 0);
 %End
 
-	QRect boundingRect(int,int,int,int,int,const char *,int = -1);
-	QRect boundingRect(const QRect &,int,const char *,int = -1);
+	TQRect boundingRect(int,int,int,int,int,const char *,int = -1);
+	TQRect boundingRect(const TQRect &,int,const char *,int = -1);
 
 	int tabStops() const;
 	void setTabStops(int);
@@ -344,101 +344,101 @@ public:
 	static void cleanup();
 
 private:
-	QPainter(const QPainter &);
+	TQPainter(const TQPainter &);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QPainter : Qt
+class TQPainter : TQt
 {
 %TypeHeaderCode
 #include <qpainter.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum CoordinateMode {
 		CoordDevice,
 		CoordPainter
 	};
 %End
 
-	QPainter();
-%If (- Qt_3_0_0)
-	QPainter(const QPaintDevice *);
-	QPainter(const QPaintDevice *,const QWidget *);
+	TQPainter();
+%If (- TQt_3_0_0)
+	TQPainter(const TQPaintDevice *);
+	TQPainter(const TQPaintDevice *,const TQWidget *);
 %End
-%If (Qt_3_0_0 -)
-	QPainter(const QPaintDevice *,bool = 0);
-	QPainter(const QPaintDevice *,const QWidget *,bool = 0);
+%If (TQt_3_0_0 -)
+	TQPainter(const TQPaintDevice *,bool = 0);
+	TQPainter(const TQPaintDevice *,const TQWidget *,bool = 0);
 %End
 
-%If (- Qt_3_0_0)
-	bool begin(const QPaintDevice *);
-	bool begin(const QPaintDevice *,const QWidget *);
+%If (- TQt_3_0_0)
+	bool begin(const TQPaintDevice *);
+	bool begin(const TQPaintDevice *,const TQWidget *);
 %End
-%If (Qt_3_0_0 -)
-	bool begin(const QPaintDevice *,bool = 0);
-	bool begin(const QPaintDevice *,const QWidget *,bool = 0);
+%If (TQt_3_0_0 -)
+	bool begin(const TQPaintDevice *,bool = 0);
+	bool begin(const TQPaintDevice *,const TQWidget *,bool = 0);
 %End
 	bool end();
-	QPaintDevice *device() const;
+	TQPaintDevice *device() const;
 
-	static void redirect(QPaintDevice *,QPaintDevice *);
+	static void redirect(TQPaintDevice *,TQPaintDevice *);
 
 	bool isActive() const;
 
-%If (Qt_3_0_0 -)
-	void flush(const QRegion &,CoordinateMode = CoordDevice);
+%If (TQt_3_0_0 -)
+	void flush(const TQRegion &,CoordinateMode = CoordDevice);
 %End
 	void flush();
 	void save();
 	void restore();
 
-	QFontMetrics fontMetrics() const;
-	QFontInfo fontInfo() const;
+	TQFontMetrics fontMetrics() const;
+	TQFontInfo fontInfo() const;
 
-	const QFont &font() const;
-	void setFont(const QFont&);
-	const QPen &pen() const;
-	void setPen(const QPen &);
+	const TQFont &font() const;
+	void setFont(const TQFont&);
+	const TQPen &pen() const;
+	void setPen(const TQPen &);
 	void setPen(PenStyle);
-	void setPen(const QColor &);
-	const QBrush &brush() const;
-	void setBrush(const QBrush &);
+	void setPen(const TQColor &);
+	const TQBrush &brush() const;
+	void setBrush(const TQBrush &);
 	void setBrush(BrushStyle);
-	void setBrush(const QColor &);
-%If (Qt_2_1_0 -)
-	// The omission of this from Qt/Embedded is probably a bug.
+	void setBrush(const TQColor &);
+%If (TQt_2_1_0 -)
+	// The omission of this from TQt/Embedded is probably a bug.
 %End
 
-	const QColor &backgroundColor() const;
-	void setBackgroundColor(const QColor &);
+	const TQColor &backgroundColor() const;
+	void setBackgroundColor(const TQColor &);
 	BGMode backgroundMode() const;
 	void setBackgroundMode(BGMode);
 	RasterOp rasterOp() const;
 	void setRasterOp(RasterOp);
-	const QPoint &brushOrigin() const;
+	const TQPoint &brushOrigin() const;
 	void setBrushOrigin(int,int);
-	void setBrushOrigin(const QPoint &);
+	void setBrushOrigin(const TQPoint &);
 
 	bool hasViewXForm() const;
 	bool hasWorldXForm() const;
 
-%If (Qt_TRANSFORMATIONS)
+%If (TQt_TRANSFORMATIONS)
 	void setViewXForm(bool);
-	QRect window() const;
-	void setWindow(const QRect &);
+	TQRect window() const;
+	void setWindow(const TQRect &);
 	void setWindow(int,int,int,int);
-	QRect viewport() const;
-	void setViewport(const QRect &);
+	TQRect viewport() const;
+	void setViewport(const TQRect &);
 	void setViewport(int,int,int,int);
 
 	void setWorldXForm(bool);
-	const QWMatrix &worldMatrix() const;
-	void setWorldMatrix(const QWMatrix &,bool = 0);
+	const TQWMatrix &worldMatrix() const;
+	void setWorldMatrix(const TQWMatrix &,bool = 0);
 
 	void saveWorldMatrix();
 	void restoreWorldMatrix();
@@ -449,113 +449,113 @@ public:
 %End
 	void translate(double,double);
 	void resetXForm();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	double translationX() const;
 	double translationY() const;
 %End
 
-	QPoint xForm(const QPoint &) const;
-	QRect xForm(const QRect &) const;
-	QPointArray xForm(const QPointArray &) const;
-	QPointArray xForm(const QPointArray &,int,int) const;
-	QPoint xFormDev(const QPoint &) const;
-	QRect xFormDev(const QRect &) const;
-	QPointArray xFormDev(const QPointArray &) const;
-	QPointArray xFormDev(const QPointArray &,int,int) const;
+	TQPoint xForm(const TQPoint &) const;
+	TQRect xForm(const TQRect &) const;
+	TQPointArray xForm(const TQPointArray &) const;
+	TQPointArray xForm(const TQPointArray &,int,int) const;
+	TQPoint xFormDev(const TQPoint &) const;
+	TQRect xFormDev(const TQRect &) const;
+	TQPointArray xFormDev(const TQPointArray &) const;
+	TQPointArray xFormDev(const TQPointArray &,int,int) const;
 
 	void setClipping(bool);
 	bool hasClipping() const;
-%If (- Qt_3_0_0)
-	const QRegion &clipRegion() const;
-	void setClipRect(const QRect &);
+%If (- TQt_3_0_0)
+	const TQRegion &clipRegion() const;
+	void setClipRect(const TQRect &);
 	void setClipRect(int,int,int,int);
-	void setClipRegion(const QRegion &);
+	void setClipRegion(const TQRegion &);
 %End
-%If (Qt_3_0_0 -)
-	QRegion clipRegion(CoordinateMode = CoordDevice) const;
-	void setClipRect(const QRect &,CoordinateMode = CoordDevice);
+%If (TQt_3_0_0 -)
+	TQRegion clipRegion(CoordinateMode = CoordDevice) const;
+	void setClipRect(const TQRect &,CoordinateMode = CoordDevice);
 	void setClipRect(int,int,int,int,CoordinateMode = CoordDevice);
-	void setClipRegion(const QRegion &,CoordinateMode = CoordDevice);
+	void setClipRegion(const TQRegion &,CoordinateMode = CoordDevice);
 %End
 
 	void drawPoint(int,int);
-	void drawPoint(const QPoint &);
-	void drawPoints(const QPointArray &,int,int = -1);
+	void drawPoint(const TQPoint &);
+	void drawPoints(const TQPointArray &,int,int = -1);
 	void moveTo(int,int);
-	void moveTo(const QPoint &);
+	void moveTo(const TQPoint &);
 	void lineTo(int,int);
-	void lineTo(const QPoint &);
+	void lineTo(const TQPoint &);
 	void drawLine(int,int,int,int);
-	void drawLine(const QPoint &,const QPoint &);
+	void drawLine(const TQPoint &,const TQPoint &);
 	void drawRect(int,int,int,int);
-	void drawRect(const QRect &);
+	void drawRect(const TQRect &);
 	void drawWinFocusRect(int,int,int,int);
-	void drawWinFocusRect(int,int,int,int,const QColor &);
-	void drawWinFocusRect(const QRect &);
-	void drawWinFocusRect(const QRect &,const QColor &);
-%If (- Qt_3_0_0)
+	void drawWinFocusRect(int,int,int,int,const TQColor &);
+	void drawWinFocusRect(const TQRect &);
+	void drawWinFocusRect(const TQRect &,const TQColor &);
+%If (- TQt_3_0_0)
 	void drawRoundRect(int,int,int,int,int,int);
-	void drawRoundRect(const QRect &,int,int);
+	void drawRoundRect(const TQRect &,int,int);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void drawRoundRect(int,int,int,int,int = 25,int = 25);
-	void drawRoundRect(const QRect &,int = 25,int = 25);
+	void drawRoundRect(const TQRect &,int = 25,int = 25);
 %End
 	void drawEllipse(int,int,int,int);
-	void drawEllipse(const QRect &);
+	void drawEllipse(const TQRect &);
 	void drawArc(int,int,int,int,int,int);
-	void drawArc(const QRect &,int,int);
+	void drawArc(const TQRect &,int,int);
 	void drawPie(int,int,int,int,int,int);
-	void drawPie(const QRect &,int,int);
+	void drawPie(const TQRect &,int,int);
 	void drawChord(int,int,int,int,int,int);
-	void drawChord(const QRect &,int,int);
-	void drawLineSegments(const QPointArray &,int = 0,int = -1);
-	void drawPolyline(const QPointArray &,int = 0,int = -1);
-	void drawPolygon(const QPointArray &,bool = 0,int = 0,int = -1);
-%If (- Qt_3_0_0)
-	void drawQuadBezier(const QPointArray &,int = 0);
-%End
-%If (Qt_3_0_0 -)
-	void drawConvexPolygon(const QPointArray &,int = 0,int = -1);
-	void drawCubicBezier(const QPointArray &,int = 0);
-%End
-	void drawPixmap(int,int,const QPixmap &,int = 0,int = 0,int = -1,
+	void drawChord(const TQRect &,int,int);
+	void drawLineSegments(const TQPointArray &,int = 0,int = -1);
+	void drawPolyline(const TQPointArray &,int = 0,int = -1);
+	void drawPolygon(const TQPointArray &,bool = 0,int = 0,int = -1);
+%If (- TQt_3_0_0)
+	void drawQuadBezier(const TQPointArray &,int = 0);
+%End
+%If (TQt_3_0_0 -)
+	void drawConvexPolygon(const TQPointArray &,int = 0,int = -1);
+	void drawCubicBezier(const TQPointArray &,int = 0);
+%End
+	void drawPixmap(int,int,const TQPixmap &,int = 0,int = 0,int = -1,
 			int = -1);
-	void drawPixmap(const QPoint &,const QPixmap &,const QRect &);
-	void drawPixmap(const QPoint &,const QPixmap &);
-%If (Qt_3_0_0 -)
-	void drawPixmap(const QRect &,const QPixmap &);
+	void drawPixmap(const TQPoint &,const TQPixmap &,const TQRect &);
+	void drawPixmap(const TQPoint &,const TQPixmap &);
+%If (TQt_3_0_0 -)
+	void drawPixmap(const TQRect &,const TQPixmap &);
 %End
-%If (- Qt_3_0_0)
-	void drawImage(int,int,const QImage &,int = 0,int = 0,int = -1,
+%If (- TQt_3_0_0)
+	void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1,
 		       int = -1);
-	void drawImage(const QPoint &,const QImage &,const QRect &);
-	void drawImage(const QPoint &,const QImage &);
+	void drawImage(const TQPoint &,const TQImage &,const TQRect &);
+	void drawImage(const TQPoint &,const TQImage &);
 %End
-%If (Qt_3_0_0 -)
-	void drawImage(int,int,const QImage &,int = 0,int = 0,int = -1,
+%If (TQt_3_0_0 -)
+	void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1,
 		       int = -1,int = 0);
-	void drawImage(const QPoint &,const QImage &,const QRect &,int = 0);
-	void drawImage(const QPoint &,const QImage &,int = 0);
-	void drawImage(const QRect &,const QImage &);
+	void drawImage(const TQPoint &,const TQImage &,const TQRect &,int = 0);
+	void drawImage(const TQPoint &,const TQImage &,int = 0);
+	void drawImage(const TQRect &,const TQImage &);
 %End
-	void drawTiledPixmap(int,int,int,int,const QPixmap &,int = 0,int = 0);
-	void drawTiledPixmap(const QRect &,const QPixmap &,const QPoint &);
-	void drawTiledPixmap(const QRect &,const QPixmap &);
-%If (Qt_PICTURE)
-	void drawPicture(const QPicture &);
-%If (Qt_3_0_0 -)
-	void drawPicture(int,int,const QPicture &);
-	void drawPicture(const QPoint &,const QPicture &);
+	void drawTiledPixmap(int,int,int,int,const TQPixmap &,int = 0,int = 0);
+	void drawTiledPixmap(const TQRect &,const TQPixmap &,const TQPoint &);
+	void drawTiledPixmap(const TQRect &,const TQPixmap &);
+%If (TQt_PICTURE)
+	void drawPicture(const TQPicture &);
+%If (TQt_3_0_0 -)
+	void drawPicture(int,int,const TQPicture &);
+	void drawPicture(const TQPoint &,const TQPicture &);
 %End
 %End
 
-	void fillRect(int,int,int,int,const QBrush &);
-	void fillRect(const QRect &,const QBrush &);
+	void fillRect(int,int,int,int,const TQBrush &);
+	void fillRect(const TQRect &,const TQBrush &);
 	void eraseRect(int,int,int,int);
-	void eraseRect(const QRect &);
+	void eraseRect(const TQRect &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum TextDirection {
 		Auto,
 		RTL,
@@ -563,23 +563,23 @@ public:
 	};
 %End
 
-%If (- Qt_3_0_0)
-	void drawText(int,int,const QString &,int = -1);
-	void drawText(const QPoint &,const QString &,int = -1);
+%If (- TQt_3_0_0)
+	void drawText(int,int,const TQString &,int = -1);
+	void drawText(const TQPoint &,const TQString &,int = -1);
 %End
-%If (Qt_3_0_0 -)
-	void drawText(int,int,const QString &,int = -1,TextDirection = Auto);
-	void drawText(const QPoint &,const QString &,int = -1,
+%If (TQt_3_0_0 -)
+	void drawText(int,int,const TQString &,int = -1,TextDirection = Auto);
+	void drawText(const TQPoint &,const TQString &,int = -1,
 		      TextDirection = Auto);
-	void drawText(int,int,const QString &,int,int,TextDirection = Auto);
-	void drawText(const QPoint &,const QString &,int,int,
+	void drawText(int,int,const TQString &,int,int,TextDirection = Auto);
+	void drawText(const TQPoint &,const TQString &,int,int,
 		      TextDirection = Auto);
 %End
-	void drawText(int,int,int,int,int,const QString &,int = -1,QRect * = 0);
-	void drawText(const QRect &,int,const QString &,int = -1,QRect * = 0);
+	void drawText(int,int,int,int,int,const TQString &,int = -1,TQRect * = 0);
+	void drawText(const TQRect &,int,const TQString &,int = -1,TQRect * = 0);
 
-	QRect boundingRect(int,int,int,int,int,const QString &,int = -1);
-	QRect boundingRect(const QRect &,int,const QString &,int = -1);
+	TQRect boundingRect(int,int,int,int,int,const TQString &,int = -1);
+	TQRect boundingRect(const TQRect &,int,const TQString &,int = -1);
 	int tabStops() const;
 	void setTabStops(int);
 
@@ -670,7 +670,7 @@ public:
 	static void cleanup();
 
 private:
-	QPainter(const QPainter &);
+	TQPainter(const TQPainter &);
 };
 
 %End
diff --git a/sip/qt/qpair.sip b/sip/qt/qpair.sip
index 6064e22..a9a76a3 100644
--- a/sip/qt/qpair.sip
+++ b/sip/qt/qpair.sip
@@ -1,39 +1,39 @@
-// This is the SIP interface definition for all types based on the QPair
+// This is the SIP interface definition for all types based on the TQPair
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QPair&lt;type,type&gt; (Qt v3+)</Title>
+<Sect2><Title>TQPair&lt;type,type&gt; (TQt v3+)</Title>
 <Para>
-Types based on the <Literal>QPair</Literal> template are automatically
+Types based on the <Literal>TQPair</Literal> template are automatically
 converted to and from Python tuples of two elements.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-%MappedType QPair<int,int>
+%MappedType TQPair<int,int>
 {
 %TypeHeaderCode
 #include <qpair.h>
@@ -58,7 +58,7 @@ converted to and from Python tuples of two elements.
 %End
 
 %ConvertToTypeCode
-	// Convert a Python tuple of integers to a QPair<int,int> on the heap.
+	// Convert a Python tuple of integers to a TQPair<int,int> on the heap.
 
 	if (sipIsErr == NULL)
 		return (PyTuple_Size(sipPy) == 2);
@@ -74,7 +74,7 @@ converted to and from Python tuples of two elements.
 		return 0;
 	}
 
-	*sipCppPtr = new QPair<int,int>(fst,sec);
+	*sipCppPtr = new TQPair<int,int>(fst,sec);
  
 	return 1;
 %End
diff --git a/sip/qt/qpalette.sip b/sip/qt/qpalette.sip
index ae7b94c..29d2581 100644
--- a/sip/qt/qpalette.sip
+++ b/sip/qt/qpalette.sip
@@ -1,51 +1,51 @@
-// This is the SIP interface definition for QPalette.
+// This is the SIP interface definition for TQPalette.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPalette</Title>
+<Sect2><Title>TQPalette</Title>
 <Para>
-<Literal>QPalette</Literal> is fully implemented, including the Python
+<Literal>TQPalette</Literal> is fully implemented, including the Python
 <Literal>==</Literal> and <Literal>!=</Literal> operators.
 </Para>
 </Sect2>
 %End
 
 
-class QPalette
+class TQPalette
 {
 %TypeHeaderCode
 #include <qpalette.h>
 %End
 
 public:
-	QPalette();
-	QPalette(const QColor &);
-%If (Qt_2_00 -)
-	QPalette(const QColor &,const QColor &);
+	TQPalette();
+	TQPalette(const TQColor &);
+%If (TQt_2_00 -)
+	TQPalette(const TQColor &,const TQColor &);
 %End
-	QPalette(const QColorGroup &,const QColorGroup &,const QColorGroup &);
-	QPalette(const QPalette &);
+	TQPalette(const TQColorGroup &,const TQColorGroup &,const TQColorGroup &);
+	TQPalette(const TQPalette &);
 
-%If (Qt_2_00 - Qt_2_1_0)
+%If (TQt_2_00 - TQt_2_1_0)
 	enum ColorGroup {
 		Normal,
 		Disabled,
@@ -53,7 +53,7 @@ public:
 		NColorGroups
 	};
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum ColorGroup {
 		Normal,
 		Disabled,
@@ -63,40 +63,40 @@ public:
 	};
 %End
 
-%If (Qt_2_00 -)
-	const QColor &color(ColorGroup,QColorGroup::ColorRole) const;
-	const QBrush &brush(ColorGroup,QColorGroup::ColorRole) const;
-	void setColor(ColorGroup,QColorGroup::ColorRole,const QColor &);
-	void setBrush(ColorGroup,QColorGroup::ColorRole,const QBrush &);
-	void setColor(QColorGroup::ColorRole,const QColor &);
-	void setBrush(QColorGroup::ColorRole,const QBrush &);
+%If (TQt_2_00 -)
+	const TQColor &color(ColorGroup,TQColorGroup::ColorRole) const;
+	const TQBrush &brush(ColorGroup,TQColorGroup::ColorRole) const;
+	void setColor(ColorGroup,TQColorGroup::ColorRole,const TQColor &);
+	void setBrush(ColorGroup,TQColorGroup::ColorRole,const TQBrush &);
+	void setColor(TQColorGroup::ColorRole,const TQColor &);
+	void setBrush(TQColorGroup::ColorRole,const TQBrush &);
 %End
 
-	QPalette copy() const;
+	TQPalette copy() const;
 
-	const QColorGroup &active() const;
-	const QColorGroup &disabled() const;
-%If (Qt_2_1_0 -)
-	const QColorGroup &inactive() const;
+	const TQColorGroup &active() const;
+	const TQColorGroup &disabled() const;
+%If (TQt_2_1_0 -)
+	const TQColorGroup &inactive() const;
 %End
-	const QColorGroup &normal() const;
+	const TQColorGroup &normal() const;
 
-	void setActive(const QColorGroup &);
-	void setDisabled(const QColorGroup &);
-%If (Qt_2_1_0 -)
-	void setInactive(const QColorGroup &);
+	void setActive(const TQColorGroup &);
+	void setDisabled(const TQColorGroup &);
+%If (TQt_2_1_0 -)
+	void setInactive(const TQColorGroup &);
 %End
-	void setNormal(const QColorGroup &);
+	void setNormal(const TQColorGroup &);
 
-	bool operator==(const QPalette &) const;
-	bool operator!=(const QPalette &) const;
+	bool operator==(const TQPalette &) const;
+	bool operator!=(const TQPalette &) const;
 
-	bool isCopyOf(const QPalette &);
+	bool isCopyOf(const TQPalette &);
 	int serialNumber() const;
 
-%If (Qt_3_0_0 -)
-	// These are defined in Qt3, but don't appear in the documentation.
-	//static QColorGroup::ColorRole foregroundRoleFromMode(Qt::BackgroundMode);
-	//static QColorGroup::ColorRole backgroundRoleFromMode(Qt::BackgroundMode);
+%If (TQt_3_0_0 -)
+	// These are defined in TQt3, but don't appear in the documentation.
+	//static TQColorGroup::ColorRole foregroundRoleFromMode(TQt::BackgroundMode);
+	//static TQColorGroup::ColorRole backgroundRoleFromMode(TQt::BackgroundMode);
 %End
 };
diff --git a/sip/qt/qpen.sip b/sip/qt/qpen.sip
index f59db98..87e5661 100644
--- a/sip/qt/qpen.sip
+++ b/sip/qt/qpen.sip
@@ -1,36 +1,36 @@
-// This is the SIP interface definition for QPen.
+// This is the SIP interface definition for TQPen.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPen</Title>
+<Sect2><Title>TQPen</Title>
 <Para>
-<Literal>QPen</Literal> is fully implemented, including the Python
+<Literal>TQPen</Literal> is fully implemented, including the Python
 <Literal>==</Literal> and <Literal>!=</Literal> operators.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 enum PenStyle {
 	NoPen,
@@ -42,60 +42,60 @@ enum PenStyle {
 };
 
 
-class QPen
+class TQPen
 {
 %TypeHeaderCode
 #include <qpen.h>
 %End
 
 public:
-	QPen();
-	QPen(PenStyle);
-	QPen(const QColor &,uint = 0,PenStyle = SolidLine);
-	QPen(const QPen &);
+	TQPen();
+	TQPen(PenStyle);
+	TQPen(const TQColor &,uint = 0,PenStyle = SolidLine);
+	TQPen(const TQPen &);
 
 	PenStyle style() const;
 	void setStyle(PenStyle);
 	uint width() const;
 	void setWidth(uint);
-	const QColor &color() const;
-	void setColor(const QColor &);
+	const TQColor &color() const;
+	void setColor(const TQColor &);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QPen : Qt
+class TQPen : TQt
 {
 %TypeHeaderCode
 #include <qpen.h>
 %End
 
 public:
-	QPen();
-	QPen(PenStyle);
-	QPen(const QColor &,uint = 0,PenStyle = SolidLine);
-%If (Qt_2_1_0 -)
-	QPen(const QColor &,uint,PenStyle,PenCapStyle,PenJoinStyle);
+	TQPen();
+	TQPen(PenStyle);
+	TQPen(const TQColor &,uint = 0,PenStyle = SolidLine);
+%If (TQt_2_1_0 -)
+	TQPen(const TQColor &,uint,PenStyle,PenCapStyle,PenJoinStyle);
 %End
-	QPen(const QPen &);
+	TQPen(const TQPen &);
 
 	PenStyle style() const;
 	void setStyle(PenStyle);
 	uint width() const;
 	void setWidth(uint);
-	const QColor &color() const;
-	void setColor(const QColor &);
-%If (Qt_2_1_0 -)
+	const TQColor &color() const;
+	void setColor(const TQColor &);
+%If (TQt_2_1_0 -)
 	PenCapStyle capStyle() const;
 	void setCapStyle(PenCapStyle);
 	PenJoinStyle joinStyle() const;
 	void setJoinStyle(PenJoinStyle);
 %End
 
-	bool operator==(const QPen &) const;
-	bool operator!=(const QPen &) const;
+	bool operator==(const TQPen &) const;
+	bool operator!=(const TQPen &) const;
 };
 
 %End
diff --git a/sip/qt/qpicture.sip b/sip/qt/qpicture.sip
index dbeb309..014d7eb 100644
--- a/sip/qt/qpicture.sip
+++ b/sip/qt/qpicture.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QPicture.
+// This is the SIP interface definition for TQPicture.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPicture</Title>
+<Sect2><Title>TQPicture</Title>
 <FuncSynopsis>
         <FuncDef>const char *<Function>data</Function></FuncDef>
         <ParamDef></ParamDef>
@@ -43,68 +43,68 @@ as a parameter.
 %End
 
 
-%If (Qt_PICTURE)
+%If (TQt_PICTURE)
 
-class QPicture : QPaintDevice
+class TQPicture : TQPaintDevice
 {
 %TypeHeaderCode
 #include <qpicture.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QPicture();
+%If (- TQt_2_00)
+	TQPicture();
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QPicture(int = 0);
+%If (TQt_2_00 - TQt_3_0_0)
+	TQPicture(int = 0);
 %End
-%If (Qt_3_0_0 -)
-	QPicture(int = -1);
-	QPicture(const QPicture &);
+%If (TQt_3_0_0 -)
+	TQPicture(int = -1);
+	TQPicture(const TQPicture &);
 %End
 
 	bool isNull() const;
 
 	uint size() const;
 //	const char *data() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setData(const char * /Array/,uint /ArraySize/);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setData(const char * /Array/,uint /ArraySize/);
 %End
 
-	bool play(QPainter *);
+	bool play(TQPainter *);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	bool load(const char *);
 	bool save(const char *);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	bool load(const QString &);
-	bool save(const QString &);
+%If (TQt_2_00 - TQt_3_0_0)
+	bool load(const TQString &);
+	bool save(const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	bool load(QIODevice *,const char * = 0);
-	bool load(const QString &,const char * = 0);
-	bool save(QIODevice *,const char * = 0);
-	bool save(const QString &,const char * = 0);
+%If (TQt_3_0_0 -)
+	bool load(TQIODevice *,const char * = 0);
+	bool load(const TQString &,const char * = 0);
+	bool save(TQIODevice *,const char * = 0);
+	bool save(const TQString &,const char * = 0);
 
-	QRect boundingRect() const;
+	TQRect boundingRect() const;
 %End
-%If (Qt_3_1_0 -)
-	void setBoundingRect(const QRect &);
+%If (TQt_3_1_0 -)
+	void setBoundingRect(const TQRect &);
 %End
 
 protected:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void detach();
-	QPicture copy() const;
+	TQPicture copy() const;
 %End
 
 private:
-%If (- Qt_3_0_0)
-	QPicture(const QPicture &);
+%If (- TQt_3_0_0)
+	TQPicture(const TQPicture &);
 %End
 };
 
diff --git a/sip/qt/qpixmap.sip b/sip/qt/qpixmap.sip
index d00cd78..0ef4284 100644
--- a/sip/qt/qpixmap.sip
+++ b/sip/qt/qpixmap.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QPixmap.
+// This is the SIP interface definition for TQPixmap.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPixmap</Title>
+<Sect2><Title>TQPixmap</Title>
 <FuncSynopsis>
-        <FuncDef><Function>QPixmap</Function></FuncDef>
+        <FuncDef><Function>TQPixmap</Function></FuncDef>
         <ParamDef>const char *<Parameter>xpm</Parameter>[]</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -56,9 +56,9 @@ Not implemented.
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QPixmap : QPaintDevice
+class TQPixmap : TQPaintDevice
 {
 %TypeHeaderCode
 #include <qpixmap.h>
@@ -72,62 +72,62 @@ public:
 		Mono
 	};
 
-	QPixmap();
-	QPixmap(int,int,int = -1);
-	QPixmap(const QSize &,int = -1);
-	QPixmap(const char *,const char * = 0,ColorMode = Auto);
-	QPixmap(const char *,const char *,int);
+	TQPixmap();
+	TQPixmap(int,int,int = -1);
+	TQPixmap(const TQSize &,int = -1);
+	TQPixmap(const char *,const char * = 0,ColorMode = Auto);
+	TQPixmap(const char *,const char *,int);
 
-	QPixmap(SIP_PYLIST) [(const char **)];
+	TQPixmap(SIP_PYLIST) [(const char **)];
 %MethodCode
 		// The Python interface is a list of strings that make up the
 		// image.
 
 		const char **str;
 
-		if ((str = PyQt_qt_ListToArray(a0)) == NULL)
+		if ((str = PyTQt_qt_ListToArray(a0)) == NULL)
 			sipIsErr = 1;
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new sipQPixmap(str);
+			sipCpp = new sipTQPixmap(str);
 			Py_END_ALLOW_THREADS
 
 			sipFree((ANY *)str);
 		}
 %End
 
-	QPixmap(const QPixmap &);
+	TQPixmap(const TQPixmap &);
 
 	bool isNull() const;
 	int width() const;
 	int height() const;
-	QSize size() const;
-	QRect rect() const;
+	TQSize size() const;
+	TQRect rect() const;
 	int depth() const;
 	static int defaultDepth();
-	void fill(const QColor & = white);
-	void fill(const QWidget *,int,int);
-	void fill(const QWidget *,const QPoint &);
+	void fill(const TQColor & = white);
+	void fill(const TQWidget *,int,int);
+	void fill(const TQWidget *,const TQPoint &);
 	void resize(int,int);
-	void resize(const QSize &);
-	const QBitmap *mask() const;
-	void setMask(const QBitmap &);
+	void resize(const TQSize &);
+	const TQBitmap *mask() const;
+	void setMask(const TQBitmap &);
 	bool selfMask() const;
-	QBitmap createHeuristicMask(bool = 1) const;
-	static QPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1);
-	QPixmap xForm(const QWMatrix &) const;
-	static QWMatrix trueMatrix(const QWMatrix &,int,int);
-	QImage convertToImage() const;
-	bool convertFromImage(const QImage &,ColorMode = Auto);
-	bool convertFromImage(const QImage &,int);
+	TQBitmap createHeuristicMask(bool = 1) const;
+	static TQPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1);
+	TQPixmap xForm(const TQWMatrix &) const;
+	static TQWMatrix trueMatrix(const TQWMatrix &,int,int);
+	TQImage convertToImage() const;
+	bool convertFromImage(const TQImage &,ColorMode = Auto);
+	bool convertFromImage(const TQImage &,int);
 	static const char *imageFormat(const char *);
 	bool load(const char *,const char * = 0,ColorMode = Auto);
 	bool load(const char *,const char *,int);
 	bool loadFromData(const uchar * /Array/,uint /ArraySize/,
 			  const char * = 0,ColorMode = Auto);
 //	bool loadFromData(const uchar *,uint,const char *,int);
-	bool loadFromData(QByteArray,const char * = 0,int = 0);
+	bool loadFromData(TQByteArray,const char * = 0,int = 0);
 	bool save(const char *,const char *) const;
 	int serialNumber() const;
 
@@ -143,17 +143,17 @@ public:
 	static Optimization defaultOptimization();
 	static void setDefaultOptimization(Optimization);
 	virtual void detach();
-	bool isQBitmap() const;
+	bool isTQBitmap() const;
 
 protected:
-	QPixmap(int,int,const uchar *,bool);
+	TQPixmap(int,int,const uchar *,bool);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QPixmap : QPaintDevice, Qt
+class TQPixmap : TQPaintDevice, TQt
 {
 %TypeHeaderCode
 #include <qpixmap.h>
@@ -176,90 +176,90 @@ public:
 		BestOptim
 	};
 
-	QPixmap();
-%If (Qt_3_0_0 -)
-	QPixmap(const QImage &);
+	TQPixmap();
+%If (TQt_3_0_0 -)
+	TQPixmap(const TQImage &);
 %End
-	QPixmap(int,int,int = -1,Optimization = DefaultOptim);
-	QPixmap(const QSize &,int = -1,Optimization = DefaultOptim);
-	QPixmap(const QString &,const char * = 0,ColorMode = Auto);
-	QPixmap(const QString &,const char *,int);
+	TQPixmap(int,int,int = -1,Optimization = DefaultOptim);
+	TQPixmap(const TQSize &,int = -1,Optimization = DefaultOptim);
+	TQPixmap(const TQString &,const char * = 0,ColorMode = Auto);
+	TQPixmap(const TQString &,const char *,int);
 
-	QPixmap(SIP_PYLIST) [(const char **)];
+	TQPixmap(SIP_PYLIST) [(const char **)];
 %MethodCode
 		// The Python interface is a list of strings that make up the
 		// image.
 
 		const char **str;
 
-		if ((str = PyQt_qt_ListToArray(a0)) == NULL)
+		if ((str = PyTQt_qt_ListToArray(a0)) == NULL)
 			sipIsErr = 1;
 		else
 		{
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new sipQPixmap(str);
+			sipCpp = new sipTQPixmap(str);
 			Py_END_ALLOW_THREADS
 
 			sipFree((ANY *)str);
 		}
 %End
 
-	QPixmap(const QByteArray &);
-	QPixmap(const QPixmap &);
+	TQPixmap(const TQByteArray &);
+	TQPixmap(const TQPixmap &);
 
 	bool isNull() const;
 	int width() const;
 	int height() const;
-	QSize size() const;
-	QRect rect() const;
+	TQSize size() const;
+	TQRect rect() const;
 	int depth() const;
 	static int defaultDepth();
-	void fill(const QColor & = Qt::white);
-	void fill(const QWidget *,int,int);
-	void fill(const QWidget *,const QPoint &);
+	void fill(const TQColor & = TQt::white);
+	void fill(const TQWidget *,int,int);
+	void fill(const TQWidget *,const TQPoint &);
 	void resize(int,int);
-	void resize(const QSize &);
-	const QBitmap *mask() const;
-	void setMask(const QBitmap &);
+	void resize(const TQSize &);
+	const TQBitmap *mask() const;
+	void setMask(const TQBitmap &);
 	bool selfMask() const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool hasAlpha() const;
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool hasAlphaChannel() const;
 %End
-	QBitmap createHeuristicMask(bool = 1) const;
-%If (Qt_3_1_0 -)
-	static QPixmap fromMimeSource(const QString &);
+	TQBitmap createHeuristicMask(bool = 1) const;
+%If (TQt_3_1_0 -)
+	static TQPixmap fromMimeSource(const TQString &);
 %End
-	static QPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1);
-%If (Qt_2_1_0 -)
-	static QPixmap grabWidget(QWidget *,int = 0,int = 0,int = -1,int = -1);
+	static TQPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1);
+%If (TQt_2_1_0 -)
+	static TQPixmap grabWidget(TQWidget *,int = 0,int = 0,int = -1,int = -1);
 %End
 
-	QPixmap xForm(const QWMatrix &) const;
-	static QWMatrix trueMatrix(const QWMatrix &,int,int);
-	QImage convertToImage() const;
-	bool convertFromImage(const QImage &,ColorMode = Auto);
-	bool convertFromImage(const QImage &,int);
-	static const char *imageFormat(const QString &);
-	bool load(const QString &,const char * = 0,ColorMode = Auto);
-	bool load(const QString &,const char *,int);
+	TQPixmap xForm(const TQWMatrix &) const;
+	static TQWMatrix trueMatrix(const TQWMatrix &,int,int);
+	TQImage convertToImage() const;
+	bool convertFromImage(const TQImage &,ColorMode = Auto);
+	bool convertFromImage(const TQImage &,int);
+	static const char *imageFormat(const TQString &);
+	bool load(const TQString &,const char * = 0,ColorMode = Auto);
+	bool load(const TQString &,const char *,int);
 	bool loadFromData(const uchar * /Array/,uint /ArraySize/,
 			  const char * = 0,ColorMode = Auto);
 //	bool loadFromData(const uchar *,uint,const char *,int);
-	bool loadFromData(QByteArray,const char * = 0,int = 0);
-%If (- Qt_3_0_0)
-	bool save(const QString &,const char *) const;
+	bool loadFromData(TQByteArray,const char * = 0,int = 0);
+%If (- TQt_3_0_0)
+	bool save(const TQString &,const char *) const;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
-	bool save(const QString &,const char *,int) const;
+%If (TQt_2_2_0 - TQt_3_0_0)
+	bool save(const TQString &,const char *,int) const;
 %End
-%If (Qt_3_0_0 -)
-	bool save(const QString &,const char *,int = -1) const;
+%If (TQt_3_0_0 -)
+	bool save(const TQString &,const char *,int = -1) const;
 %End
-%If (Qt_3_2_0 -)
-	bool save(QIODevice *,const char *,int = -1) const;
+%If (TQt_3_2_0 -)
+	bool save(TQIODevice *,const char *,int = -1) const;
 %End
 	int serialNumber() const;
 	Optimization optimization() const;
@@ -267,9 +267,9 @@ public:
 	static Optimization defaultOptimization();
 	static void setDefaultOptimization(Optimization);
 	virtual void detach();
-	bool isQBitmap() const;
+	bool isTQBitmap() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 %If (WS_X11)
 	static int x11SetDefaultScreen(int);
 	void x11SetScreen(int);
@@ -277,12 +277,12 @@ public:
 %End
 
 protected:
-	QPixmap(int,int,const uchar *,bool);
+	TQPixmap(int,int,const uchar *,bool);
 };
 
 %End
 
-%If (Qt_3_2_0 -)
-void copyBlt(QPixmap *,int,int,const QPixmap *,int = 0,int = 0,int = -1,
+%If (TQt_3_2_0 -)
+void copyBlt(TQPixmap *,int,int,const TQPixmap *,int = 0,int = 0,int = -1,
 	     int = -1);
 %End
diff --git a/sip/qt/qpixmapcache.sip b/sip/qt/qpixmapcache.sip
index 5e8e066..089296d 100644
--- a/sip/qt/qpixmapcache.sip
+++ b/sip/qt/qpixmapcache.sip
@@ -1,37 +1,37 @@
-// This is the SIP interface definition for QPixmapCache.
+// This is the SIP interface definition for TQPixmapCache.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPixmapCache (Qt v3+)</Title>
+<Sect2><Title>TQPixmapCache (TQt v3+)</Title>
 <Para>
-<Literal>QPixmapCache</Literal> is fully implemented.
+<Literal>TQPixmapCache</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QPixmapCache
+class TQPixmapCache
 {
 %TypeHeaderCode
 #include <qpixmapcache.h>
@@ -40,12 +40,12 @@ class QPixmapCache
 public:
 	static int cacheLimit();
 	static void setCacheLimit(int);
-	static QPixmap *find(const QString &);
-	static bool find(const QString &,QPixmap &);
-//	static bool insert(const QString &,QPixmap *);
-	static bool insert(const QString &,const QPixmap &);
-%If (Qt_3_2_0 -)
-	static void remove(const QString &);
+	static TQPixmap *find(const TQString &);
+	static bool find(const TQString &,TQPixmap &);
+//	static bool insert(const TQString &,TQPixmap *);
+	static bool insert(const TQString &,const TQPixmap &);
+%If (TQt_3_2_0 -)
+	static void remove(const TQString &);
 %End
 	static void clear();
 };
diff --git a/sip/qt/qplatinumstyle.sip b/sip/qt/qplatinumstyle.sip
index 5392eea..6d223d5 100644
--- a/sip/qt/qplatinumstyle.sip
+++ b/sip/qt/qplatinumstyle.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QPlatinumStyle.
+// This is the SIP interface definition for TQPlatinumStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QPlatinumStyle (Qt v2+)</Title>
+<Sect2><Title>TQPlatinumStyle (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderLength</Parameter></ParamDef>
@@ -34,107 +34,107 @@
 This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_2_00 -)
-%If (Qt_STYLE_PLATINUM)
+%If (TQt_2_00 -)
+%If (TQt_STYLE_PLATINUM)
 
-class QPlatinumStyle : QWindowsStyle
+class TQPlatinumStyle : TQWindowsStyle
 {
 %TypeHeaderCode
 #include <qplatinumstyle.h>
 %End
 
 public:
-	QPlatinumStyle();
+	TQPlatinumStyle();
 
-%If (- Qt_3_0_0)
-	void drawPopupPanel(QPainter *,int,int,int,int,const QColorGroup &,
-			    int = 2,const QBrush * = 0);
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-			const QBrush * = 0);
-	QRect buttonRect(int,int,int,int);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
-	void drawPushButton(QPushButton *,QPainter *);
-	void drawPushButtonLabel(QPushButton *,QPainter *);
+%If (- TQt_3_0_0)
+	void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &,
+			    int = 2,const TQBrush * = 0);
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+			const TQBrush * = 0);
+	TQRect buttonRect(int,int,int,int);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
+	void drawPushButton(TQPushButton *,TQPainter *);
+	void drawPushButtonLabel(TQPushButton *,TQPainter *);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,uint);
-	ScrollControl scrollBarPointOver(const QScrollBar *,int,const QPoint &);
-	QSize indicatorSize() const;
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,int,
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint);
+	ScrollControl scrollBarPointOver(const TQScrollBar *,int,const TQPoint &);
+	TQSize indicatorSize() const;
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int,
 			   bool = 0,bool = 1);
-	void drawIndicatorMask(QPainter *,int,int,int,int,int);
-	QSize exclusiveIndicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
+	void drawIndicatorMask(TQPainter *,int,int,int,int,int);
+	TQSize exclusiveIndicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
 	int sliderLength() const;
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderMask(QPainter *,int,int,int,int,Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
+	void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
 	int maximumSliderDragDistance() const;
-	void drawCheckMark(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,
 			   bool,bool);
-	void polishPopupMenu(QPopupMenu *);
-	int extraPopupMenuItemWidth(bool,int,QMenuItem *,const QFontMetrics &);
-	int popupMenuItemHeight(bool,QMenuItem *,const QFontMetrics &);
-	void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-			       const QPalette &,bool,bool,int,int,int,int);
+	void polishPopupMenu(TQPopupMenu *);
+	int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &);
+	int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &);
+	void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+			       const TQPalette &,bool,bool,int,int,int,int);
 %End
-%If (Qt_3_0_0 -)
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+%If (TQt_3_0_0 -)
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const;
+				const TQStyleOption & = TQStyleOption()) const;
  
-	QRect querySubControlMetrics(ComplexControl,const QWidget *,SubControl,
-				     const QStyleOption & = QStyleOption()) const;
+	TQRect querySubControlMetrics(ComplexControl,const TQWidget *,SubControl,
+				     const TQStyleOption & = TQStyleOption()) const;
  
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
  
-	QRect subRect(SubRect,const QWidget *) const;
+	TQRect subRect(SubRect,const TQWidget *) const;
 %End
 
 protected:
-%If (- Qt_3_0_0)
-	void drawScrollBarBackground(QPainter *,int,int,int,int,
-				     const QColorGroup &,bool,
-				     const QBrush * = 0);
+%If (- TQt_3_0_0)
+	void drawScrollBarBackground(TQPainter *,int,int,int,int,
+				     const TQColorGroup &,bool,
+				     const TQBrush * = 0);
 %End
-	QColor mixedColor(const QColor &,const QColor &) const;
-%If (- Qt_3_0_0)
-	void drawRiffles(QPainter *,int,int,int,int,const QColorGroup &,bool);
+	TQColor mixedColor(const TQColor &,const TQColor &) const;
+%If (- TQt_3_0_0)
+	void drawRiffles(TQPainter *,int,int,int,int,const TQColorGroup &,bool);
 %End
-%If (Qt_3_0_0 -)
-	void drawRiffles(QPainter *,int,int,int,int,const QColorGroup &,
+%If (TQt_3_0_0 -)
+	void drawRiffles(TQPainter *,int,int,int,int,const TQColorGroup &,
 			 bool) const;
 %End
 
 private:
-%If (Qt_3_0_0 -)
-	QPlatinumStyle(const QPlatinumStyle &);
+%If (TQt_3_0_0 -)
+	TQPlatinumStyle(const TQPlatinumStyle &);
 %End
 };
 
diff --git a/sip/qt/qpoint.sip b/sip/qt/qpoint.sip
index 5265d57..68c6561 100644
--- a/sip/qt/qpoint.sip
+++ b/sip/qt/qpoint.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QPoint.
+// This is the SIP interface definition for TQPoint.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPoint</Title>
+<Sect2><Title>TQPoint</Title>
 <Para>
 The Python 
 <Literal>+</Literal>, <Literal>+=</Literal>,
@@ -33,7 +33,7 @@ operators are supported.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rx</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rx</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -41,7 +41,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>ry</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>ry</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -51,50 +51,50 @@ Not implemented.
 %End
 
 
-class QPoint
+class TQPoint
 {
 %TypeHeaderCode
 #include <qpoint.h>
 %End
 
 public:
-	QPoint();
-	QPoint(int,int);
+	TQPoint();
+	TQPoint(int,int);
 
 	bool isNull() const;
 	int x() const;
 	int y() const;
 	void setX(int);
 	void setY(int);
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int manhattanLength() const;
 %End
-//	QCOORD &rx();
-//	QCOORD &ry();
+//	TQCOORD &rx();
+//	TQCOORD &ry();
 
-	QPoint &operator+=(const QPoint &);
-	QPoint &operator-=(const QPoint &);
-	QPoint &operator*=(int /Constrained/);
-	QPoint &operator*=(double);
-	QPoint &operator/=(int /Constrained/);
-	QPoint &operator/=(double);
+	TQPoint &operator+=(const TQPoint &);
+	TQPoint &operator-=(const TQPoint &);
+	TQPoint &operator*=(int /Constrained/);
+	TQPoint &operator*=(double);
+	TQPoint &operator/=(int /Constrained/);
+	TQPoint &operator/=(double);
 
 	int __nonzero__();
 %MethodCode
 		sipRes = !sipCpp -> isNull();
 %End
 
-	const QPoint __neg__();
+	const TQPoint __neg__();
 %MethodCode
-        	sipRes = new QPoint(-(*sipCpp));
+        	sipRes = new TQPoint(-(*sipCpp));
 %End
 };
 
-bool operator==(const QPoint &,const QPoint &);
-bool operator!=(const QPoint &,const QPoint &);
-const QPoint operator+(const QPoint &,const QPoint &);
-const QPoint operator-(const QPoint &,const QPoint &);
-const QPoint operator*(const QPoint &,int /Constrained/);
-const QPoint operator*(const QPoint &,double);
-const QPoint operator/(const QPoint &,int /Constrained/);
-const QPoint operator/(const QPoint &,double);
+bool operator==(const TQPoint &,const TQPoint &);
+bool operator!=(const TQPoint &,const TQPoint &);
+const TQPoint operator+(const TQPoint &,const TQPoint &);
+const TQPoint operator-(const TQPoint &,const TQPoint &);
+const TQPoint operator*(const TQPoint &,int /Constrained/);
+const TQPoint operator*(const TQPoint &,double);
+const TQPoint operator/(const TQPoint &,int /Constrained/);
+const TQPoint operator/(const TQPoint &,double);
diff --git a/sip/qt/qpointarray.sip b/sip/qt/qpointarray.sip
index c88b56b..f0daeea 100644
--- a/sip/qt/qpointarray.sip
+++ b/sip/qt/qpointarray.sip
@@ -1,31 +1,31 @@
-// This is the SIP interface definition for QPointArray.
+// This is the SIP interface definition for TQPointArray.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPointArray</Title>
+<Sect2><Title>TQPointArray</Title>
 <FuncSynopsis>
-        <FuncDef><Function>QPointArray</Function></FuncDef>
+        <FuncDef><Function>TQPointArray</Function></FuncDef>
         <ParamDef>int <Parameter>nPoints</Parameter></ParamDef>
-        <ParamDef>const QCOORD *<Parameter>points</Parameter></ParamDef>
+        <ParamDef>const TQCOORD *<Parameter>points</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single parameter which is a list of points.
@@ -46,7 +46,7 @@ This takes the single parameter <Literal>i</Literal> and returns the
         <FuncDef>bool <Function>putPoints</Function></FuncDef>
         <ParamDef>int <Parameter>index</Parameter></ParamDef>
         <ParamDef>int <Parameter>nPoints</Parameter></ParamDef>
-        <ParamDef>const QCOORD *<Parameter>points</Parameter></ParamDef>
+        <ParamDef>const TQCOORD *<Parameter>points</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes two parameters, <Literal>index</Literal> and a list of points.
@@ -67,7 +67,7 @@ Not implemented.
 <FuncSynopsis>
         <FuncDef>bool <Function>setPoints</Function></FuncDef>
         <ParamDef>int <Parameter>nPoints</Parameter></ParamDef>
-        <ParamDef>const QCOORD *<Parameter>points</Parameter></ParamDef>
+        <ParamDef>const TQCOORD *<Parameter>points</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This takes a single parameter which is a list of points.
@@ -87,20 +87,20 @@ Not implemented.
 %End
 
 
-class QPointArray
+class TQPointArray
 {
 %TypeHeaderCode
 #include <qpointarray.h>
 %End
 
 %TypeCode
-// Convert a list of numbers to an array on QCOORDs on the heap.
+// Convert a list of numbers to an array on TQCOORDs on the heap.
 
-static QCOORD *getPoints(int nrpnts,PyObject *pntlist)
+static TQCOORD *getPoints(int nrpnts,PyObject *pntlist)
 {
-	QCOORD *pnts, *pp;
+	TQCOORD *pnts, *pp;
 
-	if ((pnts = (QCOORD *)sipMalloc(nrpnts * sizeof (QCOORD))) == NULL)
+	if ((pnts = (TQCOORD *)sipMalloc(nrpnts * sizeof (TQCOORD))) == NULL)
 		return NULL;
 
 	// Convert the list.
@@ -109,7 +109,7 @@ static QCOORD *getPoints(int nrpnts,PyObject *pntlist)
 
 	for (int i = 0; i < nrpnts; ++i)
 	{
-		*pp++ = (QCOORD)PyInt_AsLong(PyList_GetItem(pntlist,i));
+		*pp++ = (TQCOORD)PyInt_AsLong(PyList_GetItem(pntlist,i));
 
 		if (PyErr_Occurred() != NULL)
 		{
@@ -123,17 +123,17 @@ static QCOORD *getPoints(int nrpnts,PyObject *pntlist)
 %End
 
 public:
-	QPointArray();
-	QPointArray(int);
-	QPointArray(const QPointArray &);
-	QPointArray(const QRect &,bool = 0);
+	TQPointArray();
+	TQPointArray(int);
+	TQPointArray(const TQPointArray &);
+	TQPointArray(const TQRect &,bool = 0);
 
-	QPointArray(SIP_PYLIST) [(int,const QCOORD *)];
+	TQPointArray(SIP_PYLIST) [(int,const TQCOORD *)];
 %MethodCode
-		// The Python interface is a list of QCOORDs.
+		// The Python interface is a list of TQCOORDs.
 
 		int nrpnts;
-		QCOORD *pnts;
+		TQCOORD *pnts;
 
 		nrpnts = PyList_GET_SIZE(a0);
 
@@ -141,31 +141,31 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			// No wrapper class for QPointArray.
+			// No wrapper class for TQPointArray.
 
 			Py_BEGIN_ALLOW_THREADS
-			sipCpp = new QPointArray(nrpnts / 2,pnts);
+			sipCpp = new TQPointArray(nrpnts / 2,pnts);
 			Py_END_ALLOW_THREADS
 
 			sipFree((ANY *)pnts);
 		}
 %End
 
-	QPointArray copy() const;
+	TQPointArray copy() const;
 	void translate(int,int);
-	QRect boundingRect() const;
+	TQRect boundingRect() const;
 
 	void point(uint,int *,int *) const;
 	// This is hidden by the above.  It would probably be better to remove
 	// the one above, but that would break backwards compatibility.
-	//QPoint point(uint) const;
+	//TQPoint point(uint) const;
 	void setPoint(uint,int,int);
-	void setPoint(uint,const QPoint &);
+	void setPoint(uint,const TQPoint &);
 
 	bool setPoints(SIP_PYLIST);
 %MethodCode
 		int nrpnts;
-		QCOORD *pnts;
+		TQCOORD *pnts;
 
 		nrpnts = PyList_GET_SIZE(a0);
 
@@ -186,7 +186,7 @@ public:
 	bool putPoints(int,SIP_PYLIST);
 %MethodCode
 		int nrpnts;
-		QCOORD *pnts;
+		TQCOORD *pnts;
 
 		nrpnts = PyList_GET_SIZE(a1);
 
@@ -203,29 +203,29 @@ public:
 %End
 
 //	bool putPoints(int,int,int,int,...);
-%If (Qt_3_0_0 -)
-	bool putPoints(int,int,const QPointArray &,int = 0);
+%If (TQt_3_0_0 -)
+	bool putPoints(int,int,const TQPointArray &,int = 0);
 %End
 
-%If (- Qt_2_00)
-	QPoint at(uint) const;
+%If (- TQt_2_00)
+	TQPoint at(uint) const;
 %End
 
 	void makeArc(int,int,int,int,int,int);
 	void makeEllipse(int,int,int,int);
-%If (Qt_TRANSFORMATIONS)
-%If (Qt_2_00 -)
-	void makeArc(int,int,int,int,int,int,const QWMatrix &);
+%If (TQt_TRANSFORMATIONS)
+%If (TQt_2_00 -)
+	void makeArc(int,int,int,int,int,int,const TQWMatrix &);
 %End
 %End
-%If (- Qt_3_0_0)
-	QPointArray quadBezier() const;
+%If (- TQt_3_0_0)
+	TQPointArray quadBezier() const;
 %End
-%If (Qt_3_0_0 -)
-	QPointArray cubicBezier() const;
+%If (TQt_3_0_0 -)
+	TQPointArray cubicBezier() const;
 %End
 
-	// These are actually in QArray, which isn't implemented so pretend
+	// These are actually in TQArray, which isn't implemented so pretend
 	// they are here.
 
 	uint nrefs() const;
@@ -234,14 +234,14 @@ public:
 	bool resize(uint);
 	uint size() const;
 	bool truncate(uint);
-	bool fill(const QPoint &,int = -1);
-%If (Qt_2_00 -)
-	QPoint &at(uint) const;
+	bool fill(const TQPoint &,int = -1);
+%If (TQt_2_00 -)
+	TQPoint &at(uint) const;
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void sort();
-	int bsearch(const QPoint &) const;
+	int bsearch(const TQPoint &) const;
 %End
-	int find(const QPoint &,uint = 0) const;
-	int contains(const QPoint &) const;
+	int find(const TQPoint &,uint = 0) const;
+	int contains(const TQPoint &) const;
 };
diff --git a/sip/qt/qpopupmenu.sip b/sip/qt/qpopupmenu.sip
index 08366b4..067e8cd 100644
--- a/sip/qt/qpopupmenu.sip
+++ b/sip/qt/qpopupmenu.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QPopupMenu.
+// This is the SIP interface definition for TQPopupMenu.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPopupMenu</Title>
+<Sect2><Title>TQPopupMenu</Title>
 <FuncSynopsis>
         <FuncDef>int <Function>exec</Function></FuncDef>
         <ParamDef></ParamDef>
@@ -34,12 +34,12 @@ This method also causes ownership of the underlying C++ menu to be transfered
 to Python.  This means that the C++ menu will be deleted when the Python
 wrapper is garbage collected.  Although this is a little inconsistent, it
 ensures that the menu is deleted without having to explicity code it using
-<Literal>QObject.deleteLater()</Literal> or other techniques.
+<Literal>TQObject.deleteLater()</Literal> or other techniques.
 </Para>
 
 <FuncSynopsis>
         <FuncDef>int <Function>exec</Function></FuncDef>
-        <ParamDef>const QPoint &<Parameter>pos</Parameter></ParamDef>
+        <ParamDef>const TQPoint &<Parameter>pos</Parameter></ParamDef>
         <ParamDef>int <Parameter>indexAtPoint</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -50,69 +50,69 @@ This method also causes ownership of the underlying C++ menu to be transfered
 to Python.  This means that the C++ menu will be deleted when the Python
 wrapper is garbage collected.  Although this is a little inconsistent, it
 ensures that the menu is deleted without having to explicity code it using
-<Literal>QObject.deleteLater()</Literal> or other techniques.
+<Literal>TQObject.deleteLater()</Literal> or other techniques.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QPopupMenu : QTableView, QMenuData
+class TQPopupMenu : TQTableView, TQMenuData
 {
 %TypeHeaderCode
 #include <qpopupmenu.h>
 %End
 
 public:
-	QPopupMenu(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQPopupMenu(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	void popup(const QPoint &,int = 0);
+	void popup(const TQPoint &,int = 0);
 	void updateItem(int);
 	void setCheckable(bool);
 	bool isCheckable() const;
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 	void show();
 	void hide();
 
 	int exec() /PyName=exec_loop, ReleaseGIL,
-		    PreHook=__pyQtPreEventLoopHook__,
-		    PostHook=__pyQtPostEventLoopHook__/;
+		    PreHook=__pyTQtPreEventLoopHook__,
+		    PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal menu will
 		// probably have the main window as it's parent).  This means
-		// the Qt menu will be deleted when the Python wrapper is
+		// the TQt menu will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QPopupMenu::exec();
+		sipRes = sipCpp->TQPopupMenu::exec();
 		Py_END_ALLOW_THREADS
 %End
 
-	int exec(const QPoint &,int = 0) /PyName=exec_loop, ReleaseGIL,
-					  PreHook=__pyQtPreEventLoopHook__,
-					  PostHook=__pyQtPostEventLoopHook__/;
+	int exec(const TQPoint &,int = 0) /PyName=exec_loop, ReleaseGIL,
+					  PreHook=__pyTQtPreEventLoopHook__,
+					  PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal menu will
 		// probably have the main window as it's parent).  This means
-		// the Qt menu will be deleted when the Python wrapper is
+		// the TQt menu will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QPopupMenu::exec(*a0,a1);
+		sipRes = sipCpp->TQPopupMenu::exec(*a0,a1);
 		Py_END_ALLOW_THREADS
 %End
 
 	void setActiveItem(int);
 	int idAt(int) const;
-%If (Qt_1_43 -)
-	int idAt(const QPoint &) const;
+%If (TQt_1_43 -)
+	int idAt(const TQPoint &) const;
 %End
 
 signals:
@@ -125,103 +125,103 @@ signals:
 protected:
 	int cellHeight(int);
 	int cellWidth(int);
-	void paintCell(QPainter *,int,int);
-	void paintEvent(QPaintEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void timerEvent(QTimerEvent *);
+	void paintCell(TQPainter *,int,int);
+	void paintEvent(TQPaintEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void timerEvent(TQTimerEvent *);
 
 private:
-	QPopupMenu(const QPopupMenu &);
+	TQPopupMenu(const TQPopupMenu &);
 	void menuContentsChanged();
 	void menuStateChanged();
-	void menuInsPopup(QPopupMenu *);
-	void menuDelPopup(QPopupMenu *);
+	void menuInsPopup(TQPopupMenu *);
+	void menuDelPopup(TQPopupMenu *);
 	void frameChanged();
 };
 
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QPopupMenu : QFrame, QMenuData
+class TQPopupMenu : TQFrame, TQMenuData
 {
 %TypeHeaderCode
 #include <qpopupmenu.h>
 %End
 
 public:
-	QPopupMenu(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQPopupMenu(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_3_0_5)
-	void popup(const QPoint &,int = 0);
+%If (- TQt_3_0_5)
+	void popup(const TQPoint &,int = 0);
 %End
-%If (Qt_3_0_5 -)
-	void popup(const QPoint &,int = -1);
+%If (TQt_3_0_5 -)
+	void popup(const TQPoint &,int = -1);
 %End
 	void updateItem(int);
 
 	virtual void setCheckable(bool);
 	bool isCheckable() const;
 
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 	void show();
 	void hide();
 
 	int exec() /PyName=exec_loop, ReleaseGIL,
-		    PreHook=__pyQtPreEventLoopHook__,
-		    PostHook=__pyQtPostEventLoopHook__/;
+		    PreHook=__pyTQtPreEventLoopHook__,
+		    PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal menu will
 		// probably have the main window as it's parent).  This means
-		// the Qt menu will be deleted when the Python wrapper is
+		// the TQt menu will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QPopupMenu::exec();
+		sipRes = sipCpp->TQPopupMenu::exec();
 		Py_END_ALLOW_THREADS
 %End
 
-	int exec(const QPoint &,int = 0) /PyName=exec_loop, ReleaseGIL,
-					  PreHook=__pyQtPreEventLoopHook__,
-					  PostHook=__pyQtPostEventLoopHook__/;
+	int exec(const TQPoint &,int = 0) /PyName=exec_loop, ReleaseGIL,
+					  PreHook=__pyTQtPreEventLoopHook__,
+					  PostHook=__pyTQtPostEventLoopHook__/;
 %MethodCode
 		// Transfer ownership back to Python (a modal menu will
 		// probably have the main window as it's parent).  This means
-		// the Qt menu will be deleted when the Python wrapper is
+		// the TQt menu will be deleted when the Python wrapper is
 		// garbage collected.  Although this is a little inconsistent,
 		// it saves having to code it explicitly to avoid the memory
 		// leak.
 		sipTransferBack(sipSelf);
 
 		Py_BEGIN_ALLOW_THREADS
-		sipRes = sipCpp->QPopupMenu::exec(*a0,a1);
+		sipRes = sipCpp->TQPopupMenu::exec(*a0,a1);
 		Py_END_ALLOW_THREADS
 %End
 
 	virtual void setActiveItem(int);
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 	int idAt(int) const;
-	int idAt(const QPoint &) const;
+	int idAt(const TQPoint &) const;
 
 	bool customWhatsThis() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int insertTearOffHandle(int = -1,int = -1);
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void activateItemAt(int);
 %End
-%If (Qt_3_0_0 -)
-	QRect itemGeometry(int);
+%If (TQt_3_0_0 -)
+	TQRect itemGeometry(int);
 %End
 
 signals:
@@ -230,52 +230,52 @@ signals:
 	void activatedRedirect(int);
 	void highlightedRedirect(int);
 	void aboutToShow();
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void aboutToHide();
 %End
 
 protected:
 	int itemHeight(int) const;
-	int itemHeight(QMenuItem *) const;
-	void drawItem(QPainter *,int,QMenuItem *,bool,int,int,int,int);
-
-	void drawContents(QPainter *);
-
-	void closeEvent(QCloseEvent *);
-	void paintEvent(QPaintEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_1_0 -)
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+	int itemHeight(TQMenuItem *) const;
+	void drawItem(TQPainter *,int,TQMenuItem *,bool,int,int,int,int);
+
+	void drawContents(TQPainter *);
+
+	void closeEvent(TQCloseEvent *);
+	void paintEvent(TQPaintEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_1_0 -)
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 %End
-	void timerEvent(QTimerEvent *);
-%If (Qt_3_0_0 -)
-	void leaveEvent(QEvent *);
+	void timerEvent(TQTimerEvent *);
+%If (TQt_3_0_0 -)
+	void leaveEvent(TQEvent *);
 %End
-	void styleChange(QStyle &);
-%If (Qt_3_1_0 -)
+	void styleChange(TQStyle &);
+%If (TQt_3_1_0 -)
 	void enabledChange(bool);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int columns() const;
 
 	bool focusNextPrevChild(bool);
 %End
 
-%If (Qt_3_0_0 -)
-	int itemAtPos(const QPoint &,bool = 1) const;
+%If (TQt_3_0_0 -)
+	int itemAtPos(const TQPoint &,bool = 1) const;
 %End
 
 private:
-	QPopupMenu(const QPopupMenu &);
+	TQPopupMenu(const TQPopupMenu &);
 
 	void menuContentsChanged();
 	void menuStateChanged();
-	void menuInsPopup(QPopupMenu *);
-	void menuDelPopup(QPopupMenu *);
+	void menuInsPopup(TQPopupMenu *);
+	void menuDelPopup(TQPopupMenu *);
 	void frameChanged();
 };
 
diff --git a/sip/qt/qprintdialog.sip b/sip/qt/qprintdialog.sip
index 2ead1f9..83cf681 100644
--- a/sip/qt/qprintdialog.sip
+++ b/sip/qt/qprintdialog.sip
@@ -1,63 +1,63 @@
-// This is the SIP interface definition for QPrintDialog.
+// This is the SIP interface definition for TQPrintDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPrintDialog (X11)</Title>
+<Sect2><Title>TQPrintDialog (X11)</Title>
 <Para>
-<Literal>QPrintDialog</Literal> is fully implemented.
+<Literal>TQPrintDialog</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
 %If (WS_X11)
-%If (Qt_PRINTDIALOG)
+%If (TQt_PRINTDIALOG)
 
-class QPrintDialog : QDialog
+class TQPrintDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qprintdialog.h>
 %End
 
 public:
-	QPrintDialog(QPrinter *,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQPrintDialog(TQPrinter *,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_3_0_0)
-	static bool getPrinterSetup(QPrinter *);
+%If (- TQt_3_0_0)
+	static bool getPrinterSetup(TQPrinter *);
 %End
-%If (Qt_3_0_0 -)
-	static bool getPrinterSetup(QPrinter *,QWidget * = 0);
-	static void setGlobalPrintDialog(QPrintDialog *);
+%If (TQt_3_0_0 -)
+	static bool getPrinterSetup(TQPrinter *,TQWidget * = 0);
+	static void setGlobalPrintDialog(TQPrintDialog *);
 %End
 
-	void setPrinter(QPrinter *,bool = 0);
-	QPrinter *printer() const;
+	void setPrinter(TQPrinter *,bool = 0);
+	TQPrinter *printer() const;
 
-%If (Qt_2_1_0 -)
-	void addButton(QPushButton *);
+%If (TQt_2_1_0 -)
+	void addButton(TQPushButton *);
 %End
 
 private:
-	QPrintDialog(const QPrintDialog &);
+	TQPrintDialog(const TQPrintDialog &);
 };
 
 %End
diff --git a/sip/qt/qprinter.sip b/sip/qt/qprinter.sip
index b8bf4f9..cc71284 100644
--- a/sip/qt/qprinter.sip
+++ b/sip/qt/qprinter.sip
@@ -1,44 +1,44 @@
-// This is the SIP interface definition for QPrinter.
+// This is the SIP interface definition for TQPrinter.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPrinter</Title>
+<Sect2><Title>TQPrinter</Title>
 <Para>
-<Literal>QPrinter</Literal> is fully implemented.
+<Literal>TQPrinter</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_PRINTER)
+%If (TQt_PRINTER)
 
-class QPrinter : QPaintDevice
+class TQPrinter : TQPaintDevice
 {
 %TypeHeaderCode
 #include <qprinter.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum PrinterMode {
 		ScreenResolution,
 		PrinterResolution,
@@ -47,11 +47,11 @@ public:
 	};
 %End
 
-%If (- Qt_3_0_0)
-	QPrinter();
+%If (- TQt_3_0_0)
+	TQPrinter();
 %End
-%If (Qt_3_0_0 -)
-	QPrinter(PrinterMode = ScreenResolution);
+%If (TQt_3_0_0 -)
+	TQPrinter(PrinterMode = ScreenResolution);
 %End
 
 	enum Orientation {
@@ -63,10 +63,10 @@ public:
 		A4, B5, Letter, Legal, Executive, A0, A1, A2, A3, A5, A6, A7,
 		A8, A9, B0, B1, B10, B2, B3, B4, B6, B7, B8, B9, C5E, Comm10E,
 		DLE, Folio, Ledger, Tabloid,
-%If (Qt_2_3_1 -)
+%If (TQt_2_3_1 -)
 		Custom,
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 		NPageSize
 %End
 	};
@@ -81,7 +81,7 @@ public:
 		Color
 	};
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum PaperSource {
 		OnlyOne,
 		Lower,
@@ -99,7 +99,7 @@ public:
 	};
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum PrintRange {
 		AllPages,
 		Selection,
@@ -113,16 +113,16 @@ public:
 	};
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *printerName() const;
 	void setPrinterName(const char *);
 %End
-%If (Qt_2_00 -)
-	QString printerName() const;
-	virtual void setPrinterName(const QString &);
+%If (TQt_2_00 -)
+	TQString printerName() const;
+	virtual void setPrinterName(const TQString &);
 %End
 	bool outputToFile() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOutputToFile(bool);
 	const char *outputFileName() const;
 	void setOutputFileName(const char *);
@@ -135,92 +135,92 @@ public:
 	const char *creator() const;
 	void setCreator(const char *);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOutputToFile(bool);
-	QString outputFileName() const;
-	virtual void setOutputFileName(const QString &);
+	TQString outputFileName() const;
+	virtual void setOutputFileName(const TQString &);
 
-	QString printProgram() const;
-	virtual void setPrintProgram(const QString &);
+	TQString printProgram() const;
+	virtual void setPrintProgram(const TQString &);
 
-	QString printerSelectionOption() const;
-	virtual void setPrinterSelectionOption(const QString &);
+	TQString printerSelectionOption() const;
+	virtual void setPrinterSelectionOption(const TQString &);
 
-	QString docName() const;
-	virtual void setDocName(const QString &);
-	QString creator() const;
-	virtual void setCreator(const QString &);
+	TQString docName() const;
+	virtual void setDocName(const TQString &);
+	TQString creator() const;
+	virtual void setCreator(const TQString &);
 %End
 
 	Orientation orientation() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOrientation(Orientation);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOrientation(Orientation);
 %End
 	PageSize pageSize() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setPageSize(PageSize);
 
 	void setPageOrder(PageOrder);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setPageSize(PageSize);
 
 	virtual void setPageOrder(PageOrder);
 %End
 	PageOrder pageOrder() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setResolution(int);
 	int resolution() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setColorMode(ColorMode);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setColorMode(ColorMode);
 %End
 	ColorMode colorMode() const;
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setFullPage(bool);
 	bool fullPage() const;
-	QSize margins() const;
+	TQSize margins() const;
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setMargins(uint,uint,uint,uint);
 //	void margins(uint *,uint *,uint *,uint *) const;
 %End
 
 	int fromPage() const;
 	int toPage() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setFromTo(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setFromTo(int,int);
 %End
 	int minPage() const;
 	int maxPage() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMinMax(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMinMax(int,int);
 %End
 	int numCopies() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setNumCopies(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setNumCopies(int);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool collateCopiesEnabled() const;
 	void setCollateCopiesEnabled(bool);
  
@@ -228,7 +228,7 @@ public:
 	void setCollateCopies(bool);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	PrintRange printRange() const;
 	void setPrintRange(PrintRange);
 %End
@@ -237,20 +237,20 @@ public:
 	bool abort();
 	bool aborted() const;
 
-	bool setup(QWidget * = 0);
+	bool setup(TQWidget * = 0);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	PaperSource paperSource()   const;
 	virtual void setPaperSource(PaperSource);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setOptionEnabled(PrinterOption,bool);
 	bool isOptionEnabled(PrinterOption);
 %End
 
 private:
-	QPrinter(const QPrinter &);
+	TQPrinter(const TQPrinter &);
 };
 
 %End
diff --git a/sip/qt/qprocess.sip b/sip/qt/qprocess.sip
index c02c512..cd14067 100644
--- a/sip/qt/qprocess.sip
+++ b/sip/qt/qprocess.sip
@@ -1,55 +1,55 @@
-// This is the SIP interface definition for QProcess.
+// This is the SIP interface definition for TQProcess.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QProcess (Qt v3+)</Title>
+<Sect2><Title>TQProcess (TQt v3+)</Title>
 <Para>
-<Literal>QProcess</Literal> is fully implemented.
+<Literal>TQProcess</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QProcess : QObject
+class TQProcess : TQObject
 {
 %TypeHeaderCode
 #include <qprocess.h>
 %End
 
 public:
-	QProcess(QObject * /TransferThis/ = 0,const char * = 0);
-	QProcess(const QString &,QObject * /TransferThis/ = 0,
+	TQProcess(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQProcess(const TQString &,TQObject * /TransferThis/ = 0,
 		 const char * = 0);
-	QProcess(const QStringList &,QObject * /TransferThis/ = 0,
+	TQProcess(const TQStringList &,TQObject * /TransferThis/ = 0,
 		 const char * = 0);
 
-	QStringList arguments() const;
+	TQStringList arguments() const;
 	void clearArguments();
-	virtual void setArguments(const QStringList &);
-	virtual void addArgument(const QString &);
-	QDir workingDirectory() const;
-	virtual void setWorkingDirectory(const QDir &);
+	virtual void setArguments(const TQStringList &);
+	virtual void addArgument(const TQString &);
+	TQDir workingDirectory() const;
+	virtual void setWorkingDirectory(const TQDir &);
 
 	enum Communication {
 		Stdin,
@@ -61,20 +61,20 @@ public:
 	void setCommunication(int);
 	int communication() const;
 
-	virtual bool start(QStringList * = 0);
-	virtual bool launch(const QString &, QStringList * = 0 );
-	virtual bool launch(const QByteArray &,QStringList * = 0 );
+	virtual bool start(TQStringList * = 0);
+	virtual bool launch(const TQString &, TQStringList * = 0 );
+	virtual bool launch(const TQByteArray &,TQStringList * = 0 );
 
 	bool isRunning() const;
 	bool normalExit() const;
 	int exitStatus() const;
 
-	virtual QByteArray readStdout() /ReleaseGIL/;
-	virtual QByteArray readStderr() /ReleaseGIL/;
+	virtual TQByteArray readStdout() /ReleaseGIL/;
+	virtual TQByteArray readStderr() /ReleaseGIL/;
 	bool canReadLineStdout() const;
 	bool canReadLineStderr() const;
-	virtual QString readLineStdout() /ReleaseGIL/;
-	virtual QString readLineStderr() /ReleaseGIL/;
+	virtual TQString readLineStdout() /ReleaseGIL/;
+	virtual TQString readLineStderr() /ReleaseGIL/;
 
 %If (WS_X11 || WS_MACX || WS_QWS)
 	typedef long PID;
@@ -95,8 +95,8 @@ public slots:
 	void tryTerminate() const;
 	void kill() const;
 
-	virtual void writeToStdin(const QByteArray &);
-	virtual void writeToStdin(const QString &);
+	virtual void writeToStdin(const TQByteArray &);
+	virtual void writeToStdin(const TQString &);
 	virtual void closeStdin();
 
 protected:
@@ -104,8 +104,8 @@ protected:
 	void disconnectNotify(const char *);
 
 private:
-%If (Qt_3_1_0 -)
-	QProcess(const QProcess &);
+%If (TQt_3_1_0 -)
+	TQProcess(const TQProcess &);
 %End
 };
 
diff --git a/sip/qt/qprogressbar.sip b/sip/qt/qprogressbar.sip
index bcf3ad2..d4d4b93 100644
--- a/sip/qt/qprogressbar.sip
+++ b/sip/qt/qprogressbar.sip
@@ -1,56 +1,56 @@
-// This is the SIP interface definition for QProgressBar.
+// This is the SIP interface definition for TQProgressBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QProgressBar</Title>
+<Sect2><Title>TQProgressBar</Title>
 <Para>
-<Literal>QProgressBar</Literal> is fully implemented.
+<Literal>TQProgressBar</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QProgressBar : QFrame
+class TQProgressBar : TQFrame
 {
 %TypeHeaderCode
 #include <qprogressbar.h>
 %End
 
 public:
-	QProgressBar(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-	QProgressBar(int,QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQProgressBar(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQProgressBar(int,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
 	int totalSteps() const;
 	int progress() const;
-%If (Qt_3_0_0 -)
-	const QString &progressString() const;
+%If (TQt_3_0_0 -)
+	const TQString &progressString() const;
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
-%If (Qt_2_00 -)
-	QSize minimumSizeHint() const;
+%If (TQt_2_00 -)
+	TQSize minimumSizeHint() const;
 
 	void setCenterIndicator(bool);
 	bool centerIndicator() const;
@@ -59,7 +59,7 @@ public:
 	bool indicatorFollowsStyle() const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool percentageVisible() const;
 	void setPercentageVisible(bool);
 %End
@@ -68,28 +68,28 @@ public:
 
 public slots:
 	void reset();
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setTotalSteps(int);
 	void setProgress(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setTotalSteps(int);
 	virtual void setProgress(int);
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setProgress(int,int);
 %End
 
 protected:
-	void drawContents(QPainter *);
-	virtual bool setIndicator(QString &,int,int);
-%If (Qt_2_00 - Qt_3_0_0)
-	void drawContentsMask(QPainter *);
+	void drawContents(TQPainter *);
+	virtual bool setIndicator(TQString &,int,int);
+%If (TQt_2_00 - TQt_3_0_0)
+	void drawContentsMask(TQPainter *);
 %End
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
 
 private:
-	QProgressBar(const QProgressBar &);
+	TQProgressBar(const TQProgressBar &);
 };
diff --git a/sip/qt/qprogressdialog.sip b/sip/qt/qprogressdialog.sip
index 4963041..33ee6c6 100644
--- a/sip/qt/qprogressdialog.sip
+++ b/sip/qt/qprogressdialog.sip
@@ -1,69 +1,69 @@
-// This is the SIP interface definition for QProgressDialog.
+// This is the SIP interface definition for TQProgressDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QProgressDialog</Title>
+<Sect2><Title>TQProgressDialog</Title>
 <Para>
-<Literal>QProgressDialog</Literal> is fully implemented.
+<Literal>TQProgressDialog</Literal> is fully implemented.
 value.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_PROGRESSDIALOG)
+%If (TQt_PROGRESSDIALOG)
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QProgressDialog : QDialog
+class TQProgressDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qprogressdialog.h>
 %End
 
 public:
-	QProgressDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQProgressDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 			WFlags = 0);
-	QProgressDialog(const QString &,const QString &,int,
-			QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQProgressDialog(const TQString &,const TQString &,int,
+			TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 			WFlags = 0);
 
-	void setLabel(QLabel *);
-	void setCancelButton(QPushButton *);
-	void setBar(QProgressBar *);
+	void setLabel(TQLabel *);
+	void setCancelButton(TQPushButton *);
+	void setBar(TQProgressBar *);
 
 	bool wasCancelled() const;
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool wasCanceled() const;
 %End
 
 	int totalSteps() const;
 	int progress() const;
 
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 	int minimumDuration() const;
 
-	QString labelText() const;
+	TQString labelText() const;
 
 	void setAutoReset(bool);
 	bool autoReset() const;
@@ -75,72 +75,72 @@ public slots:
 	void reset();
 	void setTotalSteps(int);
 	void setProgress(int);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setProgress(int,int);
 %End
-	void setLabelText(const QString &);
-	void setCancelButtonText(const QString &);
+	void setLabelText(const TQString &);
+	void setCancelButtonText(const TQString &);
 
 	void setMinimumDuration(int);
 
 signals:
 	void cancelled();
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void canceled();
 %End
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void closeEvent(QCloseEvent *);
-	void styleChange(QStyle &);
-	void showEvent(QShowEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void closeEvent(TQCloseEvent *);
+	void styleChange(TQStyle &);
+	void showEvent(TQShowEvent *);
 
 protected slots:
 	void forceShow();
 
 private:
-	QProgressDialog(const QProgressDialog &);
+	TQProgressDialog(const TQProgressDialog &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QProgressDialog : QSemiModal
+class TQProgressDialog : TQSemiModal
 {
 %TypeHeaderCode
 #include <qprogressdialog.h>
 %End
 
 public:
-	QProgressDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQProgressDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 			WFlags = 0);
-%If (- Qt_2_00)
-	QProgressDialog(const char *,const char *,int,QWidget * /TransferThis/ = 0,
+%If (- TQt_2_00)
+	TQProgressDialog(const char *,const char *,int,TQWidget * /TransferThis/ = 0,
 			const char * = 0,bool = 0,WFlags = 0);
 %End
-%If (Qt_2_00 -)
-	QProgressDialog(const QString &,const QString &,int,
-			QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+%If (TQt_2_00 -)
+	TQProgressDialog(const TQString &,const TQString &,int,
+			TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 			WFlags = 0);
 %End
 
-	void setLabel(QLabel *);
-	void setCancelButton(QPushButton *);
-	void setBar(QProgressBar *);
+	void setLabel(TQLabel *);
+	void setCancelButton(TQPushButton *);
+	void setBar(TQProgressBar *);
 
 	bool wasCancelled() const;
 
 	int totalSteps() const;
 	int progress() const;
 
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 	int minimumDuration() const;
 
-%If (Qt_2_1_0 -)
-	QString labelText() const;
+%If (TQt_2_1_0 -)
+	TQString labelText() const;
 
 	void setAutoReset(bool);
 	bool autoReset() const;
@@ -153,13 +153,13 @@ public slots:
 	void reset();
 	void setTotalSteps(int);
 	void setProgress(int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setLabelText(const char *);
 	void setCancelButtonText(const char *);
 %End
-%If (Qt_2_00 -)
-	void setLabelText(const QString &);
-	void setCancelButtonText(const QString &);
+%If (TQt_2_00 -)
+	void setLabelText(const TQString &);
+	void setCancelButtonText(const TQString &);
 %End
 
 	void setMinimumDuration(int);
@@ -168,25 +168,25 @@ signals:
 	void cancelled();
 
 protected:
-	void resizeEvent(QResizeEvent *);
-%If (- Qt_2_00)
+	void resizeEvent(TQResizeEvent *);
+%If (- TQt_2_00)
 	void styleChange(GUIStyle);
 %End
-%If (Qt_2_00 -)
-	void closeEvent(QCloseEvent *);
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void closeEvent(TQCloseEvent *);
+	void styleChange(TQStyle &);
 %End
-%If (Qt_2_1_0 -)
-	void showEvent(QShowEvent *);
+%If (TQt_2_1_0 -)
+	void showEvent(TQShowEvent *);
 %End
 
 protected slots:
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void forceShow();
 %End
 
 private:
-	QProgressDialog(const QProgressDialog &);
+	TQProgressDialog(const TQProgressDialog &);
 };
 
 %End
diff --git a/sip/qt/qptrlist.sip b/sip/qt/qptrlist.sip
index c49afad..b3faa04 100644
--- a/sip/qt/qptrlist.sip
+++ b/sip/qt/qptrlist.sip
@@ -1,40 +1,40 @@
-// This is the SIP interface definition for all types based on the QPtrList
+// This is the SIP interface definition for all types based on the TQPtrList
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QPtrList&lt;type&gt; (Qt v2+)</Title>
+<Sect2><Title>TQPtrList&lt;type&gt; (TQt v2+)</Title>
 <Para>
-Types based on the <Literal>QPtrList</Literal> template are automatically
+Types based on the <Literal>TQPtrList</Literal> template are automatically
 converted to and from Python lists of the type.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
 template<Type>
-%MappedType QPtrList<Type>
+%MappedType TQPtrList<Type>
 {
 %TypeHeaderCode
 #include <qptrlist.h>
@@ -85,7 +85,7 @@ template<Type>
 		return 1;
 	}
 
-	QPtrList<Type> *qpl = new QPtrList<Type>;
+	TQPtrList<Type> *qpl = new TQPtrList<Type>;
  
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
diff --git a/sip/qt/qpushbutton.sip b/sip/qt/qpushbutton.sip
index 93e6fa0..d9b4f60 100644
--- a/sip/qt/qpushbutton.sip
+++ b/sip/qt/qpushbutton.sip
@@ -1,143 +1,143 @@
-// This is the SIP interface definition for QPushButton.
+// This is the SIP interface definition for TQPushButton.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QPushButton</Title>
+<Sect2><Title>TQPushButton</Title>
 <Para>
-<Literal>QPushButton</Literal> is fully implemented.
+<Literal>TQPushButton</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QPushButton : QButton
+class TQPushButton : TQButton
 {
 %TypeHeaderCode
 #include <qpushbutton.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QPushButton(QWidget * /TransferThis/ = 0,const char * = 0);
-	QPushButton(const char *,QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQPushButton(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQPushButton(const char *,TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QPushButton(QWidget * /TransferThis/,const char * = 0);
-	QPushButton(const QString &,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQPushButton(TQWidget * /TransferThis/,const char * = 0);
+	TQPushButton(const TQString &,TQWidget * /TransferThis/,const char * = 0);
 %End
-%If (Qt_2_1_0 -)
-	QPushButton(const QIconSet &,const QString &,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_1_0 -)
+	TQPushButton(const TQIconSet &,const TQString &,TQWidget * /TransferThis/,const char * = 0);
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
 	void move(int,int);
-	void move(const QPoint &);
+	void move(const TQPoint &);
 	void resize(int,int);
-	void resize(const QSize &);
-%If (- Qt_2_00)
+	void resize(const TQSize &);
+%If (- TQt_2_00)
 	void setGeometry(int,int,int,int);
 
-	void setGeometry(const QRect &);
+	void setGeometry(const TQRect &);
 
 	void setToggleButton(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setGeometry(int,int,int,int);
 
-	virtual void setGeometry(const QRect &);
+	virtual void setGeometry(const TQRect &);
 
 	virtual void setToggleButton(bool);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setGeometry(int,int,int,int);
 
-	void setGeometry(const QRect &);
+	void setGeometry(const TQRect &);
 
 	void setToggleButton(bool);
 %End
 
 	bool autoDefault() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setAutoDefault(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setAutoDefault(bool);
 %End
 	bool isDefault() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDefault(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setDefault(bool);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setIsMenuButton(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setIsMenuButton(bool);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool isMenuButton() const;
 %End
 
-%If (Qt_2_1_0 -)
-	void setPopup(QPopupMenu *);
-	QPopupMenu *popup() const;
+%If (TQt_2_1_0 -)
+	void setPopup(TQPopupMenu *);
+	TQPopupMenu *popup() const;
 
-	void setIconSet(const QIconSet &);
-	QIconSet *iconSet() const;
+	void setIconSet(const TQIconSet &);
+	TQIconSet *iconSet() const;
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setFlat(bool);
 	bool isFlat() const;
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOn(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOn(bool);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void toggle();
 %End
 
 protected:
-	void drawButton(QPainter *);
-	void drawButtonLabel(QPainter *);
-	void focusInEvent(QFocusEvent *);
-%If (Qt_2_00 -)
-	void focusOutEvent(QFocusEvent *);
-	void resizeEvent(QResizeEvent *);
+	void drawButton(TQPainter *);
+	void drawButtonLabel(TQPainter *);
+	void focusInEvent(TQFocusEvent *);
+%If (TQt_2_00 -)
+	void focusOutEvent(TQFocusEvent *);
+	void resizeEvent(TQResizeEvent *);
 	void updateMask();
 %End
 
 private:
-	QPushButton(const QPushButton &);
+	TQPushButton(const TQPushButton &);
 };
diff --git a/sip/qt/qradiobutton.sip b/sip/qt/qradiobutton.sip
index 77c00db..083e0eb 100644
--- a/sip/qt/qradiobutton.sip
+++ b/sip/qt/qradiobutton.sip
@@ -1,84 +1,84 @@
-// This is the SIP interface definition for QRadioButton.
+// This is the SIP interface definition for TQRadioButton.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QRadioButton</Title>
+<Sect2><Title>TQRadioButton</Title>
 <Para>
-<Literal>QRadioButton</Literal> is fully implemented.
+<Literal>TQRadioButton</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QRadioButton : QButton
+class TQRadioButton : TQButton
 {
 %TypeHeaderCode
 #include <qradiobutton.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QRadioButton(QWidget * /TransferThis/ = 0,const char * = 0);
-	QRadioButton(const char *,QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQRadioButton(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQRadioButton(const char *,TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QRadioButton(QWidget * /TransferThis/,const char * = 0);
-	QRadioButton(const QString &,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQRadioButton(TQWidget * /TransferThis/,const char * = 0);
+	TQRadioButton(const TQString &,TQWidget * /TransferThis/,const char * = 0);
 %End
 
 	bool isChecked() const;
 
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setChecked(bool);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	virtual void setChecked(bool);
-	QSizePolicy sizePolicy() const;
+	TQSizePolicy sizePolicy() const;
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setChecked(bool);
 %End
 
 protected:
-	bool hitButton(const QPoint &) const;
-	void drawButton(QPainter *);
-	void drawButtonLabel(QPainter *);
-%If (- Qt_2_00)
-	void mouseReleaseEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
+	bool hitButton(const TQPoint &) const;
+	void drawButton(TQPainter *);
+	void drawButtonLabel(TQPainter *);
+%If (- TQt_2_00)
+	void mouseReleaseEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void updateMask();
 
-	void resizeEvent(QResizeEvent *);
+	void resizeEvent(TQResizeEvent *);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	void focusInEvent(QFocusEvent *);
+%If (TQt_2_00 - TQt_3_0_0)
+	void focusInEvent(TQFocusEvent *);
 %End
 
 private:
-	QRadioButton(const QRadioButton &);
+	TQRadioButton(const TQRadioButton &);
 };
diff --git a/sip/qt/qrangecontrol.sip b/sip/qt/qrangecontrol.sip
index 2c1c3af..e3e25da 100644
--- a/sip/qt/qrangecontrol.sip
+++ b/sip/qt/qrangecontrol.sip
@@ -1,43 +1,43 @@
-// This is the SIP interface definition for QRangeControl.
+// This is the SIP interface definition for TQRangeControl.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QRangeControl</Title>
+<Sect2><Title>TQRangeControl</Title>
 <Para>
-<Literal>QRangeControl</Literal> is fully implemented.
+<Literal>TQRangeControl</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QRangeControl
+class TQRangeControl
 {
 %TypeHeaderCode
 #include <qrangecontrol.h>
 %End
 
 public:
-	QRangeControl();
-	QRangeControl(int,int,int,int,int);
+	TQRangeControl();
+	TQRangeControl(int,int,int,int,int);
 
 	int value() const;
 	void setValue(int);
@@ -49,7 +49,7 @@ public:
 	int minValue() const;
 	int maxValue() const;
 	void setRange(int,int);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setMinValue(int);
 	void setMaxValue(int);
 %End
@@ -58,12 +58,12 @@ public:
 	int pageStep() const;
 	void setSteps(int,int);
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int bound(int) const;
 %End
 
 protected:
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int positionFromValue(int,int) const;
 	int valueFromPosition(int,int) const;
 %End
@@ -75,5 +75,5 @@ protected:
 	virtual void stepChange();
 
 private:
-	QRangeControl(const QRangeControl &);
+	TQRangeControl(const TQRangeControl &);
 };
diff --git a/sip/qt/qrect.sip b/sip/qt/qrect.sip
index 0f5f213..50575b1 100644
--- a/sip/qt/qrect.sip
+++ b/sip/qt/qrect.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QRect.
+// This is the SIP interface definition for TQRect.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QRect</Title>
+<Sect2><Title>TQRect</Title>
 <Para>
 The Python
 <Literal>&amp;</Literal>, <Literal>&amp;=</Literal>,
@@ -53,67 +53,67 @@ This takes no parameters and returns a tuple containing the four values.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rBottom</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rBottom</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not implemented. (Qt v2+)
+Not implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rLeft</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rLeft</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not implemented. (Qt v2+)
+Not implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rRight</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rRight</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not implemented. (Qt v2+)
+Not implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rTop</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rTop</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not implemented. (Qt v2+)
+Not implemented. (TQt v2+)
 </Para>
 </Sect2>
 %End
 
 
-class QRect
+class TQRect
 {
 %TypeHeaderCode
 #include <qrect.h>
 %End
 
 public:
-	QRect();
-	QRect(const QPoint &,const QPoint &);
-	QRect(const QPoint &,const QSize &);
-	QRect(int,int,int,int);
+	TQRect();
+	TQRect(const TQPoint &,const TQPoint &);
+	TQRect(const TQPoint &,const TQSize &);
+	TQRect(int,int,int,int);
 
 	bool isNull() const;
 	bool isEmpty() const;
 	bool isValid() const;
-	QRect normalize() const;
+	TQRect normalize() const;
 
 	int left() const;
 	int top() const;
 	int right() const;
 	int bottom() const;
 
-%If (Qt_2_00 -)
-//	QCOORD &rLeft();
-//	QCOORD &rTop();
-//	QCOORD &rRight();
-//	QCOORD &rBottom();
+%If (TQt_2_00 -)
+//	TQCOORD &rLeft();
+//	TQCOORD &rTop();
+//	TQCOORD &rRight();
+//	TQCOORD &rBottom();
 %End
 
 	int x() const;
@@ -125,83 +125,83 @@ public:
 	void setX(int);
 	void setY(int);
 
-%If (Qt_3_1_0 -)
-	void setTopLeft(const QPoint &);
-	void setBottomRight(const QPoint &);
-	void setTopRight(const QPoint &);
-	void setBottomLeft(const QPoint &);
+%If (TQt_3_1_0 -)
+	void setTopLeft(const TQPoint &);
+	void setBottomRight(const TQPoint &);
+	void setTopRight(const TQPoint &);
+	void setBottomLeft(const TQPoint &);
 %End
 
-	QPoint topLeft() const;
-	QPoint bottomRight() const;
-	QPoint topRight() const;
-	QPoint bottomLeft() const;
-	QPoint center() const;
+	TQPoint topLeft() const;
+	TQPoint bottomRight() const;
+	TQPoint topRight() const;
+	TQPoint bottomLeft() const;
+	TQPoint center() const;
 
 	void rect(int *,int *,int *,int *) const;
 	void coords(int *,int *,int *,int *) const;
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void moveLeft(int);
 	void moveTop(int);
 	void moveRight(int);
 	void moveBottom(int);
 %End
-	void moveTopLeft(const QPoint &);
-	void moveBottomLeft(const QPoint &);
-	void moveTopRight(const QPoint &);
-	void moveBottomRight(const QPoint &);
-	void moveCenter(const QPoint &);
+	void moveTopLeft(const TQPoint &);
+	void moveBottomLeft(const TQPoint &);
+	void moveTopRight(const TQPoint &);
+	void moveBottomRight(const TQPoint &);
+	void moveCenter(const TQPoint &);
 	void moveBy(int,int);
 
 	void setRect(int,int,int,int);
 	void setCoords(int,int,int,int);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void addCoords(int,int,int,int);
 %End
 
-	QSize size() const;
+	TQSize size() const;
 	int width() const;
 	int height() const;
 	void setWidth(int);
 	void setHeight(int);
-	void setSize(const QSize &);
+	void setSize(const TQSize &);
 
-	QRect operator|(const QRect &) const;
-	QRect operator&(const QRect &) const;
-	QRect &operator|=(const QRect &);
-	QRect &operator&=(const QRect &);
+	TQRect operator|(const TQRect &) const;
+	TQRect operator&(const TQRect &) const;
+	TQRect &operator|=(const TQRect &);
+	TQRect &operator&=(const TQRect &);
 
 	int __nonzero__() const;
 %MethodCode
 		sipRes = sipCpp -> isValid();
 %End
 
-	bool contains(const QPoint &,bool = 0) const;
+	bool contains(const TQPoint &,bool = 0) const;
 
-	int __contains__(const QPoint &) const;
+	int __contains__(const TQPoint &) const;
 %MethodCode
 		sipRes = sipCpp -> contains(*a0);
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool contains(int,int) const;
 	bool contains(int,int,bool) const;
 %End
-%If (Qt_2_2_0 - Qt_3_1_0)
+%If (TQt_2_2_0 - TQt_3_1_0)
 	bool contains(int,int,bool = 0) const;
 %End
-	bool contains(const QRect &,bool = 0) const;
+	bool contains(const TQRect &,bool = 0) const;
 
-	int __contains__(const QRect &) const;
+	int __contains__(const TQRect &) const;
 %MethodCode
 		sipRes = sipCpp -> contains(*a0);
 %End
 
-	QRect unite(const QRect &) const;
-	QRect intersect(const QRect &) const;
-	bool intersects(const QRect &) const;
+	TQRect unite(const TQRect &) const;
+	TQRect intersect(const TQRect &) const;
+	bool intersects(const TQRect &) const;
 };
 
-bool operator==(const QRect &,const QRect &);
-bool operator!=(const QRect &,const QRect &);
+bool operator==(const TQRect &,const TQRect &);
+bool operator!=(const TQRect &,const TQRect &);
diff --git a/sip/qt/qregexp.sip b/sip/qt/qregexp.sip
index 3d1dc40..9103f18 100644
--- a/sip/qt/qregexp.sip
+++ b/sip/qt/qregexp.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QRegExp.
+// This is the SIP interface definition for TQRegExp.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QRegExp</Title>
+<Sect2><Title>TQRegExp</Title>
 <Para>
 The Python <Literal>==</Literal> and <Literal>!=</Literal> operators are
 supported.
@@ -36,32 +36,32 @@ supported.
 <Para>
 This takes <Literal>str</Literal> and <Literal>index</Literal> parameters and
 returns a tuple of the <Literal>int</Literal> result and the
-<Literal>len</Literal> value. (Qt v1.x)
+<Literal>len</Literal> value. (TQt v1.x)
 </Para>
 
 <FuncSynopsis>
         <FuncDef>int <Function>match</Function></FuncDef>
-        <ParamDef>const QString &<Parameter>str</Parameter></ParamDef>
+        <ParamDef>const TQString &<Parameter>str</Parameter></ParamDef>
         <ParamDef>int <Parameter>index</Parameter> = 0</ParamDef>
         <ParamDef>int *<Parameter>len</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 This takes <Literal>str</Literal> and <Literal>index</Literal> parameters and
 returns a tuple of the <Literal>int</Literal> result and the
-<Literal>len</Literal> value. (Qt v2+)
+<Literal>len</Literal> value. (TQt v2+)
 </Para>
 </Sect2>
 %End
 
 
-class QRegExp
+class TQRegExp
 {
 %TypeHeaderCode
 #include <qregexp.h>
 %End
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum CaretMode {
 		CaretAtZero,
 		CaretAtOffset,
@@ -69,71 +69,71 @@ public:
 	};
 %End
 
-	QRegExp();
-%If (- Qt_2_00)
-	QRegExp(const char *,bool = 1,bool = 0);
+	TQRegExp();
+%If (- TQt_2_00)
+	TQRegExp(const char *,bool = 1,bool = 0);
 %End
-%If (Qt_2_00 -)
-	QRegExp(const QString &,bool = 1,bool = 0);
+%If (TQt_2_00 -)
+	TQRegExp(const TQString &,bool = 1,bool = 0);
 %End
-	QRegExp(const QRegExp &);
+	TQRegExp(const TQRegExp &);
 
-	bool operator==(const QRegExp &) const;
-	bool operator!=(const QRegExp &) const;
+	bool operator==(const TQRegExp &) const;
+	bool operator!=(const TQRegExp &) const;
 
 	bool isEmpty() const;
 	bool isValid() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *pattern() const;
 %End
-%If (Qt_2_00 -)
-	QString pattern() const;
+%If (TQt_2_00 -)
+	TQString pattern() const;
 %End
-%If (Qt_2_2_0 -)
-	void setPattern(const QString &);
+%If (TQt_2_2_0 -)
+	void setPattern(const TQString &);
 %End
 	bool caseSensitive() const;
 	void setCaseSensitive(bool);
 	bool wildcard() const;
 	void setWildcard(bool);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool minimal() const;
 	void setMinimal(bool);
 
-	bool exactMatch(const QString &) const;
+	bool exactMatch(const TQString &) const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int match(const char *,int = 0,int * = 0) const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	int match(const QString &,int = 0,int * = 0) const;
+%If (TQt_2_00 - TQt_3_0_0)
+	int match(const TQString &,int = 0,int * = 0) const;
 %End
 
-%If (Qt_2_2_0 - Qt_3_0_0)
-	int find(const QString &,int);
+%If (TQt_2_2_0 - TQt_3_0_0)
+	int find(const TQString &,int);
 %End
 
-%If (Qt_3_0_0 -)
-	int search(const QString &,int = 0) const;
-%If (Qt_3_1_0 -)
-	int search(const QString &,int,CaretMode) const;
+%If (TQt_3_0_0 -)
+	int search(const TQString &,int = 0) const;
+%If (TQt_3_1_0 -)
+	int search(const TQString &,int,CaretMode) const;
 %End
-	int searchRev(const QString &,int = -1) const;
-%If (Qt_3_1_0 -)
-	int searchRev(const QString &,int,CaretMode) const;
+	int searchRev(const TQString &,int = -1) const;
+%If (TQt_3_1_0 -)
+	int searchRev(const TQString &,int,CaretMode) const;
 %End
 	int matchedLength() const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int numCaptures() const;
 %End
-	QStringList capturedTexts();
-	QString cap(int = 0);
+	TQStringList capturedTexts();
+	TQString cap(int = 0);
 	int pos(int = 0);
 %End
-%If (Qt_3_1_0 -)
-	QString errorString();
+%If (TQt_3_1_0 -)
+	TQString errorString();
 
-	static QString escape(const QString &);
+	static TQString escape(const TQString &);
 %End
 };
diff --git a/sip/qt/qregion.sip b/sip/qt/qregion.sip
index 38b9beb..f73c83e 100644
--- a/sip/qt/qregion.sip
+++ b/sip/qt/qregion.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QRegion.
+// This is the SIP interface definition for TQRegion.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QRegion</Title>
+<Sect2><Title>TQRegion</Title>
 <Para>
 The Python
 <Literal>|</Literal>, <Literal>|=</Literal>,
@@ -34,7 +34,7 @@ The Python
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QArray&lt;QRect&gt; <Function>rects</Function></FuncDef>
+        <FuncDef>TQArray&lt;TQRect&gt; <Function>rects</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -43,17 +43,17 @@ Not implemented.
 
 <FuncSynopsis>
         <FuncDef>void <Function>setRects</Function></FuncDef>
-	<ParamDef>QRect *<Parameter>rects</Parameter></ParamDef>
+	<ParamDef>TQRect *<Parameter>rects</Parameter></ParamDef>
 	<ParamDef>int <Parameter>num</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2.2+)
+Not yet implemented. (TQt v2.2+)
 </Para>
 </Sect2>
 %End
 
 
-class QRegion
+class TQRegion
 {
 %TypeHeaderCode
 #include <qregion.h>
@@ -66,63 +66,63 @@ public:
 		Ellipse
 	};
 
-	QRegion();
-	QRegion(int,int,int,int,RegionType = Rectangle);
-	QRegion(const QRect &,RegionType = Rectangle);
-	QRegion(const QPointArray &,bool = 0);
-	QRegion(const QRegion &);
-%If (Qt_1_43 -)
-	QRegion(const QBitmap &);
+	TQRegion();
+	TQRegion(int,int,int,int,RegionType = Rectangle);
+	TQRegion(const TQRect &,RegionType = Rectangle);
+	TQRegion(const TQPointArray &,bool = 0);
+	TQRegion(const TQRegion &);
+%If (TQt_1_43 -)
+	TQRegion(const TQBitmap &);
 %End
 
 	bool isNull() const;
 	bool isEmpty() const;
 
-	bool contains(const QPoint &) const;
+	bool contains(const TQPoint &) const;
 
-	int __contains__(const QPoint &) const;
+	int __contains__(const TQPoint &) const;
 %MethodCode
 		sipRes = sipCpp -> contains(*a0);
 %End
 
-	bool contains(const QRect &) const;
+	bool contains(const TQRect &) const;
 
-	int __contains__(const QRect &) const;
+	int __contains__(const TQRect &) const;
 %MethodCode
 		sipRes = sipCpp -> contains(*a0);
 %End
 
 	void translate(int,int);
 
-	QRegion unite(const QRegion &) const;
-	QRegion intersect(const QRegion &) const;
-	QRegion subtract(const QRegion &) const;
-	QRegion eor(const QRegion &) const;
+	TQRegion unite(const TQRegion &) const;
+	TQRegion intersect(const TQRegion &) const;
+	TQRegion subtract(const TQRegion &) const;
+	TQRegion eor(const TQRegion &) const;
 
-	QRect boundingRect() const;
-%If (Qt_3_0_0 -)
-	QMemArray<QRect> rects() const;
+	TQRect boundingRect() const;
+%If (TQt_3_0_0 -)
+	TQMemArray<TQRect> rects() const;
 %End
-%If (Qt_2_2_0 -)
-//	void setRects(const QRect *,int);
+%If (TQt_2_2_0 -)
+//	void setRects(const TQRect *,int);
 %End
 
-	const QRegion operator|(const QRegion &) const;
-	const QRegion operator+(const QRegion &) const;
-	const QRegion operator&(const QRegion &) const;
-	const QRegion operator-(const QRegion &) const;
-	const QRegion operator^(const QRegion &) const;
-	QRegion &operator|=(const QRegion &);
-	QRegion &operator+=(const QRegion &);
-	QRegion &operator&=(const QRegion &);
-	QRegion &operator-=(const QRegion &);
-	QRegion &operator^=(const QRegion &);
+	const TQRegion operator|(const TQRegion &) const;
+	const TQRegion operator+(const TQRegion &) const;
+	const TQRegion operator&(const TQRegion &) const;
+	const TQRegion operator-(const TQRegion &) const;
+	const TQRegion operator^(const TQRegion &) const;
+	TQRegion &operator|=(const TQRegion &);
+	TQRegion &operator+=(const TQRegion &);
+	TQRegion &operator&=(const TQRegion &);
+	TQRegion &operator-=(const TQRegion &);
+	TQRegion &operator^=(const TQRegion &);
 
 	int __nonzero__() const;
 %MethodCode
 		sipRes = !sipCpp -> isNull();
 %End
 
-	bool operator==(const QRegion &) const;
-	bool operator!=(const QRegion &) const;
+	bool operator==(const TQRegion &) const;
+	bool operator!=(const TQRegion &) const;
 };
diff --git a/sip/qt/qscrollbar.sip b/sip/qt/qscrollbar.sip
index 20b8e5d..d811a88 100644
--- a/sip/qt/qscrollbar.sip
+++ b/sip/qt/qscrollbar.sip
@@ -1,101 +1,101 @@
-// This is the SIP interface definition for QScrollBar.
+// This is the SIP interface definition for TQScrollBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QScrollBar</Title>
+<Sect2><Title>TQScrollBar</Title>
 <Para>
-<Literal>QScrollBar</Literal> is fully implemented.
+<Literal>TQScrollBar</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QScrollBar : QWidget, QRangeControl
+class TQScrollBar : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
 #include <qscrollbar.h>
 %End
 
 public:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum Orientation {
 		Horizontal,
 		Vertical
 	};
 %End
 
-%If (- Qt_2_00)
-	QScrollBar(QWidget * /TransferThis/ = 0,const char * = 0);
-	QScrollBar(Orientation,QWidget * /TransferThis/ = 0,const char * = 0);
-	QScrollBar(int,int,int,int,int,Orientation,
-		   QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQScrollBar(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQScrollBar(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQScrollBar(int,int,int,int,int,Orientation,
+		   TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QScrollBar(QWidget * /TransferThis/,const char * = 0);
-	QScrollBar(Orientation,QWidget * /TransferThis/,const char * = 0);
-	QScrollBar(int,int,int,int,int,Orientation,QWidget * /TransferThis/,
+%If (TQt_2_00 -)
+	TQScrollBar(TQWidget * /TransferThis/,const char * = 0);
+	TQScrollBar(Orientation,TQWidget * /TransferThis/,const char * = 0);
+	TQScrollBar(int,int,int,int,int,Orientation,TQWidget * /TransferThis/,
 		   const char * = 0);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOrientation(Orientation);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOrientation(Orientation);
 %End
 	Orientation orientation() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setTracking(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setTracking(bool);
 %End
 	bool tracking() const;
 	bool draggingSlider() const;
 
-%If (Qt_2_00 -)
-	virtual void setPalette(const QPalette &);
+%If (TQt_2_00 -)
+	virtual void setPalette(const TQPalette &);
 %End
-%If (- Qt_2_00)
-	void setPalette(const QPalette &);
+%If (- TQt_2_00)
+	void setPalette(const TQPalette &);
 %End
-%If (Qt_3_1_0 -)
-	virtual QSize sizeHint() const;
+%If (TQt_3_1_0 -)
+	virtual TQSize sizeHint() const;
 %End
-%If (- Qt_3_1_0)
-	QSize sizeHint() const;
+%If (- TQt_3_1_0)
+	TQSize sizeHint() const;
 %End
-%If (Qt_3_1_0 -)
-	virtual void setSizePolicy(QSizePolicy);
+%If (TQt_3_1_0 -)
+	virtual void setSizePolicy(TQSizePolicy);
 %End
-%If (Qt_3_2_0 -)
-	void setSizePolicy(QSizePolicy::SizeType,QSizePolicy::SizeType,
+%If (TQt_3_2_0 -)
+	void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType,
 			   bool = 0);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int minValue() const;
 	int maxValue() const;
 	void setMinValue(int);
@@ -106,17 +106,17 @@ public:
 	void setPageStep(int);
 	int value() const;
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void setValue(int);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int sliderStart() const;
-	QRect sliderRect() const;
+	TQRect sliderRect() const;
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setValue(int);
 %End
 
@@ -131,40 +131,40 @@ signals:
 	void prevPage();
 
 protected:
-%If (Qt_2_00 -)
-	void wheelEvent(QWheelEvent *);
+%If (TQt_2_00 -)
+	void wheelEvent(TQWheelEvent *);
 %End
-	void keyPressEvent(QKeyEvent *);
-	void resizeEvent(QResizeEvent *);
-	void paintEvent(QPaintEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void paintEvent(TQPaintEvent *);
 
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-%If (Qt_3_0_0 -)
-	void contextMenuEvent(QContextMenuEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+%If (TQt_3_0_0 -)
+	void contextMenuEvent(TQContextMenuEvent *);
 %End
-%If (Qt_3_0_4 -)
-	void hideEvent(QHideEvent *);
+%If (TQt_3_0_4 -)
+	void hideEvent(TQHideEvent *);
 %End
 
 	void valueChange();
 	void stepChange();
 	void rangeChange();
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	int sliderStart() const;
-	QRect sliderRect() const;
+	TQRect sliderRect() const;
 %End
 
-%If (- Qt_2_00)
-	void timerEvent(QTimerEvent *);
+%If (- TQt_2_00)
+	void timerEvent(TQTimerEvent *);
 %End
 
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
 
 private:
-	QScrollBar(const QScrollBar &);
+	TQScrollBar(const TQScrollBar &);
 };
diff --git a/sip/qt/qscrollview.sip b/sip/qt/qscrollview.sip
index 4d7161f..19a00d8 100644
--- a/sip/qt/qscrollview.sip
+++ b/sip/qt/qscrollview.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QScrollView.
+// This is the SIP interface definition for TQScrollView.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QScrollView</Title>
+<Sect2><Title>TQScrollView</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>contentsToViewport</Function></FuncDef>
 	<ParamDef>int <Parameter>x</Parameter></ParamDef>
@@ -32,7 +32,7 @@
 <Para>
 This takes the <Literal>x</Literal> and <Literal>y</Literal> parameters and
 returns a tuple containing the <Literal>vx</Literal> and <Literal>vy</Literal>
-values. (Qt v2+)
+values. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
@@ -45,26 +45,26 @@ values. (Qt v2+)
 <Para>
 This takes the <Literal>vx</Literal> and <Literal>vy</Literal> parameters and
 returns a tuple containing the <Literal>x</Literal> and <Literal>y</Literal>
-values. (Qt v2+)
+values. (TQt v2+)
 </Para>
 </Sect2>
 %End
 
 
-class QScrollView : QFrame
+class TQScrollView : TQFrame
 {
 %TypeHeaderCode
 #include <qscrollview.h>
 %End
 
 public:
-	QScrollView(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQScrollView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
 	enum ResizePolicy {
 		Default,
 		Manual,
 		AutoOne,
-%If (Qt_2_3_0 -)
+%If (TQt_2_3_0 -)
 		AutoOneFit,
 %End
 	};
@@ -72,25 +72,25 @@ public:
 	virtual void setResizePolicy(ResizePolicy);
 	ResizePolicy resizePolicy() const;
 
-%If (Qt_2_1_0 -)
-	void styleChange(QStyle &);
+%If (TQt_2_1_0 -)
+	void styleChange(TQStyle &);
 %End
 	// The child was reparented when it was added, and it stays that way,
 	// so we don't transfer it back here.
-	void removeChild(QWidget *);
-%If (- Qt_2_00)
-	void addChild(QWidget * /Transfer/);
-	virtual void addChild(QWidget * /Transfer/,int,int);
+	void removeChild(TQWidget *);
+%If (- TQt_2_00)
+	void addChild(TQWidget * /Transfer/);
+	virtual void addChild(TQWidget * /Transfer/,int,int);
 %End
-%If (Qt_2_00 -)
-	virtual void addChild(QWidget * /Transfer/,int = 0,int = 0);
+%If (TQt_2_00 -)
+	virtual void addChild(TQWidget * /Transfer/,int = 0,int = 0);
 %End
-	virtual void moveChild(QWidget *,int,int);
-	int childX(QWidget *);
-	int childY(QWidget *);
-%If (- Qt_3_0_0)
-	bool childIsVisible(QWidget *);
-	void showChild(QWidget *,bool = 1);
+	virtual void moveChild(TQWidget *,int,int);
+	int childX(TQWidget *);
+	int childY(TQWidget *);
+%If (- TQt_3_0_0)
+	bool childIsVisible(TQWidget *);
+	void showChild(TQWidget *,bool = 1);
 %End
 
 	enum ScrollBarMode {
@@ -105,19 +105,19 @@ public:
 	ScrollBarMode hScrollBarMode() const;
 	virtual void setHScrollBarMode(ScrollBarMode);
 
-	QWidget *cornerWidget() const;
-	virtual void setCornerWidget(QWidget * /Transfer/);
+	TQWidget *cornerWidget() const;
+	virtual void setCornerWidget(TQWidget * /Transfer/);
 
-%If (- Qt_2_00)
-	QScrollBar *horizontalScrollBar();
-	QScrollBar *verticalScrollBar();
-	QWidget *viewport();
+%If (- TQt_2_00)
+	TQScrollBar *horizontalScrollBar();
+	TQScrollBar *verticalScrollBar();
+	TQWidget *viewport();
 %End
-%If (Qt_2_00 -)
-	QScrollBar *horizontalScrollBar() const;
-	QScrollBar *verticalScrollBar() const;
-	QWidget *viewport() const;
-	QWidget *clipper() const;
+%If (TQt_2_00 -)
+	TQScrollBar *horizontalScrollBar() const;
+	TQScrollBar *verticalScrollBar() const;
+	TQWidget *viewport() const;
+	TQWidget *clipper() const;
 
 	int visibleWidth() const;
 	int visibleHeight() const;
@@ -129,82 +129,82 @@ public:
 	int contentsY() const;
 
 	void resize(int,int);
-	void resize(const QSize &);
+	void resize(const TQSize &);
 	void show();
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void updateContents(int,int,int,int);
 %End
-%If (Qt_2_1_0 -)
-	void updateContents(const QRect &);
+%If (TQt_2_1_0 -)
+	void updateContents(const TQRect &);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void updateContents();
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void repaintContents(int,int,int,int,bool = 1);
 %End
-%If (Qt_2_1_0 -)
-	void repaintContents(const QRect &,bool = 1);
+%If (TQt_2_1_0 -)
+	void repaintContents(const TQRect &,bool = 1);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void repaintContents(bool = 1);
 %End
 
-%If (Qt_2_00 -)
-	// Note that this wasn't actually const until Qt v3.0.0.
+%If (TQt_2_00 -)
+	// Note that this wasn't actually const until TQt v3.0.0.
 	void contentsToViewport(int,int,int &,int &) const;
 
-	// Note that this wasn't actually const until Qt v3.0.0.
+	// Note that this wasn't actually const until TQt v3.0.0.
 	void viewportToContents(int,int,int &,int &) const;
 
-%If (- Qt_3_0_0)
-	QPoint contentsToViewport(const QPoint &);
-	QPoint viewportToContents(const QPoint &);
+%If (- TQt_3_0_0)
+	TQPoint contentsToViewport(const TQPoint &);
+	TQPoint viewportToContents(const TQPoint &);
 %End
-%If (Qt_3_0_0 -)
-	QPoint contentsToViewport(const QPoint &) const;
-	QPoint viewportToContents(const QPoint &) const;
+%If (TQt_3_0_0 -)
+	TQPoint contentsToViewport(const TQPoint &) const;
+	TQPoint viewportToContents(const TQPoint &) const;
 %End
 	void enableClipper(bool);
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setStaticBackground(bool);
 	bool hasStaticBackground() const;
 %End
 
-	QSize viewportSize(int,int) const;
-%If (Qt_2_1_0 -)
-	QSize sizeHint() const;
+	TQSize viewportSize(int,int) const;
+%If (TQt_2_1_0 -)
+	TQSize sizeHint() const;
 %End
-%If (- Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (- TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
-	QSize minimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 
-	void removeChild(QObject * /TransferBack/);
+	void removeChild(TQObject * /TransferBack/);
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isHorizontalSliderPressed();
 	bool isVerticalSliderPressed();
 %End
 
-%If (Qt_DRAGANDDROP)
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_DRAGANDDROP)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void setDragAutoScroll(bool);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setDragAutoScroll(bool);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool dragAutoScroll() const;
 %End
 %End
 
 signals:
 	void contentsMoving(int,int);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void horizontalSliderPressed();
 	void horizontalSliderReleased();
 	void verticalSliderPressed();
@@ -214,10 +214,10 @@ signals:
 public slots:
 	virtual void resizeContents(int,int);
 	void scrollBy(int,int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setContentsPos(int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setContentsPos(int,int);
 %End
 	void ensureVisible(int,int);
@@ -226,60 +226,60 @@ public slots:
 	void center(int,int,float,float);
 
 	void updateScrollBars();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setEnabled(bool);
 %End
 
 protected:
-%If (Qt_2_00 -)
-	virtual void drawContents(QPainter *,int,int,int,int);
+%If (TQt_2_00 -)
+	virtual void drawContents(TQPainter *,int,int,int,int);
 %End
-	virtual void drawContentsOffset(QPainter *,int,int,int,int,int,int);
+	virtual void drawContentsOffset(TQPainter *,int,int,int,int,int,int);
 
-%If (Qt_2_00 -)
-	virtual void contentsMousePressEvent(QMouseEvent *);
-	virtual void contentsMouseReleaseEvent(QMouseEvent *);
-	virtual void contentsMouseDoubleClickEvent(QMouseEvent *);
-	virtual void contentsMouseMoveEvent(QMouseEvent *);
-%If (Qt_DRAGANDDROP)
-	virtual void contentsDragEnterEvent(QDragEnterEvent *);
-	virtual void contentsDragMoveEvent(QDragMoveEvent *);
-	virtual void contentsDragLeaveEvent(QDragLeaveEvent *);
-	virtual void contentsDropEvent(QDropEvent *);
+%If (TQt_2_00 -)
+	virtual void contentsMousePressEvent(TQMouseEvent *);
+	virtual void contentsMouseReleaseEvent(TQMouseEvent *);
+	virtual void contentsMouseDoubleClickEvent(TQMouseEvent *);
+	virtual void contentsMouseMoveEvent(TQMouseEvent *);
+%If (TQt_DRAGANDDROP)
+	virtual void contentsDragEnterEvent(TQDragEnterEvent *);
+	virtual void contentsDragMoveEvent(TQDragMoveEvent *);
+	virtual void contentsDragLeaveEvent(TQDragLeaveEvent *);
+	virtual void contentsDropEvent(TQDropEvent *);
 %End
-	virtual void contentsWheelEvent(QWheelEvent *);
+	virtual void contentsWheelEvent(TQWheelEvent *);
 %End
-%If (Qt_3_0_0 -)
-	virtual void contentsContextMenuEvent(QContextMenuEvent *);
+%If (TQt_3_0_0 -)
+	virtual void contentsContextMenuEvent(TQContextMenuEvent *);
 %End
 
-	virtual void viewportPaintEvent(QPaintEvent *);
-%If (Qt_2_00 -)
-	virtual void viewportResizeEvent(QResizeEvent *);
+	virtual void viewportPaintEvent(TQPaintEvent *);
+%If (TQt_2_00 -)
+	virtual void viewportResizeEvent(TQResizeEvent *);
 %End
-	virtual void viewportMousePressEvent(QMouseEvent *);
-	virtual void viewportMouseReleaseEvent(QMouseEvent *);
-	virtual void viewportMouseDoubleClickEvent(QMouseEvent *);
-	virtual void viewportMouseMoveEvent(QMouseEvent *);
-%If (Qt_2_00 -)
-%If (Qt_DRAGANDDROP)
-	virtual void viewportDragEnterEvent(QDragEnterEvent *);
-	virtual void viewportDragMoveEvent(QDragMoveEvent *);
-	virtual void viewportDragLeaveEvent(QDragLeaveEvent *);
-	virtual void viewportDropEvent(QDropEvent *);
+	virtual void viewportMousePressEvent(TQMouseEvent *);
+	virtual void viewportMouseReleaseEvent(TQMouseEvent *);
+	virtual void viewportMouseDoubleClickEvent(TQMouseEvent *);
+	virtual void viewportMouseMoveEvent(TQMouseEvent *);
+%If (TQt_2_00 -)
+%If (TQt_DRAGANDDROP)
+	virtual void viewportDragEnterEvent(TQDragEnterEvent *);
+	virtual void viewportDragMoveEvent(TQDragMoveEvent *);
+	virtual void viewportDragLeaveEvent(TQDragLeaveEvent *);
+	virtual void viewportDropEvent(TQDropEvent *);
 %End
-	virtual void viewportWheelEvent(QWheelEvent *);
+	virtual void viewportWheelEvent(TQWheelEvent *);
 %End
-%If (Qt_3_0_0 -)
-	virtual void viewportContextMenuEvent(QContextMenuEvent *);
+%If (TQt_3_0_0 -)
+	virtual void viewportContextMenuEvent(TQContextMenuEvent *);
 %End
 
 	void frameChanged();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMargins(int,int,int,int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setMargins(int,int,int,int);
 %End
 	int leftMargin() const;
@@ -289,37 +289,37 @@ protected:
 
 	bool focusNextPrevChild(bool);
 
-%If (Qt_2_00 -)
-	virtual void setHBarGeometry(QScrollBar &,int,int,int,int);
-	virtual void setVBarGeometry(QScrollBar &,int,int,int,int);
+%If (TQt_2_00 -)
+	virtual void setHBarGeometry(TQScrollBar &,int,int,int,int);
+	virtual void setVBarGeometry(TQScrollBar &,int,int,int,int);
 %End
 
-	void resizeEvent(QResizeEvent *);
-%If (Qt_3_0_0 -)
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseDoubleClickEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (TQt_3_0_0 -)
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseDoubleClickEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
 %End
-%If (Qt_2_00 -)
-	void wheelEvent(QWheelEvent *);
+%If (TQt_2_00 -)
+	void wheelEvent(TQWheelEvent *);
 %End
-%If (Qt_3_0_0 -)
-	void contextMenuEvent(QContextMenuEvent *);
+%If (TQt_3_0_0 -)
+	void contextMenuEvent(TQContextMenuEvent *);
 %End
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
-%If (Qt_3_1_0 -)
-	void setCachedSizeHint(const QSize &) const;
-	QSize cachedSizeHint() const;
-	void fontChange(const QFont &);
+%If (TQt_3_1_0 -)
+	void setCachedSizeHint(const TQSize &) const;
+	TQSize cachedSizeHint() const;
+	void fontChange(const TQFont &);
 %End
 
 private:
-	QScrollView(const QScrollView &);
+	TQScrollView(const TQScrollView &);
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void disableSizeHintCaching();
 %End
 };
diff --git a/sip/qt/qsemaphore.sip b/sip/qt/qsemaphore.sip
index 5e1ba40..faef77e 100644
--- a/sip/qt/qsemaphore.sip
+++ b/sip/qt/qsemaphore.sip
@@ -1,55 +1,55 @@
-// This is the SIP interface definition for QSemaphore.
+// This is the SIP interface definition for TQSemaphore.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSemaphore (Qt v2.2+)</Title>
+<Sect2><Title>TQSemaphore (TQt v2.2+)</Title>
 <Para>
-<Literal>QSemaphore</Literal> is fully implemented.  The <Literal>+=</Literal>
-and <Literal>-=</Literal> operators have also been implemented, but require
+<Literal>TQSemaphore</Literal> is fully implemented.  The <Literal>+=</Literal>
+and <Literal>-=</Literal> operators have also been implemented, but retquire
 Python v2.0 or later.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_THREAD_SUPPORT)
+%If (TQt_THREAD_SUPPORT)
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QSemaphore
+class TQSemaphore
 {
 %TypeHeaderCode
 #include <qsemaphore.h>
 %End
 
 public:
-	QSemaphore(int);
+	TQSemaphore(int);
 
 	int available() const;
 	int total() const;
 
-	QSemaphore &operator+=(int);
+	TQSemaphore &operator+=(int);
 %MethodCode
-		// Some versions of Qt v3 under Windows have a bug where the +=
+		// Some versions of TQt v3 under Windows have a bug where the +=
 		// operator doesn't work properly (but ++ does).  This way we
 		// make sure that the most common value of n (ie. 1) works
 		// properly with the buggy version.
@@ -62,9 +62,9 @@ public:
 		Py_END_ALLOW_THREADS
 %End
 
-	QSemaphore &operator-=(int);
+	TQSemaphore &operator-=(int);
 %MethodCode
-		// Some versions of Qt v3 under Windows have a bug where the -=
+		// Some versions of TQt v3 under Windows have a bug where the -=
 		// operator doesn't work properly (but -- does).  This way we
 		// make sure that the most common value of n (ie. 1) works
 		// properly with the buggy version.
@@ -80,31 +80,31 @@ public:
 	bool tryAccess(int);
 
 private:
-	QSemaphore(const QSemaphore &);
+	TQSemaphore(const TQSemaphore &);
 };
 
 %End
 
 
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 
-class QSemaphore : Qt
+class TQSemaphore : TQt
 {
 %TypeHeaderCode
 #include <qthread.h>
 %End
 
 public:
-	QSemaphore(int);
+	TQSemaphore(int);
 
 	int available() const;
 	int total() const;
 
-	QSemaphore &operator+=(int);
-	QSemaphore &operator-=(int);
+	TQSemaphore &operator+=(int);
+	TQSemaphore &operator-=(int);
 
 private:
-	QSemaphore(const QSemaphore &);
+	TQSemaphore(const TQSemaphore &);
 };
 
 %End
diff --git a/sip/qt/qsemimodal.sip b/sip/qt/qsemimodal.sip
index 0efc1c8..f17914e 100644
--- a/sip/qt/qsemimodal.sip
+++ b/sip/qt/qsemimodal.sip
@@ -1,62 +1,62 @@
-// This is the SIP interface definition for QSemiModal.
+// This is the SIP interface definition for TQSemiModal.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSemiModal (Qt v1, v2)</Title>
+<Sect2><Title>TQSemiModal (TQt v1, v2)</Title>
 <Para>
-<Literal>QSemiModal</Literal> is fully implemented.
+<Literal>TQSemiModal</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_SEMIMODAL)
-%If (- Qt_3_0_0)
+%If (TQt_SEMIMODAL)
+%If (- TQt_3_0_0)
 
-class QSemiModal : QWidget
+class TQSemiModal : TQWidget
 {
 %TypeHeaderCode
 #include <qsemimodal.h>
 %End
 
 public:
-	QSemiModal(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,WFlags = 0);
+	TQSemiModal(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,WFlags = 0);
 
 	void show();
 	void move(int,int);
-	void move(const QPoint &);
+	void move(const TQPoint &);
 	void resize(int,int);
-	void resize(const QSize &);
-%If (- Qt_2_00)
+	void resize(const TQSize &);
+%If (- TQt_2_00)
 	void setGeometry(int,int,int,int);
-	void setGeometry(const QRect &);
+	void setGeometry(const TQRect &);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setGeometry(int,int,int,int);
-	virtual void setGeometry(const QRect &);
+	virtual void setGeometry(const TQRect &);
 %End
 
 private:
-	QSemiModal(const QSemiModal &);
+	TQSemiModal(const TQSemiModal &);
 };
 
 %End
diff --git a/sip/qt/qsessionmanager.sip b/sip/qt/qsessionmanager.sip
index 92ff03c..87af6c3 100644
--- a/sip/qt/qsessionmanager.sip
+++ b/sip/qt/qsessionmanager.sip
@@ -1,46 +1,46 @@
-// This is the SIP interface definition for QSessionManager.
+// This is the SIP interface definition for TQSessionManager.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QSessionManager (Qt v2+)</Title>
+<Sect2><Title>TQSessionManager (TQt v2+)</Title>
 <Para>
-<Literal>QSessionManager</Literal> is fully implemented.
+<Literal>TQSessionManager</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QSessionManager : QObject
+class TQSessionManager : TQObject
 {
 %TypeHeaderCode
 #include <qsessionmanager.h>
 %End
 
 public:
-	QString sessionId() const;
-%If (Qt_3_1_0 -)
-	QString sessionKey() const;
+	TQString sessionId() const;
+%If (TQt_3_1_0 -)
+	TQString sessionKey() const;
 %End
 
 	bool allowsInteraction();
@@ -59,31 +59,31 @@ public:
 	void setRestartHint(RestartHint);
 	RestartHint restartHint() const;
 
-	void setRestartCommand(const QStringList &);
-	QStringList restartCommand() const;
-	void setDiscardCommand(const QStringList &);
-	QStringList discardCommand() const;
+	void setRestartCommand(const TQStringList &);
+	TQStringList restartCommand() const;
+	void setDiscardCommand(const TQStringList &);
+	TQStringList discardCommand() const;
 
-%If (- Qt_3_0_0)
-	void setProperty(const QString &,const QString &);
-	void setProperty(const QString &,const QStringList &);
+%If (- TQt_3_0_0)
+	void setProperty(const TQString &,const TQString &);
+	void setProperty(const TQString &,const TQStringList &);
 %End
-%If (Qt_3_0_0 -)
-	void setManagerProperty(const QString &,const QString &);
-	void setManagerProperty(const QString &,const QStringList &);
+%If (TQt_3_0_0 -)
+	void setManagerProperty(const TQString &,const TQString &);
+	void setManagerProperty(const TQString &,const TQStringList &);
 %End
 
 	bool isPhase2() const;
 	void requestPhase2();
 
 private:
-%If (Qt_3_1_0 -)
-	QSessionManager(QApplication * /TransferThis/,QString &,QString &);
+%If (TQt_3_1_0 -)
+	TQSessionManager(TQApplication * /TransferThis/,TQString &,TQString &);
 %End
-%If (- Qt_3_1_0)
-	QSessionManager(QApplication * /TransferThis/,QString &);
+%If (- TQt_3_1_0)
+	TQSessionManager(TQApplication * /TransferThis/,TQString &);
 %End
-	~QSessionManager();
+	~TQSessionManager();
 };
 
 %End
diff --git a/sip/qt/qsettings.sip b/sip/qt/qsettings.sip
index 122593e..b271787 100644
--- a/sip/qt/qsettings.sip
+++ b/sip/qt/qsettings.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QSettings.
+// This is the SIP interface definition for TQSettings.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSettings (Qt v3+)</Title>
+<Sect2><Title>TQSettings (TQt v3+)</Title>
 <FuncSynopsis>
 	<FuncDef>bool <Function>readBoolEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
 	<ParamDef>bool <Parameter>def</Parameter> = 0</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
@@ -35,7 +35,7 @@ the <Literal>bool</Literal> result and the <Literal>ok</Literal> flag.
 
 <FuncSynopsis>
 <FuncDef>double <Function>readDoubleEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
 	<ParamDef>double <Parameter>def</Parameter> = 0</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
@@ -45,40 +45,40 @@ the <Literal>double</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 
 <FuncSynopsis>
-<FuncDef>QString <Function>readEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
-	<ParamDef>const QString &amp;<Parameter>def</Parameter> = QString::null</ParamDef>
+<FuncDef>TQString <Function>readEntry</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>def</Parameter> = TQString::null</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QString</Literal> result and the <Literal>ok</Literal> flag.
+the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 
 <FuncSynopsis>
-<FuncDef>QStringList <Function>readListEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
+<FuncDef>TQStringList <Function>readListEntry</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QStringList</Literal> result and the <Literal>ok</Literal> flag.
+the <Literal>TQStringList</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 
 <FuncSynopsis>
-<FuncDef>QStringList <Function>readListEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
-	<ParamDef>const QChar &amp;<Parameter>separator</Parameter></ParamDef>
+<FuncDef>TQStringList <Function>readListEntry</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQChar &amp;<Parameter>separator</Parameter></ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
 The <Literal>ok</Literal> is not passed and the returned value is a tuple of
-the <Literal>QStringList</Literal> result and the <Literal>ok</Literal> flag.
+the <Literal>TQStringList</Literal> result and the <Literal>ok</Literal> flag.
 </Para>
 
 <FuncSynopsis>
 <FuncDef>int <Function>readNumEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
 	<ParamDef>int <Parameter>def</Parameter> = 0</ParamDef>
 	<ParamDef>bool *<Parameter>ok</Parameter> = 0</ParamDef>
 </FuncSynopsis>
@@ -89,7 +89,7 @@ the <Literal>int</Literal> result and the <Literal>ok</Literal> flag.
 
 <FuncSynopsis>
 	<FuncDef>bool <Function>writeEntry</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>key</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>key</Parameter></ParamDef>
 	<ParamDef>bool <Parameter>value</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -99,16 +99,16 @@ Not implemented.
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QSettings
+class TQSettings
 {
 %TypeHeaderCode
 #include <qsettings.h>
 %End
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum Format {
 		Native,
 		Ini
@@ -121,57 +121,57 @@ public:
 		Mac
 	};
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum Scope {
 		User,
 		Global
 	};
 %End
 
-	QSettings();
-%If (Qt_3_1_0 -)
-	QSettings(Format);
+	TQSettings();
+%If (TQt_3_1_0 -)
+	TQSettings(Format);
 %End
 
-//	bool writeEntry(const QString &,bool);
-	bool writeEntry(const QString &,int /Constrained/);
-	bool writeEntry(const QString &,double);
-//	bool writeEntry(const QString &,const char *);
-	bool writeEntry(const QString &,const QString &);
-	bool writeEntry(const QString &,const QStringList &);
-	bool writeEntry(const QString &,const QStringList &,const QChar &);
+//	bool writeEntry(const TQString &,bool);
+	bool writeEntry(const TQString &,int /Constrained/);
+	bool writeEntry(const TQString &,double);
+//	bool writeEntry(const TQString &,const char *);
+	bool writeEntry(const TQString &,const TQString &);
+	bool writeEntry(const TQString &,const TQStringList &);
+	bool writeEntry(const TQString &,const TQStringList &,const TQChar &);
 
-	QStringList entryList(const QString &) const;
-	QStringList subkeyList(const QString &) const;
+	TQStringList entryList(const TQString &) const;
+	TQStringList subkeyList(const TQString &) const;
 
-	QStringList readListEntry(const QString &,bool * = 0);
-	QStringList readListEntry(const QString &,const QChar &,bool * = 0);
-	QString readEntry(const QString &,const QString & = QString::null,
+	TQStringList readListEntry(const TQString &,bool * = 0);
+	TQStringList readListEntry(const TQString &,const TQChar &,bool * = 0);
+	TQString readEntry(const TQString &,const TQString & = TQString::null,
 			  bool * = 0);
-	int readNumEntry(const QString &,int = 0,bool * = 0);
-	double readDoubleEntry(const QString &,double = 0,bool * = 0);
-	bool readBoolEntry(const QString &,bool = 0,bool * = 0);
+	int readNumEntry(const TQString &,int = 0,bool * = 0);
+	double readDoubleEntry(const TQString &,double = 0,bool * = 0);
+	bool readBoolEntry(const TQString &,bool = 0,bool * = 0);
 
-	bool removeEntry(const QString &);
+	bool removeEntry(const TQString &);
 
-	void insertSearchPath(System,const QString &);
-	void removeSearchPath(System,const QString &);
+	void insertSearchPath(System,const TQString &);
+	void removeSearchPath(System,const TQString &);
 
-%If (Qt_3_1_0 -)
-	void setPath(const QString &,const QString &,Scope = Global);
+%If (TQt_3_1_0 -)
+	void setPath(const TQString &,const TQString &,Scope = Global);
 
-	void beginGroup(const QString &);
+	void beginGroup(const TQString &);
 	void endGroup();
 	void resetGroup();
-	QString group() const;
+	TQString group() const;
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	bool sync();
 %End
 
 private:
-	QSettings(const QSettings &);
+	TQSettings(const TQSettings &);
 };
 
 %End
diff --git a/sip/qt/qsgistyle.sip b/sip/qt/qsgistyle.sip
index c2563ea..f7cf4d1 100644
--- a/sip/qt/qsgistyle.sip
+++ b/sip/qt/qsgistyle.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QSGIStyle.
+// This is the SIP interface definition for TQSGIStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QSGIStyle (Qt v2.2+)</Title>
+<Sect2><Title>TQSGIStyle (TQt v2.2+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QScrollBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQScrollBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderLength</Parameter></ParamDef>
@@ -34,123 +34,123 @@
 This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_STYLE_SGI)
-%If (Qt_2_2_0 -)
+%If (TQt_STYLE_SGI)
+%If (TQt_2_2_0 -)
 
-class QSGIStyle : QMotifStyle
+class TQSGIStyle : TQMotifStyle
 {
 %TypeHeaderCode
 #include <qsgistyle.h>
 %End
 
 public:
-	QSGIStyle(bool = 0);
+	TQSGIStyle(bool = 0);
 
-	void polish(QWidget *);
-	void unPolish(QWidget *);
-	void polish(QApplication *);
-	void unPolish(QApplication *);
+	void polish(TQWidget *);
+	void unPolish(TQWidget *);
+	void polish(TQApplication *);
+	void unPolish(TQApplication *);
 
-%If (- Qt_3_0_0)
-	void polish(QPalette &);
+%If (- TQt_3_0_0)
+	void polish(TQPalette &);
 
 	int defaultFrameWidth() const;
 
-	void drawPanel(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-		       int = 1,const QBrush * = 0);
-	void drawSeparator(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+		       int = 1,const TQBrush * = 0);
+	void drawSeparator(TQPainter *,int,int,int,int,const TQColorGroup &,
 			   bool = 1,int = 1,int = 0);
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,bool = 0,
-			const QBrush * = 0);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
-	void drawPushButton(QPushButton *,QPainter *);
-	void drawArrow(QPainter *,ArrowType,bool,int,int,int,int,
-		       const QColorGroup &,bool,const QBrush * = 0);
-
-	QSize indicatorSize() const;
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,int,
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
+			const TQBrush * = 0);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
+	void drawPushButton(TQPushButton *,TQPainter *);
+	void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int,
+		       const TQColorGroup &,bool,const TQBrush * = 0);
+
+	TQSize indicatorSize() const;
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int,
 			   bool = 0,bool = 1);
-	void drawCheckMark(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,
 			   bool,bool);
-	void drawIndicatorMask(QPainter *,int,int,int,int,int);
+	void drawIndicatorMask(TQPainter *,int,int,int,int,int);
 
-	QSize exclusiveIndicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
-	void drawExclusiveIndicatorMask(QPainter *,int,int,int,int,bool);
+	TQSize exclusiveIndicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
+	void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool);
 
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,uint);
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint);
 
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderMask(QPainter *,int,int,int,int,Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
-	void drawSliderGrooveMask(QPainter *,int,int,int,int,QCOORD,
+	void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
+	void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD,
 				  Orientation);
 
-	void drawTab(QPainter *,const QTabBar *,QTab *,bool);
-	void drawTabMask(QPainter *,const QTabBar *,QTab *,bool);
+	void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool);
+	void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool);
 
 	int splitterWidth() const;
-	void drawSplitter(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &,
 			  Orientation);
 
-	int popupMenuItemHeight(bool,QMenuItem *,const QFontMetrics &);
-	void drawPopupPanel(QPainter *,int,int,int,int,const QColorGroup &,
-			    int = 2,const QBrush * = 0);
-	void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-			       const QPalette &,bool,bool,int,int,int,int);
-	void drawMenuBarItem(QPainter *,int,int,int,int,QMenuItem *,
-			     QColorGroup &,bool,bool);
+	int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &);
+	void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &,
+			    int = 2,const TQBrush * = 0);
+	void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+			       const TQPalette &,bool,bool,int,int,int,int);
+	void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *,
+			     TQColorGroup &,bool,bool);
 %End
-%If (Qt_3_0_0 -)
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+%If (TQt_3_0_0 -)
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const; 
+				const TQStyleOption & = TQStyleOption()) const; 
 
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
 
-	QSize sizeFromContents(ContentsType,const QWidget *,const QSize &,
-			       const QStyleOption & = QStyleOption()) const;
+	TQSize sizeFromContents(ContentsType,const TQWidget *,const TQSize &,
+			       const TQStyleOption & = TQStyleOption()) const;
 
-	QRect subRect(SubRect,const QWidget *) const;
+	TQRect subRect(SubRect,const TQWidget *) const;
  
-	QRect querySubControlMetrics(ComplexControl,const QWidget *,
+	TQRect querySubControlMetrics(ComplexControl,const TQWidget *,
 				     SubControl,
-				     const QStyleOption & = QStyleOption()) const;
+				     const TQStyleOption & = TQStyleOption()) const;
 %End
 
 protected:
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 private:
-	QSGIStyle(const QSGIStyle &);
+	TQSGIStyle(const TQSGIStyle &);
 };
 
 %End
diff --git a/sip/qt/qsignalmapper.sip b/sip/qt/qsignalmapper.sip
index d587723..47cd9fd 100644
--- a/sip/qt/qsignalmapper.sip
+++ b/sip/qt/qsignalmapper.sip
@@ -1,50 +1,50 @@
-// This is the SIP interface definition for QSignalMapper
+// This is the SIP interface definition for TQSignalMapper
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSignalMapper</Title>
+<Sect2><Title>TQSignalMapper</Title>
 <Para>
-<Literal>QSignalMapper</Literal> is fully implemented.
+<Literal>TQSignalMapper</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QSignalMapper : QObject
+class TQSignalMapper : TQObject
 {
 %TypeHeaderCode
 #include <qsignalmapper.h>
 %End
 
 public:
-	QSignalMapper(QObject * /TransferThis/,const char * = 0);
+	TQSignalMapper(TQObject * /TransferThis/,const char * = 0);
 
-	virtual void setMapping(const QObject *,int);
-	virtual void setMapping(const QObject *,const QString &);
-	void removeMappings(const QObject *);
+	virtual void setMapping(const TQObject *,int);
+	virtual void setMapping(const TQObject *,const TQString &);
+	void removeMappings(const TQObject *);
 
 signals:
 	void mapped(int);
-	void mapped(const QString &);
+	void mapped(const TQString &);
 
 public slots:
 	void map();
diff --git a/sip/qt/qsimplerichtext.sip b/sip/qt/qsimplerichtext.sip
index 7b189c3..a44be99 100644
--- a/sip/qt/qsimplerichtext.sip
+++ b/sip/qt/qsimplerichtext.sip
@@ -1,90 +1,90 @@
-// This is the SIP interface definition for QSimpleRichText.
+// This is the SIP interface definition for TQSimpleRichText.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSimpleRichText (Qt v2+)</Title>
+<Sect2><Title>TQSimpleRichText (TQt v2+)</Title>
 <Para>
-<Literal>QSimpleRichText</Literal> is fully implemented.
+<Literal>TQSimpleRichText</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QSimpleRichText
+class TQSimpleRichText
 {
 %TypeHeaderCode
 #include <qsimplerichtext.h>
 %End
 
 public:
-	QSimpleRichText(const QString &,const QFont &,
-			const QString & = QString::null,
-			const QStyleSheet * = 0);
-%If (Qt_2_1_0 -)
-	QSimpleRichText(const QString &,const QFont &,const QString &,
-			const QStyleSheet *,const QMimeSourceFactory *,
-			int = -1,const QColor & = Qt::blue,bool = 1);
+	TQSimpleRichText(const TQString &,const TQFont &,
+			const TQString & = TQString::null,
+			const TQStyleSheet * = 0);
+%If (TQt_2_1_0 -)
+	TQSimpleRichText(const TQString &,const TQFont &,const TQString &,
+			const TQStyleSheet *,const TQMimeSourceFactory *,
+			int = -1,const TQColor & = TQt::blue,bool = 1);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setWidth(int);
 %End
-	void setWidth(QPainter *,int);
-%If (Qt_3_0_0 -)
-	void setDefaultFont(const QFont &);
+	void setWidth(TQPainter *,int);
+%If (TQt_3_0_0 -)
+	void setDefaultFont(const TQFont &);
 %End
 	int width() const;
 	int widthUsed() const;
 	int height() const;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void adjustSize();
 %End
 
-%If (- Qt_3_0_0)
-	void draw(QPainter *,int,int,const QRegion &,const QPalette &,
-		  const QBrush * = 0) const;
-	void draw(QPainter *,int,int,const QRegion &,const QColorGroup &,
-		  const QBrush * = 0) const;
+%If (- TQt_3_0_0)
+	void draw(TQPainter *,int,int,const TQRegion &,const TQPalette &,
+		  const TQBrush * = 0) const;
+	void draw(TQPainter *,int,int,const TQRegion &,const TQColorGroup &,
+		  const TQBrush * = 0) const;
 %End
-%If (Qt_3_0_0 -)
-	void draw(QPainter *,int,int,const QRect &,const QColorGroup &,
-		  const QBrush * = 0) const;
+%If (TQt_3_0_0 -)
+	void draw(TQPainter *,int,int,const TQRect &,const TQColorGroup &,
+		  const TQBrush * = 0) const;
 %End
 
-	QString context() const;
-%If (- Qt_3_0_0)
-	QString anchor(QPainter *,const QPoint &);
+	TQString context() const;
+%If (- TQt_3_0_0)
+	TQString anchor(TQPainter *,const TQPoint &);
 %End
-%If (Qt_2_1_0 -)
-	QString anchorAt(const QPoint &) const;
+%If (TQt_2_1_0 -)
+	TQString anchorAt(const TQPoint &) const;
 
-	bool inText(const QPoint &) const;
+	bool inText(const TQPoint &) const;
 %End
 
 private:
-%If (Qt_3_0_0 -)
-	QSimpleRichText(const QSimpleRichText &);
+%If (TQt_3_0_0 -)
+	TQSimpleRichText(const TQSimpleRichText &);
 %End
 };
 
diff --git a/sip/qt/qsize.sip b/sip/qt/qsize.sip
index d802413..e2f570d 100644
--- a/sip/qt/qsize.sip
+++ b/sip/qt/qsize.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QSize.
+// This is the SIP interface definition for TQSize.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSize</Title>
+<Sect2><Title>TQSize</Title>
 <Para>
 The Python
 <Literal>+</Literal>, <Literal>+=</Literal>,
@@ -33,7 +33,7 @@ operators are supported.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rheight</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rheight</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -41,7 +41,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QCOORD &amp;<Function>rwidth</Function></FuncDef>
+        <FuncDef>TQCOORD &amp;<Function>rwidth</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -51,14 +51,14 @@ Not implemented.
 %End
 
 
-class QSize
+class TQSize
 {
 %TypeHeaderCode
 #include <qsize.h>
 %End
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum ScaleMode {
 		ScaleFree,
 		ScaleMin,
@@ -66,8 +66,8 @@ public:
 	};
 %End
 
-	QSize();
-	QSize(int,int);
+	TQSize();
+	TQSize(int,int);
 
 	bool isNull() const;
 	bool isEmpty() const;
@@ -79,22 +79,22 @@ public:
 	void setHeight(int);
 	void transpose();
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void scale(int,int,ScaleMode);
-	void scale(const QSize &,ScaleMode);
+	void scale(const TQSize &,ScaleMode);
 %End
 
-	QSize expandedTo(const QSize &) const;
-	QSize boundedTo(const QSize &) const;
-//	QCOORD &rwidth();
-//	QCOORD &rheight();
+	TQSize expandedTo(const TQSize &) const;
+	TQSize boundedTo(const TQSize &) const;
+//	TQCOORD &rwidth();
+//	TQCOORD &rheight();
 
-	QSize &operator+=(const QSize &);
-	QSize &operator-=(const QSize &);
-	QSize &operator*=(int /Constrained/);
-	QSize &operator*=(double);
-	QSize &operator/=(int /Constrained/);
-	QSize &operator/=(double);
+	TQSize &operator+=(const TQSize &);
+	TQSize &operator-=(const TQSize &);
+	TQSize &operator*=(int /Constrained/);
+	TQSize &operator*=(double);
+	TQSize &operator/=(int /Constrained/);
+	TQSize &operator/=(double);
 
 	int __nonzero__() const;
 %MethodCode
@@ -102,11 +102,11 @@ public:
 %End
 };
 
-bool operator==(const QSize &,const QSize &);
-bool operator!=(const QSize &,const QSize &);
-const QSize operator+(const QSize &,const QSize &);
-const QSize operator-(const QSize &,const QSize &);
-const QSize operator*(const QSize &,int /Constrained/);
-const QSize operator*(const QSize &,double);
-const QSize operator/(const QSize &,int /Constrained/);
-const QSize operator/(const QSize &,double);
+bool operator==(const TQSize &,const TQSize &);
+bool operator!=(const TQSize &,const TQSize &);
+const TQSize operator+(const TQSize &,const TQSize &);
+const TQSize operator-(const TQSize &,const TQSize &);
+const TQSize operator*(const TQSize &,int /Constrained/);
+const TQSize operator*(const TQSize &,double);
+const TQSize operator/(const TQSize &,int /Constrained/);
+const TQSize operator/(const TQSize &,double);
diff --git a/sip/qt/qsizegrip.sip b/sip/qt/qsizegrip.sip
index af21e94..f88f7dd 100644
--- a/sip/qt/qsizegrip.sip
+++ b/sip/qt/qsizegrip.sip
@@ -1,58 +1,58 @@
-// This is the SIP interface definition for QSizeGrip.
+// This is the SIP interface definition for TQSizeGrip.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSizeGrip (Qt v2+)</Title>
+<Sect2><Title>TQSizeGrip (TQt v2+)</Title>
 <Para>
-<Literal>QSizeGrip</Literal> is fully implemented.
+<Literal>TQSizeGrip</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
-%If (Qt_SIZEGRIP)
+%If (TQt_2_00 -)
+%If (TQt_SIZEGRIP)
 
-class QSizeGrip : QWidget
+class TQSizeGrip : TQWidget
 {
 %TypeHeaderCode
 #include <qsizegrip.h>
 %End
 
 public:
-	QSizeGrip(QWidget * /TransferThis/,const char * = 0);
+	TQSizeGrip(TQWidget * /TransferThis/,const char * = 0);
 
-	QSize sizeHint() const;
-%If (- Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (- TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
 protected:
-	void paintEvent(QPaintEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
+	void paintEvent(TQPaintEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
 
-%If (Qt_3_0_0 -)
-	bool eventFilter(QObject *,QEvent *);
+%If (TQt_3_0_0 -)
+	bool eventFilter(TQObject *,TQEvent *);
 %End
 };
 
diff --git a/sip/qt/qsizepolicy.sip b/sip/qt/qsizepolicy.sip
index c26b54a..7fb1d75 100644
--- a/sip/qt/qsizepolicy.sip
+++ b/sip/qt/qsizepolicy.sip
@@ -1,37 +1,37 @@
-// This is the SIP interface definition for QSizePolicy.
+// This is the SIP interface definition for TQSizePolicy.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSizePolicy (Qt v2+)</Title>
+<Sect2><Title>TQSizePolicy (TQt v2+)</Title>
 <Para>
-<Literal>QSizePolicy</Literal> is fully implemented.
+<Literal>TQSizePolicy</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QSizePolicy
+class TQSizePolicy
 {
 %TypeHeaderCode
 #include <qsizepolicy.h>
@@ -46,7 +46,7 @@ public:
 		Preferred,
 		MinimumExpanding,
 		Expanding,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		Ignored
 %End
 	};
@@ -54,23 +54,23 @@ public:
 	enum ExpandData
 	{
 		NoDirection,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		Horizontally,
 		Vertically,
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 		Horizontal,
 		Vertical,
 %End
 		BothDirections
 	};
 
-	QSizePolicy();
-	QSizePolicy(SizeType,SizeType,bool = 0);
-%If (Qt_3_0_0 -)
-	// Note that Qt defines the 2nd and 3rd parameters as uchar, but it's
+	TQSizePolicy();
+	TQSizePolicy(SizeType,SizeType,bool = 0);
+%If (TQt_3_0_0 -)
+	// Note that TQt defines the 2nd and 3rd parameters as uchar, but it's
 	// really using them as numbers, not characters.
-	QSizePolicy(SizeType,SizeType,uint,uint,bool = 0);
+	TQSizePolicy(SizeType,SizeType,uint,uint,bool = 0);
 %End
 
 	SizeType horData() const;
@@ -89,13 +89,13 @@ public:
 	void setHeightForWidth(bool);
 	bool hasHeightForWidth() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	uint horStretch() const;
 	uint verStretch() const;
 	void setHorStretch(uint);
 	void setVerStretch(uint);
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void transpose();
 %End
 };
diff --git a/sip/qt/qslider.sip b/sip/qt/qslider.sip
index 9560216..513eb38 100644
--- a/sip/qt/qslider.sip
+++ b/sip/qt/qslider.sip
@@ -1,42 +1,42 @@
-// This is the SIP interface definition for QSlider.
+// This is the SIP interface definition for TQSlider.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSlider</Title>
+<Sect2><Title>TQSlider</Title>
 <Para>
-<Literal>QSlider</Literal> is fully implemented.
+<Literal>TQSlider</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QSlider : QWidget, QRangeControl
+class TQSlider : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
 #include <qslider.h>
 %End
 
 public:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum Orientation {
 		Horizontal,
 		Vertical
@@ -52,53 +52,53 @@ public:
 		Both = 3
 	};
 
-%If (- Qt_2_00)
-	QSlider(QWidget * /TransferThis/ = 0,const char * = 0);
-	QSlider(Orientation,QWidget * /TransferThis/ = 0,const char * = 0);
-	QSlider(int,int,int,int,Orientation,QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_2_00)
+	TQSlider(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQSlider(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQSlider(int,int,int,int,Orientation,TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QSlider(QWidget * /TransferThis/,const char * = 0);
-	QSlider(Orientation,QWidget * /TransferThis/,const char * = 0);
-	QSlider(int,int,int,int,Orientation,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQSlider(TQWidget * /TransferThis/,const char * = 0);
+	TQSlider(Orientation,TQWidget * /TransferThis/,const char * = 0);
+	TQSlider(int,int,int,int,Orientation,TQWidget * /TransferThis/,const char * = 0);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOrientation(Orientation);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOrientation(Orientation);
 %End
 	Orientation orientation() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setTracking(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setTracking(bool);
 %End
 	bool tracking() const;
-%If (- Qt_2_00)
-	void setPalette(const QPalette &);
+%If (- TQt_2_00)
+	void setPalette(const TQPalette &);
 %End
-%If (Qt_2_00 -)
-	virtual void setPalette(const QPalette &);
+%If (TQt_2_00 -)
+	virtual void setPalette(const TQPalette &);
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int sliderStart() const;
 %End
-	QRect sliderRect() const;
-	QSize sizeHint() const;
-%If (Qt_3_1_0 -)
-	void setSizePolicy(QSizePolicy);
+	TQRect sliderRect() const;
+	TQSize sizeHint() const;
+%If (TQt_3_1_0 -)
+	void setSizePolicy(TQSizePolicy);
 %End
-%If (Qt_3_2_0 -)
-	void setSizePolicy(QSizePolicy::SizeType,QSizePolicy::SizeType,
+%If (TQt_3_2_0 -)
+	void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType,
 			   bool = 0);
 %End
-%If (Qt_2_00 -)
-	QSizePolicy sizePolicy() const;
-	QSize minimumSizeHint() const;
+%If (TQt_2_00 -)
+	TQSizePolicy sizePolicy() const;
+	TQSize minimumSizeHint() const;
 %End
 
 	virtual void setTickmarks(TickSetting);
@@ -107,7 +107,7 @@ public:
 	virtual void setTickInterval(int);
 	int tickInterval() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int minValue() const;
 	int maxValue() const;
 	void setMinValue(int);
@@ -120,15 +120,15 @@ public:
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setValue(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setValue(int);
 %End
 	void addStep();
 	void subtractStep();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void addLine();
 	void subtractLine();
 %End
@@ -140,48 +140,48 @@ signals:
 	void sliderReleased();
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void paintEvent(QPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void paintEvent(TQPaintEvent *);
 
-	void keyPressEvent(QKeyEvent *);
-	void mousePressEvent(QMouseEvent *);
-	void mouseReleaseEvent(QMouseEvent *);
-	void mouseMoveEvent(QMouseEvent *);
-%If (Qt_2_00 -)
-	void wheelEvent(QWheelEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void mousePressEvent(TQMouseEvent *);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void mouseMoveEvent(TQMouseEvent *);
+%If (TQt_2_00 -)
+	void wheelEvent(TQWheelEvent *);
 %End
-	void focusInEvent(QFocusEvent *);
-%If (Qt_2_00 -)
-	void focusOutEvent(QFocusEvent *);
+	void focusInEvent(TQFocusEvent *);
+%If (TQt_2_00 -)
+	void focusOutEvent(TQFocusEvent *);
 %End
 
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
 
 	void valueChange();
 	void rangeChange();
 
-%If (- Qt_3_0_0)
-	void drawWinGroove(QPainter *,QCOORD);
-	void drawTicks(QPainter *,int,int,int = 1) const;
+%If (- TQt_3_0_0)
+	void drawWinGroove(TQPainter *,TQCOORD);
+	void drawTicks(TQPainter *,int,int,int = 1) const;
 	virtual int thickness() const;
 %End
 
-%If (- Qt_2_00)
-	virtual void paintSlider(QPainter *,const QRect &);
+%If (- TQt_2_00)
+	virtual void paintSlider(TQPainter *,const TQRect &);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	void updateMask();
-	virtual void paintSlider(QPainter *,const QColorGroup &,const QRect &);
-	void drawTicks(QPainter *,const QColorGroup &,int,int,int = 1) const;
+	virtual void paintSlider(TQPainter *,const TQColorGroup &,const TQRect &);
+	void drawTicks(TQPainter *,const TQColorGroup &,int,int,int = 1) const;
 %End
 
 private:
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int positionFromValue(int) const;
 	int valueFromPosition(int) const;
 %End
 
-	QSlider(const QSlider &);
+	TQSlider(const TQSlider &);
 };
diff --git a/sip/qt/qsocketnotifier.sip b/sip/qt/qsocketnotifier.sip
index 1f1527a..ae93ec3 100644
--- a/sip/qt/qsocketnotifier.sip
+++ b/sip/qt/qsocketnotifier.sip
@@ -1,35 +1,35 @@
-// This is the SIP interface definition for QSocketNotifier.
+// This is the SIP interface definition for TQSocketNotifier.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSocketNotifier</Title>
+<Sect2><Title>TQSocketNotifier</Title>
 <Para>
-<Literal>QSocketNotifier</Literal> is fully implemented.
+<Literal>TQSocketNotifier</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QSocketNotifier : QObject
+class TQSocketNotifier : TQObject
 {
 %TypeHeaderCode
 #include <qsocketnotifier.h>
@@ -42,16 +42,16 @@ public:
 		Exception
 	};
 
-	QSocketNotifier(int,Type,QObject * /TransferThis/ = 0,const char * = 0);
+	TQSocketNotifier(int,Type,TQObject * /TransferThis/ = 0,const char * = 0);
 
 	int socket() const;
 	Type type() const;
 
 	bool isEnabled() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setEnabled(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setEnabled(bool);
 %End
 
@@ -59,8 +59,8 @@ signals:
 	void activated(int);
 
 protected:
-	bool event(QEvent *);
+	bool event(TQEvent *);
 
 private:
-	QSocketNotifier(const QSocketNotifier &);
+	TQSocketNotifier(const TQSocketNotifier &);
 };
diff --git a/sip/qt/qsound.sip b/sip/qt/qsound.sip
index 8cdbb1b..8b6a944 100644
--- a/sip/qt/qsound.sip
+++ b/sip/qt/qsound.sip
@@ -1,66 +1,66 @@
-// This is the SIP interface definition for QSound.
+// This is the SIP interface definition for TQSound.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSound (Qt v2.2+)</Title>
+<Sect2><Title>TQSound (TQt v2.2+)</Title>
 <Para>
-<Literal>QSound</Literal> is fully implemented.
+<Literal>TQSound</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_SOUND)
-%If (Qt_2_2_0 -)
+%If (TQt_SOUND)
+%If (TQt_2_2_0 -)
 
-class QSound : QObject
+class TQSound : TQObject
 {
 %TypeHeaderCode
 #include <qsound.h>
 %End
 
 public:
-	QSound(const QString &,QObject * /TransferThis/ = 0,const char * = 0);
+	TQSound(const TQString &,TQObject * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	static bool available();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	static bool isAvailable();
 %End
-	static void play(const QString &);
+	static void play(const TQString &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int loops() const;
 	int loopsRemaining() const;
 	void setLoops(int);
-	QString fileName() const;
+	TQString fileName() const;
  
 	bool isFinished() const;
 %End
 
 public slots:
 	void play();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void stop();
 %End
 };
diff --git a/sip/qt/qspinbox.sip b/sip/qt/qspinbox.sip
index fad9621..1f9025e 100644
--- a/sip/qt/qspinbox.sip
+++ b/sip/qt/qspinbox.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QSpinBox.
+// This is the SIP interface definition for TQSpinBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSpinBox</Title>
+<Sect2><Title>TQSpinBox</Title>
 <FuncSynopsis>
         <FuncDef>virtual int <Function>mapTextToValue</Function></FuncDef>
         <ParamDef>bool *<Parameter>ok</Parameter></ParamDef>
@@ -34,26 +34,26 @@ This returns a tuple of the <Literal>int</Literal> result and the modified
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QSpinBox : QWidget, QRangeControl
+class TQSpinBox : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
 #include <qspinbox.h>
 %End
 
 public:
-	QSpinBox(QWidget * /TransferThis/ = 0,const char * = 0);
-	QSpinBox(int,int,int = 1,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQSpinBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQSpinBox(int,int,int = 1,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	QString text() const;
+	TQString text() const;
 
-	virtual QString prefix() const;
-	virtual QString suffix() const;
-	virtual QString cleanText() const;
+	virtual TQString prefix() const;
+	virtual TQString suffix() const;
+	virtual TQString cleanText() const;
 
-	virtual void setSpecialValueText(const QString &);
-	QString specialValueText() const;
+	virtual void setSpecialValueText(const TQString &);
+	TQString specialValueText() const;
 
 	virtual void setWrapping(bool);
 	bool wrapping() const;
@@ -66,11 +66,11 @@ public:
 	virtual void setButtonSymbols(ButtonSymbols);
 	ButtonSymbols buttonSymbols() const;
 
-	virtual void setValidator(const QValidator *);
-	const QValidator *validator() const;
+	virtual void setValidator(const TQValidator *);
+	const TQValidator *validator() const;
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 	int minValue() const;
 	int maxValue() const;
@@ -80,13 +80,13 @@ public:
 	void setLineStep(int);
 	int value() const;
 
-	QRect upRect() const;
-	QRect downRect() const;
+	TQRect upRect() const;
+	TQRect downRect() const;
 
 public slots:
 	virtual void setValue(int);
-	virtual void setPrefix(const QString &);
-	virtual void setSuffix(const QString &);
+	virtual void setPrefix(const TQString &);
+	virtual void setSuffix(const TQString &);
 	virtual void stepUp();
 	virtual void stepDown();
 	virtual void setEnabled(bool);
@@ -94,104 +94,104 @@ public slots:
 
 signals:
 	void valueChanged(int);
-	void valueChanged(const QString &);
+	void valueChanged(const TQString &);
 
 protected:
-	virtual QString mapValueToText(int);
+	virtual TQString mapValueToText(int);
 	virtual int mapTextToValue(bool *);
-	QString currentValueText();
+	TQString currentValueText();
 
 	virtual void updateDisplay();
 	virtual void interpretText();
 
-	QLineEdit *editor() const;
+	TQLineEdit *editor() const;
 
 	virtual void valueChange();
 	virtual void rangeChange();
 
-	bool eventFilter(QObject *,QEvent *);
-	void resizeEvent(QResizeEvent *);
-	void wheelEvent(QWheelEvent *);
-	void leaveEvent(QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void wheelEvent(TQWheelEvent *);
+	void leaveEvent(TQEvent *);
 
-	void styleChange(QStyle &);
+	void styleChange(TQStyle &);
 
 protected slots:
 	void textChanged();
 
 private:
-	QSpinBox(const QSpinBox &);
+	TQSpinBox(const TQSpinBox &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QSpinBox : QFrame, QRangeControl
+class TQSpinBox : TQFrame, TQRangeControl
 {
 %TypeHeaderCode
 #include <qspinbox.h>
 %End
 
 public:
-	QSpinBox(QWidget * /TransferThis/ = 0,const char * = 0);
-	QSpinBox(int,int,int = 1,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQSpinBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQSpinBox(int,int,int = 1,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *text() const;
 
 	virtual const char *prefix() const;
 	virtual const char *suffix() const;
 %End
-%If (Qt_2_00 -)
-	QString text() const;
+%If (TQt_2_00 -)
+	TQString text() const;
 
-	virtual QString prefix() const;
-	virtual QString suffix() const;
+	virtual TQString prefix() const;
+	virtual TQString suffix() const;
 %End
-	virtual QString cleanText() const;
+	virtual TQString cleanText() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setSpecialValueText(const char *);
 	const char *specialValueText() const;
 
 	void setWrapping(bool);
 %End
-%If (Qt_2_00 -)
-	virtual void setSpecialValueText(const QString &);
-	QString specialValueText() const;
+%If (TQt_2_00 -)
+	virtual void setSpecialValueText(const TQString &);
+	TQString specialValueText() const;
 
 	virtual void setWrapping(bool);
 %End
 	bool wrapping() const;
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum ButtonSymbols {
 		UpDownArrows,
 		PlusMinus
 	};
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setButtonSymbols(ButtonSymbols);
 	ButtonSymbols buttonSymbols() const;
 %End
 
-%If (- Qt_2_00)
-	void setValidator(QValidator *);
+%If (- TQt_2_00)
+	void setValidator(TQValidator *);
 %End
-%If (Qt_2_00 -)
-	virtual void setValidator(const QValidator *);
-	const QValidator *validator() const;
+%If (TQt_2_00 -)
+	virtual void setValidator(const TQValidator *);
+	const TQValidator *validator() const;
 %End
 
-	QSize sizeHint() const;
-%If (Qt_2_00 -)
-	QSizePolicy sizePolicy() const;
+	TQSize sizeHint() const;
+%If (TQt_2_00 -)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	int minValue() const;
 	int maxValue() const;
 	void setMinValue(int);
@@ -203,66 +203,66 @@ public:
 
 public slots:
 	virtual void setValue(int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual void setPrefix(const char *);
 	virtual void setSuffix(const char *);
 %End
-%If (Qt_2_00 -)
-	virtual void setPrefix(const QString &);
-	virtual void setSuffix(const QString &);
+%If (TQt_2_00 -)
+	virtual void setPrefix(const TQString &);
+	virtual void setSuffix(const TQString &);
 %End
 	virtual void stepUp();
 	virtual void stepDown();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setEnabled(bool);
 %End
 
 signals:
 	void valueChanged(int);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void valueChanged(const char *);
 %End
-%If (Qt_2_00 -)
-	void valueChanged(const QString &);
+%If (TQt_2_00 -)
+	void valueChanged(const TQString &);
 %End
 
 protected:
-	virtual QString mapValueToText(int);
+	virtual TQString mapValueToText(int);
 	virtual int mapTextToValue(bool *);
-	QString currentValueText();
+	TQString currentValueText();
 
 	virtual void updateDisplay();
 	virtual void interpretText();
 
-	QPushButton *upButton() const;
-	QPushButton *downButton() const;
+	TQPushButton *upButton() const;
+	TQPushButton *downButton() const;
 
-	QLineEdit *editor() const;
+	TQLineEdit *editor() const;
 
 	virtual void valueChange();
 	virtual void rangeChange();
 
-	bool eventFilter(QObject *,QEvent *);
-	void resizeEvent(QResizeEvent *);
-%If (- Qt_2_00)
-	void paletteChange(const QPalette &);
+	bool eventFilter(TQObject *,TQEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (- TQt_2_00)
+	void paletteChange(const TQPalette &);
 	void enabledChange(bool);
-	void fontChange(const QFont &);
+	void fontChange(const TQFont &);
 	void styleChange(GUIStyle);
 %End
-%If (Qt_2_00 -)
-	void wheelEvent(QWheelEvent *);
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void wheelEvent(TQWheelEvent *);
+	void styleChange(TQStyle &);
 %End
-%If (Qt_2_1_0 -)
-	void leaveEvent(QEvent *);
+%If (TQt_2_1_0 -)
+	void leaveEvent(TQEvent *);
 %End
 
 protected slots:
 	void textChanged();
 
 private:
-	QSpinBox(const QSpinBox &);
+	TQSpinBox(const TQSpinBox &);
 };
 
 %End
diff --git a/sip/qt/qsplashscreen.sip b/sip/qt/qsplashscreen.sip
index 8277f11..69d2f5c 100644
--- a/sip/qt/qsplashscreen.sip
+++ b/sip/qt/qsplashscreen.sip
@@ -1,61 +1,61 @@
-// This is the SIP interface definition for QSplashScreen.
+// This is the SIP interface definition for TQSplashScreen.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSplashScreen (Qt v3.2.0+)</Title>
+<Sect2><Title>TQSplashScreen (TQt v3.2.0+)</Title>
 <Para>
-<Literal>QSplashScreen</Literal> is fully implemented.
+<Literal>TQSplashScreen</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 
-class QSplashScreen : QWidget
+class TQSplashScreen : TQWidget
 {
 %TypeHeaderCode
 #include <qsplashscreen.h>
 %End
 
 public:
-	QSplashScreen(const QPixmap & = QPixmap(),WFlags = 0);
-	virtual ~QSplashScreen();
+	TQSplashScreen(const TQPixmap & = TQPixmap(),WFlags = 0);
+	virtual ~TQSplashScreen();
 
-	void setPixmap(const QPixmap &);
-	QPixmap *pixmap() const;
-	void finish(QWidget *);
+	void setPixmap(const TQPixmap &);
+	TQPixmap *pixmap() const;
+	void finish(TQWidget *);
 	void repaint();
 
 public slots:
-	void message(const QString &,int = AlignLeft,const QColor & = Qt::black);
+	void message(const TQString &,int = AlignLeft,const TQColor & = TQt::black);
 	void clear();
 
 signals:
-	void messageChanged(const QString &);
+	void messageChanged(const TQString &);
 
 protected:
-	virtual void drawContents(QPainter *);
-	void mousePressEvent(QMouseEvent *);
+	virtual void drawContents(TQPainter *);
+	void mousePressEvent(TQMouseEvent *);
 };
 
 %End
diff --git a/sip/qt/qsplitter.sip b/sip/qt/qsplitter.sip
index 167f8fc..b27ce7b 100644
--- a/sip/qt/qsplitter.sip
+++ b/sip/qt/qsplitter.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QSplitter.
+// This is the SIP interface definition for TQSplitter.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSplitter</Title>
+<Sect2><Title>TQSplitter</Title>
 <FuncSynopsis>
         <FuncDef>void <Function>getRange</Function></FuncDef>
         <ParamDef>int <Parameter>id</Parameter></ParamDef>
@@ -30,22 +30,22 @@
 </FuncSynopsis>
 <Para>
 This takes the <Literal>id</Literal> parameter and returns the
-<Literal>min</Literal> and <Literal>max</Literal> values as a tuple. (Qt v2+)
+<Literal>min</Literal> and <Literal>max</Literal> values as a tuple. (TQt v2+)
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_SPLITTER)
+%If (TQt_SPLITTER)
 
-class QSplitter : QFrame
+class TQSplitter : TQFrame
 {
 %TypeHeaderCode
 #include <qsplitter.h>
 %End
 
 public:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum Orientation {
 		Horizontal,
 		Vertical
@@ -55,105 +55,105 @@ public:
 	enum ResizeMode {
 		Stretch,
 		KeepSize,
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 		FollowSizeHint,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		Auto
 %End
 	};
 
-	QSplitter(QWidget * /TransferThis/ = 0,const char * = 0);
-	QSplitter(Orientation,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQSplitter(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQSplitter(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOrientation(Orientation);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOrientation(Orientation);
 %End
 	Orientation orientation() const;
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setChildrenCollapsible(bool);
 	bool childrenCollapsible() const;
 
-	void setCollapsible(QWidget *,bool);
+	void setCollapsible(TQWidget *,bool);
 %End
 
-%If (- Qt_2_00)
-	void setResizeMode(QWidget *,ResizeMode);
+%If (- TQt_2_00)
+	void setResizeMode(TQWidget *,ResizeMode);
 	void setOpaqueResize(bool = 1);
 %End
-%If (Qt_2_00 -)
-	virtual void setResizeMode(QWidget *,ResizeMode);
+%If (TQt_2_00 -)
+	virtual void setResizeMode(TQWidget *,ResizeMode);
 	virtual void setOpaqueResize(bool = 1);
 %End
 	bool opaqueResize() const;
 
-	void moveToFirst(QWidget *);
-	void moveToLast(QWidget *);
+	void moveToFirst(TQWidget *);
+	void moveToLast(TQWidget *);
 
 	void refresh();
-%If (Qt_2_00 -)
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+%If (TQt_2_00 -)
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_2_00 -)
-	QValueList<int> sizes() const;
-	void setSizes(QValueList<int>);
+%If (TQt_2_00 -)
+	TQValueList<int> sizes() const;
+	void setSizes(TQValueList<int>);
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int handleWidth() const;
 	void setHandleWidth(int);
 %End
 
-%If (- Qt_2_00)
-	bool event(QEvent *);
+%If (- TQt_2_00)
+	bool event(TQEvent *);
 %End
 
 protected:
-%If (Qt_2_00 -)
-	void childEvent(QChildEvent *);
+%If (TQt_2_00 -)
+	void childEvent(TQChildEvent *);
 
-	bool event(QEvent *);
+	bool event(TQEvent *);
 %End
-	void resizeEvent(QResizeEvent *);
+	void resizeEvent(TQResizeEvent *);
 
-%If (- Qt_2_00)
-	void childInsertEvent(QChildEvent *);
-	void childRemoveEvent(QChildEvent *);
-	void layoutHintEvent(QEvent *);
+%If (- TQt_2_00)
+	void childInsertEvent(TQChildEvent *);
+	void childRemoveEvent(TQChildEvent *);
+	void layoutHintEvent(TQEvent *);
 
-	void moveSplitter(QCOORD);
+	void moveSplitter(TQCOORD);
 %End
-%If (Qt_2_00 -)
-	int idAfter(QWidget *) const;
+%If (TQt_2_00 -)
+	int idAfter(TQWidget *) const;
 
-	void moveSplitter(QCOORD,int);
+	void moveSplitter(TQCOORD,int);
 %End
-	virtual void drawSplitter(QPainter *,QCOORD,QCOORD,QCOORD,QCOORD);
-%If (Qt_2_1_0 -)
-	void styleChange(QStyle &);
+	virtual void drawSplitter(TQPainter *,TQCOORD,TQCOORD,TQCOORD,TQCOORD);
+%If (TQt_2_1_0 -)
+	void styleChange(TQStyle &);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	int adjustPos(int);
 	void setRubberband(int);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	int adjustPos(int,int);
 	virtual void setRubberband(int);
 	void getRange(int,int *,int *);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QSplitter(const QSplitter &);
+%If (TQt_2_1_0 -)
+	TQSplitter(const TQSplitter &);
 %End
 };
 
diff --git a/sip/qt/qstatusbar.sip b/sip/qt/qstatusbar.sip
index 4e1f704..5ab47fd 100644
--- a/sip/qt/qstatusbar.sip
+++ b/sip/qt/qstatusbar.sip
@@ -1,94 +1,94 @@
-// This is the SIP interface definition for QStatusBar.
+// This is the SIP interface definition for TQStatusBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QStatusBar</Title>
+<Sect2><Title>TQStatusBar</Title>
 <Para>
-<Literal>QStatusBar</Literal> is fully implemented.
+<Literal>TQStatusBar</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QStatusBar : QWidget
+class TQStatusBar : TQWidget
 {
 %TypeHeaderCode
 #include <qstatusbar.h>
 %End
 
 public:
-	QStatusBar(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQStatusBar(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_1_0)
-	void addWidget(QWidget * /Transfer/,int,bool = 0);
+%If (- TQt_2_1_0)
+	void addWidget(TQWidget * /Transfer/,int,bool = 0);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void addWidget(QWidget * /Transfer/,int = 0,bool = 0);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void addWidget(TQWidget * /Transfer/,int = 0,bool = 0);
 %End
-%If (Qt_3_0_0 -)
-	virtual void addWidget(QWidget * /Transfer/,int = 0,bool = 0);
+%If (TQt_3_0_0 -)
+	virtual void addWidget(TQWidget * /Transfer/,int = 0,bool = 0);
 %End
-%If (- Qt_3_0_0)
-	void removeWidget(QWidget * /TransferBack/);
+%If (- TQt_3_0_0)
+	void removeWidget(TQWidget * /TransferBack/);
 %End
-%If (Qt_3_0_0 -)
-	virtual void removeWidget(QWidget * /TransferBack/);
+%If (TQt_3_0_0 -)
+	virtual void removeWidget(TQWidget * /TransferBack/);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setSizeGripEnabled(bool);
 	bool isSizeGripEnabled() const;
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void message(const char *);
 	void message(const char *,int);
 %End
-%If (Qt_2_00 -)
-	void message(const QString &);
-	void message(const QString &,int);
+%If (TQt_2_00 -)
+	void message(const TQString &);
+	void message(const TQString &,int);
 %End
 	void clear();
 
 signals:
-%If (Qt_3_1_0 -)
-	void messageChanged(const QString &);
+%If (TQt_3_1_0 -)
+	void messageChanged(const TQString &);
 %End
 
 protected:
-	void paintEvent(QPaintEvent *);
-%If (Qt_2_1_0 -)
-	void resizeEvent(QResizeEvent *);
+	void paintEvent(TQPaintEvent *);
+%If (TQt_2_1_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
 
 	void reformat();
 	void hideOrShow();
-%If (Qt_2_1_0 -)
-	bool event(QEvent *);
+%If (TQt_2_1_0 -)
+	bool event(TQEvent *);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QStatusBar(const QStatusBar &);
+%If (TQt_2_1_0 -)
+	TQStatusBar(const TQStatusBar &);
 %End
 };
diff --git a/sip/qt/qstring.sip b/sip/qt/qstring.sip
index f0097f4..3b49341 100644
--- a/sip/qt/qstring.sip
+++ b/sip/qt/qstring.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QChar and QString.
+// This is the SIP interface definition for TQChar and TQString.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QChar (Qt v2+)</Title>
+<Sect2><Title>TQChar (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>uchar &<Function>cell</Function> const</FuncDef>
 	<ParamDef></ParamDef>
@@ -39,10 +39,10 @@ Not implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QString</Title>
+<Sect2><Title>TQString</Title>
 <Para>
 A Python string object (or Unicode object) can be used whenever a
-<Literal>QString</Literal> can be used.  A <Literal>QString</Literal> can be
+<Literal>TQString</Literal> can be used.  A <Literal>TQString</Literal> can be
 converted to a Python string object using the Python <Literal>str()</Literal>
 function, and to a Python Unicode object using the Python
 <Literal>unicode()</Literal> function.
@@ -56,40 +56,40 @@ comparison operators are supported.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QCharRef <Function>at</Function></FuncDef>
+	<FuncDef>TQCharRef <Function>at</Function></FuncDef>
 	<ParamDef>uint <Parameter>i</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2+)
+Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QChar <Function>constref</Function> const</FuncDef>
+	<FuncDef>TQChar <Function>constref</Function> const</FuncDef>
 	<ParamDef>uint <Parameter>i</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2+)
+Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QChar &<Function>ref</Function></FuncDef>
+	<FuncDef>TQChar &<Function>ref</Function></FuncDef>
 	<ParamDef>uint <Parameter>i</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2+)
+Not yet implemented. (TQt v2+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QString &<Function>setUnicodeCodes</Function></FuncDef>
+	<FuncDef>TQString &<Function>setUnicodeCodes</Function></FuncDef>
 	<ParamDef>const ushort *<Parameter>unicode_as_shorts</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented. (Qt v2.1+)
+Not yet implemented. (TQt v2.1+)
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QString &<Function>sprintf</Function></FuncDef>
+	<FuncDef>TQString &<Function>sprintf</Function></FuncDef>
 	<ParamDef>const char *<Parameter>format</Parameter></ParamDef>
 	<ParamDef>...</ParamDef>
 </FuncSynopsis>
@@ -172,34 +172,34 @@ This returns a tuple of the <Literal>double</Literal> result and the
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QChar
+class TQChar
 {
 %TypeHeaderCode
 #include <qstring.h>
 %End
 
 public:
-	QChar();
-	QChar(char);
-//	QChar(uchar);
-	QChar(uchar,uchar);
-	QChar(const QChar &);
-//	QChar(ushort);
-//	QChar(short);
-//	QChar(uint);
-	QChar(int);
-
-	static const QChar null;
-	static const QChar replacement;
-	static const QChar byteOrderMark;
-	static const QChar byteOrderSwapped;
-%If (Qt_2_2_0 -)
-	static const QChar nbsp;
-%End
-
-%If (- Qt_3_0_0)
+	TQChar();
+	TQChar(char);
+//	TQChar(uchar);
+	TQChar(uchar,uchar);
+	TQChar(const TQChar &);
+//	TQChar(ushort);
+//	TQChar(short);
+//	TQChar(uint);
+	TQChar(int);
+
+	static const TQChar null;
+	static const TQChar replacement;
+	static const TQChar byteOrderMark;
+	static const TQChar byteOrderSwapped;
+%If (TQt_2_2_0 -)
+	static const TQChar nbsp;
+%End
+
+%If (- TQt_3_0_0)
 	enum Category {
 		NoCategory,
  
@@ -241,7 +241,7 @@ public:
 		Symbol_Other
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Category {
 		NoCategory,
  
@@ -284,7 +284,7 @@ public:
 	};
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum Direction {
 		DirL,
 		DirR,
@@ -299,7 +299,7 @@ public:
 		DirON
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Direction {
 		DirL,
 		DirR,
@@ -351,7 +351,7 @@ public:
 		Center
 	};
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum CombiningClass {
 		Combining_BelowLeftAttached,
 		Combining_BelowAttached,
@@ -378,24 +378,24 @@ public:
 %End
 
 	int digitValue() const;
-	QChar lower() const;
-	QChar upper() const;
+	TQChar lower() const;
+	TQChar upper() const;
 
 	Category category() const;
 	Direction direction() const;
 	Joining joining() const;
 	bool mirrored() const;
-%If (Qt_2_1_0 -)
-	QChar mirroredChar() const;
+%If (TQt_2_1_0 -)
+	TQChar mirroredChar() const;
 %End
-%If (- Qt_3_0_0)
-	QString decomposition() const;
+%If (- TQt_3_0_0)
+	TQString decomposition() const;
 %End
-%If (Qt_3_0_0 -)
-	const QString &decomposition() const;
+%If (TQt_3_0_0 -)
+	const TQString &decomposition() const;
 %End
 	Decomposition decompositionTag() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	unsigned char combiningClass() const;
 %End
 
@@ -409,11 +409,11 @@ public:
 	bool isMark() const;
 	bool isLetter() const;
 	bool isNumber() const;
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool isLetterOrNumber() const;
 %End
 	bool isDigit() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isSymbol() const;
 %End
 
@@ -421,7 +421,7 @@ public:
 //	uchar& row();
 	uchar cell() const;
 	uchar row() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setCell(uchar);
 	void setRow(uchar);
 %End
@@ -429,101 +429,101 @@ public:
 	static bool networkOrdered();
 };
 
-bool operator==(QChar,char);
-bool operator==(QChar,QChar);
-bool operator!=(QChar,QChar);
-bool operator!=(QChar,char);
-bool operator<=(QChar,char);
-bool operator<=(QChar,QChar);
-bool operator>=(QChar,char);
-bool operator>=(QChar,QChar);
-bool operator<(QChar,char);
-bool operator<(QChar,QChar);
-bool operator>(QChar,char);
-bool operator>(QChar,QChar);
-
-
-class QString
+bool operator==(TQChar,char);
+bool operator==(TQChar,TQChar);
+bool operator!=(TQChar,TQChar);
+bool operator!=(TQChar,char);
+bool operator<=(TQChar,char);
+bool operator<=(TQChar,TQChar);
+bool operator>=(TQChar,char);
+bool operator>=(TQChar,TQChar);
+bool operator<(TQChar,char);
+bool operator<(TQChar,TQChar);
+bool operator>(TQChar,char);
+bool operator>(TQChar,TQChar);
+
+
+class TQString
 {
 %TypeHeaderCode
 #include <qstring.h>
 %End
 
 public:
-	QString();
-	QString(QChar);
-	QString(const QString &);
-	QString(const QByteArray &);
-//	QString(const QChar *,uint);
-//	QString(const char *);
+	TQString();
+	TQString(TQChar);
+	TQString(const TQString &);
+	TQString(const TQByteArray &);
+//	TQString(const TQChar *,uint);
+//	TQString(const char *);
 
-%If (Qt_2_1_0 -)
-	// This is how we implement QUrl::operator QString() const.
-	QString(const QUrl &);
+%If (TQt_2_1_0 -)
+	// This is how we implement TQUrl::operator TQString() const.
+	TQString(const TQUrl &);
 %End
 
-%If (Qt_3_0_0 -)
-	// This is how we implement QKeySequence::operator QString() const.
-	QString(const QKeySequence &);
+%If (TQt_3_0_0 -)
+	// This is how we implement TQKeySequence::operator TQString() const.
+	TQString(const TQKeySequence &);
 
-	// This is how we implement QUuid::operator QString() const.
-	QString(const QUuid &);
+	// This is how we implement TQUuid::operator TQString() const.
+	TQString(const TQUuid &);
 %End
 
-	static const QString null;
+	static const TQString null;
 
 	bool isNull() const;
 	bool isEmpty() const;
 	uint length() const;
 	void truncate(uint);
-%If (- Qt_3_0_0)
-	void fill(QChar,int = -1);
-%End
-%If (Qt_3_0_0 -)
-	QString &fill(QChar,int = -1);
-%End
-	QString copy() const;
-
-	QString arg(int /Constrained/,int = 0,int = 10) const;
-	QString arg(double /Constrained/,int = 0,char = 'g',int = -1) const;
-%If (Qt_3_2_0 -)
-//	QString arg(Q_LLONG,int = 0,int = 10) const;
-//	QString arg(Q_ULLONG,int = 0,int = 10) const;
-%End
-	QString arg(long,int = 0,int = 10) const;
-	QString arg(ulong,int = 0,int = 10) const;
-//	QString arg(uint,int = 0,int = 10) const;
-//	QString arg(short,int = 0,int = 10) const;
-//	QString arg(ushort,int = 0,int = 10) const;
-	QString arg(char,int = 0) const;
-	QString arg(QChar,int = 0) const;
-	QString arg(const QString&,int = 0) const;
-%If (Qt_3_2_0 -)
-	QString arg(const QString &,const QString &) const;
-	QString arg(const QString &,const QString &,const QString &) const;
-	QString arg(const QString &,const QString &,const QString &,
-		    const QString &) const;
-%End
-
-//	QString &sprintf(const char *,...);
-
-	int find(QChar,int = 0,bool = 1) const;
+%If (- TQt_3_0_0)
+	void fill(TQChar,int = -1);
+%End
+%If (TQt_3_0_0 -)
+	TQString &fill(TQChar,int = -1);
+%End
+	TQString copy() const;
+
+	TQString arg(int /Constrained/,int = 0,int = 10) const;
+	TQString arg(double /Constrained/,int = 0,char = 'g',int = -1) const;
+%If (TQt_3_2_0 -)
+//	TQString arg(Q_LLONG,int = 0,int = 10) const;
+//	TQString arg(Q_ULLONG,int = 0,int = 10) const;
+%End
+	TQString arg(long,int = 0,int = 10) const;
+	TQString arg(ulong,int = 0,int = 10) const;
+//	TQString arg(uint,int = 0,int = 10) const;
+//	TQString arg(short,int = 0,int = 10) const;
+//	TQString arg(ushort,int = 0,int = 10) const;
+	TQString arg(char,int = 0) const;
+	TQString arg(TQChar,int = 0) const;
+	TQString arg(const TQString&,int = 0) const;
+%If (TQt_3_2_0 -)
+	TQString arg(const TQString &,const TQString &) const;
+	TQString arg(const TQString &,const TQString &,const TQString &) const;
+	TQString arg(const TQString &,const TQString &,const TQString &,
+		    const TQString &) const;
+%End
+
+//	TQString &sprintf(const char *,...);
+
+	int find(TQChar,int = 0,bool = 1) const;
 	int find(char,int = 0,bool = 1) const;
-	int find(const QString &,int = 0,bool = 1) const;
-	int find(const QRegExp &,int = 0) const;
+	int find(const TQString &,int = 0,bool = 1) const;
+	int find(const TQRegExp &,int = 0) const;
 //	int find(const char *,int = 0) const;
-	int findRev(QChar,int = -1,bool = 1) const;
+	int findRev(TQChar,int = -1,bool = 1) const;
 	int findRev(char,int = -1,bool = 1) const;
-	int findRev(const QString &,int = -1,bool = 1) const;
-	int findRev(const QRegExp &,int = -1) const;
+	int findRev(const TQString &,int = -1,bool = 1) const;
+	int findRev(const TQRegExp &,int = -1) const;
 //	int findRev(const char *,int = -1) const;
-	int contains(QChar,bool = 1) const;
+	int contains(TQChar,bool = 1) const;
 	int contains(char,bool = 1) const;
 //	int contains(const char *,bool = 1) const;
-	int contains(const QString &,bool = 1) const;
-	int contains(const QRegExp &) const;
+	int contains(const TQString &,bool = 1) const;
+	int contains(const TQRegExp &) const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum SectionFlags {
 		SectionDefault,
 		SectionSkipEmpty,
@@ -532,76 +532,76 @@ public:
 		SectionCaseInsensitiveSeps
 	};
 
-	QString section(QChar,int,int = 0xffffffff,int = SectionDefault) const;
-//	QString section(char,int,int = 0xffffffff,int = SectionDefault) const;
-//	QString section(const char *,int,int = 0xffffffff,
+	TQString section(TQChar,int,int = 0xffffffff,int = SectionDefault) const;
+//	TQString section(char,int,int = 0xffffffff,int = SectionDefault) const;
+//	TQString section(const char *,int,int = 0xffffffff,
 //			int = SectionDefault) const;
-	QString section(const QString &,int,int = 0xffffffff,
+	TQString section(const TQString &,int,int = 0xffffffff,
 			int = SectionDefault) const;
-	QString section(const QRegExp &,int,int = 0xffffffff,
+	TQString section(const TQRegExp &,int,int = 0xffffffff,
 			int = SectionDefault) const;
 %End
 
-	QString left(uint)  const;
-	QString right(uint) const;
-	QString mid(uint,uint = 0xffffffff) const;
-	QString leftJustify(uint,QChar = ' ',bool = 0) const;
-	QString rightJustify(uint,QChar = ' ',bool = 0) const;
-	QString lower() const;
-	QString upper() const;
-	QString stripWhiteSpace() const;
-	QString simplifyWhiteSpace() const;
-
-	QString &insert(uint,const QString &);
-%If (Qt_3_2_0 -)
-	QString &insert(uint,const QByteArray &);
-//	QString &insert(uint,const char *);
-%End
-	QString &insert(uint,QChar *,uint);
-	QString &insert(uint,QChar);
-	QString &insert(uint,char);
-
-	QString &append(char);
-%If (Qt_2_2_0 -)
-	QString &append(QChar);
-%End
-	QString &append(const QString &);
-	QString &prepend(char);
-%If (Qt_2_2_0 -)
-	QString &prepend(QChar);
-%End
-	QString &prepend(const QString &);
-	QString &remove(uint,uint);
-%If (Qt_3_1_0 -)
-	QString &remove(const QString &);
-%If (Qt_3_2_0 -)
-	QString &remove(const QString &,bool);
-%End
-	QString &remove(QChar);
-	QString &remove(char);
-	QString &remove(const QRegExp &);
-%End
-	QString &replace(uint,uint,const QString &);
-	QString &replace(uint,uint,const QChar *,uint);
-%If (Qt_3_1_0 -)
-	QString &replace(uint,uint,QChar);
-	QString &replace(uint,uint,char);
-	QString &replace(QChar,const QString &);
-%If (Qt_3_2_0 -)
-	QString &replace(QChar,const QString &,bool);
-%End
-	QString &replace(char,const QString &);
-%If (Qt_3_2_0 -)
-	QString &replace(char,const QString &,bool);
-%End
-	QString &replace(const QString &,const QString &);
-%If (Qt_3_2_0 -)
-	QString &replace(const QString &,const QString &,bool);
-%End
-%End
-	QString &replace(const QRegExp &,const QString &);
-%If (Qt_3_1_0 -)
-	QString &replace(QChar,QChar);
+	TQString left(uint)  const;
+	TQString right(uint) const;
+	TQString mid(uint,uint = 0xffffffff) const;
+	TQString leftJustify(uint,TQChar = ' ',bool = 0) const;
+	TQString rightJustify(uint,TQChar = ' ',bool = 0) const;
+	TQString lower() const;
+	TQString upper() const;
+	TQString stripWhiteSpace() const;
+	TQString simplifyWhiteSpace() const;
+
+	TQString &insert(uint,const TQString &);
+%If (TQt_3_2_0 -)
+	TQString &insert(uint,const TQByteArray &);
+//	TQString &insert(uint,const char *);
+%End
+	TQString &insert(uint,TQChar *,uint);
+	TQString &insert(uint,TQChar);
+	TQString &insert(uint,char);
+
+	TQString &append(char);
+%If (TQt_2_2_0 -)
+	TQString &append(TQChar);
+%End
+	TQString &append(const TQString &);
+	TQString &prepend(char);
+%If (TQt_2_2_0 -)
+	TQString &prepend(TQChar);
+%End
+	TQString &prepend(const TQString &);
+	TQString &remove(uint,uint);
+%If (TQt_3_1_0 -)
+	TQString &remove(const TQString &);
+%If (TQt_3_2_0 -)
+	TQString &remove(const TQString &,bool);
+%End
+	TQString &remove(TQChar);
+	TQString &remove(char);
+	TQString &remove(const TQRegExp &);
+%End
+	TQString &replace(uint,uint,const TQString &);
+	TQString &replace(uint,uint,const TQChar *,uint);
+%If (TQt_3_1_0 -)
+	TQString &replace(uint,uint,TQChar);
+	TQString &replace(uint,uint,char);
+	TQString &replace(TQChar,const TQString &);
+%If (TQt_3_2_0 -)
+	TQString &replace(TQChar,const TQString &,bool);
+%End
+	TQString &replace(char,const TQString &);
+%If (TQt_3_2_0 -)
+	TQString &replace(char,const TQString &,bool);
+%End
+	TQString &replace(const TQString &,const TQString &);
+%If (TQt_3_2_0 -)
+	TQString &replace(const TQString &,const TQString &,bool);
+%End
+%End
+	TQString &replace(const TQRegExp &,const TQString &);
+%If (TQt_3_1_0 -)
+	TQString &replace(TQChar,TQChar);
 %End
 
 	short toShort(bool * = 0,int = 10) const;
@@ -610,56 +610,56 @@ public:
 	uint toUInt(bool * = 0,int = 10) const;
 	long toLong(bool * = 0,int = 10) const;
 	ulong toULong(bool * = 0,int = 10) const;
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 //	Q_LLONG toLongLong(bool * = 0,int = 10) const;
 //	Q_ULLONG toULongLong(bool * = 0,int = 10) const;
 %End
 	float toFloat(bool * = 0) const;
 	double toDouble(bool * = 0) const;
 
-	QString &setNum(int /Constrained/,int = 10);
-	QString &setNum(double /Constrained/,char = 'g',int = 6);
-//	QString &setNum(short,int = 10);
-//	QString &setNum(ushort,int = 10);
-//	QString &setNum(uint,int = 10);
-	QString &setNum(long,int = 10);
-	QString &setNum(ulong,int = 10);
-%If (Qt_3_2_0 -)
-//	QString &setNum(Q_LLONG,int = 10);
-//	QString &setNum(Q_ULLONG,int = 10);
+	TQString &setNum(int /Constrained/,int = 10);
+	TQString &setNum(double /Constrained/,char = 'g',int = 6);
+//	TQString &setNum(short,int = 10);
+//	TQString &setNum(ushort,int = 10);
+//	TQString &setNum(uint,int = 10);
+	TQString &setNum(long,int = 10);
+	TQString &setNum(ulong,int = 10);
+%If (TQt_3_2_0 -)
+//	TQString &setNum(Q_LLONG,int = 10);
+//	TQString &setNum(Q_ULLONG,int = 10);
 %End
-//	QString &setNum(float,char = 'g',int = 6);
+//	TQString &setNum(float,char = 'g',int = 6);
 
-	static QString number(int /Constrained/,int = 10);
-	static QString number(double /Constrained/,char = 'g',int = 6);
-	static QString number(long,int = 10);
-	static QString number(ulong,int = 10);
-%If (Qt_3_2_0 -)
-//	static QString number(Q_LLONG,int = 10);
-//	static QString number(Q_ULLONG,int = 10);
+	static TQString number(int /Constrained/,int = 10);
+	static TQString number(double /Constrained/,char = 'g',int = 6);
+	static TQString number(long,int = 10);
+	static TQString number(ulong,int = 10);
+%If (TQt_3_2_0 -)
+//	static TQString number(Q_LLONG,int = 10);
+//	static TQString number(Q_ULLONG,int = 10);
 %End
-//	static QString number(uint,int = 10);
+//	static TQString number(uint,int = 10);
 
-	void setExpand(uint,QChar);
+	void setExpand(uint,TQChar);
 
-	QString &operator+=(const QString &);
-%If (Qt_3_3_0 -)
-	QString &operator+=(const QByteArray &);
+	TQString &operator+=(const TQString &);
+%If (TQt_3_3_0 -)
+	TQString &operator+=(const TQByteArray &);
 %End
-	QString &operator+=(QChar);
-	//QString &operator+=(char);
+	TQString &operator+=(TQChar);
+	//TQString &operator+=(char);
 
-	QString operator*(int);
+	TQString operator*(int);
 %MethodCode
-		sipRes = new QString();
+		sipRes = new TQString();
 
 		while (a0-- > 0)
 			*sipRes += *sipCpp;
 %End
 
-	QString &operator*=(int);
+	TQString &operator*=(int);
 %MethodCode
-		QString orig(*sipCpp);
+		TQString orig(*sipCpp);
 
 		sipCpp -> truncate(0);
 
@@ -667,84 +667,84 @@ public:
 			*sipCpp += orig;
 %End
 
-	QChar at(uint) const;
-//	QCharRef at(uint);
-//	QChar constref(uint) const;
-//	QChar &ref(uint);
-//	const QChar *unicode() const;
+	TQChar at(uint) const;
+//	TQCharRef at(uint);
+//	TQChar constref(uint) const;
+//	TQChar &ref(uint);
+//	const TQChar *unicode() const;
 	const char *ascii() const;
-%If (Qt_3_1_0 -)
-	static QString fromAscii(const char *,int = -1);
+%If (TQt_3_1_0 -)
+	static TQString fromAscii(const char *,int = -1);
 %End
 	const char *latin1() const;
-	static QString fromLatin1(const char *,int = -1);
-	QCString utf8() const;
-	static QString fromUtf8(const char *,int = -1);
-	QCString local8Bit() const;
-	static QString fromLocal8Bit(const char *,int = -1);
-
-%If (Qt_3_1_0 -)
-//	static QString fromUcs2(const unsigned short *);
+	static TQString fromLatin1(const char *,int = -1);
+	TQCString utf8() const;
+	static TQString fromUtf8(const char *,int = -1);
+	TQCString local8Bit() const;
+	static TQString fromLocal8Bit(const char *,int = -1);
+
+%If (TQt_3_1_0 -)
+//	static TQString fromUcs2(const unsigned short *);
 //	const unsigned short *ucs2() const;
 %End
 
-%If (Qt_2_1_0 -)
-//	QString &setUnicode(const QChar *,uint);
-//	QString &setUnicodeCodes(const ushort *,uint);
+%If (TQt_2_1_0 -)
+//	TQString &setUnicode(const TQChar *,uint);
+//	TQString &setUnicodeCodes(const ushort *,uint);
 %End
-%If (Qt_3_1_0 -)
-	QString &setAscii(const char *,int = -1);
+%If (TQt_3_1_0 -)
+	TQString &setAscii(const char *,int = -1);
 %End
-%If (Qt_2_1_0 -)
-	QString &setLatin1(const char *,int = -1);
+%If (TQt_2_1_0 -)
+	TQString &setLatin1(const char *,int = -1);
 %End
 
-	int compare(const QString &) const;
-	static int compare(const QString &,const QString &);
+	int compare(const TQString &) const;
+	static int compare(const TQString &,const TQString &);
 
-%If (Qt_3_0_0 -)
-	int localeAwareCompare(const QString &) const;
-	static int localeAwareCompare(const QString &,const QString &);
+%If (TQt_3_0_0 -)
+	int localeAwareCompare(const TQString &) const;
+	static int localeAwareCompare(const TQString &,const TQString &);
 %End
 
 	void compose();
-%If (- Qt_3_0_0)
-	QChar::Direction basicDirection();
-	QString visual(int = 0,int = -1);
+%If (- TQt_3_0_0)
+	TQChar::Direction basicDirection();
+	TQString visual(int = 0,int = -1);
 %End
-%If (Qt_2_2_0 -)
-	bool startsWith(const QString &) const;
+%If (TQt_2_2_0 -)
+	bool startsWith(const TQString &) const;
 %End
-%If (Qt_3_2_0 -)
-	bool startsWith(const QString &,bool) const;
+%If (TQt_3_2_0 -)
+	bool startsWith(const TQString &,bool) const;
 %End
-%If (Qt_3_0_0 -)
-	bool endsWith(const QString &) const;
+%If (TQt_3_0_0 -)
+	bool endsWith(const TQString &) const;
 %End
-%If (Qt_3_2_0 -)
-	bool endsWith(const QString &,bool) const;
+%If (TQt_3_2_0 -)
+	bool endsWith(const TQString &,bool) const;
 %End
  
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setLength(uint);
 %End
  
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	uint capacity() const;
 	void reserve(uint);
 	void squeeze();
 %End
  
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool simpleText() const;
 	bool isRightToLeft() const;
 %End
 
-	// Force the numeric interpretation so that str + QString gets handled
+	// Force the numeric interpretation so that str + TQString gets handled
 	// as we want.
-	const QString operator+(const QString &) /Numeric/;
+	const TQString operator+(const TQString &) /Numeric/;
 
-	QString operator[](int) const;
+	TQString operator[](int) const;
 %MethodCode
 		int len;
 
@@ -753,10 +753,10 @@ public:
 		if ((a0 = (int)sipConvertFromSequenceIndex(a0,len)) < 0)
 			sipIsErr = 1;
 		else
-			sipRes = new QString(sipCpp -> at(a0));
+			sipRes = new TQString(sipCpp -> at(a0));
 %End
 
-	QString operator[](SIP_PYSLICE) const;
+	TQString operator[](SIP_PYSLICE) const;
 %MethodCode
 #if PY_VERSION_HEX >= 0x02050000
 		Py_ssize_t len, start, stop, step, slicelength, i;
@@ -770,7 +770,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			sipRes = new QString();
+			sipRes = new TQString();
 
 			for (i = 0; i < slicelength; ++i)
 			{
@@ -785,7 +785,7 @@ public:
 		sipRes = sipCpp -> length();
 %End
 
-	int __contains__(const QString &) const;
+	int __contains__(const TQString &) const;
 %MethodCode
 		sipRes = (sipCpp -> contains(*a0) > 0);
 %End
@@ -793,7 +793,7 @@ public:
 	SIP_PYOBJECT __unicode__();
 %MethodCode
 #if PY_VERSION_HEX >= 0x01060000
-		sipRes = QStringToPyUnicode(sipCpp);
+		sipRes = TQStringToPyUnicode(sipCpp);
 #else
 		Py_INCREF(Py_None);
 		sipRes = Py_None;
@@ -803,7 +803,7 @@ public:
 	SIP_PYOBJECT __str__();
 %MethodCode
 #if PY_VERSION_HEX >= 0x01060000
-		sipRes = QStringToPyUnicode(sipCpp);
+		sipRes = TQStringToPyUnicode(sipCpp);
 #else
 		const char *s;
 
@@ -822,8 +822,8 @@ public:
 #include <qtextcodec.h>
 
 #if PY_VERSION_HEX >= 0x01060000
-// Convenience function for converting a QString to a Python Unicode object.
-static PyObject *QStringToPyUnicode(QString *qs)
+// Convenience function for converting a TQString to a Python Unicode object.
+static PyObject *TQStringToPyUnicode(TQString *qs)
 {
 	PyObject *uobj;
 
@@ -840,13 +840,13 @@ static PyObject *QStringToPyUnicode(QString *qs)
 #endif
 
 // Convenience function for converting a Python unicode or string object to a
-// QString on the heap.
-static QString *PyUnicodeStringToQString(PyObject *py)
+// TQString on the heap.
+static TQString *PyUnicodeStringToTQString(PyObject *py)
 {
 #if PY_VERSION_HEX >= 0x01060000
 	if (PyUnicode_Check(py))
 	{
-		QString *qs = new QString;
+		TQString *qs = new TQString;
 
 #if defined(Py_UNICODE_WIDE)
 		PY_UNICODE_TYPE *ucode = PyUnicode_AS_UNICODE(py);
@@ -863,14 +863,14 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 #endif
 
 	if (PyString_Check(py))
-		return new QString(PyString_AS_STRING(py));
+		return new TQString(PyString_AS_STRING(py));
 
 	return 0;
 }
 %End
 
 %ConvertToTypeCode
-	// Allow a Python string (or a unicode string) whenever a QString is
+	// Allow a Python string (or a unicode string) whenever a TQString is
 	// expected.
 
 	if (sipIsErr == NULL)
@@ -880,12 +880,12 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 #endif
 			sipCanConvertToInstance(sipPy,sipClass_QString,SIP_NO_CONVERTORS));
 
-	*sipCppPtr = PyUnicodeStringToQString(sipPy);
+	*sipCppPtr = PyUnicodeStringToTQString(sipPy);
 
 	if (*sipCppPtr)
 		return sipGetState(sipTransferObj);
 
-	*sipCppPtr = reinterpret_cast<QString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
+	*sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
 
 	return 0;
 %End
@@ -893,7 +893,7 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 %BIGetReadBufferCode
 	if (sipSegment != 0)
 	{
-		PyErr_SetString(PyExc_SystemError, "accessing non-existent QString segment");
+		PyErr_SetString(PyExc_SystemError, "accessing non-existent TQString segment");
 		sipRes = -1;
 	}
 	else
@@ -913,21 +913,21 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 %BIGetCharBufferCode
 	if (sipSegment != 0)
 	{
-		PyErr_SetString(PyExc_SystemError, "accessing non-existent QString segment");
+		PyErr_SetString(PyExc_SystemError, "accessing non-existent TQString segment");
 		sipRes = -1;
 	}
 	else
 	{
-		static QTextCodec *codec = 0;
+		static TQTextCodec *codec = 0;
 		static bool check_codec = TRUE;
 
-		// For the first time only, try and find a Qt codec that
+		// For the first time only, try and find a TQt codec that
 		// corresponds to the default Python codec.  If one wasn't
 		// found then fall back to ASCII (which is actually the codec
-		// returned by QTextCodec::codecForCStrings()).
+		// returned by TQTextCodec::codecForCStrings()).
 		if (check_codec)
 		{
-			codec = QTextCodec::codecForName(PyUnicode_GetDefaultEncoding());
+			codec = TQTextCodec::codecForName(PyUnicode_GetDefaultEncoding());
 			check_codec = FALSE;
 		}
 
@@ -936,7 +936,7 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 			// A Python string is the most convenient method to
 			// save the encoded version on the heap.
 			PyObject *encobj = ((sipSimpleWrapper *)sipSelf)->user;
-			QCString enc;
+			TQCString enc;
 
 			Py_XDECREF(encobj);
 
@@ -963,30 +963,30 @@ static QString *PyUnicodeStringToQString(PyObject *py)
 %End
 };
 
-bool operator==(const QString &,const QString &);
-bool operator!=(const QString &,const QString &);
-bool operator<(const QString &,const QString &);
-bool operator<=(const QString &,const QString &);
-bool operator>(const QString &,const QString &);
-bool operator>=(const QString &,const QString &);
+bool operator==(const TQString &,const TQString &);
+bool operator!=(const TQString &,const TQString &);
+bool operator<(const TQString &,const TQString &);
+bool operator<=(const TQString &,const TQString &);
+bool operator>(const TQString &,const TQString &);
+bool operator>=(const TQString &,const TQString &);
 
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QString : QByteArray
+class TQString : TQByteArray
 {
 %TypeHeaderCode
 #include <qstring.h>
 %End
 
 public:
-	QString();
-	QString(int);
-	QString(const QString &);
-	QString(const char *);
-	QString(const char *,uint);
+	TQString();
+	TQString(int);
+	TQString(const TQString &);
+	TQString(const char *);
+	TQString(const char *,uint);
 
 	bool isNull() const;
 	bool isEmpty() const;
@@ -994,33 +994,33 @@ public:
 	bool resize(uint);
 	bool truncate(uint);
 	bool fill(char,int = -1);
-	QString copy() const;
-//	QString &sprintf(const char *,...);
+	TQString copy() const;
+//	TQString &sprintf(const char *,...);
 	int find(char,int = 0,bool = 1) const;
 	int find(const char *,int = 0,bool = 1) const;
-	int find(const QRegExp &,int = 0) const;
+	int find(const TQRegExp &,int = 0) const;
 	int findRev(char,int = -1,bool = 1) const;
 	int findRev(const char *,int = -1,bool = 1) const;
-	int findRev(const QRegExp &,int = -1) const;
+	int findRev(const TQRegExp &,int = -1) const;
 	int contains(char,bool = 1) const;
 	int contains(const char *,bool = 1) const;
-	int contains(const QRegExp &) const;
-	QString left(uint)  const;
-	QString right(uint) const;
-	QString mid(uint,uint) const;
-	QString leftJustify(uint,char = ' ',bool = 0) const;
-	QString rightJustify(uint,char = ' ',bool = 0) const;
-	QString lower() const;
-	QString upper() const;
-	QString stripWhiteSpace() const;
-	QString simplifyWhiteSpace() const;
-	QString &insert(uint,const char *);
-	QString &insert(uint,char);
-	QString &append(const char *);
-	QString &prepend(const char *);
-	QString &remove(uint,uint);
-	QString &replace(uint,uint,const char *);
-	QString &replace(const QRegExp &,const char *);
+	int contains(const TQRegExp &) const;
+	TQString left(uint)  const;
+	TQString right(uint) const;
+	TQString mid(uint,uint) const;
+	TQString leftJustify(uint,char = ' ',bool = 0) const;
+	TQString rightJustify(uint,char = ' ',bool = 0) const;
+	TQString lower() const;
+	TQString upper() const;
+	TQString stripWhiteSpace() const;
+	TQString simplifyWhiteSpace() const;
+	TQString &insert(uint,const char *);
+	TQString &insert(uint,char);
+	TQString &append(const char *);
+	TQString &prepend(const char *);
+	TQString &remove(uint,uint);
+	TQString &replace(uint,uint,const char *);
+	TQString &replace(const TQRegExp &,const char *);
 
 	short toShort(bool * = 0) const;
 	ushort toUShort(bool * = 0) const;
@@ -1031,15 +1031,15 @@ public:
 	float toFloat(bool * = 0) const;
 	double toDouble(bool * = 0) const;
 
-	QString &setStr(const char *);
-//	QString &setNum(short);
-//	QString &setNum(ushort);
-	QString &setNum(int /Constrained/);
-//	QString &setNum(uint);
-//	QString &setNum(long);
-//	QString &setNum(ulong);
-//	QString &setNum(float,char = 'g',int = 6);
-	QString &setNum(double,char = 'g',int = 6);
+	TQString &setStr(const char *);
+//	TQString &setNum(short);
+//	TQString &setNum(ushort);
+	TQString &setNum(int /Constrained/);
+//	TQString &setNum(uint);
+//	TQString &setNum(long);
+//	TQString &setNum(ulong);
+//	TQString &setNum(float,char = 'g',int = 6);
+	TQString &setNum(double,char = 'g',int = 6);
 	bool setExpand(uint,char);
 
 	SIP_PYOBJECT __str__();
@@ -1057,7 +1057,7 @@ public:
 %End
 
 %ConvertToTypeCode
-	// Allow a Python string whenever a QString is expected.
+	// Allow a Python string whenever a TQString is expected.
 
 	if (sipIsErr == NULL)
 		return (PyString_Check(sipPy) ||
@@ -1065,12 +1065,12 @@ public:
 
 	if (PyString_Check(sipPy))
 	{
-		*sipCppPtr = new QString(PyString_AS_STRING(sipPy));
+		*sipCppPtr = new TQString(PyString_AS_STRING(sipPy));
 
 		return sipGetState(sipTransferObj);
 	}
 
-	*sipCppPtr = reinterpret_cast<QString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
+	*sipCppPtr = reinterpret_cast<TQString *>(sipConvertToInstance(sipPy,sipClass_QString,sipTransferObj,SIP_NO_CONVERTORS,0,sipIsErr));
 
 	return 0;
 %End
diff --git a/sip/qt/qstringlist.sip b/sip/qt/qstringlist.sip
index d95034c..b48a60d 100644
--- a/sip/qt/qstringlist.sip
+++ b/sip/qt/qstringlist.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QStringList.
+// This is the SIP interface definition for TQStringList.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QStringList (Qt v2+)</Title>
+<Sect2><Title>TQStringList (TQt v2+)</Title>
 <Para>
 The Python <Literal>len</Literal>, <Literal>[]</Literal> (for both reading and
 writing slices and individual elements), <Literal>del</Literal> (for deleting
@@ -32,7 +32,7 @@ slices and individual elements), <Literal>+</Literal>, <Literal>+=</Literal>,
 
 <FuncSynopsis>
 	<FuncDef>Iterator <Function>append</Function></FuncDef>
-	<ParamDef>const QString &<Parameter>x</Parameter></ParamDef>
+	<ParamDef>const TQString &<Parameter>x</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This does not return a value.
@@ -40,7 +40,7 @@ This does not return a value.
 
 <FuncSynopsis>
 	<FuncDef>Iterator <Function>prepend</Function></FuncDef>
-	<ParamDef>const QString &<Parameter>x</Parameter></ParamDef>
+	<ParamDef>const TQString &<Parameter>x</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 This does not return a value.
@@ -49,46 +49,46 @@ This does not return a value.
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QStringList
+class TQStringList
 {
 %TypeHeaderCode
 #include <qstringlist.h>
 %End
 
 public:
-	QStringList();
-	QStringList(const QStringList &);
-	QStringList(const QString &);
+	TQStringList();
+	TQStringList(const TQStringList &);
+	TQStringList(const TQString &);
 
 	void sort();
-%If (Qt_2_1_0 -)
-	static QStringList fromStrList(const QStrList &);
-	static QStringList split(const QString &,const QString &,bool = 0);
-	static QStringList split(const QChar &,const QString &,bool = 0);
-	static QStringList split(const QRegExp &,const QString &,bool = 0);
-	QString join(const QString &) const;
-	QStringList grep(const QString &,bool = 1) const;
-	QStringList grep(const QRegExp &) const;
+%If (TQt_2_1_0 -)
+	static TQStringList fromStrList(const TQStrList &);
+	static TQStringList split(const TQString &,const TQString &,bool = 0);
+	static TQStringList split(const TQChar &,const TQString &,bool = 0);
+	static TQStringList split(const TQRegExp &,const TQString &,bool = 0);
+	TQString join(const TQString &) const;
+	TQStringList grep(const TQString &,bool = 1) const;
+	TQStringList grep(const TQRegExp &) const;
 %End
 
-%If (Qt_3_2_0 -)
-	QStringList &gres(const QString &,const QString &,bool = 1);
-	QStringList &gres(const QRegExp &,const QString &);
+%If (TQt_3_2_0 -)
+	TQStringList &gres(const TQString &,const TQString &,bool = 1);
+	TQStringList &gres(const TQRegExp &,const TQString &);
 %End
 
-	// These are actually in QValueList, which isn't implemented so
+	// These are actually in TQValueList, which isn't implemented so
 	// pretend they are here.
 
 	bool isEmpty() const;
-	void append(const QString &);
-	void prepend(const QString &);
-	void remove(const QString &);
-	const QString &first() const;
-	const QString &last() const;
-	int findIndex(const QString &) const;
-	uint contains(const QString &) const;
+	void append(const TQString &);
+	void prepend(const TQString &);
+	void remove(const TQString &);
+	const TQString &first() const;
+	const TQString &last() const;
+	int findIndex(const TQString &) const;
+	uint contains(const TQString &) const;
 	uint count() const;
 	void clear();
 
@@ -97,7 +97,7 @@ public:
 		sipRes = sipCpp -> count();
 %End
 
-	void __setitem__(int,const QString &);
+	void __setitem__(int,const TQString &);
 %MethodCode
 		int len;
 
@@ -109,7 +109,7 @@ public:
 			(*sipCpp)[a0] = *a1;
 %End
 
-	void __setitem__(SIP_PYSLICE,const QStringList &);
+	void __setitem__(SIP_PYSLICE,const TQStringList &);
 %MethodCode
 #if PY_VERSION_HEX >= 0x02050000
 		Py_ssize_t len, start, stop, step, slicelength, i;
@@ -132,7 +132,7 @@ public:
 			}
 			else
 			{
-				QStringList::ConstIterator it = a1 -> begin();
+				TQStringList::ConstIterator it = a1 -> begin();
 
 				for (i = 0; i < slicelength; ++i)
 				{
@@ -176,7 +176,7 @@ public:
 			}
 %End
 
-	QString operator[](int);
+	TQString operator[](int);
 %MethodCode
 		int len;
 
@@ -185,10 +185,10 @@ public:
 		if ((a0 = (int)sipConvertFromSequenceIndex(a0,len)) < 0)
 			sipIsErr = 1;
 		else
-			sipRes = new QString((*sipCpp)[a0]);
+			sipRes = new TQString((*sipCpp)[a0]);
 %End
 
-	QStringList operator[](SIP_PYSLICE);
+	TQStringList operator[](SIP_PYSLICE);
 %MethodCode
 #if PY_VERSION_HEX >= 0x02050000
 		Py_ssize_t len, start, stop, step, slicelength, i;
@@ -202,7 +202,7 @@ public:
 			sipIsErr = 1;
 		else
 		{
-			sipRes = new QStringList();
+			sipRes = new TQStringList();
 
 			for (i = 0; i < slicelength; ++i)
 			{
@@ -212,27 +212,27 @@ public:
 		}
 %End
 
-	int __contains__(const QString &);
+	int __contains__(const TQString &);
 %MethodCode
 		sipRes = (sipCpp -> findIndex(*a0) >= 0);
 %End
 
-	QStringList operator+(const QStringList &);
-	QStringList &operator+=(const QStringList &);
+	TQStringList operator+(const TQStringList &);
+	TQStringList &operator+=(const TQStringList &);
 
-	QStringList &operator+=(const QString &);
+	TQStringList &operator+=(const TQString &);
 
-	QStringList operator*(int);
+	TQStringList operator*(int);
 %MethodCode
-		sipRes = new QStringList();
+		sipRes = new TQStringList();
 
 		while (a0-- > 0)
 			*sipRes += *sipCpp;
 %End
 
-	QStringList &operator*=(int);
+	TQStringList &operator*=(int);
 %MethodCode
-		QStringList orig(*sipCpp);
+		TQStringList orig(*sipCpp);
 
 		sipCpp -> clear();
 
@@ -240,8 +240,8 @@ public:
 			*sipCpp += orig;
 %End
 
-	bool operator==(const QStringList &);
-	bool operator!=(const QStringList &);
+	bool operator==(const TQStringList &);
+	bool operator!=(const TQStringList &);
 };
 
 %End
diff --git a/sip/qt/qstrlist.sip b/sip/qt/qstrlist.sip
index 189e134..6d31cf9 100644
--- a/sip/qt/qstrlist.sip
+++ b/sip/qt/qstrlist.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QStrList.
+// This is the SIP interface definition for TQStrList.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QStrList</Title>
+<Sect2><Title>TQStrList</Title>
 <Para>
-This class isn't implemented.  Whenever a <Literal>QStrList</Literal> is the
+This class isn't implemented.  Whenever a <Literal>TQStrList</Literal> is the
 return type of a function or the type of an argument, a Python list of strings
 is used instead.
 </Para>
@@ -31,7 +31,7 @@ is used instead.
 %End
 
 
-%MappedType QStrList
+%MappedType TQStrList
 {
 %TypeHeaderCode
 #include <qstrlist.h>
@@ -71,12 +71,12 @@ is used instead.
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of strings to a QStrList on the heap.
+	// Convert a Python list of strings to a TQStrList on the heap.
 
 	if (sipIsErr == NULL)
 		return PyList_Check(sipPy);
 
-	QStrList *qsl = new QStrList;
+	TQStrList *qsl = new TQStrList;
 
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
diff --git a/sip/qt/qstyle.sip b/sip/qt/qstyle.sip
index bbef81c..358327b 100644
--- a/sip/qt/qstyle.sip
+++ b/sip/qt/qstyle.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QStyle and QStyleOption.
+// This is the SIP interface definition for TQStyle and TQStyleOption.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QStyle (Qt v2+)</Title>
+<Sect2><Title>TQStyle (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>virtual void <Function>getButtonShift</Function></FuncDef>
 	<ParamDef>int &amp;<Parameter>x</Parameter></ParamDef>
@@ -29,12 +29,12 @@
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>x</Literal> and
-<Literal>y</Literal> values.  (Qt v2)
+<Literal>y</Literal> values.  (TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>virtual void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QScrollBar *<Parameter>b</Parameter></ParamDef>
+	<ParamDef>const TQScrollBar *<Parameter>b</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>sliderLength</Parameter></ParamDef>
@@ -44,12 +44,12 @@ This takes no parameters and returns a tuple of the <Literal>x</Literal> and
 Thus takes only the <Literal>b</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>virtual void <Function>tabbarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>t</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>t</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>hframe</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>vframe</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>overlap</Parameter></ParamDef>
@@ -57,21 +57,21 @@ Thus takes only the <Literal>b</Literal> parameter and returns a tuple of the
 <Para>
 This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 <Literal>hframe</Literal>, <Literal>vframe</Literal> and
-<Literal>overlap</Literal> values.  (Qt v2)
+<Literal>overlap</Literal> values.  (TQt v2)
 </Para>
 </Sect2>
 
-<Sect2><Title>QStyleOption (Qt v3+)</Title>
+<Sect2><Title>TQStyleOption (TQt v3+)</Title>
 <Para>
-<Literal>QStyleOption</Literal> is fully implemented.
+<Literal>TQStyleOption</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QStyleOption
+class TQStyleOption
 {
 %TypeHeaderCode
 #include <qstyle.h>
@@ -82,31 +82,31 @@ public:
 		Default
 	};
  
-	QStyleOption(StyleOptionDefault /Constrained/ = Default);
+	TQStyleOption(StyleOptionDefault /Constrained/ = Default);
  
-%If (Qt_3_2_0 -)
-	QStyleOption(int);
-%End
-	QStyleOption(int,int);
-	QStyleOption(int,int,int,int);
-	QStyleOption(QMenuItem *);
-	QStyleOption(QMenuItem *,int);
-	QStyleOption(QMenuItem *,int,int);
-	QStyleOption(const QColor &);
-	QStyleOption(QTab *);
-	QStyleOption(QListViewItem *);
-%If (Qt_3_1_0 -)
-	QStyleOption(QCheckListItem *);
-%End
-	QStyleOption(Qt::ArrowType /Constrained/);
-%If (Qt_3_1_0 -)
-	QStyleOption(const QRect &);
-	QStyleOption(QWidget *);
+%If (TQt_3_2_0 -)
+	TQStyleOption(int);
+%End
+	TQStyleOption(int,int);
+	TQStyleOption(int,int,int,int);
+	TQStyleOption(TQMenuItem *);
+	TQStyleOption(TQMenuItem *,int);
+	TQStyleOption(TQMenuItem *,int,int);
+	TQStyleOption(const TQColor &);
+	TQStyleOption(TQTab *);
+	TQStyleOption(TQListViewItem *);
+%If (TQt_3_1_0 -)
+	TQStyleOption(TQCheckListItem *);
+%End
+	TQStyleOption(TQt::ArrowType /Constrained/);
+%If (TQt_3_1_0 -)
+	TQStyleOption(const TQRect &);
+	TQStyleOption(TQWidget *);
 %End
  
 	bool isDefault() const;
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	int day() const;
 %End
  
@@ -115,149 +115,149 @@ public:
 	int frameShape() const;
 	int frameShadow() const;
  
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int headerSection() const;
 %End
-	QMenuItem* menuItem() const;
+	TQMenuItem* menuItem() const;
 	int maxIconWidth() const;
 	int tabWidth() const;
  
-	const QColor& color() const;
+	const TQColor& color() const;
  
-	QTab *tab() const;
+	TQTab *tab() const;
  
-%If (Qt_3_1_0 -)
-	QCheckListItem *checkListItem() const;
+%If (TQt_3_1_0 -)
+	TQCheckListItem *checkListItem() const;
 %End
-	QListViewItem *listViewItem() const;
+	TQListViewItem *listViewItem() const;
  
-	Qt::ArrowType arrowType() const;
-%If (Qt_3_1_0 -)
-	QRect rect() const;
-	QWidget *widget() const;
+	TQt::ArrowType arrowType() const;
+%If (TQt_3_1_0 -)
+	TQRect rect() const;
+	TQWidget *widget() const;
 %End
 };
 
 %End
 
 
-%If (Qt_3_0_0 -)
-//	Not yet defined in Qt v3Beta5.
-class QStyleHintReturn;
+%If (TQt_3_0_0 -)
+//	Not yet defined in TQt v3Beta5.
+class TQStyleHintReturn;
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QStyle : QObject
+class TQStyle : TQObject
 {
 %TypeHeaderCode
 #include <qstyle.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	QStyle();
+%If (TQt_3_0_0 -)
+	TQStyle();
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	GUIStyle guiStyle() const;
 %End
 
-	virtual void polish(QWidget *);
-	virtual void unPolish(QWidget *);
+	virtual void polish(TQWidget *);
+	virtual void unPolish(TQWidget *);
 
-	virtual void polish(QApplication *);
-	virtual void unPolish(QApplication *);
+	virtual void polish(TQApplication *);
+	virtual void unPolish(TQApplication *);
 
-	virtual void polish(QPalette &);
+	virtual void polish(TQPalette &);
 
-%If (Qt_3_0_0 -)
-	virtual void polishPopupMenu(QPopupMenu *) = 0;
+%If (TQt_3_0_0 -)
+	virtual void polishPopupMenu(TQPopupMenu *) = 0;
 %End
 
-%If (- Qt_3_0_0)
-	virtual QRect itemRect(QPainter *,int,int,int,int,int,bool,
-			       const QPixmap *,const QString &,int = -1);
+%If (- TQt_3_0_0)
+	virtual TQRect itemRect(TQPainter *,int,int,int,int,int,bool,
+			       const TQPixmap *,const TQString &,int = -1);
 
-	virtual void drawItem(QPainter *,int,int,int,int,int,
-			      const QColorGroup &,bool,const QPixmap *,
-			      const QString &,int = -1,const QColor * = 0);
+	virtual void drawItem(TQPainter *,int,int,int,int,int,
+			      const TQColorGroup &,bool,const TQPixmap *,
+			      const TQString &,int = -1,const TQColor * = 0);
 %End
-%If (Qt_3_0_0 -)
-	virtual QRect itemRect(QPainter *,const QRect &,int,bool,
-			       const QPixmap *,const QString &,int = -1) const;
+%If (TQt_3_0_0 -)
+	virtual TQRect itemRect(TQPainter *,const TQRect &,int,bool,
+			       const TQPixmap *,const TQString &,int = -1) const;
  
-	virtual void drawItem(QPainter *,const QRect &,int,const QColorGroup &,
-			      bool,const QPixmap *,const QString &,int = -1,
-			      const QColor * = 0) const;
+	virtual void drawItem(TQPainter *,const TQRect &,int,const TQColorGroup &,
+			      bool,const TQPixmap *,const TQString &,int = -1,
+			      const TQColor * = 0) const;
 %End
 
-%If (- Qt_3_0_0)
-	virtual void drawSeparator(QPainter *,int,int,int,int,
-				   const QColorGroup &,bool = 1,int = 1,
+%If (- TQt_3_0_0)
+	virtual void drawSeparator(TQPainter *,int,int,int,int,
+				   const TQColorGroup &,bool = 1,int = 1,
 				   int = 0);
-	virtual void drawRect(QPainter *,int,int,int,int,const QColor &,
-			      int = 1,const QBrush * = 0);
-	virtual void drawRectStrong(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool = 0,int = 1,
-				    int = 0,const QBrush * = 0);
-	virtual void drawButton(QPainter *,int,int,int,int,const QColorGroup &,
-				bool = 0,const QBrush * = 0) = 0;
-	virtual QRect buttonRect(int,int,int,int);
-	virtual void drawButtonMask(QPainter *,int,int,int,int);
-	virtual void drawBevelButton(QPainter *,int,int,int,int,
-				     const QColorGroup &,bool = 0,
-				     const QBrush * = 0) = 0;
-%If (Qt_2_1_0 -)
-	QRect bevelButtonRect(int,int,int,int);
-%End
-	virtual void drawToolButton(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool = 0,
-				    const QBrush * = 0);
-%If (Qt_2_1_0 -)
-	void drawToolButton(QToolButton *,QPainter *);
-	QRect toolButtonRect(int,int,int,int);
-%End
-	virtual void drawPanel(QPainter *,int,int,int,int,const QColorGroup &,
-			       bool = 0,int = 1,const QBrush * = 0);
-	virtual void drawPopupPanel(QPainter *,int,int,int,int,
-				    const QColorGroup &,int = 2,
-				    const QBrush * = 0);
-	virtual void drawArrow(QPainter *,Qt::ArrowType,bool,int,int,int,int,
-			       const QColorGroup &,bool,const QBrush * = 0) = 0;
-	virtual QSize exclusiveIndicatorSize() const = 0;
-	virtual void drawExclusiveIndicator(QPainter *,int,int,int,int,
-					    const QColorGroup &,bool,bool = 0,
+	virtual void drawRect(TQPainter *,int,int,int,int,const TQColor &,
+			      int = 1,const TQBrush * = 0);
+	virtual void drawRectStrong(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool = 0,int = 1,
+				    int = 0,const TQBrush * = 0);
+	virtual void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+				bool = 0,const TQBrush * = 0) = 0;
+	virtual TQRect buttonRect(int,int,int,int);
+	virtual void drawButtonMask(TQPainter *,int,int,int,int);
+	virtual void drawBevelButton(TQPainter *,int,int,int,int,
+				     const TQColorGroup &,bool = 0,
+				     const TQBrush * = 0) = 0;
+%If (TQt_2_1_0 -)
+	TQRect bevelButtonRect(int,int,int,int);
+%End
+	virtual void drawToolButton(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool = 0,
+				    const TQBrush * = 0);
+%If (TQt_2_1_0 -)
+	void drawToolButton(TQToolButton *,TQPainter *);
+	TQRect toolButtonRect(int,int,int,int);
+%End
+	virtual void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,
+			       bool = 0,int = 1,const TQBrush * = 0);
+	virtual void drawPopupPanel(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,int = 2,
+				    const TQBrush * = 0);
+	virtual void drawArrow(TQPainter *,TQt::ArrowType,bool,int,int,int,int,
+			       const TQColorGroup &,bool,const TQBrush * = 0) = 0;
+	virtual TQSize exclusiveIndicatorSize() const = 0;
+	virtual void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+					    const TQColorGroup &,bool,bool = 0,
 					    bool = 1) = 0;
-	virtual void drawExclusiveIndicatorMask(QPainter *,int,int,int,int,
+	virtual void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,
 						bool);
-	virtual QSize indicatorSize() const = 0;
-	virtual void drawIndicator(QPainter *,int,int,int,int,
-				   const QColorGroup &,int,bool = 0,
+	virtual TQSize indicatorSize() const = 0;
+	virtual void drawIndicator(TQPainter *,int,int,int,int,
+				   const TQColorGroup &,int,bool = 0,
 				   bool = 1) = 0;
-	virtual void drawIndicatorMask(QPainter *,int,int,int,int,int);
-	virtual void drawFocusRect(QPainter *,const QRect &,const QColorGroup &,
-				   const QColor * = 0,bool = 0) = 0;
-	virtual void drawComboButton(QPainter *,int,int,int,int,
-				     const QColorGroup &,bool = 0,bool = 0,
-				     bool = 1,const QBrush * = 0) = 0;
-	virtual QRect comboButtonRect(int,int,int,int) = 0;
-	virtual QRect comboButtonFocusRect(int,int,int,int) = 0;
-	virtual void drawComboButtonMask(QPainter *,int,int,int,int) = 0;
-	virtual void drawPushButton(QPushButton *,QPainter *) = 0;
-	virtual void drawPushButtonLabel(QPushButton *,QPainter *) = 0;
-
-%If (Qt_2_1_0 -)
-	QRect pushButtonContentsRect(QPushButton *);
+	virtual void drawIndicatorMask(TQPainter *,int,int,int,int,int);
+	virtual void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &,
+				   const TQColor * = 0,bool = 0) = 0;
+	virtual void drawComboButton(TQPainter *,int,int,int,int,
+				     const TQColorGroup &,bool = 0,bool = 0,
+				     bool = 1,const TQBrush * = 0) = 0;
+	virtual TQRect comboButtonRect(int,int,int,int) = 0;
+	virtual TQRect comboButtonFocusRect(int,int,int,int) = 0;
+	virtual void drawComboButtonMask(TQPainter *,int,int,int,int) = 0;
+	virtual void drawPushButton(TQPushButton *,TQPainter *) = 0;
+	virtual void drawPushButtonLabel(TQPushButton *,TQPainter *) = 0;
+
+%If (TQt_2_1_0 -)
+	TQRect pushButtonContentsRect(TQPushButton *);
 	int menuButtonIndicatorWidth(int);
 %End
 
 	virtual void getButtonShift(int &,int &) = 0;
 	virtual int defaultFrameWidth() const = 0;
-	virtual void tabbarMetrics(const QTabBar *,int &,int &,int &) = 0;
-	virtual void drawTab(QPainter *,const QTabBar *,QTab *,bool) = 0;
-	virtual void drawTabMask(QPainter *,const QTabBar* ,QTab* ,bool) = 0;
+	virtual void tabbarMetrics(const TQTabBar *,int &,int &,int &) = 0;
+	virtual void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool) = 0;
+	virtual void drawTabMask(TQPainter *,const TQTabBar* ,TQTab* ,bool) = 0;
 
 	enum ScrollControl
 	{
@@ -271,57 +271,57 @@ public:
 		NoScroll = 0x80
 	};
 
-	virtual void scrollBarMetrics(const QScrollBar *,int &,int &,int &,
+	virtual void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,
 				      int &) = 0;
-	virtual void drawScrollBarControls(QPainter *,const QScrollBar *,int,
+	virtual void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,
 					   uint,uint) = 0;
-	virtual ScrollControl scrollBarPointOver(const QScrollBar *,int,
-						 const QPoint &) = 0;
+	virtual ScrollControl scrollBarPointOver(const TQScrollBar *,int,
+						 const TQPoint &) = 0;
 	virtual int sliderLength() const = 0;
-	virtual void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	virtual void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 				Orientation,bool,bool) = 0;
-	virtual void drawSliderMask(QPainter *,int,int,int,int,Orientation,
+	virtual void drawSliderMask(TQPainter *,int,int,int,int,Orientation,
 				    bool,bool) = 0;
-	virtual void drawSliderGroove(QPainter *,int,int,int,int,
-				      const QColorGroup &,QCOORD,
+	virtual void drawSliderGroove(TQPainter *,int,int,int,int,
+				      const TQColorGroup &,TQCOORD,
 				      Orientation) = 0;
-	virtual void drawSliderGrooveMask(QPainter *,int,int,int,int,QCOORD,
+	virtual void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD,
 					  Orientation) = 0;
 	virtual int maximumSliderDragDistance() const = 0;
 	virtual int splitterWidth() const = 0;
-	virtual void drawSplitter(QPainter *,int,int,int,int,
-				  const QColorGroup &,Orientation) = 0;
-	virtual void drawCheckMark(QPainter *,int,int,int,int,
-				   const QColorGroup &,bool,bool) = 0;
-	virtual void polishPopupMenu(QPopupMenu *) = 0;
-	virtual int extraPopupMenuItemWidth(bool,int,QMenuItem *,
-					    const QFontMetrics &) = 0;
-	virtual int popupSubmenuIndicatorWidth(const QFontMetrics &) = 0;
-	virtual int popupMenuItemHeight(bool,QMenuItem *,
-					const QFontMetrics &) = 0;
-	virtual void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-				       const QPalette &,bool, bool,int,int,int,
+	virtual void drawSplitter(TQPainter *,int,int,int,int,
+				  const TQColorGroup &,Orientation) = 0;
+	virtual void drawCheckMark(TQPainter *,int,int,int,int,
+				   const TQColorGroup &,bool,bool) = 0;
+	virtual void polishPopupMenu(TQPopupMenu *) = 0;
+	virtual int extraPopupMenuItemWidth(bool,int,TQMenuItem *,
+					    const TQFontMetrics &) = 0;
+	virtual int popupSubmenuIndicatorWidth(const TQFontMetrics &) = 0;
+	virtual int popupMenuItemHeight(bool,TQMenuItem *,
+					const TQFontMetrics &) = 0;
+	virtual void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+				       const TQPalette &,bool, bool,int,int,int,
 				       int) = 0;
-%If (Qt_2_2_0 -)
-	virtual void drawMenuBarItem(QPainter *,int,int,int,int,QMenuItem *,
-				     QColorGroup &,bool,bool);
+%If (TQt_2_2_0 -)
+	virtual void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *,
+				     TQColorGroup &,bool,bool);
 %End
-%If (Qt_2_1_0 -)
-	QSize scrollBarExtent();
+%If (TQt_2_1_0 -)
+	TQSize scrollBarExtent();
 	int buttonDefaultIndicatorWidth() const;
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	int buttonMargin() const;
 	int toolBarHandleExtent() const;
 	int sliderThickness() const;
 %End
 	int toolBarHandleExtend() const;
-	void drawToolBarHandle(QPainter *,const QRect &,Qt::Orientation,bool,
-			       const QColorGroup &,bool = 0);
+	void drawToolBarHandle(TQPainter *,const TQRect &,TQt::Orientation,bool,
+			       const TQColorGroup &,bool = 0);
 %End
 
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum PrimitiveElement {
 		PE_ButtonCommand,
 		PE_ButtonDefault,
@@ -381,23 +381,23 @@ public:
 
 		PE_ProgressBarChunk,
 
-%If (Qt_3_0_1 -)
+%If (TQt_3_0_1 -)
 		PE_PanelLineEdit,
 		PE_PanelTabWidget,
 
 		PE_WindowFrame,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		PE_CheckListController,
 		PE_CheckListIndicator,
 		PE_CheckListExclusiveIndicator,
 
 		PE_PanelGroupBox,
 %End
-%If (Qt_3_0_4 - Qt_3_0_5)
+%If (TQt_3_0_4 - TQt_3_0_5)
 		PE_PopupMenuScroller,
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		PE_RubberBand,
 %End
 
@@ -428,9 +428,9 @@ public:
 
 	typedef uint SFlags;
 
-	virtual void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-				   const QColorGroup &,SFlags = Style_Default,
-				   const QStyleOption & = QStyleOption()) const = 0;
+	virtual void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+				   const TQColorGroup &,SFlags = Style_Default,
+				   const TQStyleOption & = TQStyleOption()) const = 0;
 
 	enum ControlElement {
 		CE_PushButton,
@@ -453,16 +453,16 @@ public:
 		CE_MenuBarItem,
 
 		CE_ToolButtonLabel,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		CE_MenuBarEmptyArea,
 %End
-%If (Qt_3_0_5 -)
+%If (TQt_3_0_5 -)
 		CE_PopupMenuScroller,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		CE_DockWindowEmptyArea,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		CE_PopupMenuVerticalExtra,
 		CE_PopupMenuHorizontalExtra,
 
@@ -473,13 +473,13 @@ public:
 		CE_CustomBase
 	};
 
-	virtual void drawControl(ControlElement,QPainter *,const QWidget *,
-				 const QRect &,const QColorGroup &,
+	virtual void drawControl(ControlElement,TQPainter *,const TQWidget *,
+				 const TQRect &,const TQColorGroup &,
 				 SFlags = Style_Default,
-				 const QStyleOption & = QStyleOption()) const = 0;
-	virtual void drawControlMask(ControlElement,QPainter *,const QWidget *,
-				     const QRect &,
-				     const QStyleOption & = QStyleOption()) const = 0;
+				 const TQStyleOption & = TQStyleOption()) const = 0;
+	virtual void drawControlMask(ControlElement,TQPainter *,const TQWidget *,
+				     const TQRect &,
+				     const TQStyleOption & = TQStyleOption()) const = 0;
 
 	enum SubRect {
 		SR_PushButtonContents,
@@ -505,7 +505,7 @@ public:
 
 		SR_ToolButtonContents,
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		SR_DialogButtonAccept,
 		SR_DialogButtonReject,
 		SR_DialogButtonApply,
@@ -522,7 +522,7 @@ public:
 		SR_CustomBase
 	};
 
-	virtual QRect subRect(SubRect,const QWidget *) const = 0;
+	virtual TQRect subRect(SubRect,const TQWidget *) const = 0;
 
 	enum ComplexControl{
 		CC_SpinWidget,
@@ -557,7 +557,7 @@ public:
 		SC_ComboBoxFrame,
 		SC_ComboBoxEditField,
 		SC_ComboBoxArrow,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		SC_ComboBoxListBoxPopup,
 %End
 
@@ -586,22 +586,22 @@ public:
 
 	typedef uint SCFlags;
 
-	virtual void drawComplexControl(ComplexControl,QPainter *,
-					const QWidget *,const QRect &,
-					const QColorGroup &,
+	virtual void drawComplexControl(ComplexControl,TQPainter *,
+					const TQWidget *,const TQRect &,
+					const TQColorGroup &,
 					SFlags = Style_Default,
 					SCFlags = SC_All,SCFlags = SC_None,
-					const QStyleOption & = QStyleOption()) const = 0;
-	virtual void drawComplexControlMask(ComplexControl,QPainter *,
-					    const QWidget *,const QRect &,
-					    const QStyleOption & = QStyleOption()) const = 0;
-
-	virtual QRect querySubControlMetrics(ComplexControl,
-					     const QWidget *,SubControl,
-					     const QStyleOption & = QStyleOption()) const = 0;
-	virtual SubControl querySubControl(ComplexControl,const QWidget *,
-					   const QPoint &,
-					   const QStyleOption & = QStyleOption()) const = 0;
+					const TQStyleOption & = TQStyleOption()) const = 0;
+	virtual void drawComplexControlMask(ComplexControl,TQPainter *,
+					    const TQWidget *,const TQRect &,
+					    const TQStyleOption & = TQStyleOption()) const = 0;
+
+	virtual TQRect querySubControlMetrics(ComplexControl,
+					     const TQWidget *,SubControl,
+					     const TQStyleOption & = TQStyleOption()) const = 0;
+	virtual SubControl querySubControl(ComplexControl,const TQWidget *,
+					   const TQPoint &,
+					   const TQStyleOption & = TQStyleOption()) const = 0;
 
 	enum PixelMetric {
 		PM_ButtonMargin,
@@ -645,13 +645,13 @@ public:
 		PM_IndicatorHeight,
 		PM_ExclusiveIndicatorWidth,
 		PM_ExclusiveIndicatorHeight,
-%If (Qt_3_0_4 -)
+%If (TQt_3_0_4 -)
 		PM_PopupMenuScrollerHeight,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		PM_CheckListButtonSize,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		PM_CheckListControllerSize,
 		PM_PopupMenuFrameHorizontalExtra,
 		PM_PopupMenuFrameVerticalExtra,
@@ -668,7 +668,7 @@ public:
 		PM_TabBarTabShiftHorizontal,
 		PM_TabBarTabShiftVertical,
 %End
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		PM_TabBarScrollButtonWidth,
 
 		PM_MenuBarItemSpacing,
@@ -678,7 +678,7 @@ public:
 		PM_CustomBase
 	};
 
-	virtual int pixelMetric(PixelMetric,const QWidget * = 0) const = 0;
+	virtual int pixelMetric(PixelMetric,const TQWidget * = 0) const = 0;
 
 	enum ContentsType {
 		CT_PushButton,
@@ -690,7 +690,7 @@ public:
 		CT_DockWindow,
 		CT_ProgressBar,
 		CT_PopupMenuItem,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		CT_TabBarTab,
 		CT_Slider,
 		CT_Header,
@@ -698,7 +698,7 @@ public:
 		CT_MenuBar,
 		CT_SpinBox,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		CT_SizeGrip,
 		CT_TabWidget,
 		CT_DialogButtons,
@@ -707,9 +707,9 @@ public:
 		CT_CustomBase
 	};
 
-	virtual QSize sizeFromContents(ContentsType,const QWidget *,
-				       const QSize &,
-				       const QStyleOption & = QStyleOption()) const = 0;
+	virtual TQSize sizeFromContents(ContentsType,const TQWidget *,
+				       const TQSize &,
+				       const TQStyleOption & = TQStyleOption()) const = 0;
 
 	enum StyleHint {
 		SH_EtchDisabledText,
@@ -764,23 +764,23 @@ public:
 
 		SH_ComboBox_Popup,
 
-%If (Qt_3_0_1 -)
+%If (TQt_3_0_1 -)
 		SH_TitleBar_NoBorder,
 
 		SH_ScrollBar_StopMouseOverSlider,
 %End
 
-%If (Qt_3_0_2 -)
+%If (TQt_3_0_2 -)
 		SH_BlinkCursorWhenTextSelected,
 
 		SH_RichText_FullWidthSelection,
 %End
 
-%If (Qt_3_0_4 -)
+%If (TQt_3_0_4 -)
 		SH_PopupMenu_Scrollable,
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		SH_GroupBox_TextLabelVerticalAlignment,
 
 		SH_GroupBox_TextLabelColor,
@@ -788,7 +788,7 @@ public:
 		SH_PopupMenu_SloppySubMenus,
 %End
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		SH_Table_GridLineColor,
 
 		SH_LineEdit_PasswordCharacter,
@@ -804,7 +804,7 @@ public:
 		SH_ListViewExpand_SelectMouseType,
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 		SH_UnderlineAccelerator,
 
 		SH_ToolButton_Uses3D,
@@ -813,9 +813,9 @@ public:
 		SH_CustomBase
 	};
 
-	virtual int styleHint(StyleHint,const QWidget * = 0,
-			      const QStyleOption & = QStyleOption(),
-			      QStyleHintReturn * = 0) const = 0;
+	virtual int styleHint(StyleHint,const TQWidget * = 0,
+			      const TQStyleOption & = TQStyleOption(),
+			      TQStyleHintReturn * = 0) const = 0;
 
 	enum StylePixmap {
 		SP_TitleBarMinButton,
@@ -828,34 +828,34 @@ public:
 		SP_MessageBoxInformation,
 		SP_MessageBoxWarning,
 		SP_MessageBoxCritical,
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		SP_MessageBoxQuestion,
 %End
 
 		SP_CustomBase
 	};
 
-	virtual QPixmap stylePixmap(StylePixmap,const QWidget * = 0,
-				    const QStyleOption & = QStyleOption()) const = 0;
+	virtual TQPixmap stylePixmap(StylePixmap,const TQWidget * = 0,
+				    const TQStyleOption & = TQStyleOption()) const = 0;
 
-	static QRect visualRect(const QRect &,const QWidget *);
+	static TQRect visualRect(const TQRect &,const TQWidget *);
 
-	static QRect visualRect(const QRect &,const QRect &);
+	static TQRect visualRect(const TQRect &,const TQRect &);
 %End
 
 protected:
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void setScrollBarExtent(int,int = -1);
 	void setButtonDefaultIndicatorWidth(int);
 %End
 
 private:
-%If (- Qt_3_0_0)
-	QStyle();
-	QStyle(GUIStyle);
+%If (- TQt_3_0_0)
+	TQStyle();
+	TQStyle(GUIStyle);
 %End
-%If (Qt_2_1_0 -)
-	QStyle(const QStyle &);
+%If (TQt_2_1_0 -)
+	TQStyle(const TQStyle &);
 %End
 };
 
diff --git a/sip/qt/qstylefactory.sip b/sip/qt/qstylefactory.sip
index 9249c62..faed8bc 100644
--- a/sip/qt/qstylefactory.sip
+++ b/sip/qt/qstylefactory.sip
@@ -1,45 +1,45 @@
-// This is the SIP interface definition for QStyleFactory.
+// This is the SIP interface definition for TQStyleFactory.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QStyleFactory (Qt v3+)</Title>
+<Sect2><Title>TQStyleFactory (TQt v3+)</Title>
 <Para>
-<Literal>QStyleFactory</Literal> is fully implemented.
+<Literal>TQStyleFactory</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QStyleFactory
+class TQStyleFactory
 {
 %TypeHeaderCode
 #include <qstylefactory.h>
 %End
 
 public:
-	static QStringList keys();
-	static QStyle *create(const QString &) /Factory/;
+	static TQStringList keys();
+	static TQStyle *create(const TQString &) /Factory/;
 }; 
 
 %End
diff --git a/sip/qt/qstylesheet.sip b/sip/qt/qstylesheet.sip
index c248e56..3b0d252 100644
--- a/sip/qt/qstylesheet.sip
+++ b/sip/qt/qstylesheet.sip
@@ -1,55 +1,55 @@
-// This is the SIP interface definition for QStyleSheet and QStyleSheetItem.
+// This is the SIP interface definition for TQStyleSheet and TQStyleSheetItem.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QStyleSheet (Qt v2+)</Title>
+<Sect2><Title>TQStyleSheet (TQt v2+)</Title>
 <Para>
-<Literal>QStyleSheet</Literal> is fully implemented.
+<Literal>TQStyleSheet</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QStyleSheetItem (Qt v2+)</Title>
+<Sect2><Title>TQStyleSheetItem (TQt v2+)</Title>
 <Para>
-<Literal>QStyleSheetItem</Literal> is fully implemented.
+<Literal>TQStyleSheetItem</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QStyleSheetItem : Qt
+class TQStyleSheetItem : TQt
 {
 %TypeHeaderCode
 #include <qstylesheet.h>
 %End
 
 public:
-	QStyleSheetItem(QStyleSheet * /TransferThis/,const QString &);
+	TQStyleSheetItem(TQStyleSheet * /TransferThis/,const TQString &);
 
-	QString name() const;
+	TQString name() const;
 
-	QStyleSheet *styleSheet();
-//	const QStyleSheet *styleSheet() const;
+	TQStyleSheet *styleSheet();
+//	const TQStyleSheet *styleSheet() const;
 
 	enum AdditionalStyleValues {
 		Undefined
@@ -68,7 +68,7 @@ public:
 	int alignment() const;
 	void setAlignment(int);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum VerticalAlignment {
 		VAlignBaseline,
 		VAlignSub,
@@ -91,14 +91,14 @@ public:
 	int fontSize() const;
 	void setFontSize(int);
 
-	QString fontFamily() const;
-	void setFontFamily(const QString &);
+	TQString fontFamily() const;
+	void setFontFamily(const TQString &);
 
 	int numberOfColumns() const;
 	void setNumberOfColumns(int);
 
-	QColor color() const;
-	void setColor(const QColor &);
+	TQColor color() const;
+	void setColor(const TQColor &);
 
 	bool fontItalic() const;
 	void setFontItalic(bool);
@@ -108,7 +108,7 @@ public:
 	void setFontUnderline(bool);
 	bool definesFontUnderline() const;
 
-%If (Qt_3_0_5 -)
+%If (TQt_3_0_5 -)
 	bool fontStrikeOut() const;
 	void setFontStrikeOut(bool);
 	bool definesFontStrikeOut() const;
@@ -117,13 +117,13 @@ public:
 	bool isAnchor() const;
 	void setAnchor(bool);
 
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 	enum WhiteSpaceMode {
 		WhiteSpaceNormal,
 		WhiteSpacePre
 	};
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum WhiteSpaceMode {
 		WhiteSpaceNormal,
 		WhiteSpacePre,
@@ -134,7 +134,7 @@ public:
 	WhiteSpaceMode whiteSpaceMode() const;
 	void setWhiteSpaceMode(WhiteSpaceMode);
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum Margin {
 		MarginLeft,
 		MarginRight,
@@ -145,7 +145,7 @@ public:
 		MarginHorizontal
 	};
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	enum Margin {
 		MarginLeft,
 		MarginRight,
@@ -173,66 +173,66 @@ public:
 	ListStyle listStyle() const;
 	void setListStyle(ListStyle);
 
-	QString contexts() const;
-	void setContexts(const QString &);
-	bool allowedInContext(const QStyleSheetItem *) const;
+	TQString contexts() const;
+	void setContexts(const TQString &);
+	bool allowedInContext(const TQStyleSheetItem *) const;
 
 	bool selfNesting() const;
 	void setSelfNesting(bool);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setLineSpacing(int);
 	int lineSpacing() const;
 %End
 };
 
 
-class QStyleSheet : QObject
+class TQStyleSheet : TQObject
 {
 %TypeHeaderCode
 #include <qstylesheet.h>
 %End
 
 public:
-	QStyleSheet(QObject * /TransferThis/ = 0,const char * = 0);
+	TQStyleSheet(TQObject * /TransferThis/ = 0,const char * = 0);
 
-	static QStyleSheet *defaultSheet();
-	static void setDefaultSheet(QStyleSheet *);
+	static TQStyleSheet *defaultSheet();
+	static void setDefaultSheet(TQStyleSheet *);
 
-	QStyleSheetItem *item(const QString &);
-//	const QStyleSheetItem *item(const QString &) const;
+	TQStyleSheetItem *item(const TQString &);
+//	const TQStyleSheetItem *item(const TQString &) const;
 
-	void insert(QStyleSheetItem *);
+	void insert(TQStyleSheetItem *);
 
-%If (- Qt_3_0_0)
-//	virtual QTextNode *tag(const QString &,const QMap<QString,QString> &,
-//			       const QString &,const QMimeSourceFactory &,
+%If (- TQt_3_0_0)
+//	virtual TQTextNode *tag(const TQString &,const TQMap<TQString,TQString> &,
+//			       const TQString &,const TQMimeSourceFactory &,
 //			       bool = 0) const;
 %End
-%If (Qt_3_0_0 -)
-//	virtual QTextCustomItem *tag(const QString &,
-//				     const QMap<QString,QString> &,
-//				     const QString &,
-//				     const QMimeSourceFactory &,bool,
-//				     QTextDocument *) const;
+%If (TQt_3_0_0 -)
+//	virtual TQTextCustomItem *tag(const TQString &,
+//				     const TQMap<TQString,TQString> &,
+//				     const TQString &,
+//				     const TQMimeSourceFactory &,bool,
+//				     TQTextDocument *) const;
 %End
 
-%If (Qt_3_0_0 -)
-	static QString escape(const QString &);
-	static QString convertFromPlainText(const QString &,
-					    QStyleSheetItem::WhiteSpaceMode = QStyleSheetItem::WhiteSpacePre);
+%If (TQt_3_0_0 -)
+	static TQString escape(const TQString &);
+	static TQString convertFromPlainText(const TQString &,
+					    TQStyleSheetItem::WhiteSpaceMode = TQStyleSheetItem::WhiteSpacePre);
 %End
-%If (- Qt_3_0_0)
-	static QString convertFromPlainText(const QString &);
+%If (- TQt_3_0_0)
+	static TQString convertFromPlainText(const TQString &);
 %End
-	static bool mightBeRichText(const QString &);
+	static bool mightBeRichText(const TQString &);
 
-	virtual void scaleFont(QFont &,int) const;
-	virtual void error(const QString &) const;
+	virtual void scaleFont(TQFont &,int) const;
+	virtual void error(const TQString &) const;
 
 private:
-%If (Qt_3_1_0 -)
-	QStyleSheet(const QStyleSheet &);
+%If (TQt_3_1_0 -)
+	TQStyleSheet(const TQStyleSheet &);
 %End
 };
 
diff --git a/sip/qt/qsyntaxhighlighter.sip b/sip/qt/qsyntaxhighlighter.sip
index 13d24e8..b0fd978 100644
--- a/sip/qt/qsyntaxhighlighter.sip
+++ b/sip/qt/qsyntaxhighlighter.sip
@@ -1,55 +1,55 @@
-// This is the SIP interface definition for QSyntaxHighlighter.
+// This is the SIP interface definition for TQSyntaxHighlighter.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QSyntaxHighlighter (Qt v3.1+)</Title>
+<Sect2><Title>TQSyntaxHighlighter (TQt v3.1+)</Title>
 <Para>
-<Literal>QSyntaxHighlighter</Literal> is fully implemented.
+<Literal>TQSyntaxHighlighter</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 
-class QSyntaxHighlighter : Qt
+class TQSyntaxHighlighter : TQt
 {
 %TypeHeaderCode
 #include <qsyntaxhighlighter.h>
 %End
 
 public:
-	QSyntaxHighlighter(QTextEdit * /TransferThis/);
+	TQSyntaxHighlighter(TQTextEdit * /TransferThis/);
 
-	virtual int highlightParagraph(const QString &,int) = 0;
+	virtual int highlightParagraph(const TQString &,int) = 0;
 
-	void setFormat(int,int,const QFont &,const QColor &);
-	void setFormat(int,int,const QColor &);
-	void setFormat(int,int,const QFont &);
-	QTextEdit *textEdit() const;
+	void setFormat(int,int,const TQFont &,const TQColor &);
+	void setFormat(int,int,const TQColor &);
+	void setFormat(int,int,const TQFont &);
+	TQTextEdit *textEdit() const;
 
 	void rehighlight();
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	int currentParagraph() const;
 %End
 };
diff --git a/sip/qt/qtabbar.sip b/sip/qt/qtabbar.sip
index d53ffab..908011d 100644
--- a/sip/qt/qtabbar.sip
+++ b/sip/qt/qtabbar.sip
@@ -1,64 +1,64 @@
-// This is the SIP interface definition for QTab and QTabBar.
+// This is the SIP interface definition for TQTab and TQTabBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTab</Title>
+<Sect2><Title>TQTab</Title>
 <Para>
-<Literal>QTab</Literal> is fully implemented.
+<Literal>TQTab</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTabBar</Title>
+<Sect2><Title>TQTabBar</Title>
 <FuncSynopsis>
-        <FuncDef>QList&lt;QTab&gt; <Function>tabList</Function></FuncDef>
+        <FuncDef>TQList&lt;TQTab&gt; <Function>tabList</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-This returns a list of <Literal>QTab</Literal> instances.
+This returns a list of <Literal>TQTab</Literal> instances.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QTab : Qt
+class TQTab : TQt
 {
 %TypeHeaderCode
 #include <qtabbar.h>
 %End
 
 public:
-	QTab();
-	QTab(const QString &);
-	QTab(const QIconSet &,const QString & = QString::null);
-	virtual ~QTab();
-
-	void setText(const QString &);
-	QString text() const;
-	void setIconSet(const QIconSet &);
-	QIconSet *iconSet() const;
-	void setRect(const QRect &);
-	QRect rect() const;
+	TQTab();
+	TQTab(const TQString &);
+	TQTab(const TQIconSet &,const TQString & = TQString::null);
+	virtual ~TQTab();
+
+	void setText(const TQString &);
+	TQString text() const;
+	void setIconSet(const TQIconSet &);
+	TQIconSet *iconSet() const;
+	void setRect(const TQRect &);
+	TQRect rect() const;
 	void setEnabled(bool);
 	bool isEnabled() const;
 	void setIdentifier(int);
@@ -67,40 +67,40 @@ public:
 
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QTab
+class TQTab
 {
 %TypeHeaderCode
 #include <qtabbar.h>
 %End
 
 public:
-	QTab();
-%If (Qt_2_1_0 -)
-	QTab(const QString &);
-	QTab(const QIconSet &,const QString & = QString::null);
+	TQTab();
+%If (TQt_2_1_0 -)
+	TQTab(const TQString &);
+	TQTab(const TQIconSet &,const TQString & = TQString::null);
 %End
-	virtual ~QTab();
+	virtual ~TQTab();
 
-	QString label;
-	QRect r;
+	TQString label;
+	TQRect r;
 	bool enabled;
 	int id;
-	QIconSet *iconset;
+	TQIconSet *iconset;
 };
 
 %End
 
 
-class QTabBar : QWidget
+class TQTabBar : TQWidget
 {
 %TypeHeaderCode
 #include <qtabbar.h>
 %End
 
 public:
-	QTabBar(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTabBar(TQWidget * /TransferThis/ = 0,const char * = 0);
 
 	enum Shape {
 		RoundedAbove,
@@ -110,131 +110,131 @@ public:
 	};
 
 	Shape shape() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setShape(Shape);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setShape(Shape);
 %End
 
 	void show();
 
-	virtual int addTab(QTab * /Transfer/);
-%If (Qt_2_00 -)
-	virtual int insertTab(QTab * /Transfer/,int = -1);
-	virtual void removeTab(QTab *);
+	virtual int addTab(TQTab * /Transfer/);
+%If (TQt_2_00 -)
+	virtual int insertTab(TQTab * /Transfer/,int = -1);
+	virtual void removeTab(TQTab *);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setTabEnabled(int,bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setTabEnabled(int,bool);
 %End
 	bool isTabEnabled(int) const;
 
-	QSize sizeHint() const;
-%If (Qt_2_2_0 -)
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+%If (TQt_2_2_0 -)
+	TQSize minimumSizeHint() const;
 %End
-%If (Qt_2_00 -)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 -)
+	TQSizePolicy sizePolicy() const;
 %End
 
 	int currentTab() const;
 	int keyboardFocusTab() const;
 
-%If (- Qt_3_0_0)
-	QTab *tab(int);
+%If (- TQt_3_0_0)
+	TQTab *tab(int);
 %End
-%If (Qt_3_0_0 -)
-	QTab *tab(int) const;
-	QTab *tabAt(int) const;
+%If (TQt_3_0_0 -)
+	TQTab *tab(int) const;
+	TQTab *tabAt(int) const;
 	int indexOf(int) const;
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	int count() const;
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void layoutTabs();
 %End
-%If (Qt_3_0_0 -)
-	virtual QTab *selectTab(const QPoint &) const;
+%If (TQt_3_0_0 -)
+	virtual TQTab *selectTab(const TQPoint &) const;
  
 	void removeToolTip(int);
-	void setToolTip(int,const QString &);
-	QString toolTip(int) const;
+	void setToolTip(int,const TQString &);
+	TQString toolTip(int) const;
 %End
 
 public slots:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setCurrentTab(int);
-	void setCurrentTab(QTab *);
+	void setCurrentTab(TQTab *);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setCurrentTab(int);
-	virtual void setCurrentTab(QTab *);
+	virtual void setCurrentTab(TQTab *);
 %End
 
 signals:
 	void selected(int);
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void layoutChanged();
 %End
 
 protected:
-	virtual void paint(QPainter *,QTab *,bool) const;
-%If (Qt_2_00 -)
-	virtual void paintLabel(QPainter *,const QRect &,QTab *,bool) const;
+	virtual void paint(TQPainter *,TQTab *,bool) const;
+%If (TQt_2_00 -)
+	virtual void paintLabel(TQPainter *,const TQRect &,TQTab *,bool) const;
 %End
 
-%If (- Qt_3_0_0)
-	virtual QTab *selectTab(const QPoint &) const;
+%If (- TQt_3_0_0)
+	virtual TQTab *selectTab(const TQPoint &) const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 	void updateMask();
 %End
 
-%If (Qt_2_1_0 -)
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+%If (TQt_2_1_0 -)
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 
-	void resizeEvent(QResizeEvent *);
+	void resizeEvent(TQResizeEvent *);
 %End
-	void paintEvent(QPaintEvent *);
-	void mousePressEvent(QMouseEvent *);
-%If (Qt_3_0_0 -)
-	void mouseMoveEvent(QMouseEvent *);
+	void paintEvent(TQPaintEvent *);
+	void mousePressEvent(TQMouseEvent *);
+%If (TQt_3_0_0 -)
+	void mouseMoveEvent(TQMouseEvent *);
 %End
-	void mouseReleaseEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_1_0 -)
-	void styleChange(QStyle &);
+	void mouseReleaseEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_1_0 -)
+	void styleChange(TQStyle &);
 %End
-%If (Qt_3_0_0 -)
-	void fontChange(const QFont &);
+%If (TQt_3_0_0 -)
+	void fontChange(const TQFont &);
 %End
 
-%If (Qt_3_1_0 -)
-	bool event(QEvent *);
+%If (TQt_3_1_0 -)
+	bool event(TQEvent *);
 %End
 
-	SIP_PYLIST tabList() [QList<QTab> *()];
+	SIP_PYLIST tabList() [TQList<TQTab> *()];
 %MethodCode
 		if ((sipRes = PyList_New(0)) == NULL)
 			sipIsErr = 1;
 		else
 		{
-			QList<QTab> *tl;
-			QTab *tab;
+			TQList<TQTab> *tl;
+			TQTab *tab;
 
 			Py_BEGIN_ALLOW_THREADS
 			tl = sipCpp -> sipProtect_tabList();
 			Py_END_ALLOW_THREADS
 
 			// Convert the list.
-			for (QListIterator<QTab> it(*tl); (tab = it.current()) != NULL; ++it)
+			for (TQListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it)
 			{
 				PyObject *inst = sipBuildResult(&sipIsErr,"C",tab,sipClass_QTab,NULL);
 
@@ -260,7 +260,7 @@ protected:
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QTabBar(const QTabBar &);
+%If (TQt_2_1_0 -)
+	TQTabBar(const TQTabBar &);
 %End
 };
diff --git a/sip/qt/qtabdialog.sip b/sip/qt/qtabdialog.sip
index 115cf9d..8e930e1 100644
--- a/sip/qt/qtabdialog.sip
+++ b/sip/qt/qtabdialog.sip
@@ -1,142 +1,142 @@
-// This is the SIP interface definition for QTabDialog.
+// This is the SIP interface definition for TQTabDialog.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTabDialog</Title>
+<Sect2><Title>TQTabDialog</Title>
 <Para>
-<Literal>QTabDialog</Literal> is fully implemented.
+<Literal>TQTabDialog</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_TABDIALOG)
+%If (TQt_TABDIALOG)
 
-class QTabDialog : QDialog
+class TQTabDialog : TQDialog
 {
 %TypeHeaderCode
 #include <qtabdialog.h>
 %End
 
 public:
-	QTabDialog(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQTabDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 		   WFlags = 0);
 
 	void show();
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 
-%If (- Qt_2_00)
-	void addTab(QWidget *,const char *);
+%If (- TQt_2_00)
+	void addTab(TQWidget *,const char *);
 %End
-%If (Qt_2_00 -)
-	void addTab(QWidget *,const QString &);
-	void addTab(QWidget *,const QIconSet &,const QString &);
+%If (TQt_2_00 -)
+	void addTab(TQWidget *,const TQString &);
+	void addTab(TQWidget *,const TQIconSet &,const TQString &);
 %End
-	void addTab(QWidget *,QTab *);
+	void addTab(TQWidget *,TQTab *);
 
-%If (Qt_2_00 -)
-	void insertTab(QWidget *,const QString &,int = -1);
-	void insertTab(QWidget *,const QIconSet &,const QString &,int = -1);
-	void insertTab(QWidget *,QTab *,int = -1);
+%If (TQt_2_00 -)
+	void insertTab(TQWidget *,const TQString &,int = -1);
+	void insertTab(TQWidget *,const TQIconSet &,const TQString &,int = -1);
+	void insertTab(TQWidget *,TQTab *,int = -1);
 
-	void changeTab(QWidget *,const QString &);
-	void changeTab(QWidget *,const QIconSet &,const QString &);
+	void changeTab(TQWidget *,const TQString &);
+	void changeTab(TQWidget *,const TQIconSet &,const TQString &);
 %End
 
-%If (Qt_2_00 -)
-	bool isTabEnabled(QWidget *) const;
-	void setTabEnabled(QWidget *,bool);
+%If (TQt_2_00 -)
+	bool isTabEnabled(TQWidget *) const;
+	void setTabEnabled(TQWidget *,bool);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool isTabEnabled(const char *) const;
 	void setTabEnabled(const char *,bool);
 %End
 
-	void showPage(QWidget *);
-%If (Qt_2_00 -)
-	void removePage(QWidget *);
-	QString tabLabel(QWidget *);
+	void showPage(TQWidget *);
+%If (TQt_2_00 -)
+	void removePage(TQWidget *);
+	TQString tabLabel(TQWidget *);
 %End
-%If (- Qt_2_00)
-	const char *tabLabel(QWidget *);
+%If (- TQt_2_00)
+	const char *tabLabel(TQWidget *);
 %End
 
-%If (Qt_2_00 -)
-	QWidget *currentPage() const;
+%If (TQt_2_00 -)
+	TQWidget *currentPage() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setDefaultButton(const char * = "Defaults");
 %End
-%If (Qt_2_00 -)
-	void setDefaultButton(const QString &);
+%If (TQt_2_00 -)
+	void setDefaultButton(const TQString &);
 	void setDefaultButton();
 %End
 	bool hasDefaultButton() const;
 
-%If (Qt_2_00 -)
-	void setHelpButton(const QString &);
+%If (TQt_2_00 -)
+	void setHelpButton(const TQString &);
 	void setHelpButton();
 	bool hasHelpButton() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setCancelButton(const char * = "Cancel");
 %End
-%If (Qt_2_00 -)
-	void setCancelButton(const QString &);
+%If (TQt_2_00 -)
+	void setCancelButton(const TQString &);
 	void setCancelButton();
 %End
 	bool hasCancelButton() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setApplyButton(const char * = "Apply");
 %End
-%If (Qt_2_00 -)
-	void setApplyButton(const QString &);
+%If (TQt_2_00 -)
+	void setApplyButton(const TQString &);
 	void setApplyButton();
 %End
 	bool hasApplyButton() const;
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOkButton(const char * = "OK");
 %End
-%If (Qt_2_00 -)
-	void setOkButton(const QString &);
+%If (TQt_2_00 -)
+	void setOkButton(const TQString &);
 	void setOkButton();
 %End
 	bool hasOkButton() const;
 
 protected:
-	void paintEvent(QPaintEvent *);
-	void resizeEvent(QResizeEvent *);
-%If (- Qt_2_00)
+	void paintEvent(TQPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
+%If (- TQt_2_00)
 	void styleChange(GUIStyle);
 %End
-%If (Qt_2_00 -)
-	void styleChange(QStyle &);
+%If (TQt_2_00 -)
+	void styleChange(TQStyle &);
 %End
-	void setTabBar(QTabBar *);
-	QTabBar *tabBar() const;
+	void setTabBar(TQTabBar *);
+	TQTabBar *tabBar() const;
 
 signals:
 	void aboutToShow();
@@ -144,23 +144,23 @@ signals:
 	void applyButtonPressed();
 	void cancelButtonPressed();
 	void defaultButtonPressed();
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void helpButtonPressed();
 %End
 
-%If (Qt_2_2_0 -)
-	void currentChanged(QWidget *);
+%If (TQt_2_2_0 -)
+	void currentChanged(TQWidget *);
 %End
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void selected(const char *);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	void selected(const QString &);
+%If (TQt_2_00 - TQt_3_0_0)
+	void selected(const TQString &);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QTabDialog(const QTabDialog &);
+%If (TQt_2_1_0 -)
+	TQTabDialog(const TQTabDialog &);
 %End
 };
 
diff --git a/sip/qt/qtableview.sip b/sip/qt/qtableview.sip
index a2159be..3541ff9 100644
--- a/sip/qt/qtableview.sip
+++ b/sip/qt/qtableview.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QTableView.
+// This is the SIP interface definition for TQTableView.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTableView (Qt 1.x, Qt 2.x)</Title>
+<Sect2><Title>TQTableView (TQt 1.x, TQt 2.x)</Title>
 <FuncSynopsis>
         <FuncDef>bool <Function>colXPos</Function></FuncDef>
         <ParamDef>int <Parameter>col</Parameter></ParamDef>
@@ -45,8 +45,8 @@ the <Literal>bool</Literal> result and <Literal>yPos</Literal>.
 %End
 
 
-%If (Qt_TABLEVIEW)
-%If (- Qt_3_0_0)
+%If (TQt_TABLEVIEW)
+%If (- TQt_3_0_0)
 
 %ModuleHeaderCode
 #include <qtableview.h>
@@ -76,29 +76,29 @@ const uint Tbl_snapToVGrid;
 const uint Tbl_snapToGrid;
 
 
-class QTableView : QFrame
+class TQTableView : TQFrame
 {
 %TypeHeaderCode
 #include <qtableview.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	void setBackgroundColor(const QColor &);
-	void setPalette(const QPalette &);
+%If (- TQt_2_00)
+	void setBackgroundColor(const TQColor &);
+	void setPalette(const TQPalette &);
 %End
-%If (Qt_2_00 -)
-	virtual void setBackgroundColor(const QColor &);
-	virtual void setPalette(const QPalette &);
+%If (TQt_2_00 -)
+	virtual void setBackgroundColor(const TQColor &);
+	virtual void setPalette(const TQPalette &);
 %End
 	void show();
 	void repaint(bool = 1);
 	void repaint(int,int,int,int,bool = 1);
-	void repaint(const QRect &,bool = 1);
+	void repaint(const TQRect &,bool = 1);
 
 protected:
-	QTableView(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-	~QTableView();
+	TQTableView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	~TQTableView();
 
 	int numRows() const;
 	int numCols() const;
@@ -117,18 +117,18 @@ protected:
 	void clearTableFlags(uint = ~0);
 	bool autoUpdate() const;
 	void updateCell(int,int,bool = 1);
-	QRect cellUpdateRect() const;
-	QRect viewRect() const;
+	TQRect cellUpdateRect() const;
+	TQRect viewRect() const;
 	int lastRowVisible() const;
 	int lastColVisible() const;
 	bool rowIsVisible(int) const;
 	bool colIsVisible(int) const;
-	const QScrollBar *verticalScrollBar() const;
-	const QScrollBar *horizontalScrollBar() const;
-	virtual void paintCell(QPainter *,int,int) = 0;
-	virtual void setupPainter(QPainter *);
-	void paintEvent(QPaintEvent *);
-	void resizeEvent(QResizeEvent *);
+	const TQScrollBar *verticalScrollBar() const;
+	const TQScrollBar *horizontalScrollBar() const;
+	virtual void paintCell(TQPainter *,int,int) = 0;
+	virtual void setupPainter(TQPainter *);
+	void paintEvent(TQPaintEvent *);
+	void resizeEvent(TQResizeEvent *);
 	int findRow(int) const;
 	int findCol(int) const;
 	bool rowYPos(int,int *) const;
@@ -147,7 +147,7 @@ protected:
 	void updateScrollBars();
 	void updateTableSize();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setNumRows(int);
 	void setNumCols(int);
 	void setTopCell(int);
@@ -162,7 +162,7 @@ protected:
 	void setAutoUpdate(bool);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setNumRows(int);
 	virtual void setNumCols(int);
 	virtual void setTopCell(int);
@@ -178,7 +178,7 @@ protected:
 %End
 
 private:
-	QTableView(const QTableView &);
+	TQTableView(const TQTableView &);
 };
 
 %End
diff --git a/sip/qt/qtabwidget.sip b/sip/qt/qtabwidget.sip
index 2f78472..34f19e6 100644
--- a/sip/qt/qtabwidget.sip
+++ b/sip/qt/qtabwidget.sip
@@ -1,122 +1,122 @@
-// This is the SIP interface definition for QTabWidget.
+// This is the SIP interface definition for TQTabWidget.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTabWidget (Qt v2+)</Title>
+<Sect2><Title>TQTabWidget (TQt v2+)</Title>
 <Para>
-<Literal>QTabWidget</Literal> is fully implemented.
+<Literal>TQTabWidget</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QTabWidget : QWidget
+class TQTabWidget : TQWidget
 {
 %TypeHeaderCode
 #include <qtabwidget.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	QTabWidget(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQTabWidget(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	QTabWidget(QWidget * /TransferThis/,const char *,WFlags);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	TQTabWidget(TQWidget * /TransferThis/,const char *,WFlags);
 %End
-%If (- Qt_3_0_0)
-	QTabWidget(QWidget * /TransferThis/ = 0,const char * = 0);
+%If (- TQt_3_0_0)
+	TQTabWidget(TQWidget * /TransferThis/ = 0,const char * = 0);
 %End
 
-	// The QWidget is passed to QWidgetStack::addWidget().
-%If (- Qt_3_0_0)
-	void addTab(QWidget * /Transfer/,const QString &);
-	void addTab(QWidget * /Transfer/,const QIconSet &,const QString &);
-	void addTab(QWidget * /Transfer/,QTab *);
+	// The TQWidget is passed to TQWidgetStack::addWidget().
+%If (- TQt_3_0_0)
+	void addTab(TQWidget * /Transfer/,const TQString &);
+	void addTab(TQWidget * /Transfer/,const TQIconSet &,const TQString &);
+	void addTab(TQWidget * /Transfer/,TQTab *);
 
-	void insertTab(QWidget * /Transfer/,const QString &,int = -1);
-	void insertTab(QWidget * /Transfer/,const QIconSet &,const QString &,
+	void insertTab(TQWidget * /Transfer/,const TQString &,int = -1);
+	void insertTab(TQWidget * /Transfer/,const TQIconSet &,const TQString &,
 		       int = -1);
-	void insertTab(QWidget * /Transfer/,QTab *,int = -1);
+	void insertTab(TQWidget * /Transfer/,TQTab *,int = -1);
 %End
-%If (Qt_3_0_0 -)
-	virtual void addTab(QWidget * /Transfer/,const QString &);
-	virtual void addTab(QWidget * /Transfer/,const QIconSet &,
-			    const QString &);
-	virtual void addTab(QWidget * /Transfer/,QTab *);
+%If (TQt_3_0_0 -)
+	virtual void addTab(TQWidget * /Transfer/,const TQString &);
+	virtual void addTab(TQWidget * /Transfer/,const TQIconSet &,
+			    const TQString &);
+	virtual void addTab(TQWidget * /Transfer/,TQTab *);
 
-	virtual void insertTab(QWidget * /Transfer/,const QString &,int = -1);
-	virtual void insertTab(QWidget * /Transfer/,const QIconSet &,
-			       const QString &,int = -1);
-	virtual void insertTab(QWidget * /Transfer/,QTab *,int = -1);
+	virtual void insertTab(TQWidget * /Transfer/,const TQString &,int = -1);
+	virtual void insertTab(TQWidget * /Transfer/,const TQIconSet &,
+			       const TQString &,int = -1);
+	virtual void insertTab(TQWidget * /Transfer/,TQTab *,int = -1);
 %End
 
-	void changeTab(QWidget *,const QString &);
-	void changeTab(QWidget *,const QIconSet &,const QString &);
+	void changeTab(TQWidget *,const TQString &);
+	void changeTab(TQWidget *,const TQIconSet &,const TQString &);
 
-	bool isTabEnabled(QWidget *) const;
-	void setTabEnabled(QWidget *,bool);
+	bool isTabEnabled(TQWidget *) const;
+	void setTabEnabled(TQWidget *,bool);
 
-%If (Qt_3_2_0 -)
-	void setCornerWidget(QWidget *,Qt::Corner = Qt::TopRight);
-	QWidget *cornerWidget(Qt::Corner = Qt::TopRight) const;
+%If (TQt_3_2_0 -)
+	void setCornerWidget(TQWidget *,TQt::Corner = TQt::TopRight);
+	TQWidget *cornerWidget(TQt::Corner = TQt::TopRight) const;
 %End
 
-%If (- Qt_3_0_0)
-	void showPage(QWidget *);
-	void removePage(QWidget *);
+%If (- TQt_3_0_0)
+	void showPage(TQWidget *);
+	void removePage(TQWidget *);
 
-	QString tabLabel(QWidget *);
+	TQString tabLabel(TQWidget *);
 %End
-%If (Qt_3_0_0 -)
-	QString tabLabel(QWidget *) const;
-	void setTabLabel(QWidget *,const QString &);
+%If (TQt_3_0_0 -)
+	TQString tabLabel(TQWidget *) const;
+	void setTabLabel(TQWidget *,const TQString &);
  
-	QIconSet tabIconSet(QWidget *) const;
-	void setTabIconSet(QWidget *,const QIconSet &);
+	TQIconSet tabIconSet(TQWidget *) const;
+	void setTabIconSet(TQWidget *,const TQIconSet &);
  
-	void removeTabToolTip(QWidget *);
-	void setTabToolTip(QWidget *,const QString &);
-	QString tabToolTip(QWidget *) const;
+	void removeTabToolTip(TQWidget *);
+	void setTabToolTip(TQWidget *,const TQString &);
+	TQString tabToolTip(TQWidget *) const;
 %End
 
-	QWidget *currentPage() const;
-%If (Qt_3_0_0 -)
-	QWidget *page(int) const;
-	QString label(int) const;
+	TQWidget *currentPage() const;
+%If (TQt_3_0_0 -)
+	TQWidget *page(int) const;
+	TQString label(int) const;
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	int currentPageIndex() const;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	void setCurrentPage(int);
 %End
-%If (Qt_3_0_0 -)
-	int indexOf(QWidget *) const;
+%If (TQt_3_0_0 -)
+	int indexOf(TQWidget *) const;
 %End
 
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 	enum TabPosition {
 		Top,
@@ -126,7 +126,7 @@ public:
 	TabPosition tabPosition() const;
 	void setTabPosition(TabPosition);
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum TabShape {
 		Rounded,
 		Triangular
@@ -139,38 +139,38 @@ public:
 	int margin() const;
 	void setMargin(int);
 
-%If (Qt_2_1_0 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_1_0 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	int count() const;
 %End
 
 public slots:
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setCurrentPage(int);
-	virtual void showPage(QWidget *);
-	virtual void removePage(QWidget *);
+	virtual void showPage(TQWidget *);
+	virtual void removePage(TQWidget *);
 %End
 
 protected:
-	void showEvent(QShowEvent *);
-	void resizeEvent(QResizeEvent *);
-	void setTabBar(QTabBar *);
-	QTabBar *tabBar() const;
-	void styleChange(QStyle &);
+	void showEvent(TQShowEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void setTabBar(TQTabBar *);
+	TQTabBar *tabBar() const;
+	void styleChange(TQStyle &);
 	void updateMask();
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 signals:
-%If (Qt_2_2_0 -)
-	void currentChanged(QWidget *);
+%If (TQt_2_2_0 -)
+	void currentChanged(TQWidget *);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QTabWidget(const QTabWidget &);
+%If (TQt_2_1_0 -)
+	TQTabWidget(const TQTabWidget &);
 %End
 };
 
diff --git a/sip/qt/qtextbrowser.sip b/sip/qt/qtextbrowser.sip
index d7f4570..d9c60d3 100644
--- a/sip/qt/qtextbrowser.sip
+++ b/sip/qt/qtextbrowser.sip
@@ -1,92 +1,92 @@
-// This is the SIP interface definition for QTextBrowser.
+// This is the SIP interface definition for TQTextBrowser.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTextBrowser (Qt v2+)</Title>
+<Sect2><Title>TQTextBrowser (TQt v2+)</Title>
 <Para>
-<Literal>QTextBrowser</Literal> is fully implemented.
+<Literal>TQTextBrowser</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QTextBrowser : QTextEdit
+class TQTextBrowser : TQTextEdit
 {
 %TypeHeaderCode
 #include <qtextbrowser.h>
 %End
 
 public:
-	QTextBrowser(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextBrowser(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	QString source() const;
+	TQString source() const;
 
 public slots:
-	virtual void setSource(const QString &);
+	virtual void setSource(const TQString &);
 	virtual void backward();
 	virtual void forward();
 	virtual void home();
 	virtual void reload();
-	void setText(const QString &);
-	virtual void setText(const QString &,const QString &);
+	void setText(const TQString &);
+	virtual void setText(const TQString &,const TQString &);
 
 signals:
 	void backwardAvailable(bool);
 	void forwardAvailable(bool);
-%If (Qt_3_1_0 -)
-	void sourceChanged(const QString &);
+%If (TQt_3_1_0 -)
+	void sourceChanged(const TQString &);
 %End
-	void highlighted(const QString &);
-	void linkClicked(const QString &);
-%If (Qt_3_1_0 -)
-	void anchorClicked(const QString &,const QString &);
+	void highlighted(const TQString &);
+	void linkClicked(const TQString &);
+%If (TQt_3_1_0 -)
+	void anchorClicked(const TQString &,const TQString &);
 %End
 
 protected:
-	void keyPressEvent(QKeyEvent *);
+	void keyPressEvent(TQKeyEvent *);
 
 private:
-	QTextBrowser(const QTextBrowser &);
+	TQTextBrowser(const TQTextBrowser &);
 };
 
 %End
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 
-class QTextBrowser : QTextView
+class TQTextBrowser : TQTextView
 {
 %TypeHeaderCode
 #include <qtextbrowser.h>
 %End
 
 public:
-	QTextBrowser(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextBrowser(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	virtual void setSource(const QString &);
-	QString source() const;
-	void setText(const QString &,const QString & = QString::null);
-	void scrollToAnchor(const QString &);
+	virtual void setSource(const TQString &);
+	TQString source() const;
+	void setText(const TQString &,const TQString & = TQString::null);
+	void scrollToAnchor(const TQString &);
 
 public slots:
 	virtual void backward();
@@ -96,18 +96,18 @@ public slots:
 signals:
 	void backwardAvailable(bool);
 	void forwardAvailable(bool);
-	void highlighted(const QString &);
+	void highlighted(const TQString &);
 	void textChanged();
 
 protected:
-	void viewportMousePressEvent(QMouseEvent *);
-	void viewportMouseReleaseEvent(QMouseEvent *);
-	void viewportMouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
+	void viewportMousePressEvent(TQMouseEvent *);
+	void viewportMouseReleaseEvent(TQMouseEvent *);
+	void viewportMouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
 
 private:
-%If (Qt_2_1_0 -)
-	QTextBrowser(const QTextBrowser &);
+%If (TQt_2_1_0 -)
+	TQTextBrowser(const TQTextBrowser &);
 %End
 };
 
diff --git a/sip/qt/qtextcodec.sip b/sip/qt/qtextcodec.sip
index 626e12b..739fa95 100644
--- a/sip/qt/qtextcodec.sip
+++ b/sip/qt/qtextcodec.sip
@@ -1,108 +1,108 @@
-// This is the SIP interface definition for QTextCodec, QTextDecoder and
-// QTextEncoder.
+// This is the SIP interface definition for TQTextCodec, TQTextDecoder and
+// TQTextEncoder.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QTextCodec (Qt v2+)</Title>
+<Sect2><Title>TQTextCodec (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef>virtual QCString <Function>fromUnicode</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>uc</Parameter></ParamDef>
+	<FuncDef>virtual TQCString <Function>fromUnicode</Function></FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>uc</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>lenInOut</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-The returned value is a tuple of the <Literal>QCString</Literal> result and the
+The returned value is a tuple of the <Literal>TQCString</Literal> result and the
 updated <Literal>lenInOut</Literal>.
 </Para>
 </Sect2>
  
-<Sect2><Title>QTextDecoder (Qt v2+)</Title>
+<Sect2><Title>TQTextDecoder (TQt v2+)</Title>
 <Para>
-<Literal>QTextDecoder</Literal> is fully implemented.
+<Literal>TQTextDecoder</Literal> is fully implemented.
 </Para>
 </Sect2>
  
-<Sect2><Title>QTextEncoder (Qt v2+)</Title>
+<Sect2><Title>TQTextEncoder (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef>virtual QCString <Function>fromUnicode</Function> = 0</FuncDef>
-	<ParamDef>const QString &amp;<Parameter>uc</Parameter></ParamDef>
+	<FuncDef>virtual TQCString <Function>fromUnicode</Function> = 0</FuncDef>
+	<ParamDef>const TQString &amp;<Parameter>uc</Parameter></ParamDef>
 	<ParamDef>int &amp;<Parameter>lenInOut</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-The returned value is a tuple of the <Literal>QCString</Literal> result and the
+The returned value is a tuple of the <Literal>TQCString</Literal> result and the
 updated <Literal>lenInOut</Literal>.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QTextEncoder
+class TQTextEncoder
 {
 %TypeHeaderCode
 #include <qtextcodec.h>
 %End
 
 public:
-	virtual QCString fromUnicode(const QString &,int & /In,Out/) = 0;
+	virtual TQCString fromUnicode(const TQString &,int & /In,Out/) = 0;
 };
 
 
-class QTextDecoder
+class TQTextDecoder
 {
 %TypeHeaderCode
 #include <qtextcodec.h>
 %End
 
 public:
-	virtual QString toUnicode(const char *,int) = 0;
+	virtual TQString toUnicode(const char *,int) = 0;
 };
 
 
-class QTextCodec
+class TQTextCodec
 {
 %TypeHeaderCode
 #include <qtextcodec.h>
 %End
 
 public:
-%If (Qt_CODECS)
-	static QTextCodec *loadCharmap(QIODevice *);
-	static QTextCodec *loadCharmapFile(QString);
+%If (TQt_CODECS)
+	static TQTextCodec *loadCharmap(TQIODevice *);
+	static TQTextCodec *loadCharmapFile(TQString);
 %End
-	static QTextCodec *codecForMib(int);
-	static QTextCodec *codecForName(const char *,int = 0);
-	static QTextCodec *codecForContent(const char *,int);
-	static QTextCodec *codecForIndex(int);
-	static QTextCodec *codecForLocale();
-%If (Qt_3_0_0 -)
-	static void setCodecForLocale(QTextCodec *);
+	static TQTextCodec *codecForMib(int);
+	static TQTextCodec *codecForName(const char *,int = 0);
+	static TQTextCodec *codecForContent(const char *,int);
+	static TQTextCodec *codecForIndex(int);
+	static TQTextCodec *codecForLocale();
+%If (TQt_3_0_0 -)
+	static void setCodecForLocale(TQTextCodec *);
 %End
 
-%If (Qt_3_1_0 -)
-	static QTextCodec *codecForTr();
-	static void setCodecForTr(QTextCodec *);
-	static QTextCodec *codecForCStrings();
-	static void setCodecForCStrings(QTextCodec *);
+%If (TQt_3_1_0 -)
+	static TQTextCodec *codecForTr();
+	static void setCodecForTr(TQTextCodec *);
+	static TQTextCodec *codecForCStrings();
+	static void setCodecForCStrings(TQTextCodec *);
 %End
 
 	static void deleteAllCodecs();
@@ -110,37 +110,37 @@ public:
 	static const char *locale();
 
 	virtual const char *name() const = 0;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual const char *mimeName() const;
 %End
 	virtual int mibEnum() const = 0;
 
-	virtual QTextDecoder *makeDecoder() const /Factory/;
-	virtual QTextEncoder *makeEncoder() const /Factory/;
-
-	virtual QString toUnicode(const char *,int) const;
-	virtual QCString fromUnicode(const QString &,int & /In,Out/) const;
-	QCString fromUnicode(const QString &) const;
-	QString toUnicode(const QByteArray &,int) const;
-	QString toUnicode(const QByteArray &) const;
-%If (Qt_3_0_0 -)
-	QString toUnicode(const QCString &,int) const;
-	QString toUnicode(const QCString &) const;
+	virtual TQTextDecoder *makeDecoder() const /Factory/;
+	virtual TQTextEncoder *makeEncoder() const /Factory/;
+
+	virtual TQString toUnicode(const char *,int) const;
+	virtual TQCString fromUnicode(const TQString &,int & /In,Out/) const;
+	TQCString fromUnicode(const TQString &) const;
+	TQString toUnicode(const TQByteArray &,int) const;
+	TQString toUnicode(const TQByteArray &) const;
+%If (TQt_3_0_0 -)
+	TQString toUnicode(const TQCString &,int) const;
+	TQString toUnicode(const TQCString &) const;
 %End
-	QString toUnicode(const char *) const;
-	virtual bool canEncode(QChar) const;
-	virtual bool canEncode(const QString &) const;
+	TQString toUnicode(const char *) const;
+	virtual bool canEncode(TQChar) const;
+	virtual bool canEncode(const TQString &) const;
 
 	virtual int heuristicContentMatch(const char *,int) const = 0;
 	virtual int heuristicNameMatch(const char *) const;
 
-%If (Qt_3_0_0 -)
-	virtual QByteArray fromUnicode(const QString &,int,int) const;
-	virtual unsigned short characterFromUnicode(const QString &,int) const;
+%If (TQt_3_0_0 -)
+	virtual TQByteArray fromUnicode(const TQString &,int,int) const;
+	virtual unsigned short characterFromUnicode(const TQString &,int) const;
 %End
 
 protected:
-	QTextCodec();
+	TQTextCodec();
 };
 
 %End
diff --git a/sip/qt/qtextedit.sip b/sip/qt/qtextedit.sip
index 3576bf3..4d2362c 100644
--- a/sip/qt/qtextedit.sip
+++ b/sip/qt/qtextedit.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QTextEdit.
+// This is the SIP interface definition for TQTextEdit.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTextEdit (Qt v3+)</Title>
+<Sect2><Title>TQTextEdit (TQt v3+)</Title>
 <FuncSynopsis>
 <FuncDef>int <Function>charAt</Function></FuncDef>
-	<ParamDef>const QPoint &amp;<Parameter>pos</Parameter></ParamDef>
+	<ParamDef>const TQPoint &amp;<Parameter>pos</Parameter></ParamDef>
 	<ParamDef>int *<Parameter>para</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
@@ -42,7 +42,7 @@ This has been renamed <Literal>delChar</Literal> in Python.
 
 <FuncSynopsis>
 <FuncDef>virtual bool <Function>find</Function></FuncDef>
-	<ParamDef>const QString &amp;<Parameter>expr</Parameter></ParamDef>
+	<ParamDef>const TQString &amp;<Parameter>expr</Parameter></ParamDef>
 	<ParamDef>bool <Parameter>cs</Parameter></ParamDef>
 	<ParamDef>bool <Parameter>wo</Parameter></ParamDef>
 	<ParamDef>bool <Parameter>forward</Parameter> = TRUE</ParamDef>
@@ -83,16 +83,16 @@ the <Literal>paraFrom</Literal>, <Literal>indexFrom</Literal>,
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-// These aren't part of the public API in the Qt3 beta, so define them as
+// These aren't part of the public API in the TQt3 beta, so define them as
 // opaque for the moment.
 
-class QTextDocument;
-class QTextCursor;
+class TQTextDocument;
+class TQTextCursor;
 
 
-class QTextEdit : QScrollView
+class TQTextEdit : TQScrollView
 {
 %TypeHeaderCode
 #include <qtextedit.h>
@@ -110,12 +110,12 @@ public:
 		AtWordBoundary,
 		Anywhere,
 		AtWhiteSpace,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		AtWordOrDocumentBoundary
 %End
 	};
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum AutoFormatting {
 		AutoNone,
 		AutoBulletList,
@@ -128,7 +128,7 @@ public:
 		ActionDelete,
 		ActionReturn,
 		ActionKill,
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		ActionWordBackspace,
 		ActionWordDelete
 %End
@@ -155,7 +155,7 @@ public:
 		AlignSubScript
 	};
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum TextInsertionFlags {
 		RedoIndentation,
 		CheckNewLines,
@@ -163,24 +163,24 @@ public:
 	};
 %End
 
-	QTextEdit(const QString &,const QString & = QString::null,
-		  QWidget * /TransferThis/ = 0,const char * = 0);
-	QTextEdit(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextEdit(const TQString &,const TQString & = TQString::null,
+		  TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextEdit(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-	void setPalette(const QPalette &);
+	void setPalette(const TQPalette &);
 
-	QString text() const;
-	QString text(int) const;
+	TQString text() const;
+	TQString text(int) const;
 	TextFormat textFormat() const;
-	QString context() const;
-	QString documentTitle() const;
+	TQString context() const;
+	TQString documentTitle() const;
 
 	void getSelection(int *,int *,int *,int *,int = 0) const;
 
 	// We implement find() as two separate methods as it's the easiest way
-	// to handle the somewhat strange Qt interface.
-	virtual bool find(const QString &,bool,bool,bool = 1);
-	virtual bool find(const QString &,bool,bool,bool,int * /In,Out/,
+	// to handle the somewhat strange TQt interface.
+	virtual bool find(const TQString &,bool,bool,bool = 1);
+	virtual bool find(const TQString &,bool,bool,bool,int * /In,Out/,
 			  int * /In,Out/);
 
 	int paragraphs() const;
@@ -188,17 +188,17 @@ public:
 	int linesOfParagraph(int) const;
 	int lineOfChar(int,int);
 	int length() const;
-	QRect paragraphRect(int) const;
-	int paragraphAt(const QPoint &) const;
+	TQRect paragraphRect(int) const;
+	int paragraphAt(const TQPoint &) const;
 
 	// Note that this is handwritten code because the generated code would
 	// return the values in the (correct but) reverse order.
-	SIP_PYTUPLE charAt(const QPoint &) const;
+	SIP_PYTUPLE charAt(const TQPoint &) const;
 %MethodCode
 		int para, index;
  
 		Py_BEGIN_ALLOW_THREADS
-		index = sipCpp -> QTextEdit::charAt(*a0,&para);
+		index = sipCpp -> TQTextEdit::charAt(*a0,&para);
 		Py_END_ALLOW_THREADS
  
 		sipRes = sipBuildResult(&sipIsErr,"(ii)",para,index);
@@ -206,16 +206,16 @@ public:
 
 	int paragraphLength(int) const;
 
-	QStyleSheet *styleSheet() const;
-	QMimeSourceFactory *mimeSourceFactory() const;
+	TQStyleSheet *styleSheet() const;
+	TQMimeSourceFactory *mimeSourceFactory() const;
 
-	QBrush paper() const;
+	TQBrush paper() const;
 	bool linkUnderline() const;
 
 	int heightForWidth(int) const;
 
 	bool hasSelectedText() const;
-	QString selectedText() const;
+	TQString selectedText() const;
 	bool isUndoAvailable() const;
 	bool isRedoAvailable() const;
 
@@ -225,12 +225,12 @@ public:
 
 	int tabStopWidth() const;
 
-	QString anchorAt(const QPoint &);
-%If (Qt_3_1_0 -)
-	QString anchorAt(const QPoint &,AnchorAttribute);
+	TQString anchorAt(const TQPoint &);
+%If (TQt_3_1_0 -)
+	TQString anchorAt(const TQPoint &,AnchorAttribute);
 %End
 
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
 	bool isReadOnly() const;
 
@@ -240,33 +240,33 @@ public:
 	bool italic() const;
 	bool bold() const;
 	bool underline() const;
-	QString family() const;
+	TQString family() const;
 	int pointSize() const;
-	QColor color() const;
-	QFont font() const;
-%If (Qt_3_1_0 -)
-	QFont currentFont() const;
+	TQColor color() const;
+	TQFont font() const;
+%If (TQt_3_1_0 -)
+	TQFont currentFont() const;
 %End
 	int alignment() const;
 	int undoDepth() const;
 
 	// These are undocumented and marked as "don't use".
-	//virtual bool getFormat(int,int,QFont *,QColor *,VerticalAlignment *);
-	//virtual bool getParagraphFormat(int,QFont *,QColor *,
+	//virtual bool getFormat(int,int,TQFont *,TQColor *,VerticalAlignment *);
+	//virtual bool getParagraphFormat(int,TQFont *,TQColor *,
 	//				VerticalAlignment *,int *,
-	//				QStyleSheetItem::DisplayMode *,
-	//				QStyleSheetItem::ListStyle *,
+	//				TQStyleSheetItem::DisplayMode *,
+	//				TQStyleSheetItem::ListStyle *,
 	//				int *);
 
 	bool isOverwriteMode() const;
-	QColor paragraphBackgroundColor(int) const;
+	TQColor paragraphBackgroundColor(int) const;
 
 	bool isUndoRedoEnabled() const;
-	bool eventFilter(QObject *,QEvent *);
-%If (Qt_3_1_0 -)
+	bool eventFilter(TQObject *,TQEvent *);
+%If (TQt_3_1_0 -)
 	bool tabChangesFocus() const;
 
-	// Qt defines the following as uint rather than int because it uses the
+	// TQt defines the following as uint rather than int because it uses the
 	// AutoFormatting enum as a set of flags.  Because SIP implements enums
 	// as a subclass of int they are always signed.  AutoAll is defined as
 	// 0xffffffff which Python converts to -1 and then fails to convert it
@@ -275,16 +275,16 @@ public:
 	void setAutoFormatting(int);
 	int autoFormatting() const;
 %End
-%If (Qt_3_3_0 -)
-	QSyntaxHighlighter *syntaxHighlighter() const;
+%If (TQt_3_3_0 -)
+	TQSyntaxHighlighter *syntaxHighlighter() const;
 %End
 
 public slots:
 	void setEnabled(bool);
-	virtual void setMimeSourceFactory(QMimeSourceFactory *);
-	virtual void setStyleSheet(QStyleSheet *);
-	virtual void scrollToAnchor(const QString &);
-	virtual void setPaper(const QBrush &);
+	virtual void setMimeSourceFactory(TQMimeSourceFactory *);
+	virtual void setStyleSheet(TQStyleSheet *);
+	virtual void scrollToAnchor(const TQString &);
+	virtual void setPaper(const TQBrush &);
 	virtual void setLinkUnderline(bool);
 
 	virtual void setWordWrap(WordWrap);
@@ -292,10 +292,10 @@ public slots:
 	virtual void setWrapPolicy(WrapPolicy);
 
 	virtual void copy();
-	virtual void append(const QString &);
+	virtual void append(const TQString &);
 
-	void setText(const QString &);
-	virtual void setText(const QString &,const QString &);
+	void setText(const TQString &);
+	virtual void setText(const TQString &,const TQString &);
 	virtual void setTextFormat(TextFormat);
 
 	virtual void selectAll(bool = 1);
@@ -313,61 +313,61 @@ public slots:
 	virtual void redo();
 	virtual void cut();
 	virtual void paste();
-	virtual void pasteSubType(const QCString &);
+	virtual void pasteSubType(const TQCString &);
 	virtual void clear();
 	virtual void del() /PyName=delChar/;
 	virtual void indent();
 	virtual void setItalic(bool);
 	virtual void setBold(bool);
 	virtual void setUnderline(bool);
-	virtual void setFamily(const QString &);
+	virtual void setFamily(const TQString &);
 	virtual void setPointSize(int);
-	virtual void setColor(const QColor &);
-	virtual void setFont(const QFont &);
+	virtual void setColor(const TQColor &);
+	virtual void setFont(const TQFont &);
 	virtual void setVerticalAlignment(VerticalAlignment);
 	virtual void setAlignment(int);
-	virtual void setParagType(QStyleSheetItem::DisplayMode,
-				  QStyleSheetItem::ListStyle);
+	virtual void setParagType(TQStyleSheetItem::DisplayMode,
+				  TQStyleSheetItem::ListStyle);
 	virtual void setCursorPosition(int,int);
 	virtual void setSelection(int,int,int,int,int = 0);
-	virtual void setSelectionAttributes(int,const QColor &,bool);
+	virtual void setSelectionAttributes(int,const TQColor &,bool);
 	virtual void setModified(bool);
 	virtual void resetFormat();
 	virtual void setUndoDepth(int);
-//	Marked as internal in the Qt3 beta.
-//	virtual void setFormat(QTextFormat *,int);
+//	Marked as internal in the TQt3 beta.
+//	virtual void setFormat(TQTextFormat *,int);
 	virtual void ensureCursorVisible();
-	virtual void placeCursor(const QPoint &,QTextCursor * = 0);
+	virtual void placeCursor(const TQPoint &,TQTextCursor * = 0);
 	virtual void moveCursor(CursorAction,bool);
 	virtual void doKeyboardAction(KeyboardAction);
 	virtual void removeSelectedText(int = 0);
 	virtual void removeSelection(int = 0);
-	virtual void setCurrentFont(const QFont &);
+	virtual void setCurrentFont(const TQFont &);
 	virtual void setOverwriteMode(bool);
 
 	virtual void scrollToBottom();
 
-%If (Qt_3_1_0 -)
-	void insert(const QString &,uint = CheckNewLines | RemoveSelected);
-	virtual void insert(const QString &,bool,bool = 1,bool = 1);
+%If (TQt_3_1_0 -)
+	void insert(const TQString &,uint = CheckNewLines | RemoveSelected);
+	virtual void insert(const TQString &,bool,bool = 1,bool = 1);
 %End
-%If (- Qt_3_1_0)
-	virtual void insert(const QString &,bool = 0,bool = 1,bool = 1);
+%If (- TQt_3_1_0)
+	virtual void insert(const TQString &,bool = 0,bool = 1,bool = 1);
 %End
-	virtual void insertAt(const QString &,int,int);
+	virtual void insertAt(const TQString &,int,int);
 	virtual void removeParagraph(int);
-	virtual void insertParagraph(const QString &,int);
+	virtual void insertParagraph(const TQString &,int);
 
-	virtual void setParagraphBackgroundColor(int,const QColor &);
+	virtual void setParagraphBackgroundColor(int,const TQColor &);
 	virtual void clearParagraphBackground(int);
 
 	virtual void setUndoRedoEnabled(bool);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setTabChangesFocus(bool);
 
 	void polish();
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setMaxLogLines(int);
 	int maxLogLines();
 %End
@@ -378,15 +378,15 @@ signals:
 	void copyAvailable(bool);
 	void undoAvailable(bool);
 	void redoAvailable(bool);
-	void currentFontChanged(const QFont &);
-	void currentColorChanged(const QColor &);
+	void currentFontChanged(const TQFont &);
+	void currentColorChanged(const TQColor &);
 	void currentAlignmentChanged(int);
 	void currentVerticalAlignmentChanged(VerticalAlignment);
-	void cursorPositionChanged(QTextCursor *);
+	void cursorPositionChanged(TQTextCursor *);
 	void cursorPositionChanged(int,int);
 	void returnPressed();
 	void modificationChanged(bool);
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void clicked(int,int);
 	void doubleClicked(int,int);
 %End
@@ -394,43 +394,43 @@ signals:
 protected:
 	void repaintChanged();
 	void updateStyles();
-	void drawContents(QPainter *,int,int,int,int);
-	bool event(QEvent *);
-	void keyPressEvent(QKeyEvent *);
-	void resizeEvent(QResizeEvent *);
-	void viewportResizeEvent(QResizeEvent *);
-	void contentsMousePressEvent(QMouseEvent *);
-	void contentsMouseMoveEvent(QMouseEvent *);
-	void contentsMouseReleaseEvent(QMouseEvent *);
-	void contentsMouseDoubleClickEvent(QMouseEvent *);
-	void contentsWheelEvent(QWheelEvent *);
-	void imStartEvent(QIMEvent *);
-	void imComposeEvent(QIMEvent *);
-	void imEndEvent(QIMEvent *);
-	void contentsDragEnterEvent(QDragEnterEvent *);
-	void contentsDragMoveEvent(QDragMoveEvent *);
-	void contentsDragLeaveEvent(QDragLeaveEvent *);
-	void contentsDropEvent(QDropEvent *);
-	void contentsContextMenuEvent(QContextMenuEvent *);
+	void drawContents(TQPainter *,int,int,int,int);
+	bool event(TQEvent *);
+	void keyPressEvent(TQKeyEvent *);
+	void resizeEvent(TQResizeEvent *);
+	void viewportResizeEvent(TQResizeEvent *);
+	void contentsMousePressEvent(TQMouseEvent *);
+	void contentsMouseMoveEvent(TQMouseEvent *);
+	void contentsMouseReleaseEvent(TQMouseEvent *);
+	void contentsMouseDoubleClickEvent(TQMouseEvent *);
+	void contentsWheelEvent(TQWheelEvent *);
+	void imStartEvent(TQIMEvent *);
+	void imComposeEvent(TQIMEvent *);
+	void imEndEvent(TQIMEvent *);
+	void contentsDragEnterEvent(TQDragEnterEvent *);
+	void contentsDragMoveEvent(TQDragMoveEvent *);
+	void contentsDragLeaveEvent(TQDragLeaveEvent *);
+	void contentsDropEvent(TQDropEvent *);
+	void contentsContextMenuEvent(TQContextMenuEvent *);
 	bool focusNextPrevChild(bool);
-	QTextDocument *document() const;
-	QTextCursor *textCursor() const;
-	void setDocument(QTextDocument *);
-	virtual QPopupMenu *createPopupMenu(const QPoint &) /Factory/;
-	virtual QPopupMenu *createPopupMenu() /Factory/;
+	TQTextDocument *document() const;
+	TQTextCursor *textCursor() const;
+	void setDocument(TQTextDocument *);
+	virtual TQPopupMenu *createPopupMenu(const TQPoint &) /Factory/;
+	virtual TQPopupMenu *createPopupMenu() /Factory/;
 	void drawCursor(bool);
 
 	void windowActivationChange(bool);
 
 protected slots:
 	virtual void doChangeInterval();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void sliderReleased();
 %End
 
 private:
-%If (Qt_3_1_0 -)
-	QTextEdit(const QTextEdit &);
+%If (TQt_3_1_0 -)
+	TQTextEdit(const TQTextEdit &);
 %End
 };
 
diff --git a/sip/qt/qtextstream.sip b/sip/qt/qtextstream.sip
index 7e8abcd..d546eb2 100644
--- a/sip/qt/qtextstream.sip
+++ b/sip/qt/qtextstream.sip
@@ -1,30 +1,30 @@
-// This is the SIP interface definition for QTextStream, QTextIStream and
-// QTextOStream.
+// This is the SIP interface definition for TQTextStream, TQTextIStream and
+// TQTextOStream.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTextStream</Title>
+<Sect2><Title>TQTextStream</Title>
 <FuncSynopsis>
-	<FuncDef><Function>QTextStream</Function></FuncDef>
+	<FuncDef><Function>TQTextStream</Function></FuncDef>
 	<ParamDef>FILE *<Parameter>fp</Parameter></ParamDef>
 	<ParamDef>int <Parameter>mode</Parameter></ParamDef>
 </FuncSynopsis>
@@ -33,7 +33,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QTextStream &<Function>readRawBytes</Function></FuncDef>
+	<FuncDef>TQTextStream &<Function>readRawBytes</Function></FuncDef>
 	<ParamDef>char *<Parameter>buf</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
@@ -42,7 +42,7 @@ Not yet implemented.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QTextStream &<Function>writeRawBytes</Function></FuncDef>
+	<FuncDef>TQTextStream &<Function>writeRawBytes</Function></FuncDef>
 	<ParamDef>const char *<Parameter>buf</Parameter></ParamDef>
 	<ParamDef>uint <Parameter>len</Parameter></ParamDef>
 </FuncSynopsis>
@@ -51,9 +51,9 @@ Not yet implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTextIStream (Qt v2+)</Title>
+<Sect2><Title>TQTextIStream (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef><Function>QTextIStream</Function></FuncDef>
+	<FuncDef><Function>TQTextIStream</Function></FuncDef>
 	<ParamDef>FILE *<Parameter>fp</Parameter></ParamDef>
 	<ParamDef>int <Parameter>mode</Parameter></ParamDef>
 </FuncSynopsis>
@@ -62,9 +62,9 @@ Not implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTextOStream (Qt v2+)</Title>
+<Sect2><Title>TQTextOStream (TQt v2+)</Title>
 <FuncSynopsis>
-	<FuncDef><Function>QTextOStream</Function></FuncDef>
+	<FuncDef><Function>TQTextOStream</Function></FuncDef>
 	<ParamDef>FILE *<Parameter>fp</Parameter></ParamDef>
 	<ParamDef>int <Parameter>mode</Parameter></ParamDef>
 </FuncSynopsis>
@@ -75,14 +75,14 @@ Not implemented.
 %End
 
 
-class QTextStream
+class TQTextStream
 {
 %TypeHeaderCode
 #include <qtextstream.h>
 %End
 
 public:
-%If (Qt_2_00 - Qt_2_2_0)
+%If (TQt_2_00 - TQt_2_2_0)
 	enum Encoding {
 		Locale,
 		Latin1,
@@ -92,7 +92,7 @@ public:
 		RawUnicode
 	};
 %End
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	enum Encoding {
 		Locale,
 		Latin1,
@@ -104,37 +104,37 @@ public:
 	};
 %End
 
-	QTextStream();
-	QTextStream(QIODevice *);
-%If (Qt_2_00 -)
-	QTextStream(QString *,int);
+	TQTextStream();
+	TQTextStream(TQIODevice *);
+%If (TQt_2_00 -)
+	TQTextStream(TQString *,int);
 %End
-	QTextStream(QByteArray,int);
-//	QTextStream(FILE *,int);
+	TQTextStream(TQByteArray,int);
+//	TQTextStream(FILE *,int);
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setEncoding(Encoding);
-	void setCodec(QTextCodec *);
+	void setCodec(TQTextCodec *);
 %End
-%If (Qt_3_1_0 -)
-	QTextCodec *codec();
+%If (TQt_3_1_0 -)
+	TQTextCodec *codec();
 %End
 
-	QIODevice *device() const;
-	void setDevice(QIODevice *);
+	TQIODevice *device() const;
+	void setDevice(TQIODevice *);
 	void unsetDevice();
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool atEnd() const;
 %End
 	bool eof() const;
 
-//	QTextStream &readRawBytes(char *,uint) /ReleaseGIL/;
-//	QTextStream &writeRawBytes(const char *,uint) /ReleaseGIL/;
+//	TQTextStream &readRawBytes(char *,uint) /ReleaseGIL/;
+//	TQTextStream &writeRawBytes(const char *,uint) /ReleaseGIL/;
 
-	QString readLine() /ReleaseGIL/;
-%If (Qt_2_00 -)
-	QString read() /ReleaseGIL/;
+	TQString readLine() /ReleaseGIL/;
+%If (TQt_2_00 -)
+	TQString read() /ReleaseGIL/;
 	void skipWhiteSpace();
 %End
 
@@ -174,57 +174,57 @@ public:
 	int precision()	const;
 	int precision(int);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	// These are defined in qmainwindow.h as global operators so we have
 	// to implement them here and pretend they are class operators.
-	QTextStream &operator<<(const QMainWindow &);
-	QTextStream &operator>>(QMainWindow &);
+	TQTextStream &operator<<(const TQMainWindow &);
+	TQTextStream &operator>>(TQMainWindow &);
 
 	// These are defined in qdockarea.h as global operators so we have
 	// to implement them here and pretend they are class operators.
-	QTextStream &operator<<(const QDockArea &);
-	QTextStream &operator>>(QDockArea &);
+	TQTextStream &operator<<(const TQDockArea &);
+	TQTextStream &operator>>(TQDockArea &);
 %End
 
 private:
-	QTextStream(const QTextStream &);
+	TQTextStream(const TQTextStream &);
 };
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QTextIStream : QTextStream
+class TQTextIStream : TQTextStream
 {
 %TypeHeaderCode
 #include <qtextstream.h>
 %End
 
 public:
-	QTextIStream(QString *);
-	QTextIStream(QByteArray);
-//	QTextIStream(FILE *);
+	TQTextIStream(TQString *);
+	TQTextIStream(TQByteArray);
+//	TQTextIStream(FILE *);
 
 private:
-%If (Qt_3_1_0 -)
-	QTextIStream(const QTextIStream &);
+%If (TQt_3_1_0 -)
+	TQTextIStream(const TQTextIStream &);
 %End
 };
 
 
-class QTextOStream : QTextStream
+class TQTextOStream : TQTextStream
 {
 %TypeHeaderCode
 #include <qtextstream.h>
 %End
 
 public:
-	QTextOStream(QString *);
-	QTextOStream(QByteArray);
-//	QTextOStream(FILE *);
+	TQTextOStream(TQString *);
+	TQTextOStream(TQByteArray);
+//	TQTextOStream(FILE *);
 
 private:
-%If (Qt_3_1_0 -)
-	QTextOStream(const QTextOStream &);
+%If (TQt_3_1_0 -)
+	TQTextOStream(const TQTextOStream &);
 %End
 };
 
diff --git a/sip/qt/qtextview.sip b/sip/qt/qtextview.sip
index d79a34a..c17b0d0 100644
--- a/sip/qt/qtextview.sip
+++ b/sip/qt/qtextview.sip
@@ -1,127 +1,127 @@
-// This is the SIP interface definition for QTextView.
+// This is the SIP interface definition for TQTextView.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTextView (Qt v2+)</Title>
+<Sect2><Title>TQTextView (TQt v2+)</Title>
 <Para>
-<Literal>QTextView</Literal> is fully implemented.
+<Literal>TQTextView</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QTextView : QTextEdit
+class TQTextView : TQTextEdit
 {
 %TypeHeaderCode
 #include <qtextview.h>
 %End
 
 public:
-	QTextView(QWidget * /TransferThis/ = 0,const char * = 0);
-	QTextView(const QString &,const QString & = QString::null,
-		  QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextView(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextView(const TQString &,const TQString & = TQString::null,
+		  TQWidget * /TransferThis/ = 0,const char * = 0);
 
 private:
-%If (Qt_3_1_0 -)
-	QTextView(const QTextView &);
+%If (TQt_3_1_0 -)
+	TQTextView(const TQTextView &);
 %End
 };
 
 %End
 
 
-%If (Qt_2_00 - Qt_3_0_0)
+%If (TQt_2_00 - TQt_3_0_0)
 
-class QTextView : QScrollView
+class TQTextView : TQScrollView
 {
 %TypeHeaderCode
 #include <qtextview.h>
 %End
 
 public:
-	QTextView(QWidget * /TransferThis/ = 0,const char * = 0);
-	QTextView(const QString &,const QString & = QString::null,
-		  QWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextView(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQTextView(const TQString &,const TQString & = TQString::null,
+		  TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (- Qt_2_1_0)
-	virtual void setText(const QString &,const QString & = QString::null);
+%If (- TQt_2_1_0)
+	virtual void setText(const TQString &,const TQString & = TQString::null);
 %End
-%If (Qt_2_1_0 -)
-	virtual void setText(const QString &,const QString &);
-	void setText(const QString &);
+%If (TQt_2_1_0 -)
+	virtual void setText(const TQString &,const TQString &);
+	void setText(const TQString &);
 %End
-	virtual QString text() const;
-	virtual QString context() const;
-	Qt::TextFormat textFormat() const;
-	void setTextFormat(Qt::TextFormat);
-	QStyleSheet *styleSheet() const;
-	void setStyleSheet(QStyleSheet *);
-	void setPaper(const QBrush &);
-	const QBrush &paper();
-	void setPaperColorGroup(const QColorGroup &);
-	const QColorGroup &paperColorGroup() const;
-	void setLinkColor(const QColor &);
-	const QColor &linkColor() const;
+	virtual TQString text() const;
+	virtual TQString context() const;
+	TQt::TextFormat textFormat() const;
+	void setTextFormat(TQt::TextFormat);
+	TQStyleSheet *styleSheet() const;
+	void setStyleSheet(TQStyleSheet *);
+	void setPaper(const TQBrush &);
+	const TQBrush &paper();
+	void setPaperColorGroup(const TQColorGroup &);
+	const TQColorGroup &paperColorGroup() const;
+	void setLinkColor(const TQColor &);
+	const TQColor &linkColor() const;
 	void setLinkUnderline(bool);
 	bool linkUnderline() const;
-	void setMimeSourceFactory(QMimeSourceFactory *);
-	QMimeSourceFactory *mimeSourceFactory() const;
-	QString documentTitle() const;
+	void setMimeSourceFactory(TQMimeSourceFactory *);
+	TQMimeSourceFactory *mimeSourceFactory() const;
+	TQString documentTitle() const;
 	int heightForWidth(int) const;
-%If (Qt_2_1_0 -)
-	void append(const QString &);
+%If (TQt_2_1_0 -)
+	void append(const TQString &);
 	bool hasSelectedText() const;
-	QString selectedText() const;
+	TQString selectedText() const;
 %End
 
 public slots:
-%If (Qt_2_1_0 -)
-%If (Qt_CLIPBOARD)
+%If (TQt_2_1_0 -)
+%If (TQt_CLIPBOARD)
 	void copy();
 %End
 	void selectAll();
 %End
 
 protected:
-	void drawContentsOffset(QPainter *,int,int,int,int,int,int);
-	void resizeEvent(QResizeEvent *);
-	void viewportResizeEvent(QResizeEvent *);
-	void viewportMousePressEvent(QMouseEvent *);
-	void viewportMouseReleaseEvent(QMouseEvent *);
-	void viewportMouseMoveEvent(QMouseEvent *);
-	void keyPressEvent(QKeyEvent *);
-%If (Qt_2_1_0 -)
-	void showEvent(QShowEvent *);
-	void focusInEvent(QFocusEvent *);
-	void focusOutEvent(QFocusEvent *);
+	void drawContentsOffset(TQPainter *,int,int,int,int,int,int);
+	void resizeEvent(TQResizeEvent *);
+	void viewportResizeEvent(TQResizeEvent *);
+	void viewportMousePressEvent(TQMouseEvent *);
+	void viewportMouseReleaseEvent(TQMouseEvent *);
+	void viewportMouseMoveEvent(TQMouseEvent *);
+	void keyPressEvent(TQKeyEvent *);
+%If (TQt_2_1_0 -)
+	void showEvent(TQShowEvent *);
+	void focusInEvent(TQFocusEvent *);
+	void focusOutEvent(TQFocusEvent *);
 %End
-//	QRichText &richText() const;
-	void paletteChange(const QPalette &);
+//	TQRichText &richText() const;
+	void paletteChange(const TQPalette &);
 
 private:
-%If (Qt_2_1_0 -)
-	QTextView(const QTextView &);
+%If (TQt_2_1_0 -)
+	TQTextView(const TQTextView &);
 %End
 };
 
diff --git a/sip/qt/qthread.sip b/sip/qt/qthread.sip
index 29966c6..6f47b61 100644
--- a/sip/qt/qthread.sip
+++ b/sip/qt/qthread.sip
@@ -1,66 +1,66 @@
-// This is the SIP interface definition for QThread.
+// This is the SIP interface definition for TQThread.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QThread (Qt v2.2+)</Title>
+<Sect2><Title>TQThread (TQt v2.2+)</Title>
 <Para>
-<Literal>QThread</Literal> is fully implemented.
+<Literal>TQThread</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_THREAD_SUPPORT)
-%If (Qt_2_2_0 -)
+%If (TQt_THREAD_SUPPORT)
+%If (TQt_2_2_0 -)
 
-class QThread : Qt /CreatesThread/
+class TQThread : TQt /CreatesThread/
 {
 %TypeHeaderCode
 #include <qthread.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	static HANDLE currentThread();
 %End
-%If (Qt_3_0_0 -)
-	static Qt::HANDLE currentThread();
+%If (TQt_3_0_0 -)
+	static TQt::HANDLE currentThread();
 %End
-	static void postEvent(QObject *,QEvent * /Transfer/) /ReleaseGIL/;
-%If (Qt_3_0_0 -)
+	static void postEvent(TQObject *,TQEvent * /Transfer/) /ReleaseGIL/;
+%If (TQt_3_0_0 -)
 	static void initialize();
 	static void cleanup();
 %End
 
 	static void exit() /ReleaseGIL/;
 
-%If (Qt_3_1_0 -)
-	QThread(unsigned int);
+%If (TQt_3_1_0 -)
+	TQThread(unsigned int);
 %End
-	QThread();
+	TQThread();
 
 	bool wait(unsigned long = ULONG_MAX) /ReleaseGIL/;
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum Priority {
 		IdlePriority,
 		LowestPriority,
@@ -76,7 +76,7 @@ public:
 %End
 	void start() /ReleaseGIL/;
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void terminate();
 %End
 
@@ -91,7 +91,7 @@ protected:
 	static void usleep(unsigned long) /ReleaseGIL/;
 
 private:
-	QThread(const QThread &);
+	TQThread(const TQThread &);
 };
 
 %End
diff --git a/sip/qt/qtimer.sip b/sip/qt/qtimer.sip
index 62d20b2..bb7fc9b 100644
--- a/sip/qt/qtimer.sip
+++ b/sip/qt/qtimer.sip
@@ -1,42 +1,42 @@
-// This is the SIP interface definition for QTimer.
+// This is the SIP interface definition for TQTimer.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QTimer</Title>
+<Sect2><Title>TQTimer</Title>
 <Para>
-<Literal>QTimer</Literal> is fully implemented.
+<Literal>TQTimer</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QTimer : QObject
+class TQTimer : TQObject
 {
 %TypeHeaderCode
 #include <qtimer.h>
 %End
 
 public:
-	QTimer(QObject * /TransferThis/ = 0,char * = 0);
+	TQTimer(TQObject * /TransferThis/ = 0,char * = 0);
 
 	bool isActive() const;
 	int start(int,bool = 0);
@@ -44,7 +44,7 @@ public:
 	void stop();
 	static void singleShot(int,SIP_RXOBJ_CON,SIP_SLOT_CON());
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	int timerId() const;
 %End
 
@@ -52,8 +52,8 @@ signals:
 	void timeout();
 
 protected:
-	bool event(QEvent *);
+	bool event(TQEvent *);
 
 private:
-	QTimer(const QTimer &);
+	TQTimer(const TQTimer &);
 };
diff --git a/sip/qt/qtmod.sip b/sip/qt/qtmod.sip
index 045c779..d727a78 100644
--- a/sip/qt/qtmod.sip
+++ b/sip/qt/qtmod.sip
@@ -1,28 +1,28 @@
-// This is the SIP interface definition for the qt module of PyQt.
+// This is the SIP interface definition for the qt module of PyTQt.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %Module qt 2
 
-%Plugin PyQt3
+%Plugin PyTQt3
 
 %Include versions.sip
 %Include copying.sip
@@ -49,7 +49,7 @@ static const char *PYQT_VERSION_STR = "3.18.1";
 %PreInitialisationCode
 	if (!vendorid_check())
 	{
-		PyErr_SetString(PyExc_RuntimeError, "PyQt cannot be used with this Python interpreter");
+		PyErr_SetString(PyExc_RuntimeError, "PyTQt cannot be used with this Python interpreter");
 		return;
 	}
 %End
@@ -254,20 +254,20 @@ static const char *PYQT_VERSION_STR = "3.18.1";
 # Copyright (c) 2007
 # 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 # 
-# This file is part of PyQt.
+# This file is part of PyTQt.
 # 
-# This copy of PyQt is free software; you can redistribute it and/or modify it
+# This copy of PyTQt is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2, or (at your option) any later
 # version.
 # 
-# PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+# PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 # 
 # You should have received a copy of the GNU General Public License along with
-# PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+# PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
diff --git a/sip/qt/qtoolbar.sip b/sip/qt/qtoolbar.sip
index 7143ba0..3f281da 100644
--- a/sip/qt/qtoolbar.sip
+++ b/sip/qt/qtoolbar.sip
@@ -1,110 +1,110 @@
-// This is the SIP interface definition for QToolBar.
+// This is the SIP interface definition for TQToolBar.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QToolBar</Title>
+<Sect2><Title>TQToolBar</Title>
 <Para>
-<Literal>QToolBar</Literal> is fully implemented.
+<Literal>TQToolBar</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QToolBar : QDockWindow
+class TQToolBar : TQDockWindow
 {
 %TypeHeaderCode
 #include <qtoolbar.h>
 %End
 
 public:
-	QToolBar(const QString &,QMainWindow * /TransferThis/,Dock = DockTop,
+	TQToolBar(const TQString &,TQMainWindow * /TransferThis/,Dock = DockTop,
 		 bool = 0,const char * = 0);
-	QToolBar(const QString &,QMainWindow *,QWidget * /TransferThis/,
+	TQToolBar(const TQString &,TQMainWindow *,TQWidget * /TransferThis/,
 		 bool = 0,const char * = 0,WFlags = 0);
-	QToolBar(QMainWindow * /TransferThis/ = 0,const char * = 0);
+	TQToolBar(TQMainWindow * /TransferThis/ = 0,const char * = 0);
 
 	void addSeparator();
 
 	void show();
 	void hide();
 
-	QMainWindow *mainWindow() const;
+	TQMainWindow *mainWindow() const;
 
-	virtual void setStretchableWidget(QWidget *);
+	virtual void setStretchableWidget(TQWidget *);
 
-	bool event(QEvent *);
+	bool event(TQEvent *);
 
-	virtual void setLabel(const QString &);
-	QString label() const;
+	virtual void setLabel(const TQString &);
+	TQString label() const;
 
 	virtual void clear();
 
-	QSize minimumSize() const;
-	QSize minimumSizeHint() const;
+	TQSize minimumSize() const;
+	TQSize minimumSizeHint() const;
 
 	void setOrientation(Orientation);
 	void setMinimumSize(int,int);
 
 protected:
-	void resizeEvent(QResizeEvent *);
-	void styleChange(QStyle &);
+	void resizeEvent(TQResizeEvent *);
+	void styleChange(TQStyle &);
 
 private:
-	QToolBar(const QToolBar &);
+	TQToolBar(const TQToolBar &);
 };
 
 %End
 
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 
-class QToolBar : QWidget
+class TQToolBar : TQWidget
 {
 %TypeHeaderCode
 #include <qtoolbar.h>
 %End
 
 public:
-%If (- Qt_2_00)
-	QToolBar(const char *,QMainWindow * /TransferThis/,
-		 QMainWindow::ToolBarDock = QMainWindow::Top,
+%If (- TQt_2_00)
+	TQToolBar(const char *,TQMainWindow * /TransferThis/,
+		 TQMainWindow::ToolBarDock = TQMainWindow::Top,
 		 bool = 0,const char * = 0);
-	QToolBar(const char *,QMainWindow *,QWidget * /TransferThis/,bool = 0,
+	TQToolBar(const char *,TQMainWindow *,TQWidget * /TransferThis/,bool = 0,
 		 const char * = 0,WFlags = 0);
 %End
-%If (Qt_2_00 -)
-	QToolBar(const QString &,QMainWindow * /TransferThis/,
-		 QMainWindow::ToolBarDock = QMainWindow::Top,bool = 0,
+%If (TQt_2_00 -)
+	TQToolBar(const TQString &,TQMainWindow * /TransferThis/,
+		 TQMainWindow::ToolBarDock = TQMainWindow::Top,bool = 0,
 		 const char * = 0);
-	QToolBar(const QString &,QMainWindow *,QWidget * /TransferThis/,bool = 0,
+	TQToolBar(const TQString &,TQMainWindow *,TQWidget * /TransferThis/,bool = 0,
 		 const char * = 0,WFlags = 0);
 %End
-	QToolBar(QMainWindow * /TransferThis/ = 0,const char * = 0);
+	TQToolBar(TQMainWindow * /TransferThis/ = 0,const char * = 0);
 
 	void addSeparator();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	enum Orientation
 	{
 		Horizontal,
@@ -115,45 +115,45 @@ public:
 	virtual void setOrientation(Orientation);
 	Orientation orientation() const;
 	void show();
-	QMainWindow *mainWindow();
-	bool event(QEvent *);
-%If (- Qt_2_00)
-	void setStretchableWidget(QWidget *);
+	TQMainWindow *mainWindow();
+	bool event(TQEvent *);
+%If (- TQt_2_00)
+	void setStretchableWidget(TQWidget *);
 %End
-%If (Qt_2_00 -)
-	virtual void setStretchableWidget(QWidget *);
-	bool eventFilter(QObject *,QEvent *);
-	virtual void setLabel(const QString &);
-	QString label() const;
+%If (TQt_2_00 -)
+	virtual void setStretchableWidget(TQWidget *);
+	bool eventFilter(TQObject *,TQEvent *);
+	virtual void setLabel(const TQString &);
+	TQString label() const;
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void hide();
 	void setHorizontalStretchable(bool);
 	void setVerticalStretchable(bool);
 	bool isHorizontalStretchable() const;
 	bool isVerticalStretchable() const;
 	void clear();
-	QSize minimumSize() const;
-	QSize minimumSizeHint() const;
+	TQSize minimumSize() const;
+	TQSize minimumSizeHint() const;
 %End
 
 protected:
-	void paintEvent(QPaintEvent *);
-%If (Qt_2_1_0 -)
-	void resizeEvent(QResizeEvent *);
+	void paintEvent(TQPaintEvent *);
+%If (TQt_2_1_0 -)
+	void resizeEvent(TQResizeEvent *);
 %End
-%If (Qt_2_3_0 -)
-	void styleChange(QStyle &);
+%If (TQt_2_3_0 -)
+	void styleChange(TQStyle &);
 %End
 
 signals:
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void orientationChanged(Orientation);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QToolBar(const QToolBar &);
+%If (TQt_2_1_0 -)
+	TQToolBar(const TQToolBar &);
 %End
 };
 
diff --git a/sip/qt/qtoolbox.sip b/sip/qt/qtoolbox.sip
index 804d7dd..9e8e220 100644
--- a/sip/qt/qtoolbox.sip
+++ b/sip/qt/qtoolbox.sip
@@ -1,74 +1,74 @@
-// This is the SIP interface definition for QToolBox.
+// This is the SIP interface definition for TQToolBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QToolBox (Qt v3.2.0+)</Title>
+<Sect2><Title>TQToolBox (TQt v3.2.0+)</Title>
 <Para>
-<Literal>QToolBox</Literal> is fully implemented.
+<Literal>TQToolBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 
-class QToolBox : QFrame
+class TQToolBox : TQFrame
 {
 %TypeHeaderCode
 #include <qtoolbox.h>
 %End
 
 public:
-	QToolBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
-	~QToolBox();
+	TQToolBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	~TQToolBox();
 
-	int addItem(QWidget * /Transfer/,const QString &);
-	int addItem(QWidget * /Transfer/,const QIconSet &,const QString &);
-	int insertItem(int,QWidget * /Transfer/,const QString &);
-	int insertItem(int,QWidget * /Transfer/,const QIconSet &,
-		       const QString &);
+	int addItem(TQWidget * /Transfer/,const TQString &);
+	int addItem(TQWidget * /Transfer/,const TQIconSet &,const TQString &);
+	int insertItem(int,TQWidget * /Transfer/,const TQString &);
+	int insertItem(int,TQWidget * /Transfer/,const TQIconSet &,
+		       const TQString &);
 
-	// On return the QWidget will have the QToolBox as it's parent, so we
+	// On return the TQWidget will have the TQToolBox as it's parent, so we
 	// don't transfer ownership back.
-	int removeItem(QWidget *);
+	int removeItem(TQWidget *);
 
 	void setItemEnabled(int,bool);
 	bool isItemEnabled(int) const;
 
-	void setItemLabel(int,const QString &);
-	QString itemLabel(int) const;
+	void setItemLabel(int,const TQString &);
+	TQString itemLabel(int) const;
 
-	void setItemIconSet(int,const QIconSet &);
-	QIconSet itemIconSet(int) const;
+	void setItemIconSet(int,const TQIconSet &);
+	TQIconSet itemIconSet(int) const;
 
-	void setItemToolTip(int,const QString &);
-	QString itemToolTip(int) const;
+	void setItemToolTip(int,const TQString &);
+	TQString itemToolTip(int) const;
 
-	QWidget *currentItem() const;
-	void setCurrentItem(QWidget *);
+	TQWidget *currentItem() const;
+	void setCurrentItem(TQWidget *);
 
 	int currentIndex() const;
-	QWidget *item(int) const;
-	int indexOf(QWidget *) const;
+	TQWidget *item(int) const;
+	int indexOf(TQWidget *) const;
 	int count() const;
 
 public slots:
@@ -80,9 +80,9 @@ signals:
 protected:
 	virtual void itemInserted(int);
 	virtual void itemRemoved(int);
-	void showEvent(QShowEvent *);
+	void showEvent(TQShowEvent *);
 	void frameChanged();
-	void styleChange(QStyle &);
+	void styleChange(TQStyle &);
 };
 
 %End
diff --git a/sip/qt/qtoolbutton.sip b/sip/qt/qtoolbutton.sip
index 7de2e90..d640a8c 100644
--- a/sip/qt/qtoolbutton.sip
+++ b/sip/qt/qtoolbutton.sip
@@ -1,44 +1,44 @@
-// This is the SIP interface definition for QToolButton.
+// This is the SIP interface definition for TQToolButton.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QToolButton</Title>
+<Sect2><Title>TQToolButton</Title>
 <Para>
-<Literal>QToolButton</Literal> is fully implemented.
+<Literal>TQToolButton</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QToolButton : QButton
+class TQToolButton : TQButton
 {
 %TypeHeaderCode
 #include <qtoolbutton.h>
 %End
 
 public:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum TextPosition {
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		BesideIcon,
 		BelowIcon,
 %End
@@ -47,153 +47,153 @@ public:
 	};
 %End
 
-%If (- Qt_2_00)
-	QToolButton(QWidget * /TransferThis/ = 0,const char * = 0);
-	QToolButton(const QPixmap &,const char *,const char *,SIP_RXOBJ_CON,
-		    SIP_SLOT_CON(),QToolBar * /TransferThis/,const char * = 0);
-	QToolButton(QIconSet,const char *,const char *,SIP_RXOBJ_CON,
-		    SIP_SLOT_CON(),QToolBar * /TransferThis/,const char * = 0);
+%If (- TQt_2_00)
+	TQToolButton(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQToolButton(const TQPixmap &,const char *,const char *,SIP_RXOBJ_CON,
+		    SIP_SLOT_CON(),TQToolBar * /TransferThis/,const char * = 0);
+	TQToolButton(TQIconSet,const char *,const char *,SIP_RXOBJ_CON,
+		    SIP_SLOT_CON(),TQToolBar * /TransferThis/,const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QToolButton(QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_00 -)
+	TQToolButton(TQWidget * /TransferThis/,const char * = 0);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QToolButton(const QPixmap &,const QString &,const QString &,
-		    SIP_RXOBJ_CON,SIP_SLOT_CON(),QToolBar * /TransferThis/,
+%If (TQt_2_00 - TQt_3_0_0)
+	TQToolButton(const TQPixmap &,const TQString &,const TQString &,
+		    SIP_RXOBJ_CON,SIP_SLOT_CON(),TQToolBar * /TransferThis/,
 		    const char * = 0);
 %End
-%If (Qt_2_00 -)
-	QToolButton(const QIconSet &,const QString &,const QString &,
-		    SIP_RXOBJ_CON,SIP_SLOT_CON(),QToolBar * /TransferThis/,
+%If (TQt_2_00 -)
+	TQToolButton(const TQIconSet &,const TQString &,const TQString &,
+		    SIP_RXOBJ_CON,SIP_SLOT_CON(),TQToolBar * /TransferThis/,
 		    const char * = 0);
 %End
-%If (Qt_2_1_0 -)
-	QToolButton(ArrowType,QWidget * /TransferThis/,const char * = 0);
+%If (TQt_2_1_0 -)
+	TQToolButton(ArrowType,TQWidget * /TransferThis/,const char * = 0);
 %End
 
-	QSize sizeHint() const;
-%If (Qt_3_0_0 -)
-	QSize minimumSizeHint() const;
+	TQSize sizeHint() const;
+%If (TQt_3_0_0 -)
+	TQSize minimumSizeHint() const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
 
-%If (Qt_2_1_0 - Qt_3_0_0)
-	void setOnIconSet(const QIconSet &);
-	void setOffIconSet(const QIconSet &);
+%If (TQt_2_1_0 - TQt_3_0_0)
+	void setOnIconSet(const TQIconSet &);
+	void setOffIconSet(const TQIconSet &);
 %End
-%If (- Qt_2_00)
-	void setIconSet(const QIconSet &);
+%If (- TQt_2_00)
+	void setIconSet(const TQIconSet &);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual void setIconSet(const QIconSet &,bool = 0);
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual void setIconSet(const TQIconSet &,bool = 0);
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
-	QIconSet onIconSet() const;
-	QIconSet offIconSet() const;
+%If (TQt_2_1_0 - TQt_3_0_0)
+	TQIconSet onIconSet() const;
+	TQIconSet offIconSet() const;
 %End
-%If (- Qt_2_00)
-	QIconSet iconSet() const;
+%If (- TQt_2_00)
+	TQIconSet iconSet() const;
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	QIconSet iconSet(bool = 0) const;
+%If (TQt_2_00 - TQt_3_0_0)
+	TQIconSet iconSet(bool = 0) const;
 %End
-%If (Qt_3_0_0 -)
-	virtual void setIconSet(const QIconSet &);
-	QIconSet iconSet() const;
+%If (TQt_3_0_0 -)
+	virtual void setIconSet(const TQIconSet &);
+	TQIconSet iconSet() const;
 %End
 
 	bool usesBigPixmap() const;
 	bool usesTextLabel() const;
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	const char *textLabel() const;
 %End
-%If (Qt_2_00 -)
-	QString textLabel() const;
+%If (TQt_2_00 -)
+	TQString textLabel() const;
 %End
 
-%If (Qt_2_1_0 -)
-	void setPopup(QPopupMenu *);
-	QPopupMenu* popup() const;
+%If (TQt_2_1_0 -)
+	void setPopup(TQPopupMenu *);
+	TQPopupMenu* popup() const;
 
 	void setPopupDelay(int);
 	int popupDelay() const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void openPopup();
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setAutoRaise(bool);
 	bool autoRaise() const;
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	TextPosition textPosition() const;
 %End
 
-%If (Qt_3_2_0 -)
-	void setText(const QString &);
+%If (TQt_3_2_0 -)
+	void setText(const TQString &);
 %End
 
 public slots:
 	virtual void setUsesBigPixmap(bool);
 	virtual void setUsesTextLabel(bool);
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual void setTextLabel(const char *,bool = 1);
 %End
-%If (Qt_2_00 - Qt_3_0_0)
-	virtual void setTextLabel(const QString &,bool = 1);
+%If (TQt_2_00 - TQt_3_0_0)
+	virtual void setTextLabel(const TQString &,bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setTextLabel(const QString &,bool);
+%If (TQt_3_0_0 -)
+	virtual void setTextLabel(const TQString &,bool);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setToggleButton(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setToggleButton(bool);
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setOn(bool);
 %End
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	virtual void setOn(bool);
 %End
 	void toggle();
-%If (Qt_3_0_0 -)
-	// This was actually introduced in Qt v2.1.0 but gives signature
-	// conflict until Qt v3.0.0.
-	void setTextLabel(const QString &);
+%If (TQt_3_0_0 -)
+	// This was actually introduced in TQt v2.1.0 but gives signature
+	// conflict until TQt v3.0.0.
+	void setTextLabel(const TQString &);
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setTextPosition(TextPosition);
 %End
 
 protected:
-%If (Qt_3_0_0 -)
-	void mousePressEvent(QMouseEvent *);
+%If (TQt_3_0_0 -)
+	void mousePressEvent(TQMouseEvent *);
 %End
-	void drawButton(QPainter *);
-	void drawButtonLabel(QPainter *);
+	void drawButton(TQPainter *);
+	void drawButtonLabel(TQPainter *);
 
-	void enterEvent(QEvent *);
-	void leaveEvent(QEvent *);
-%If (Qt_2_1_0 -)
-	void moveEvent(QMoveEvent *);
+	void enterEvent(TQEvent *);
+	void leaveEvent(TQEvent *);
+%If (TQt_2_1_0 -)
+	void moveEvent(TQMoveEvent *);
 %End
 
 	bool uses3D() const;
 
-%If (Qt_3_0_0 -)
-	bool eventFilter(QObject *,QEvent *);
+%If (TQt_3_0_0 -)
+	bool eventFilter(TQObject *,TQEvent *);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QToolButton(const QToolButton &);
+%If (TQt_2_1_0 -)
+	TQToolButton(const TQToolButton &);
 %End
 };
diff --git a/sip/qt/qtooltip.sip b/sip/qt/qtooltip.sip
index 5dacad7..eb9a073 100644
--- a/sip/qt/qtooltip.sip
+++ b/sip/qt/qtooltip.sip
@@ -1,167 +1,167 @@
-// This is the SIP interface definition for QToolTip and QToolTipGroup.
+// This is the SIP interface definition for TQToolTip and TQToolTipGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QToolTip</Title>
+<Sect2><Title>TQToolTip</Title>
 <Para>
-<Literal>QToolTip</Literal> is fully implemented.
+<Literal>TQToolTip</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QToolTipGroup</Title>
+<Sect2><Title>TQToolTipGroup</Title>
 <Para>
-<Literal>QToolTipGroup</Literal> is fully implemented.
+<Literal>TQToolTipGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QToolTipGroup : QObject
+class TQToolTipGroup : TQObject
 {
 %TypeHeaderCode
 #include <qtooltip.h>
 %End
 
 public:
-	QToolTipGroup(QObject * /TransferThis/,const char * = 0);
+	TQToolTipGroup(TQObject * /TransferThis/,const char * = 0);
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	bool delay() const;
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	bool enabled() const;
 %End
 
 public slots:
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setDelay(bool);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setEnabled(bool);
 %End
 
 signals:
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void showTip(const char *);
 %End
-%If (Qt_2_00 -)
-	void showTip(const QString &);
+%If (TQt_2_00 -)
+	void showTip(const TQString &);
 %End
 	void removeTip();
  
 private:
-	QToolTipGroup(const QToolTipGroup &);
+	TQToolTipGroup(const TQToolTipGroup &);
 };
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QToolTip
+class TQToolTip
 {
 %TypeHeaderCode
 #include <qtooltip.h>
 %End
 
 public:
-	QToolTip(QWidget *,QToolTipGroup * = 0);
-
-	static void add(QWidget *,const char *);
-	static void add(QWidget *,const char *,QToolTipGroup *,const char *);
-	static void remove(QWidget *);
-	static void add(QWidget *,const QRect &,const char *);
-	static void add(QWidget *,const QRect &,const char *,QToolTipGroup *,const char *);
-	static void remove(QWidget *,const QRect &);
-	static QFont font();
-	static void setFont(const QFont &);
-	static QPalette palette();
-	static void setPalette(const QPalette &);
-	QWidget *parentWidget() const;
-	QToolTipGroup *group() const;
+	TQToolTip(TQWidget *,TQToolTipGroup * = 0);
+
+	static void add(TQWidget *,const char *);
+	static void add(TQWidget *,const char *,TQToolTipGroup *,const char *);
+	static void remove(TQWidget *);
+	static void add(TQWidget *,const TQRect &,const char *);
+	static void add(TQWidget *,const TQRect &,const char *,TQToolTipGroup *,const char *);
+	static void remove(TQWidget *,const TQRect &);
+	static TQFont font();
+	static void setFont(const TQFont &);
+	static TQPalette palette();
+	static void setPalette(const TQPalette &);
+	TQWidget *parentWidget() const;
+	TQToolTipGroup *group() const;
 
 protected:
-	virtual void maybeTip(const QPoint &) = 0;
-	void tip(const QRect &,const char *);
-	void tip(const QRect &,const char *,const char *);
+	virtual void maybeTip(const TQPoint &) = 0;
+	void tip(const TQRect &,const char *);
+	void tip(const TQRect &,const char *,const char *);
 	void clear();
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QToolTip : Qt
+class TQToolTip : TQt
 {
 %TypeHeaderCode
 #include <qtooltip.h>
 %End
 
 public:
-	QToolTip(QWidget *,QToolTipGroup * = 0);
+	TQToolTip(TQWidget *,TQToolTipGroup * = 0);
 
-	static void add(QWidget *,const QString &);
-	static void add(QWidget *,const QString &,QToolTipGroup *,
-			const QString &);
-	static void remove(QWidget *);
+	static void add(TQWidget *,const TQString &);
+	static void add(TQWidget *,const TQString &,TQToolTipGroup *,
+			const TQString &);
+	static void remove(TQWidget *);
 
-	static void add(QWidget *,const QRect &,const QString &);
-	static void add(QWidget *,const QRect &,const QString &,
-			QToolTipGroup *,const QString &);
-	static void remove(QWidget *,const QRect &);
+	static void add(TQWidget *,const TQRect &,const TQString &);
+	static void add(TQWidget *,const TQRect &,const TQString &,
+			TQToolTipGroup *,const TQString &);
+	static void remove(TQWidget *,const TQRect &);
 
-%If (Qt_3_0_0 -)
-	static QString textFor(QWidget *,const QPoint & = QPoint());
+%If (TQt_3_0_0 -)
+	static TQString textFor(TQWidget *,const TQPoint & = TQPoint());
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	static void hide();
 %End
 
-	static QFont font();
-	static void setFont(const QFont &);
-	static QPalette palette();
-	static void setPalette(const QPalette &);
+	static TQFont font();
+	static void setFont(const TQFont &);
+	static TQPalette palette();
+	static void setPalette(const TQPalette &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	static void setGloballyEnabled(bool);
 	static bool isGloballyEnabled();
 %End
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	static void setEnabled(bool);
 	static bool enabled();
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	static void setWakeUpDelay(int);
 %End
 
-	QWidget *parentWidget() const;
-	QToolTipGroup *group() const;
+	TQWidget *parentWidget() const;
+	TQToolTipGroup *group() const;
 
 protected:
-	virtual void maybeTip(const QPoint &) = 0;
-	void tip(const QRect &,const QString &);
-	void tip(const QRect &,const QString &,const QString &);
-%If (Qt_3_1_0 -)
-	void tip(const QRect &,const QString &,const QRect &);
-	void tip(const QRect &,const QString &,const QString &,const QRect &);
+	virtual void maybeTip(const TQPoint &) = 0;
+	void tip(const TQRect &,const TQString &);
+	void tip(const TQRect &,const TQString &,const TQString &);
+%If (TQt_3_1_0 -)
+	void tip(const TQRect &,const TQString &,const TQRect &);
+	void tip(const TQRect &,const TQString &,const TQString &,const TQRect &);
 %End
 	void clear();
 };
diff --git a/sip/qt/qtranslator.sip b/sip/qt/qtranslator.sip
index 08200ad..e368b7c 100644
--- a/sip/qt/qtranslator.sip
+++ b/sip/qt/qtranslator.sip
@@ -1,62 +1,62 @@
-// This is the SIP interface definition for QTranslator and QTranslatorMessage.
+// This is the SIP interface definition for TQTranslator and TQTranslatorMessage.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QTranslator (Qt v2+)</Title>
+<Sect2><Title>TQTranslator (TQt v2+)</Title>
 <Para>
-<Literal>QTranslator</Literal> is fully implemented.
+<Literal>TQTranslator</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QTranslatorMessage (Qt v2.2+)</Title>
+<Sect2><Title>TQTranslatorMessage (TQt v2.2+)</Title>
 <Para>
-<Literal>QTranslatorMessage</Literal> is fully implemented.
+<Literal>TQTranslatorMessage</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 
-class QTranslatorMessage
+class TQTranslatorMessage
 {
 %TypeHeaderCode
 #include <qtranslator.h>
 %End
 
 public:
-	QTranslatorMessage();
-	QTranslatorMessage(const char *,const char *,const char *,
-			   const QString & = QString::null);
-	QTranslatorMessage(QDataStream &);
-	QTranslatorMessage(const QTranslatorMessage &);
+	TQTranslatorMessage();
+	TQTranslatorMessage(const char *,const char *,const char *,
+			   const TQString & = TQString::null);
+	TQTranslatorMessage(TQDataStream &);
+	TQTranslatorMessage(const TQTranslatorMessage &);
  
 	uint hash() const;
 	const char *context() const;
 	const char *sourceText() const;
 	const char *comment() const;
  
-	void setTranslation(const QString &);
-	QString translation() const;
+	void setTranslation(const TQString &);
+	TQString translation() const;
  
 	enum Prefix {
 		NoPrefix,
@@ -66,61 +66,61 @@ public:
 		HashContextSourceTextComment
 	};
 
-%If (- Qt_3_0_0)
-	void write(QDataStream &,bool,
+%If (- TQt_3_0_0)
+	void write(TQDataStream &,bool,
 		   Prefix = HashContextSourceTextComment) const /ReleaseGIL/;
 %End
-%If (Qt_3_0_0 -)
-	void write(QDataStream &,bool = 0,
+%If (TQt_3_0_0 -)
+	void write(TQDataStream &,bool = 0,
 		   Prefix = HashContextSourceTextComment) const /ReleaseGIL/;
 %End
 
-	Prefix commonPrefix(const QTranslatorMessage &) const;
+	Prefix commonPrefix(const TQTranslatorMessage &) const;
 };
 
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QTranslator : QObject
+class TQTranslator : TQObject
 {
 %TypeHeaderCode
 #include <qtranslator.h>
 %End
 
 public:
-%If (Qt_3_2_0 -)
-	QTranslator(QObject * /TransferThis/ = 0,const char * = 0);
+%If (TQt_3_2_0 -)
+	TQTranslator(TQObject * /TransferThis/ = 0,const char * = 0);
 %End
-%If (- Qt_3_2_0)
-	QTranslator(QObject * /TransferThis/,const char * = 0);
+%If (- TQt_3_2_0)
+	TQTranslator(TQObject * /TransferThis/,const char * = 0);
 %End
 
-%If (Qt_2_2_0 -)
-	QString find(const char *,const char *,const char *) const;
+%If (TQt_2_2_0 -)
+	TQString find(const char *,const char *,const char *) const;
 %End
-%If (- Qt_3_0_0)
-	virtual QString find(const char *,const char *) const;
+%If (- TQt_3_0_0)
+	virtual TQString find(const char *,const char *) const;
 %End
 
-%If (Qt_2_2_0 - Qt_3_0_0)
-	QTranslatorMessage findMessage(const char *,const char *,
+%If (TQt_2_2_0 - TQt_3_0_0)
+	TQTranslatorMessage findMessage(const char *,const char *,
 				       const char *) const;
 %End
-%If (Qt_3_0_0 - Qt_3_2_0)
-	virtual QTranslatorMessage findMessage(const char *,const char *,
+%If (TQt_3_0_0 - TQt_3_2_0)
+	virtual TQTranslatorMessage findMessage(const char *,const char *,
 					       const char *) const;
 %End
-%If (Qt_3_2_0 -)
-	virtual QTranslatorMessage findMessage(const char *,const char *,
+%If (TQt_3_2_0 -)
+	virtual TQTranslatorMessage findMessage(const char *,const char *,
 					       const char * = 0) const;
 %End
 
-	bool load(const QString &,const QString & = QString::null,
-		  const QString & = QString::null,
-		  const QString & = QString::null);
-%If (Qt_3_1_0 -)
+	bool load(const TQString &,const TQString & = TQString::null,
+		  const TQString & = TQString::null,
+		  const TQString & = TQString::null);
+%If (TQt_3_1_0 -)
 	bool load(const uchar *,int);
 %End
 
@@ -131,47 +131,47 @@ public:
 		Stripped
 	};
 
-	bool save(const QString &,SaveMode = Everything);
+	bool save(const TQString &,SaveMode = Everything);
 
-%If (Qt_2_2_0 -)
-	void insert(const QTranslatorMessage &);
+%If (TQt_2_2_0 -)
+	void insert(const TQTranslatorMessage &);
 %End
-%If (- Qt_3_0_0)
-	void insert(const char *,const char *,const QString &);
+%If (- TQt_3_0_0)
+	void insert(const char *,const char *,const TQString &);
 %End
-%If (Qt_2_2_0 -)
-	void remove(const QTranslatorMessage &);
+%If (TQt_2_2_0 -)
+	void remove(const TQTranslatorMessage &);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void remove(const char *,const char *);
 %End
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool contains(const char *,const char *) const;
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	bool contains(const char *,const char *,const char *) const;
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool contains(const char *,const char *,const char * = 0) const;
 %End
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	void squeeze();
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	void squeeze(SaveMode);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void squeeze(SaveMode = Everything);
 %End
 	void unsqueeze();
 
-%If (Qt_2_2_0 -)
-	QValueList<QTranslatorMessage> messages() const;
+%If (TQt_2_2_0 -)
+	TQValueList<TQTranslatorMessage> messages() const;
 %End
 
 private:
-	QTranslator(const QTranslator &);
+	TQTranslator(const TQTranslator &);
 };
 
 %End
diff --git a/sip/qt/qurl.sip b/sip/qt/qurl.sip
index 7d343a9..2e1006e 100644
--- a/sip/qt/qurl.sip
+++ b/sip/qt/qurl.sip
@@ -1,116 +1,116 @@
-// This is the SIP interface definition for QUrl.
+// This is the SIP interface definition for TQUrl.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QUrl (Qt v2.1+)</Title>
+<Sect2><Title>TQUrl (TQt v2.1+)</Title>
 <Para>
-<Literal>QUrl</Literal> is fully implemented, including the
-<Literal>QString()</Literal>, <Literal>==</Literal> and <Literal>!=</Literal>
+<Literal>TQUrl</Literal> is fully implemented, including the
+<Literal>TQString()</Literal>, <Literal>==</Literal> and <Literal>!=</Literal>
 operators.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 
-class QUrl
+class TQUrl
 {
 %TypeHeaderCode
 #include <qurl.h>
 %End
 
 public:
-	QUrl();
-	QUrl(const QString &);
-	QUrl(const QUrl &);
-	QUrl(const QUrl &,const QString &,bool = 0);
+	TQUrl();
+	TQUrl(const TQString &);
+	TQUrl(const TQUrl &);
+	TQUrl(const TQUrl &,const TQString &,bool = 0);
 
-	QString protocol() const;
-	virtual void setProtocol(const QString &);
+	TQString protocol() const;
+	virtual void setProtocol(const TQString &);
 
-	QString user() const;
-	virtual void setUser(const QString &);
+	TQString user() const;
+	virtual void setUser(const TQString &);
 	bool hasUser() const;
 
-	QString password() const;
-	virtual void setPassword(const QString &);
+	TQString password() const;
+	virtual void setPassword(const TQString &);
 	bool hasPassword() const;
 
-	QString host() const;
-	virtual void setHost(const QString &);
+	TQString host() const;
+	virtual void setHost(const TQString &);
 	bool hasHost() const;
 
 	int port() const;
 	virtual void setPort(int);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool hasPort() const;
 %End
 
-	QString path(bool = 1) const;
-	virtual void setPath(const QString &);
+	TQString path(bool = 1) const;
+	virtual void setPath(const TQString &);
 	bool hasPath() const;
 
-	virtual void setEncodedPathAndQuery(const QString &);
-	QString encodedPathAndQuery();
+	virtual void setEncodedPathAndQuery(const TQString &);
+	TQString encodedPathAndQuery();
 
-	virtual void setQuery(const QString &);
-	QString query() const;
+	virtual void setQuery(const TQString &);
+	TQString query() const;
 
-	QString ref() const;
-	virtual void setRef(const QString &);
+	TQString ref() const;
+	virtual void setRef(const TQString &);
 	bool hasRef() const;
 
 	bool isValid() const;
 	bool isLocalFile() const;
 
-	virtual void addPath(const QString &);
-	virtual void setFileName(const QString &);
+	virtual void addPath(const TQString &);
+	virtual void setFileName(const TQString &);
 
-	QString fileName() const;
-	QString dirPath() const;
+	TQString fileName() const;
+	TQString dirPath() const;
 
-	bool operator==(const QUrl &) const;
-	bool operator==(const QString &) const;
+	bool operator==(const TQUrl &) const;
+	bool operator==(const TQString &) const;
 
-%If (Qt_SIP_PRE_4_7_2)
-	// Qt doesn't implement these, but SIP doesn't support C++'s default
+%If (TQt_SIP_PRE_4_7_2)
+	// TQt doesn't implement these, but SIP doesn't support C++'s default
     // handling of != when == is implemented.
-	bool operator!=(const QUrl &) const;
-	bool operator!=(const QString &) const;
+	bool operator!=(const TQUrl &) const;
+	bool operator!=(const TQString &) const;
 %End
 
-	static void decode(QString &);
-	static void encode(QString &);
+	static void decode(TQString &);
+	static void encode(TQString &);
 
-	virtual QString toString(bool = 0,bool = 0) const;
+	virtual TQString toString(bool = 0,bool = 0) const;
 
 	virtual bool cdUp();
 
-	static bool isRelativeUrl(const QString &);
+	static bool isRelativeUrl(const TQString &);
 
 protected:
 	virtual void reset();
-	virtual bool parse(const QString &);
+	virtual bool parse(const TQString &);
 };
 
 %End
diff --git a/sip/qt/qurlinfo.sip b/sip/qt/qurlinfo.sip
index 7f2d5d3..2f1e06b 100644
--- a/sip/qt/qurlinfo.sip
+++ b/sip/qt/qurlinfo.sip
@@ -1,45 +1,45 @@
-// This is the SIP interface definition for QUrlInfo.
+// This is the SIP interface definition for TQUrlInfo.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QUrlInfo (Qt v2.1+)</Title>
+<Sect2><Title>TQUrlInfo (TQt v2.1+)</Title>
 <Para>
-<Literal>QUrlInfo</Literal> is fully implemented.
+<Literal>TQUrlInfo</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_NETWORKPROTOCOL)
-%If (Qt_2_1_0 -)
+%If (TQt_NETWORKPROTOCOL)
+%If (TQt_2_1_0 -)
 
-class QUrlInfo
+class TQUrlInfo
 {
 %TypeHeaderCode
 #include <qurlinfo.h>
 %End
 
 public:
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum PermissionSpec {
 		ReadOwner, WriteOwner, ExeOwner,
 		ReadGroup, WriteGroup, ExeGroup,
@@ -47,39 +47,39 @@ public:
 	};
 %End
 
-	QUrlInfo();
-	QUrlInfo(const QUrlOperator &,const QString &);
-	QUrlInfo(const QUrlInfo &);
-	QUrlInfo(const QString &,int,const QString &,const QString &,uint,
-		 const QDateTime &,const QDateTime &,bool,bool,bool,bool,bool,
+	TQUrlInfo();
+	TQUrlInfo(const TQUrlOperator &,const TQString &);
+	TQUrlInfo(const TQUrlInfo &);
+	TQUrlInfo(const TQString &,int,const TQString &,const TQString &,uint,
+		 const TQDateTime &,const TQDateTime &,bool,bool,bool,bool,bool,
 		 bool);
-	QUrlInfo(const QUrl &,int,const QString &,const QString &,uint,
-		 const QDateTime &,const QDateTime &,bool,bool,bool,bool,bool,
+	TQUrlInfo(const TQUrl &,int,const TQString &,const TQString &,uint,
+		 const TQDateTime &,const TQDateTime &,bool,bool,bool,bool,bool,
 		 bool);
 
-	virtual void setName(const QString &);
+	virtual void setName(const TQString &);
 	virtual void setDir(bool);
 	virtual void setFile(bool);
 	virtual void setSymLink(bool);
-	virtual void setOwner(const QString &);
-	virtual void setGroup(const QString &);
+	virtual void setOwner(const TQString &);
+	virtual void setGroup(const TQString &);
 	virtual void setSize(uint);
 	virtual void setWritable(bool);
 	virtual void setReadable(bool);
 	virtual void setPermissions(int);
-	virtual void setLastModified(const QDateTime &);
+	virtual void setLastModified(const TQDateTime &);
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isValid() const;
 %End
 
-	QString name() const;
+	TQString name() const;
 	int permissions() const;
-	QString owner() const;
-	QString group() const;
+	TQString owner() const;
+	TQString group() const;
 	uint size() const;
-	QDateTime lastModified() const;
-	QDateTime lastRead() const;
+	TQDateTime lastModified() const;
+	TQDateTime lastRead() const;
 	bool isDir() const;
 	bool isFile() const;
 	bool isSymLink() const;
@@ -87,9 +87,9 @@ public:
 	bool isReadable() const;
 	bool isExecutable() const;
 
-	static bool greaterThan(const QUrlInfo &,const QUrlInfo &,int);
-	static bool lessThan(const QUrlInfo &,const QUrlInfo &,int);
-	static bool equal(const QUrlInfo &,const QUrlInfo &,int);
+	static bool greaterThan(const TQUrlInfo &,const TQUrlInfo &,int);
+	static bool lessThan(const TQUrlInfo &,const TQUrlInfo &,int);
+	static bool equal(const TQUrlInfo &,const TQUrlInfo &,int);
 };
 
 %End
diff --git a/sip/qt/qurloperator.sip b/sip/qt/qurloperator.sip
index b776516..522e1b2 100644
--- a/sip/qt/qurloperator.sip
+++ b/sip/qt/qurloperator.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QUrlOperator.
+// This is the SIP interface definition for TQUrlOperator.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QUrlOperator (Qt v2.1+)</Title>
+<Sect2><Title>TQUrlOperator (TQt v2.1+)</Title>
 <FuncSynopsis>
 	<FuncDef>virtual bool <Function>isDir</Function></FuncDef>
 	<ParamDef>bool *<Parameter>ok</Parameter></ParamDef>
@@ -34,76 +34,76 @@ This returns a tuple of the <Literal>bool</Literal> result and the
 %End
 
 
-%If (Qt_NETWORKPROTOCOL)
-%If (Qt_2_1_0 -)
+%If (TQt_NETWORKPROTOCOL)
+%If (TQt_2_1_0 -)
 
-class QUrlOperator : QObject, QUrl
+class TQUrlOperator : TQObject, TQUrl
 {
 %TypeHeaderCode
 #include <qurloperator.h>
 %End
 
 public:
-	QUrlOperator();
-	QUrlOperator(const QString &);
-	QUrlOperator(const QUrlOperator &);
-	QUrlOperator(const QUrlOperator &,const QString &,bool = 0);
+	TQUrlOperator();
+	TQUrlOperator(const TQString &);
+	TQUrlOperator(const TQUrlOperator &);
+	TQUrlOperator(const TQUrlOperator &,const TQString &,bool = 0);
 
-	virtual void setPath(const QString &);
+	virtual void setPath(const TQString &);
 	virtual bool cdUp();
 
-	virtual const QNetworkOperation *listChildren();
-	virtual const QNetworkOperation *mkdir(const QString &);
-	virtual const QNetworkOperation *remove(const QString &);
-	virtual const QNetworkOperation *rename(const QString &,
-						const QString &);
-	virtual const QNetworkOperation *get(const QString & = QString::null);
-	virtual const QNetworkOperation *put(const QByteArray &,
-					     const QString & = QString::null);
-%If (- Qt_3_0_0)
-	virtual QList<QNetworkOperation> copy(const QString &,const QString &,
+	virtual const TQNetworkOperation *listChildren();
+	virtual const TQNetworkOperation *mkdir(const TQString &);
+	virtual const TQNetworkOperation *remove(const TQString &);
+	virtual const TQNetworkOperation *rename(const TQString &,
+						const TQString &);
+	virtual const TQNetworkOperation *get(const TQString & = TQString::null);
+	virtual const TQNetworkOperation *put(const TQByteArray &,
+					     const TQString & = TQString::null);
+%If (- TQt_3_0_0)
+	virtual TQList<TQNetworkOperation> copy(const TQString &,const TQString &,
 					      bool = 0);
 %End
-%If (Qt_3_0_0 -)
-	virtual QPtrList<QNetworkOperation> copy(const QString &,
-						 const QString &,bool = 0,
+%If (TQt_3_0_0 -)
+	virtual TQPtrList<TQNetworkOperation> copy(const TQString &,
+						 const TQString &,bool = 0,
 						 bool = 1);
 %End
-	virtual void copy(const QStringList &,const QString &,bool = 0);
+	virtual void copy(const TQStringList &,const TQString &,bool = 0);
 	virtual bool isDir(bool * = 0);
 
-	virtual void setNameFilter(const QString &);
-	QString nameFilter() const;
+	virtual void setNameFilter(const TQString &);
+	TQString nameFilter() const;
 
-	virtual QUrlInfo info(const QString &) const;
+	virtual TQUrlInfo info(const TQString &) const;
 
 	virtual void stop();
 
 signals:
-	void newChildren(const QValueList<QUrlInfo> &,QNetworkOperation *);
-	void finished(QNetworkOperation *);
-	void start(QNetworkOperation *);
-	void createdDirectory(const QUrlInfo &,QNetworkOperation *);
-	void removed(QNetworkOperation *);
-	void itemChanged(QNetworkOperation *);
-	void data(const QByteArray &,QNetworkOperation *);
-	void dataTransferProgress(int,int,QNetworkOperation *);
-%If (- Qt_3_0_0)
-	void startedNextCopy(const QList<QNetworkOperation> &);
+	void newChildren(const TQValueList<TQUrlInfo> &,TQNetworkOperation *);
+	void finished(TQNetworkOperation *);
+	void start(TQNetworkOperation *);
+	void createdDirectory(const TQUrlInfo &,TQNetworkOperation *);
+	void removed(TQNetworkOperation *);
+	void itemChanged(TQNetworkOperation *);
+	void data(const TQByteArray &,TQNetworkOperation *);
+	void dataTransferProgress(int,int,TQNetworkOperation *);
+%If (- TQt_3_0_0)
+	void startedNextCopy(const TQList<TQNetworkOperation> &);
 %End
-%If (Qt_3_0_0 -)
-	void startedNextCopy(const QPtrList<QNetworkOperation> &);
+%If (TQt_3_0_0 -)
+	void startedNextCopy(const TQPtrList<TQNetworkOperation> &);
 %End
-	void connectionStateChanged(int,const QString &);
+	void connectionStateChanged(int,const TQString &);
 
 protected:
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void reset();
-	virtual bool parse(const QString &);
+	virtual bool parse(const TQString &);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void reset();
-	bool parse(const QString &);
+	bool parse(const TQString &);
 %End
 	virtual bool checkValid();
 	virtual void clearEntries();
diff --git a/sip/qt/quuid.sip b/sip/qt/quuid.sip
index 5836dfb..ff9eda0 100644
--- a/sip/qt/quuid.sip
+++ b/sip/qt/quuid.sip
@@ -1,44 +1,44 @@
-// This is the SIP interface definition for QUuid.
+// This is the SIP interface definition for TQUuid.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QUuid (Qt v3.0+)</Title>
+<Sect2><Title>TQUuid (TQt v3.0+)</Title>
 <Para>
-<Literal>QUuid</Literal> is fully implemented.
+<Literal>TQUuid</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QUuid
+class TQUuid
 {
 %TypeHeaderCode
 #include <quuid.h>
 %End
 
 public:
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	enum Variant
 	{
 		VarUnknown,
@@ -58,29 +58,29 @@ public:
 	};
 %End
 
-	QUuid();
-%If (Qt_3_0_1 -)
-	QUuid(uint,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar);
+	TQUuid();
+%If (TQt_3_0_1 -)
+	TQUuid(uint,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar);
 %End
-%If (- Qt_3_0_1)
-	QUuid(ulong,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar);
+%If (- TQt_3_0_1)
+	TQUuid(ulong,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar);
 %End
-	QUuid(const QUuid &);
-	QUuid(const QString &);
+	TQUuid(const TQUuid &);
+	TQUuid(const TQString &);
 
-	QString toString() const;
+	TQString toString() const;
 	bool isNull() const;
 
-	bool operator==(const QUuid &) const;
-	bool operator!=(const QUuid &) const;
+	bool operator==(const TQUuid &) const;
+	bool operator!=(const TQUuid &) const;
 
-%If (Qt_3_3_0 -)
-	bool operator<(const QUuid &) const;
-	bool operator>(const QUuid &) const;
+%If (TQt_3_3_0 -)
+	bool operator<(const TQUuid &) const;
+	bool operator>(const TQUuid &) const;
 
-	static QUuid createUuid();
-	QUuid::Variant variant() const;
-	QUuid::Version version() const;
+	static TQUuid createUuid();
+	TQUuid::Variant variant() const;
+	TQUuid::Version version() const;
 %End
 };
 
diff --git a/sip/qt/qvalidator.sip b/sip/qt/qvalidator.sip
index d3329db..fa0f781 100644
--- a/sip/qt/qvalidator.sip
+++ b/sip/qt/qvalidator.sip
@@ -1,31 +1,31 @@
-// This is the SIP interface definition for QValidator, QDoubleValidator,
-// QIntValidator and QRegExpValidator.
+// This is the SIP interface definition for TQValidator, TQDoubleValidator,
+// TQIntValidator and TQRegExpValidator.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QValidator</Title>
+<Sect2><Title>TQValidator</Title>
 <FuncSynopsis>
         <FuncDef>virtual State <Function>validate</Function></FuncDef>
-        <ParamDef>QString& <Parameter>input</Parameter></ParamDef>
+        <ParamDef>TQString& <Parameter>input</Parameter></ParamDef>
         <ParamDef>int& <Parameter>pos</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -34,10 +34,10 @@ updated <Literal>pos</Literal>.
 </Para>
 </Sect2>
 
-<Sect2><Title>QDoubleValidator</Title>
+<Sect2><Title>TQDoubleValidator</Title>
 <FuncSynopsis>
         <FuncDef>State <Function>validate</Function></FuncDef>
-        <ParamDef>QString& <Parameter>input</Parameter></ParamDef>
+        <ParamDef>TQString& <Parameter>input</Parameter></ParamDef>
         <ParamDef>int& <Parameter>pos</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -46,10 +46,10 @@ updated <Literal>pos</Literal>.
 </Para>
 </Sect2>
 
-<Sect2><Title>QIntValidator</Title>
+<Sect2><Title>TQIntValidator</Title>
 <FuncSynopsis>
         <FuncDef>State <Function>validate</Function></FuncDef>
-        <ParamDef>QString& <Parameter>input</Parameter></ParamDef>
+        <ParamDef>TQString& <Parameter>input</Parameter></ParamDef>
         <ParamDef>int& <Parameter>pos</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -58,10 +58,10 @@ updated <Literal>pos</Literal>.
 </Para>
 </Sect2>
 
-<Sect2><Title>QRegExpValidator (Qt v3+)</Title>
+<Sect2><Title>TQRegExpValidator (TQt v3+)</Title>
 <FuncSynopsis>
         <FuncDef>virtual State <Function>validate</Function></FuncDef>
-        <ParamDef>QString& <Parameter>input</Parameter></ParamDef>
+        <ParamDef>TQString& <Parameter>input</Parameter></ParamDef>
         <ParamDef>int& <Parameter>pos</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -72,21 +72,21 @@ updated <Literal>pos</Literal>.
 %End
 
 
-class QValidator : QObject
+class TQValidator : TQObject
 {
 %TypeHeaderCode
 #include <qvalidator.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QValidator(QWidget * /TransferThis/,const char * = 0);
+%If (- TQt_3_0_0)
+	TQValidator(TQWidget * /TransferThis/,const char * = 0);
 %End
-%If (Qt_3_0_0 -)
-	QValidator(QObject * /TransferThis/,const char * = 0);
+%If (TQt_3_0_0 -)
+	TQValidator(TQObject * /TransferThis/,const char * = 0);
 %End
 
-%If (- Qt_2_1_0)
+%If (- TQt_2_1_0)
 	enum State
 	{
 		Invalid,
@@ -94,7 +94,7 @@ public:
 		Acceptable
 	};
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum State
 	{
 		Invalid,
@@ -104,46 +104,46 @@ public:
 	};
 %End
 
-%If (Qt_2_00 -)
-	virtual State validate(QString &,int & /In,Out/) const = 0;
-	virtual void fixup(QString &) const;
+%If (TQt_2_00 -)
+	virtual State validate(TQString &,int & /In,Out/) const = 0;
+	virtual void fixup(TQString &) const;
 %End
-%If (- Qt_2_00)
-	virtual State validate(QString &,int & /In,Out/) = 0;
-	virtual void fixup(QString &);
+%If (- TQt_2_00)
+	virtual State validate(TQString &,int & /In,Out/) = 0;
+	virtual void fixup(TQString &);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QValidator(const QValidator &);
+%If (TQt_2_1_0 -)
+	TQValidator(const TQValidator &);
 %End
 };
 
 
-class QIntValidator : QValidator
+class TQIntValidator : TQValidator
 {
 %TypeHeaderCode
 #include <qvalidator.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	QIntValidator(QObject * /TransferThis/,const char * = 0);
-	QIntValidator(int,int,QObject * /TransferThis/,const char * = 0);
+%If (TQt_3_0_0 -)
+	TQIntValidator(TQObject * /TransferThis/,const char * = 0);
+	TQIntValidator(int,int,TQObject * /TransferThis/,const char * = 0);
 %End
-%If (- Qt_3_0_0)
-	QIntValidator(QWidget * /TransferThis/,const char * = 0);
-	QIntValidator(int,int,QWidget * /TransferThis/,const char * = 0);
+%If (- TQt_3_0_0)
+	TQIntValidator(TQWidget * /TransferThis/,const char * = 0);
+	TQIntValidator(int,int,TQWidget * /TransferThis/,const char * = 0);
 %End
 
-%If (Qt_2_00 -)
-	QValidator::State validate(QString &,int & /In,Out/) const;
+%If (TQt_2_00 -)
+	TQValidator::State validate(TQString &,int & /In,Out/) const;
 %End
-%If (- Qt_2_00)
-	QValidator::State validate(QString &,int & /In,Out/);
+%If (- TQt_2_00)
+	TQValidator::State validate(TQString &,int & /In,Out/);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setBottom(int);
 	void setTop(int);
 %End
@@ -153,39 +153,39 @@ public:
 	int top() const;
 
 private:
-%If (Qt_2_1_0 -)
-	QIntValidator(const QIntValidator &);
+%If (TQt_2_1_0 -)
+	TQIntValidator(const TQIntValidator &);
 %End
 };
 
 
-class QDoubleValidator : QValidator
+class TQDoubleValidator : TQValidator
 {
 %TypeHeaderCode
 #include <qvalidator.h>
 %End
 
 public:
-%If (Qt_3_0_0 -)
-	QDoubleValidator(QObject * /TransferThis/,const char * = 0);
-	QDoubleValidator(double,double,int,QObject * /TransferThis/,
+%If (TQt_3_0_0 -)
+	TQDoubleValidator(TQObject * /TransferThis/,const char * = 0);
+	TQDoubleValidator(double,double,int,TQObject * /TransferThis/,
 			 const char * = 0);
 %End
-%If (- Qt_3_0_0)
-	QDoubleValidator(QWidget * /TransferThis/,const char * = 0);
-	QDoubleValidator(double,double,int,QWidget * /TransferThis/,
+%If (- TQt_3_0_0)
+	TQDoubleValidator(TQWidget * /TransferThis/,const char * = 0);
+	TQDoubleValidator(double,double,int,TQWidget * /TransferThis/,
 			 const char * = 0);
 %End
 
-%If (Qt_2_00 -)
-	QValidator::State validate(QString &,int & /In,Out/) const;
+%If (TQt_2_00 -)
+	TQValidator::State validate(TQString &,int & /In,Out/) const;
 %End
-%If (- Qt_2_00)
-	QValidator::State validate(QString &,int & /In,Out/);
+%If (- TQt_2_00)
+	TQValidator::State validate(TQString &,int & /In,Out/);
 %End
 
 	virtual void setRange(double,double,int = 0);
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void setBottom(double);
 	void setTop(double);
 	void setDecimals(int);
@@ -196,32 +196,32 @@ public:
 	int decimals() const;
 
 private:
-%If (Qt_2_1_0 -)
-	QDoubleValidator(const QDoubleValidator &);
+%If (TQt_2_1_0 -)
+	TQDoubleValidator(const TQDoubleValidator &);
 %End
 };
 
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QRegExpValidator : QValidator
+class TQRegExpValidator : TQValidator
 {
 %TypeHeaderCode
 #include <qvalidator.h>
 %End
 
 public:
-	QRegExpValidator(QObject * /TransferThis/,const char * = 0);
-	QRegExpValidator(const QRegExp &,QObject * /TransferThis/,
+	TQRegExpValidator(TQObject * /TransferThis/,const char * = 0);
+	TQRegExpValidator(const TQRegExp &,TQObject * /TransferThis/,
 			 const char * = 0);
  
-	virtual QValidator::State validate(QString &,int & /In,Out/) const;
+	virtual TQValidator::State validate(TQString &,int & /In,Out/) const;
  
-	void setRegExp(const QRegExp &);
-	const QRegExp &regExp() const;
+	void setRegExp(const TQRegExp &);
+	const TQRegExp &regExp() const;
  
 private:
-	QRegExpValidator(const QRegExpValidator &);
+	TQRegExpValidator(const TQRegExpValidator &);
 };
 
 %End
diff --git a/sip/qt/qvaluelist.sip b/sip/qt/qvaluelist.sip
index 732740d..55bf35e 100644
--- a/sip/qt/qvaluelist.sip
+++ b/sip/qt/qvaluelist.sip
@@ -1,40 +1,40 @@
-// This is the SIP interface definition for all types based on the QValueList
+// This is the SIP interface definition for all types based on the TQValueList
 // template.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QValueList&lt;type&gt; (Qt v2+)</Title>
+<Sect2><Title>TQValueList&lt;type&gt; (TQt v2+)</Title>
 <Para>
-Types based on the <Literal>QValueList</Literal> template are automatically
+Types based on the <Literal>TQValueList</Literal> template are automatically
 converted to and from Python lists of the type.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 
 template<Type>
-%MappedType QValueList<Type>
+%MappedType TQValueList<Type>
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
@@ -52,7 +52,7 @@ template<Type>
 	// Get it.
 
 	i = 0;
-	QValueListConstIterator<Type> it;
+	TQValueListConstIterator<Type> it;
 
 	for (it = sipCpp -> begin(); it != sipCpp -> end(); ++it)
 	{
@@ -85,7 +85,7 @@ template<Type>
 		return 1;
 	}
 
-	QValueList<Type> *qvl = new QValueList<Type>;
+	TQValueList<Type> *qvl = new TQValueList<Type>;
  
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
@@ -118,9 +118,9 @@ template<Type>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-%MappedType QValueList<int>
+%MappedType TQValueList<int>
 {
 %TypeHeaderCode
 #include <qvaluelist.h>
@@ -150,12 +150,12 @@ template<Type>
 %End
 
 %ConvertToTypeCode
-	// Convert a Python list of integers to a QValueList<int> on the heap.
+	// Convert a Python list of integers to a TQValueList<int> on the heap.
  
 	if (sipIsErr == NULL)
 		return PyList_Check(sipPy);
 
-	QValueList<int> *qvl = new QValueList<int>;
+	TQValueList<int> *qvl = new TQValueList<int>;
  
 	PyErr_Clear();
 
diff --git a/sip/qt/qvariant.sip b/sip/qt/qvariant.sip
index c942c3e..3c7a134 100644
--- a/sip/qt/qvariant.sip
+++ b/sip/qt/qvariant.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QVariant.
+// This is the SIP interface definition for TQVariant.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QVariant (Qt v2.1+)</Title>
+<Sect2><Title>TQVariant (TQt v2.1+)</Title>
 <FuncSynopsis>
-        <FuncDef><Function>QVariant</Function></FuncDef>
+        <FuncDef><Function>TQVariant</Function></FuncDef>
         <ParamDef>const char *<Parameter>val</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -31,35 +31,35 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QVariant</Function></FuncDef>
-        <ParamDef>const QBitArray &amp;<Parameter>val</Parameter></ParamDef>
+        <FuncDef><Function>TQVariant</Function></FuncDef>
+        <ParamDef>const TQBitArray &amp;<Parameter>val</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented.  (Qt v3+)
+Not yet implemented.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QVariant</Function></FuncDef>
-        <ParamDef>const QValueList&lt;QVariant&gt; &amp;<Parameter>val</Parameter></ParamDef>
+        <FuncDef><Function>TQVariant</Function></FuncDef>
+        <ParamDef>const TQValueList&lt;TQVariant&gt; &amp;<Parameter>val</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef><Function>QVariant</Function></FuncDef>
-        <ParamDef>const QMap&lt;QString,QVariant&gt; &amp;<Parameter>val</Parameter></ParamDef>
+        <FuncDef><Function>TQVariant</Function></FuncDef>
+        <ParamDef>const TQMap&lt;TQString,TQVariant&gt; &amp;<Parameter>val</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not yet implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QBitArray &amp;<Function>asBitArray</Function></FuncDef>
+        <FuncDef>TQBitArray &amp;<Function>asBitArray</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented.  (Qt v3+)
+Not yet implemented.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
@@ -87,7 +87,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QValueList&lt;QVariant&gt; &amp;<Function>asList</Function></FuncDef>
+        <FuncDef>TQValueList&lt;TQVariant&gt; &amp;<Function>asList</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -95,7 +95,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QMap&lt;QString,QVariant&gt; &amp;<Function>asMap</Function></FuncDef>
+        <FuncDef>TQMap&lt;TQString,TQVariant&gt; &amp;<Function>asMap</Function></FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -111,7 +111,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QValueListConstIterator&lt;QVariant&gt;<Function>listBegin</Function> const</FuncDef>
+        <FuncDef>TQValueListConstIterator&lt;TQVariant&gt;<Function>listBegin</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -119,7 +119,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QValueListConstIterator&lt;QVariant&gt;<Function>listEnd</Function> const</FuncDef>
+        <FuncDef>TQValueListConstIterator&lt;TQVariant&gt;<Function>listEnd</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -127,7 +127,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QMapConstIterator&lt;QString,QVariant&gt;<Function>mapBegin</Function> const</FuncDef>
+        <FuncDef>TQMapConstIterator&lt;TQString,TQVariant&gt;<Function>mapBegin</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -135,7 +135,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QMapConstIterator&lt;QString,QVariant&gt;<Function>mapEnd</Function> const</FuncDef>
+        <FuncDef>TQMapConstIterator&lt;TQString,TQVariant&gt;<Function>mapEnd</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -143,15 +143,15 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QMapConstIterator&lt;QString,QVariant&gt;<Function>mapFind</Function> const</FuncDef>
-        <ParamDef>const QString &<Parameter>key</Parameter></ParamDef>
+        <FuncDef>TQMapConstIterator&lt;TQString,TQVariant&gt;<Function>mapFind</Function> const</FuncDef>
+        <ParamDef>const TQString &<Parameter>key</Parameter></ParamDef>
 </FuncSynopsis>
 <Para>
 Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QValueListConstIterator&lt;QString&gt;<Function>stringListBegin</Function> const</FuncDef>
+        <FuncDef>TQValueListConstIterator&lt;TQString&gt;<Function>stringListBegin</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -159,7 +159,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QValueListConstIterator&lt;QString&gt;<Function>stringListEnd</Function> const</FuncDef>
+        <FuncDef>TQValueListConstIterator&lt;TQString&gt;<Function>stringListEnd</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -167,15 +167,15 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>const QBitArray <Function>toBitArray</Function> const</FuncDef>
+        <FuncDef>const TQBitArray <Function>toBitArray</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
-Not yet implemented.  (Qt v3+)
+Not yet implemented.  (TQt v3+)
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>const QValueList&lt;QVariant&gt;<Function>toList</Function> const</FuncDef>
+        <FuncDef>const TQValueList&lt;TQVariant&gt;<Function>toList</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -183,7 +183,7 @@ Not yet implemented.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>const QMap&lt;QString,QVariant&gt;<Function>toMap</Function> const</FuncDef>
+        <FuncDef>const TQMap&lt;TQString,TQVariant&gt;<Function>toMap</Function> const</FuncDef>
         <ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -193,9 +193,9 @@ Not yet implemented.
 %End
 
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 
-class QVariant
+class TQVariant
 {
 %TypeHeaderCode
 #include <qvariant.h>
@@ -228,10 +228,10 @@ public:
 		Region,
 		Bitmap,
 		Cursor,
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 		SizePolicy,
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		Date,
 		Time,
 		DateTime,
@@ -239,179 +239,179 @@ public:
 		BitArray,
 		KeySequence,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		Pen,
 %End
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 		LongLong,
 		ULongLong,
 %End
 	};
 
-	QVariant();
-	QVariant(const QVariant &);
-	QVariant(QDataStream &);
-
-	QVariant(const QString &);
-	QVariant(const QCString &);
-//	QVariant(const char *);
-	QVariant(const QStringList &);
-	QVariant(const QFont &);
-	QVariant(const QPixmap &);
-	QVariant(const QImage &);
-	QVariant(const QBrush &);
-	QVariant(const QPoint &);
-	QVariant(const QRect &);
-	QVariant(const QSize &);
-	QVariant(const QColor &);
-	QVariant(const QPalette &);
-	QVariant(const QColorGroup &);
-	QVariant(const QIconSet &);
-	QVariant(const QPointArray &);
-	QVariant(const QRegion &);
-	QVariant(const QBitmap &);
-	QVariant(const QCursor &);
-%If (Qt_3_0_0 -)
-	QVariant(const QDate &);
-	QVariant(const QTime &);
-	QVariant(const QDateTime &);
-	QVariant(const QByteArray &);
-//	QVariant(const QBitArray &);
+	TQVariant();
+	TQVariant(const TQVariant &);
+	TQVariant(TQDataStream &);
+
+	TQVariant(const TQString &);
+	TQVariant(const TQCString &);
+//	TQVariant(const char *);
+	TQVariant(const TQStringList &);
+	TQVariant(const TQFont &);
+	TQVariant(const TQPixmap &);
+	TQVariant(const TQImage &);
+	TQVariant(const TQBrush &);
+	TQVariant(const TQPoint &);
+	TQVariant(const TQRect &);
+	TQVariant(const TQSize &);
+	TQVariant(const TQColor &);
+	TQVariant(const TQPalette &);
+	TQVariant(const TQColorGroup &);
+	TQVariant(const TQIconSet &);
+	TQVariant(const TQPointArray &);
+	TQVariant(const TQRegion &);
+	TQVariant(const TQBitmap &);
+	TQVariant(const TQCursor &);
+%If (TQt_3_0_0 -)
+	TQVariant(const TQDate &);
+	TQVariant(const TQTime &);
+	TQVariant(const TQDateTime &);
+	TQVariant(const TQByteArray &);
+//	TQVariant(const TQBitArray &);
 %End
-//	QVariant(const QValueList<QVariant> &);
-//	QVariant(const QMap<QString,QVariant> &);
-	QVariant(int /Constrained/);
-//	QVariant(uint);
-%If (Qt_3_2_0 -)
-//	QVariant(Q_LLONG);
-//	QVariant(Q_ULLONG);
+//	TQVariant(const TQValueList<TQVariant> &);
+//	TQVariant(const TQMap<TQString,TQVariant> &);
+	TQVariant(int /Constrained/);
+//	TQVariant(uint);
+%If (TQt_3_2_0 -)
+//	TQVariant(Q_LLONG);
+//	TQVariant(Q_ULLONG);
 %End
-	QVariant(bool,int);
-	QVariant(double);
-%If (Qt_2_2_0 -)
-	QVariant(QSizePolicy);
+	TQVariant(bool,int);
+	TQVariant(double);
+%If (TQt_2_2_0 -)
+	TQVariant(TQSizePolicy);
 %End
-%If (Qt_3_0_0 -)
-	// This must appear after the QString, int and double ctors because
-	// each of those can be converted automatically to a QKeySequence and
+%If (TQt_3_0_0 -)
+	// This must appear after the TQString, int and double ctors because
+	// each of those can be converted automatically to a TQKeySequence and
 	// we want those to take precedence.
-	QVariant(const QKeySequence &);
+	TQVariant(const TQKeySequence &);
 %End
-%If (Qt_3_1_0 -)
-	QVariant(const QPen &);
+%If (TQt_3_1_0 -)
+	TQVariant(const TQPen &);
 %End
 
 	Type type() const;
 	const char* typeName() const;
 
 	bool canCast(Type) const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool cast(Type);
 %End
 
 	bool isValid() const;
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isNull() const;
 %End
 
 	void clear();
 
-	const QString toString() const;
-	const QCString toCString() const;
-	const QStringList toStringList() const;
-	const QFont toFont() const;
-	const QPixmap toPixmap() const;
-	const QImage toImage() const;
-	const QBrush toBrush() const;
-	const QPoint toPoint() const;
-	const QRect toRect() const;
-	const QSize toSize() const;
-	const QColor toColor() const;
-	const QPalette toPalette() const;
-	const QColorGroup toColorGroup() const;
-	const QIconSet toIconSet() const;
-	const QPointArray toPointArray() const;
-	const QBitmap toBitmap() const;
-	const QRegion toRegion() const;
-	const QCursor toCursor() const;
-%If (Qt_3_0_0 -)
-	const QDate toDate() const;
-	const QTime toTime() const;
-	const QDateTime toDateTime() const;
-	const QByteArray toByteArray() const;
-//	const QBitArray toBitArray() const;
-	const QKeySequence toKeySequence() const;
+	const TQString toString() const;
+	const TQCString toCString() const;
+	const TQStringList toStringList() const;
+	const TQFont toFont() const;
+	const TQPixmap toPixmap() const;
+	const TQImage toImage() const;
+	const TQBrush toBrush() const;
+	const TQPoint toPoint() const;
+	const TQRect toRect() const;
+	const TQSize toSize() const;
+	const TQColor toColor() const;
+	const TQPalette toPalette() const;
+	const TQColorGroup toColorGroup() const;
+	const TQIconSet toIconSet() const;
+	const TQPointArray toPointArray() const;
+	const TQBitmap toBitmap() const;
+	const TQRegion toRegion() const;
+	const TQCursor toCursor() const;
+%If (TQt_3_0_0 -)
+	const TQDate toDate() const;
+	const TQTime toTime() const;
+	const TQDateTime toDateTime() const;
+	const TQByteArray toByteArray() const;
+//	const TQBitArray toBitArray() const;
+	const TQKeySequence toKeySequence() const;
 %End
-%If (Qt_3_1_0 -)
-	const QPen toPen() const;
+%If (TQt_3_1_0 -)
+	const TQPen toPen() const;
 %End
 	int toInt() const;
 	uint toUInt() const;
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 //	Q_LLONG toLongLong(bool * = 0) const;
 //	Q_ULLONG toULongLong( bool * = 0) const;
 %End
 	bool toBool() const;
 	double toDouble() const;
-//	const QValueList<QVariant> toList() const;
-//	const QMap<QString,QVariant> toMap() const;
-%If (Qt_2_2_0 -)
-	QSizePolicy toSizePolicy() const;
+//	const TQValueList<TQVariant> toList() const;
+//	const TQMap<TQString,TQVariant> toMap() const;
+%If (TQt_2_2_0 -)
+	TQSizePolicy toSizePolicy() const;
 %End
 
-//	QValueListConstIterator<QVariant> listBegin() const;
-//	QValueListConstIterator<QVariant> listEnd() const;
-//	QValueListConstIterator<QString> stringListBegin() const;
-//	QValueListConstIterator<QString> stringListEnd() const;
-//	QMapConstIterator<QString,QVariant> mapBegin() const;
-//	QMapConstIterator<QString,QVariant> mapEnd() const;
-//	QMapConstIterator<QString,QVariant> mapFind(const QString &) const;
-
-	QString & asString();
-	QCString & asCString();
-	QStringList & asStringList();
-	QFont & asFont();
-	QPixmap & asPixmap();
-	QImage & asImage();
-	QBrush & asBrush();
-	QPoint & asPoint();
-	QRect & asRect();
-	QSize & asSize();
-	QColor & asColor();
-	QPalette & asPalette();
-	QColorGroup & asColorGroup();
-	QIconSet & asIconSet();
-	QPointArray & asPointArray();
-	QBitmap & asBitmap();
-	QRegion & asRegion();
-	QCursor & asCursor();
-%If (Qt_3_0_0 -)
-	QDate & asDate();
-	QTime & asTime();
-	QDateTime & asDateTime();
-	QByteArray & asByteArray();
-//	QBitArray & asBitArray();
-	QKeySequence & asKeySequence();
+//	TQValueListConstIterator<TQVariant> listBegin() const;
+//	TQValueListConstIterator<TQVariant> listEnd() const;
+//	TQValueListConstIterator<TQString> stringListBegin() const;
+//	TQValueListConstIterator<TQString> stringListEnd() const;
+//	TQMapConstIterator<TQString,TQVariant> mapBegin() const;
+//	TQMapConstIterator<TQString,TQVariant> mapEnd() const;
+//	TQMapConstIterator<TQString,TQVariant> mapFind(const TQString &) const;
+
+	TQString & asString();
+	TQCString & asCString();
+	TQStringList & asStringList();
+	TQFont & asFont();
+	TQPixmap & asPixmap();
+	TQImage & asImage();
+	TQBrush & asBrush();
+	TQPoint & asPoint();
+	TQRect & asRect();
+	TQSize & asSize();
+	TQColor & asColor();
+	TQPalette & asPalette();
+	TQColorGroup & asColorGroup();
+	TQIconSet & asIconSet();
+	TQPointArray & asPointArray();
+	TQBitmap & asBitmap();
+	TQRegion & asRegion();
+	TQCursor & asCursor();
+%If (TQt_3_0_0 -)
+	TQDate & asDate();
+	TQTime & asTime();
+	TQDateTime & asDateTime();
+	TQByteArray & asByteArray();
+//	TQBitArray & asBitArray();
+	TQKeySequence & asKeySequence();
 %End
-%If (Qt_3_1_0 -)
-	QPen & asPen();
+%If (TQt_3_1_0 -)
+	TQPen & asPen();
 %End
 //	int & asInt();
 //	uint & asUInt();
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 //	Q_LLONG & asLongLong();
 //	Q_ULLONG & asULongLong();
 %End
 //	bool & asBool();
 //	double & asDouble();
-//	QValueList<QVariant> & asList();
-//	QMap<QString,QVariant> & asMap();
-%If (Qt_2_2_0 -)
-	QSizePolicy & asSizePolicy();
+//	TQValueList<TQVariant> & asList();
+//	TQMap<TQString,TQVariant> & asMap();
+%If (TQt_2_2_0 -)
+	TQSizePolicy & asSizePolicy();
 %End
 
-	void load(QDataStream &);
-	void save(QDataStream &) const;
+	void load(TQDataStream &);
+	void save(TQDataStream &) const;
 
 	static const char *typeToName(Type);
 	static Type nameToType(const char *);
diff --git a/sip/qt/qvbox.sip b/sip/qt/qvbox.sip
index 9f0e811..c8900c3 100644
--- a/sip/qt/qvbox.sip
+++ b/sip/qt/qvbox.sip
@@ -1,54 +1,54 @@
-// This is the SIP interface definition for QVBox.
+// This is the SIP interface definition for TQVBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QVBox (Qt v2+)</Title>
+<Sect2><Title>TQVBox (TQt v2+)</Title>
 <Para>
-<Literal>QVBox</Literal> is fully implemented.
+<Literal>TQVBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QVBox : QHBox
+class TQVBox : TQHBox
 {
 %TypeHeaderCode
 #include <qvbox.h>
 %End
 
 public:
-%If (- Qt_3_0_0)
-	QVBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
+%If (- TQt_3_0_0)
+	TQVBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0,
 	      bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	QVBox(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+%If (TQt_3_0_0 -)
+	TQVBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QVBox(const QVBox &);
+%If (TQt_2_1_0 -)
+	TQVBox(const TQVBox &);
 %End
 };
 
diff --git a/sip/qt/qvbuttongroup.sip b/sip/qt/qvbuttongroup.sip
index 9561ed5..0a88885 100644
--- a/sip/qt/qvbuttongroup.sip
+++ b/sip/qt/qvbuttongroup.sip
@@ -1,48 +1,48 @@
-// This is the SIP interface definition for QVButtonGroup.
+// This is the SIP interface definition for TQVButtonGroup.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QVButtonGroup (Qt v2+)</Title>
+<Sect2><Title>TQVButtonGroup (TQt v2+)</Title>
 <Para>
-<Literal>QVButtonGroup</Literal> is fully implemented.
+<Literal>TQVButtonGroup</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QVButtonGroup : QButtonGroup
+class TQVButtonGroup : TQButtonGroup
 {
 %TypeHeaderCode
 #include <qvbuttongroup.h>
 %End
 
 public:
-	QVButtonGroup(QWidget * /TransferThis/ = 0,const char * = 0);
-	QVButtonGroup(const QString &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQVButtonGroup(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQVButtonGroup(const TQString &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 private:
-	QVButtonGroup(const QVButtonGroup &);
+	TQVButtonGroup(const TQVButtonGroup &);
 };
 
 %End
diff --git a/sip/qt/qvgroupbox.sip b/sip/qt/qvgroupbox.sip
index 06b355e..1ef6a0b 100644
--- a/sip/qt/qvgroupbox.sip
+++ b/sip/qt/qvgroupbox.sip
@@ -1,48 +1,48 @@
-// This is the SIP interface definition for QVGroupBox.
+// This is the SIP interface definition for TQVGroupBox.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QVGroupBox (Qt v2+)</Title>
+<Sect2><Title>TQVGroupBox (TQt v2+)</Title>
 <Para>
-<Literal>QVGroupBox</Literal> is fully implemented.
+<Literal>TQVGroupBox</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QVGroupBox : QGroupBox
+class TQVGroupBox : TQGroupBox
 {
 %TypeHeaderCode
 #include <qvgroupbox.h>
 %End
 
 public:
-	QVGroupBox(QWidget * /TransferThis/ = 0,const char * = 0);
-	QVGroupBox(const QString &,QWidget * /TransferThis/ = 0,const char * = 0);
+	TQVGroupBox(TQWidget * /TransferThis/ = 0,const char * = 0);
+	TQVGroupBox(const TQString &,TQWidget * /TransferThis/ = 0,const char * = 0);
 
 private:
-	QVGroupBox(const QVGroupBox &);
+	TQVGroupBox(const TQVGroupBox &);
 };
 
 %End
diff --git a/sip/qt/qwaitcondition.sip b/sip/qt/qwaitcondition.sip
index 5d8d66f..00c1e94 100644
--- a/sip/qt/qwaitcondition.sip
+++ b/sip/qt/qwaitcondition.sip
@@ -1,79 +1,79 @@
-// This is the SIP interface definition for QWaitCondition.
+// This is the SIP interface definition for TQWaitCondition.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWaitCondition (Qt v2.2+)</Title>
+<Sect2><Title>TQWaitCondition (TQt v2.2+)</Title>
 <Para>
-<Literal>QWaitCondition</Literal> is fully implemented.
+<Literal>TQWaitCondition</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_THREAD_SUPPORT)
+%If (TQt_THREAD_SUPPORT)
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 
-class QWaitCondition
+class TQWaitCondition
 {
 %TypeHeaderCode
 #include <qwaitcondition.h>
 %End
 
 public:
-	QWaitCondition();
+	TQWaitCondition();
 
 	bool wait(unsigned long = ULONG_MAX) /ReleaseGIL/;
-	bool wait(QMutex *,unsigned long = ULONG_MAX) /ReleaseGIL/;
+	bool wait(TQMutex *,unsigned long = ULONG_MAX) /ReleaseGIL/;
 
 	void wakeOne();
 	void wakeAll();
 
 private:
-	QWaitCondition(const QWaitCondition &);
+	TQWaitCondition(const TQWaitCondition &);
 };
 
 %End
 
 
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 
-class QWaitCondition : Qt
+class TQWaitCondition : TQt
 {
 %TypeHeaderCode
 #include <qthread.h>
 %End
 
 public:
-	QWaitCondition();
+	TQWaitCondition();
 
 	bool wait(unsigned long = ULONG_MAX) /ReleaseGIL/;
-	bool wait(QMutex *,unsigned long = ULONG_MAX) /ReleaseGIL/;
+	bool wait(TQMutex *,unsigned long = ULONG_MAX) /ReleaseGIL/;
 
 	void wakeOne();
 	void wakeAll();
 
 private:
-	QWaitCondition(const QWaitCondition &);
+	TQWaitCondition(const TQWaitCondition &);
 };
 
 %End
diff --git a/sip/qt/qwhatsthis.sip b/sip/qt/qwhatsthis.sip
index b745449..a93f1d3 100644
--- a/sip/qt/qwhatsthis.sip
+++ b/sip/qt/qwhatsthis.sip
@@ -1,96 +1,96 @@
-// This is the SIP interface definition for QWhatsThis.
+// This is the SIP interface definition for TQWhatsThis.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWhatsThis</Title>
+<Sect2><Title>TQWhatsThis</Title>
 <Para>
-<Literal>QWhatsThis</Literal> is fully implemented.
+<Literal>TQWhatsThis</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QWhatsThis
+class TQWhatsThis
 {
 %TypeHeaderCode
 #include <qwhatsthis.h>
 %End
 
 public:
-	static void add(QWidget *,const char *,bool = 1);
-	static void add(QWidget *,const QPixmap &,const char *,const char *,bool = 1);
-	static void remove(QWidget *);
-	static const char *textFor(QWidget *);
-	static QToolButton *whatsThisButton(QWidget *);
+	static void add(TQWidget *,const char *,bool = 1);
+	static void add(TQWidget *,const TQPixmap &,const char *,const char *,bool = 1);
+	static void remove(TQWidget *);
+	static const char *textFor(TQWidget *);
+	static TQToolButton *whatsThisButton(TQWidget *);
 };
 
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 
-class QWhatsThis : Qt
+class TQWhatsThis : TQt
 {
 %TypeHeaderCode
 #include <qwhatsthis.h>
 %End
 
 public:
-	QWhatsThis(QWidget *);
+	TQWhatsThis(TQWidget *);
 
-	virtual QString text(const QPoint &);
-%If (Qt_3_0_0 -)
-	virtual bool clicked(const QString &);
+	virtual TQString text(const TQPoint &);
+%If (TQt_3_0_0 -)
+	virtual bool clicked(const TQString &);
 %End
 
-%If (Qt_3_1_0 -)
-	static void setFont(const QFont &);
+%If (TQt_3_1_0 -)
+	static void setFont(const TQFont &);
 %End
 
-	static void add(QWidget *,const QString &);
-	static void remove(QWidget *);
-%If (- Qt_3_0_0)
-	static QString textFor(QWidget *,const QPoint & = QPoint());
+	static void add(TQWidget *,const TQString &);
+	static void remove(TQWidget *);
+%If (- TQt_3_0_0)
+	static TQString textFor(TQWidget *,const TQPoint & = TQPoint());
 %End
-%If (Qt_3_0_0 -)
-	static QString textFor(QWidget *,const QPoint & = QPoint(),bool = 0);
+%If (TQt_3_0_0 -)
+	static TQString textFor(TQWidget *,const TQPoint & = TQPoint(),bool = 0);
 %End
 
-	static QToolButton *whatsThisButton(QWidget *);
+	static TQToolButton *whatsThisButton(TQWidget *);
 
 	static void enterWhatsThisMode();
 	static bool inWhatsThisMode();
-%If (- Qt_3_0_0)
-	static void leaveWhatsThisMode(const QString & = QString::null,
-				       const QPoint & = QCursor::pos());
+%If (- TQt_3_0_0)
+	static void leaveWhatsThisMode(const TQString & = TQString::null,
+				       const TQPoint & = TQCursor::pos());
 %End
-%If (Qt_3_0_0 -)
-	static void leaveWhatsThisMode(const QString & = QString::null,
-				       const QPoint & = QCursor::pos(),
-				       QWidget * = 0);
+%If (TQt_3_0_0 -)
+	static void leaveWhatsThisMode(const TQString & = TQString::null,
+				       const TQPoint & = TQCursor::pos(),
+				       TQWidget * = 0);
 
-	static void display(const QString &,const QPoint & = QCursor::pos(),
-			    QWidget * = 0);
+	static void display(const TQString &,const TQPoint & = TQCursor::pos(),
+			    TQWidget * = 0);
 %End
 };
 
diff --git a/sip/qt/qwidget.sip b/sip/qt/qwidget.sip
index 72b4304..c6da89c 100644
--- a/sip/qt/qwidget.sip
+++ b/sip/qt/qwidget.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QWidget.
+// This is the SIP interface definition for TQWidget.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWidget</Title>
+<Sect2><Title>TQWidget</Title>
 <FuncSynopsis>
-	<FuncDef>QWExtra *<Function>extraData</Function></FuncDef>
+	<FuncDef>TQWExtra *<Function>extraData</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -31,7 +31,7 @@ Not implemented.
 </Para>
 
 <FuncSynopsis>
-	<FuncDef>QFocusData *<Function>focusData</Function></FuncDef>
+	<FuncDef>TQFocusData *<Function>focusData</Function></FuncDef>
 	<ParamDef></ParamDef>
 </FuncSynopsis>
 <Para>
@@ -57,109 +57,109 @@ This has been renamed to <Literal>raiseW</Literal> in Python.
 %End
 
 
-class QWidget : QObject, QPaintDevice
+class TQWidget : TQObject, TQPaintDevice
 {
 %TypeHeaderCode
 #include <qwidget.h>
 %End
 
 public:
-	QWidget(QWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
+	TQWidget(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0);
 
 	WId winId() const;
 	bool isTopLevel() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isDialog() const;
 %End
 	bool isPopup() const;
 	bool isDesktop() const;
 	bool isModal() const;
 	bool isEnabled() const;
-	bool isEnabledTo(QWidget *) const;
+	bool isEnabledTo(TQWidget *) const;
 	bool isEnabledToTLW() const;
-	const QRect &geometry() const;
+	const TQRect &geometry() const;
 	int x() const;
 	int y() const;
-	QPoint pos() const;
-	QSize size() const;
+	TQPoint pos() const;
+	TQSize size() const;
 	int width() const;
 	int height() const;
-	QRect rect() const;
-	QRect childrenRect() const;
-	QSize minimumSize() const;
-	QSize maximumSize() const;
-	void setMinimumSize(const QSize &);
-	void setMaximumSize(const QSize &);
+	TQRect rect() const;
+	TQRect childrenRect() const;
+	TQSize minimumSize() const;
+	TQSize maximumSize() const;
+	void setMinimumSize(const TQSize &);
+	void setMaximumSize(const TQSize &);
 	void setMinimumWidth(int);
 	void setMinimumHeight(int);
 	void setMaximumWidth(int);
 	void setMaximumHeight(int);
-	QSize sizeIncrement() const;
-	void setSizeIncrement(const QSize &);
-	void setFixedSize(const QSize &);
+	TQSize sizeIncrement() const;
+	void setSizeIncrement(const TQSize &);
+	void setFixedSize(const TQSize &);
 	void setFixedSize(int,int);
 	void setFixedWidth(int);
 	void setFixedHeight(int);
-	QPoint mapToGlobal(const QPoint &) const;
-	QPoint mapFromGlobal(const QPoint &) const;
-	QPoint mapToParent(const QPoint &) const;
-	QPoint mapFromParent(const QPoint &) const;
-%If (Qt_2_2_0 -)
-	QPoint mapTo(QWidget *,const QPoint &) const;
-	QPoint mapFrom(QWidget *,const QPoint &) const;
+	TQPoint mapToGlobal(const TQPoint &) const;
+	TQPoint mapFromGlobal(const TQPoint &) const;
+	TQPoint mapToParent(const TQPoint &) const;
+	TQPoint mapFromParent(const TQPoint &) const;
+%If (TQt_2_2_0 -)
+	TQPoint mapTo(TQWidget *,const TQPoint &) const;
+	TQPoint mapFrom(TQWidget *,const TQPoint &) const;
 %End
 
-	QWidget *topLevelWidget() const;
+	TQWidget *topLevelWidget() const;
 
 	BackgroundMode backgroundMode() const;
-%If (- Qt_3_0_0)
-	const QColor &backgroundColor() const;
-	virtual void setBackgroundColor(const QColor &);
-	const QPixmap *backgroundPixmap();
-	virtual void setBackgroundPixmap(const QPixmap &);
+%If (- TQt_3_0_0)
+	const TQColor &backgroundColor() const;
+	virtual void setBackgroundColor(const TQColor &);
+	const TQPixmap *backgroundPixmap();
+	virtual void setBackgroundPixmap(const TQPixmap &);
 %End
 
-	const QColor &foregroundColor() const;
+	const TQColor &foregroundColor() const;
 
-%If (Qt_3_0_0 -)
-	const QColor &eraseColor() const;
-	virtual void setEraseColor(const QColor &);
+%If (TQt_3_0_0 -)
+	const TQColor &eraseColor() const;
+	virtual void setEraseColor(const TQColor &);
 
-	const QPixmap *erasePixmap() const;
-	virtual void setErasePixmap(const QPixmap &);
+	const TQPixmap *erasePixmap() const;
+	virtual void setErasePixmap(const TQPixmap &);
 %End
 
-	const QColorGroup &colorGroup() const;
-	const QPalette &palette() const;
-%If (Qt_2_2_0 -)
+	const TQColorGroup &colorGroup() const;
+	const TQPalette &palette() const;
+%If (TQt_2_2_0 -)
 	bool ownPalette() const;
 %End
-	virtual void setPalette(const QPalette &);
-%If (Qt_2_1_0 -)
+	virtual void setPalette(const TQPalette &);
+%If (TQt_2_1_0 -)
 	void unsetPalette();
 %End
 
-%If (Qt_3_0_0 -)
-	const QColor &paletteForegroundColor() const;
-	void setPaletteForegroundColor(const QColor &);
+%If (TQt_3_0_0 -)
+	const TQColor &paletteForegroundColor() const;
+	void setPaletteForegroundColor(const TQColor &);
  
-	const QColor &paletteBackgroundColor() const;
-	virtual void setPaletteBackgroundColor(const QColor &);
+	const TQColor &paletteBackgroundColor() const;
+	virtual void setPaletteBackgroundColor(const TQColor &);
  
-	const QPixmap *paletteBackgroundPixmap() const;
-	virtual void setPaletteBackgroundPixmap(const QPixmap &);
+	const TQPixmap *paletteBackgroundPixmap() const;
+	virtual void setPaletteBackgroundPixmap(const TQPixmap &);
 
-	const QBrush &backgroundBrush() const;
+	const TQBrush &backgroundBrush() const;
 %End
 
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	bool ownFont() const;
 %End
-	virtual void setFont(const QFont &);
-	QFontMetrics fontMetrics() const;
-	QFontInfo fontInfo() const;
+	virtual void setFont(const TQFont &);
+	TQFontMetrics fontMetrics() const;
+	TQFontInfo fontInfo() const;
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	enum PropagationMode
 	{
 		NoChildren,
@@ -172,14 +172,14 @@ public:
 	PropagationMode palettePropagation() const;
 %End
 
-	const QCursor &cursor() const;
-%If (Qt_2_2_0 -)
+	const TQCursor &cursor() const;
+%If (TQt_2_2_0 -)
 	bool ownCursor() const;
 %End
-	virtual void setCursor(const QCursor &);
-	const QPixmap *icon() const;
+	virtual void setCursor(const TQCursor &);
+	const TQPixmap *icon() const;
 	bool hasMouseTracking() const;
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool hasMouse() const;
 %End
 
@@ -188,60 +188,60 @@ public:
 	bool isFocusEnabled() const;
 	FocusPolicy focusPolicy() const;
 	bool hasFocus() const;
-	static void setTabOrder(QWidget *,QWidget *);
-	QWidget *focusProxy() const;
+	static void setTabOrder(TQWidget *,TQWidget *);
+	TQWidget *focusProxy() const;
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void setInputMethodEnabled(bool);
 	bool isInputMethodEnabled() const;
 %End
 
 	void grabMouse();
-	void grabMouse(const QCursor &);
+	void grabMouse(const TQCursor &);
 	void releaseMouse();
 	void grabKeyboard();
 	void releaseKeyboard();
-	static QWidget *mouseGrabber();
-	static QWidget *keyboardGrabber();
+	static TQWidget *mouseGrabber();
+	static TQWidget *keyboardGrabber();
 	bool isUpdatesEnabled() const;
 	bool isVisible() const;
-	bool isVisibleTo(QWidget *) const;
+	bool isVisibleTo(TQWidget *) const;
 	bool isVisibleToTLW() const;
-	virtual QSize sizeHint() const;
-%If (- Qt_3_1_0)
+	virtual TQSize sizeHint() const;
+%If (- TQt_3_1_0)
 	virtual void adjustSize();
 %End
 	void erase();
 	void erase(int,int,int,int);
-	void erase(const QRect &);
+	void erase(const TQRect &);
 	void scroll(int,int);
-	QWidget *focusWidget() const;
+	TQWidget *focusWidget() const;
 	bool acceptDrops() const;
-%If (- Qt_3_0_0)
-	QWidget *parentWidget() const;
+%If (- TQt_3_0_0)
+	TQWidget *parentWidget() const;
 	bool testWFlags(WFlags) const;
 %End
-%If (Qt_3_0_0 -)
-	QWidget *parentWidget(bool = 0) const;
+%If (TQt_3_0_0 -)
+	TQWidget *parentWidget(bool = 0) const;
 	WState testWState(WState) const;
 	WFlags testWFlags(WFlags) const;
 %End
-	static QWidget *find(WId);
+	static TQWidget *find(WId);
 
-%If (Qt_3_0_0 -)
-	QWidget *childAt(int,int,bool = 0) const;
-	QWidget *childAt(const QPoint &,bool = 0) const;
+%If (TQt_3_0_0 -)
+	TQWidget *childAt(int,int,bool = 0) const;
+	TQWidget *childAt(const TQPoint &,bool = 0) const;
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	void setWindowOpacity(double);
 	double windowOpacity() const;
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	GUIStyle style() const;
 	virtual void setStyle(GUIStyle);
-	const QRect &frameGeometry() const;
+	const TQRect &frameGeometry() const;
 	void setMinimumSize(int,int);
 	void setMaximumSize(int,int);
 	void setSizeIncrement(int,int);
@@ -262,13 +262,13 @@ public:
 	};
 
 	void setBackgroundMode(BackgroundMode);
-	const QFont &font() const;
+	const TQFont &font() const;
 	void setFontPropagation(PropagationMode);
 	void setPalettePropagation(PropagationMode);
 	const char *caption() const;
 	const char *iconText() const;
-	void setMask(QBitmap);
-	void setMask(const QRegion &);
+	void setMask(TQBitmap);
+	void setMask(const TQRegion &);
 
 	enum FocusPolicy
 	{
@@ -282,24 +282,24 @@ public:
 	void setFocusPolicy(FocusPolicy);
 	void setFocus();
 	void clearFocus();
-	void setFocusProxy(QWidget *);
+	void setFocusProxy(TQWidget *);
 	virtual bool close(bool = 0);
-	void recreate(QWidget *,WFlags,const QPoint &,bool = 0);
+	void recreate(TQWidget *,WFlags,const TQPoint &,bool = 0);
 	void drawText(int,int,const char *);
-	void drawText(const QPoint &,const char *);
+	void drawText(const TQPoint &,const char *);
 	void setAcceptDrops(bool);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setName(const char *);
-	QStyle &style() const;
-	void setStyle(QStyle *);
-%If (Qt_3_0_0 -)
-	QStyle *setStyle(const QString &);
-%End
-	QRect frameGeometry() const;
-	QSize frameSize() const;
-	QRegion childrenRegion() const;
+	TQStyle &style() const;
+	void setStyle(TQStyle *);
+%If (TQt_3_0_0 -)
+	TQStyle *setStyle(const TQString &);
+%End
+	TQRect frameGeometry() const;
+	TQSize frameSize() const;
+	TQRegion childrenRegion() const;
 	int minimumWidth() const;
 	int minimumHeight() const;
 	int maximumWidth() const;
@@ -307,11 +307,11 @@ public:
 	virtual void setMinimumSize(int,int);
 	virtual void setMaximumSize(int,int);
 	virtual void setSizeIncrement(int,int);
-	QSize baseSize() const;
-	void setBaseSize(const QSize &);
+	TQSize baseSize() const;
+	void setBaseSize(const TQSize &);
 	void setBaseSize(int,int);
 
-%If (- Qt_2_2_0)
+%If (- TQt_2_2_0)
 	enum BackgroundMode
 	{
 		FixedColor,
@@ -332,7 +332,7 @@ public:
 		PaletteHighlightedText
 	};
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
+%If (TQt_2_2_0 - TQt_3_0_0)
 	enum BackgroundMode
 	{
 		FixedColor,
@@ -357,21 +357,21 @@ public:
 %End
 
 	virtual void setBackgroundMode(BackgroundMode);
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	void setBackgroundMode(BackgroundMode,BackgroundMode);
 %End
-	QFont font() const;
-%If (- Qt_3_0_0)
-	void setPalette(const QPalette &,bool);
-	void setFont(const QFont &,bool);
+	TQFont font() const;
+%If (- TQt_3_0_0)
+	void setPalette(const TQPalette &,bool);
+	void setFont(const TQFont &,bool);
 	virtual void setFontPropagation(PropagationMode);
 	virtual void setPalettePropagation(PropagationMode);
 %End
 	virtual void unsetCursor();
-	QString caption() const;
-	QString iconText() const;
-	virtual void setMask(const QBitmap &);
-	virtual void setMask(const QRegion &);
+	TQString caption() const;
+	TQString iconText() const;
+	virtual void setMask(const TQBitmap &);
+	virtual void setMask(const TQRegion &);
 
 	enum FocusPolicy
 	{
@@ -384,47 +384,47 @@ public:
 
 	virtual void setActiveWindow();
 	virtual void setFocusPolicy(FocusPolicy);
-	virtual void setFocusProxy(QWidget *);
+	virtual void setFocusProxy(TQWidget *);
 	virtual bool close(bool);
 	// Obsolete.
-	QRect visibleRect() const;
+	TQRect visibleRect() const;
 	bool isMinimized() const;
-	virtual QSize minimumSizeHint() const;
-	virtual QSizePolicy sizePolicy() const;
-%If (Qt_2_2_0 -)
+	virtual TQSize minimumSizeHint() const;
+	virtual TQSizePolicy sizePolicy() const;
+%If (TQt_2_2_0 -)
 	bool isHidden() const;
 	bool isMaximized() const;
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	bool isShown() const;
 	bool isFullScreen() const;
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 	uint windowState() const;
 	void setWindowState(uint);
 %End
 
-%If (Qt_3_0_0 -)
-	virtual void setSizePolicy(QSizePolicy);
+%If (TQt_3_0_0 -)
+	virtual void setSizePolicy(TQSizePolicy);
 %End
-%If (Qt_3_1_0 -)
-	void setSizePolicy(QSizePolicy::SizeType,QSizePolicy::SizeType,
+%If (TQt_3_1_0 -)
+	void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType,
 			   bool = 0);
 %End
-%If (Qt_2_2_0 - Qt_3_0_0)
-	void setSizePolicy(QSizePolicy);
+%If (TQt_2_2_0 - TQt_3_0_0)
+	void setSizePolicy(TQSizePolicy);
 %End
 	virtual int heightForWidth(int) const;
 
-%If (Qt_3_2_0 -)
-	QRegion clipRegion() const;
+%If (TQt_3_2_0 -)
+	TQRegion clipRegion() const;
 %End
 
-	QLayout *layout() const;
+	TQLayout *layout() const;
 	void updateGeometry();
 
-	virtual void reparent(QWidget * /GetWrapper/,WFlags,const QPoint &,
+	virtual void reparent(TQWidget * /GetWrapper/,WFlags,const TQPoint &,
 			      bool = 0);
 %MethodCode
 		if (sipCpp -> parent() != a0)
@@ -436,12 +436,12 @@ public:
         }
 
 		Py_BEGIN_ALLOW_THREADS
-		sipSelfWasArg ? sipCpp->QWidget::reparent(a0, a1, *a2, a3) : sipCpp->reparent(a0, a1, *a2, a3);
+		sipSelfWasArg ? sipCpp->TQWidget::reparent(a0, a1, *a2, a3) : sipCpp->reparent(a0, a1, *a2, a3);
 		Py_END_ALLOW_THREADS
 %End
 
-%If (Qt_2_1_0 -)
-	void reparent(QWidget * /GetWrapper/,const QPoint &,bool = 0);
+%If (TQt_2_1_0 -)
+	void reparent(TQWidget * /GetWrapper/,const TQPoint &,bool = 0);
 %MethodCode
 		if (sipCpp -> parent() != a0)
         {
@@ -457,188 +457,188 @@ public:
 %End
 %End
 
-	void erase(const QRegion &);
-	void scroll(int,int,const QRect &);
-	void drawText(int,int,const QString &);
-	void drawText(const QPoint &,const QString &);
+	void erase(const TQRegion &);
+	void scroll(int,int,const TQRect &);
+	void drawText(int,int,const TQString &);
+	void drawText(const TQPoint &,const TQString &);
 	virtual void setAcceptDrops(bool);
 	virtual void setAutoMask(bool);
 	bool autoMask() const;
 	virtual bool customWhatsThis() const;
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	bool testWState(uint) const;
 %End
 %End
 
-%If (Qt_2_1_0 -)
-	QRect microFocusHint() const;
+%If (TQt_2_1_0 -)
+	TQRect microFocusHint() const;
 	void unsetFont();
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	enum BackgroundOrigin {
 		WidgetOrigin,
 		ParentOrigin,
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 		WindowOrigin,
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 		AncestorOrigin,
 %End
 	};
 %End
  
-%If (Qt_2_1_0 - Qt_3_0_0)
+%If (TQt_2_1_0 - TQt_3_0_0)
 	void setBackgroundOrigin(BackgroundOrigin);
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	virtual void setBackgroundOrigin(BackgroundOrigin);
 %End
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	BackgroundOrigin backgroundOrigin() const;
 %End
 
-%If (Qt_3_1_0 -)
-	QPoint backgroundOffset() const;
+%If (TQt_3_1_0 -)
+	TQPoint backgroundOffset() const;
 %End
 
 public slots:
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	virtual void adjustSize();
 %End
 	virtual void setEnabled(bool);
-%If (Qt_2_2_0 -)
+%If (TQt_2_2_0 -)
 	void setDisabled(bool);
 %End
 	void update();
 	void update(int,int,int,int);
-	void update(const QRect &);
+	void update(const TQRect &);
 	void repaint(int,int,int,int,bool = 1);
-	void repaint(const QRect &,bool = 1);
+	void repaint(const TQRect &,bool = 1);
 	virtual void show();
 	virtual void hide();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	void setShown(bool);
 	void setHidden(bool);
 %End
 	void raise() /PyName=raiseW/;
 	void lower() /PyName=lowerW/;
 	virtual void move(int,int);
-	void move(const QPoint &);
+	void move(const TQPoint &);
 	virtual void resize(int,int);
-	void resize(const QSize &);
+	void resize(const TQSize &);
 	virtual void setGeometry(int,int,int,int);
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setCaption(const char *);
-	void setIcon(const QPixmap &);
+	void setIcon(const TQPixmap &);
 	void setIconText(const char *);
 	void setMouseTracking(bool);
 	void setUpdatesEnabled(bool);
 	void repaint(bool = 1);
 	void iconify();
-	void setGeometry(const QRect &);
+	void setGeometry(const TQRect &);
 %End
 
-%If (Qt_2_00 -)
-	virtual void setCaption(const QString &);
-	virtual void setIcon(const QPixmap &);
-	virtual void setIconText(const QString &);
+%If (TQt_2_00 -)
+	virtual void setCaption(const TQString &);
+	virtual void setIcon(const TQPixmap &);
+	virtual void setIconText(const TQString &);
 	virtual void setMouseTracking(bool);
 	virtual void setFocus();
 	void clearFocus();
 	virtual void setUpdatesEnabled(bool);
 	void repaint();
 	void repaint(bool);
-	void repaint(const QRegion &,bool = 1);
+	void repaint(const TQRegion &,bool = 1);
 	virtual void showMinimized();
 	virtual void showMaximized();
 	virtual void showNormal();
 	virtual void polish();
 	bool close();
-	virtual void setGeometry(const QRect &);
+	virtual void setGeometry(const TQRect &);
 %End
 
-%If (Qt_2_1_0 -)
+%If (TQt_2_1_0 -)
 	void showFullScreen();
 	void constPolish() const;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
     // This was added before v3 but I can't be bothered to work out exactly
     // when.
-    void stackUnder(QWidget *);
+    void stackUnder(TQWidget *);
 %End
 
 protected:
-	bool event(QEvent *);
-	virtual void mousePressEvent(QMouseEvent *);
-	virtual void mouseReleaseEvent(QMouseEvent *);
-	virtual void mouseDoubleClickEvent(QMouseEvent *);
-	virtual void mouseMoveEvent(QMouseEvent *);
-	virtual void keyPressEvent(QKeyEvent *);
-	virtual void keyReleaseEvent(QKeyEvent *);
-	virtual void focusInEvent(QFocusEvent *);
-	virtual void focusOutEvent(QFocusEvent *);
-	virtual void enterEvent(QEvent *);
-	virtual void leaveEvent(QEvent *);
-	virtual void paintEvent(QPaintEvent *);
-	virtual void moveEvent(QMoveEvent *);
-	virtual void resizeEvent(QResizeEvent *);
-	virtual void closeEvent(QCloseEvent *);
-%If (Qt_3_0_0 -)
-	virtual void contextMenuEvent(QContextMenuEvent *);
-	virtual void imStartEvent(QIMEvent *);
-	virtual void imComposeEvent(QIMEvent *);
-	virtual void imEndEvent(QIMEvent *);
-	virtual void tabletEvent(QTabletEvent *);
+	bool event(TQEvent *);
+	virtual void mousePressEvent(TQMouseEvent *);
+	virtual void mouseReleaseEvent(TQMouseEvent *);
+	virtual void mouseDoubleClickEvent(TQMouseEvent *);
+	virtual void mouseMoveEvent(TQMouseEvent *);
+	virtual void keyPressEvent(TQKeyEvent *);
+	virtual void keyReleaseEvent(TQKeyEvent *);
+	virtual void focusInEvent(TQFocusEvent *);
+	virtual void focusOutEvent(TQFocusEvent *);
+	virtual void enterEvent(TQEvent *);
+	virtual void leaveEvent(TQEvent *);
+	virtual void paintEvent(TQPaintEvent *);
+	virtual void moveEvent(TQMoveEvent *);
+	virtual void resizeEvent(TQResizeEvent *);
+	virtual void closeEvent(TQCloseEvent *);
+%If (TQt_3_0_0 -)
+	virtual void contextMenuEvent(TQContextMenuEvent *);
+	virtual void imStartEvent(TQIMEvent *);
+	virtual void imComposeEvent(TQIMEvent *);
+	virtual void imEndEvent(TQIMEvent *);
+	virtual void tabletEvent(TQTabletEvent *);
 %End
 	virtual void enabledChange(bool);
-%If (- Qt_3_0_0)
-	virtual void backgroundColorChange(const QColor &);
-	virtual void backgroundPixmapChange(const QPixmap &);
+%If (- TQt_3_0_0)
+	virtual void backgroundColorChange(const TQColor &);
+	virtual void backgroundPixmapChange(const TQPixmap &);
 %End
-	virtual void paletteChange(const QPalette &);
-	virtual void fontChange(const QFont &);
-%If (Qt_3_0_0 -)
+	virtual void paletteChange(const TQPalette &);
+	virtual void fontChange(const TQFont &);
+%If (TQt_3_0_0 -)
 	virtual void windowActivationChange(bool);
 	void resetInputContext();
 %End
 	WFlags getWFlags() const;
 	void clearWFlags(WFlags);
 	virtual bool focusNextPrevChild(bool);
-//	QWExtra *extraData();
-//	QFocusData *focusData();
+//	TQWExtra *extraData();
+//	TQFocusData *focusData();
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	virtual void styleChange(GUIStyle);
 	void create(WId);
 	void create(WId,bool,bool);
 	void destroy(bool,bool);
 	void setWFlags(WFlags);
-	void setFRect(const QRect &);
-	void setCRect(const QRect &);
+	void setFRect(const TQRect &);
+	void setCRect(const TQRect &);
 	void setSizeGrip(bool);
 %End
 
-%If (Qt_2_00 -)
-	virtual void wheelEvent(QWheelEvent *);
-%If (Qt_DRAGANDDROP)
-	virtual void dragEnterEvent(QDragEnterEvent *);
-	virtual void dragMoveEvent(QDragMoveEvent *);
-	virtual void dragLeaveEvent(QDragLeaveEvent *);
-	virtual void dropEvent(QDropEvent *);
+%If (TQt_2_00 -)
+	virtual void wheelEvent(TQWheelEvent *);
+%If (TQt_DRAGANDDROP)
+	virtual void dragEnterEvent(TQDragEnterEvent *);
+	virtual void dragMoveEvent(TQDragMoveEvent *);
+	virtual void dragLeaveEvent(TQDragLeaveEvent *);
+	virtual void dropEvent(TQDropEvent *);
 %End
-	virtual void showEvent(QShowEvent *);
-	virtual void hideEvent(QHideEvent *);
-%If (- Qt_3_0_0)
-	virtual void customEvent(QCustomEvent *);
+	virtual void showEvent(TQShowEvent *);
+	virtual void hideEvent(TQHideEvent *);
+%If (- TQt_3_0_0)
+	virtual void customEvent(TQCustomEvent *);
 %End
 
 
 	virtual void updateMask();
 
-	virtual void styleChange(QStyle &);
+	virtual void styleChange(TQStyle &);
 	int metric(int) const;
 	virtual void create(WId = 0,bool = 1,bool = 1);
 	virtual void destroy(bool = 1,bool = 1);
@@ -646,19 +646,19 @@ protected:
 	virtual void setWState(uint);
 	void clearWState(uint);
 	virtual void setWFlags(WFlags);
-%If (- Qt_3_0_0)
-	virtual void setFRect(const QRect &);
-	virtual void setCRect(const QRect &);
+%If (- TQt_3_0_0)
+	virtual void setFRect(const TQRect &);
+	virtual void setCRect(const TQRect &);
 %End
 	virtual void setKeyCompression(bool);
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 	virtual void setMicroFocusHint(int,int,int,int,bool = 1);
 %End
-%If (Qt_3_0_0 -)
-	virtual void setMicroFocusHint(int,int,int,int,bool = 1,QFont * = 0);
+%If (TQt_3_0_0 -)
+	virtual void setMicroFocusHint(int,int,int,int,bool = 1,TQFont * = 0);
 %End
 %End
 
 private:
-	QWidget(const QWidget &);
+	TQWidget(const TQWidget &);
 };
diff --git a/sip/qt/qwidgetlist.sip b/sip/qt/qwidgetlist.sip
index 9fdc1ad..2b70a2b 100644
--- a/sip/qt/qwidgetlist.sip
+++ b/sip/qt/qwidgetlist.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QWidgetList.
+// This is the SIP interface definition for TQWidgetList.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWidgetList</Title>
+<Sect2><Title>TQWidgetList</Title>
 <Para>
-This class isn't implemented.  Whenever a <Literal>QWidgetList</Literal> is the
+This class isn't implemented.  Whenever a <Literal>TQWidgetList</Literal> is the
 return type of a function or the type of an argument, a Python list of
 instances is used instead.
 </Para>
@@ -31,7 +31,7 @@ instances is used instead.
 %End
 
 
-%MappedType QWidgetList
+%MappedType TQWidgetList
 {
 %TypeHeaderCode
 #include <qwidgetlist.h>
@@ -41,12 +41,12 @@ instances is used instead.
 	// Convert the list.
 
 	PyObject *pl;
-	QWidget *obj;
+	TQWidget *obj;
 
 	if ((pl = PyList_New(0)) == NULL)
 		return NULL;
 
-	for (QWidgetListIt it(*sipCpp); (obj = it.current()) != NULL; ++it)
+	for (TQWidgetListIt it(*sipCpp); (obj = it.current()) != NULL; ++it)
 	{
 		PyObject *inst;
 
@@ -65,7 +65,7 @@ instances is used instead.
 %End
  
 %ConvertToTypeCode
-	// Convert a Python list of QWidget instances to a QWidgetList on the
+	// Convert a Python list of TQWidget instances to a TQWidgetList on the
 	// heap.
 
 	if (sipIsErr == NULL)
@@ -80,16 +80,16 @@ instances is used instead.
 		return 1;
 	}
  
-	QWidgetList *qwl = new QWidgetList;
+	TQWidgetList *qwl = new TQWidgetList;
  
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 	{
-		QWidget *qw;
+		TQWidget *qw;
  
 		// We apply the transfer to the list itself, not the elements.
 		// Note that any temporary element will never be destroyed.
 		// There is nothing that can be done about this.
-		qw = reinterpret_cast<QWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QWidget,0,0,0,sipIsErr));
+		qw = reinterpret_cast<TQWidget *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_QWidget,0,0,0,sipIsErr));
  
 		if (*sipIsErr)
 		{
diff --git a/sip/qt/qwidgetstack.sip b/sip/qt/qwidgetstack.sip
index daf6694..59aacc2 100644
--- a/sip/qt/qwidgetstack.sip
+++ b/sip/qt/qwidgetstack.sip
@@ -1,98 +1,98 @@
-// This is the SIP interface definition for QWidgetStack.
+// This is the SIP interface definition for TQWidgetStack.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWidgetStack</Title>
+<Sect2><Title>TQWidgetStack</Title>
 <Para>
-<Literal>QWidgetStack</Literal> is fully implemented.
+<Literal>TQWidgetStack</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-class QWidgetStack : QFrame
+class TQWidgetStack : TQFrame
 {
 %TypeHeaderCode
 #include <qwidgetstack.h>
 %End
 
 public:
-	QWidgetStack(QWidget * /TransferThis/ = 0,const char * = 0);
-%If (Qt_3_1_0 -)
-	QWidgetStack(QWidget * /TransferThis/,const char *,WFlags);
+	TQWidgetStack(TQWidget * /TransferThis/ = 0,const char * = 0);
+%If (TQt_3_1_0 -)
+	TQWidgetStack(TQWidget * /TransferThis/,const char *,WFlags);
 %End
 
-	// The QWidget has it's parent changed to be `this' so it will be
+	// The TQWidget has it's parent changed to be `this' so it will be
 	// deleted automatically when `this' is deleted.  It stays this way
 	// even if removeWidget() is called, so it isn't transferred back.
-%If (- Qt_3_0_0)
-	void addWidget(QWidget * /Transfer/,int);
+%If (- TQt_3_0_0)
+	void addWidget(TQWidget * /Transfer/,int);
 %End
-%If (Qt_3_0_0 -)
-	int addWidget(QWidget * /Transfer/,int = -1);
+%If (TQt_3_0_0 -)
+	int addWidget(TQWidget * /Transfer/,int = -1);
 %End
-	void removeWidget(QWidget *);
+	void removeWidget(TQWidget *);
 
-%If (Qt_2_00 -)
-	QSize sizeHint() const;
-	QSize minimumSizeHint() const;
+%If (TQt_2_00 -)
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 %End
 	void show();
 
-	QWidget *widget(int) const;
-	int id(QWidget *) const;
+	TQWidget *widget(int) const;
+	int id(TQWidget *) const;
 
-	QWidget *visibleWidget() const;
+	TQWidget *visibleWidget() const;
 
-%If (Qt_2_00 -)
-	void setFrameRect(const QRect &);
+%If (TQt_2_00 -)
+	void setFrameRect(const TQRect &);
 %End
 
-%If (- Qt_2_00)
-	bool event(QEvent *);
+%If (- TQt_2_00)
+	bool event(TQEvent *);
 %End
 
 signals:
 	void aboutToShow(int);
-	void aboutToShow(QWidget *);
+	void aboutToShow(TQWidget *);
 
 public slots:
 	void raiseWidget(int);
-	void raiseWidget(QWidget *);
+	void raiseWidget(TQWidget *);
 
 protected:
 	void frameChanged();
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setChildGeometries();
 %End
-%If (Qt_2_00 -)
-	void resizeEvent(QResizeEvent *);
+%If (TQt_2_00 -)
+	void resizeEvent(TQResizeEvent *);
 
 	virtual void setChildGeometries();
-	void childEvent(QChildEvent *);
+	void childEvent(TQChildEvent *);
 %End
 
 private:
-%If (Qt_2_1_0 -)
-	QWidgetStack(const QWidgetStack &);
+%If (TQt_2_1_0 -)
+	TQWidgetStack(const TQWidgetStack &);
 %End
 };
diff --git a/sip/qt/qwindow.sip b/sip/qt/qwindow.sip
index 4305c42..9b1d511 100644
--- a/sip/qt/qwindow.sip
+++ b/sip/qt/qwindow.sip
@@ -1,47 +1,47 @@
-// This is the SIP interface definition for QWindow.
+// This is the SIP interface definition for TQWindow.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWindow</Title>
+<Sect2><Title>TQWindow</Title>
 <Para>
-<Literal>QWindow</Literal> is fully implemented (Qt v1.x).
+<Literal>TQWindow</Literal> is fully implemented (TQt v1.x).
 </Para>
 </Sect2>
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
-class QWindow : QWidget
+class TQWindow : TQWidget
 {
 %TypeHeaderCode
 #include <qwindow.h>
 %End
 
 public:
-	QWindow(QWidget * = 0,const char * = 0,WFlags = 0);
+	TQWindow(TQWidget * = 0,const char * = 0,WFlags = 0);
 
 private:
-	QWindow(const QWindow &);
+	TQWindow(const TQWindow &);
 };
 
 %End
diff --git a/sip/qt/qwindowdefs.sip b/sip/qt/qwindowdefs.sip
index 4638d71..3b1afdc 100644
--- a/sip/qt/qwindowdefs.sip
+++ b/sip/qt/qwindowdefs.sip
@@ -3,27 +3,27 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>Qt Constants</Title>
+<Sect2><Title>TQt Constants</Title>
 <Para>
-All constant values defined by Qt have equivalent constants defined to Python.
+All constant values defined by TQt have equivalent constants defined to Python.
 </Para>
 </Sect2>
 %End
@@ -40,32 +40,32 @@ All constant values defined by Qt have equivalent constants defined to Python.
 %OptionalInclude qwindowdefs_x11.sip
 
 
-%If (- Qt_2_00)
-typedef short QCOORD;
+%If (- TQt_2_00)
+typedef short TQCOORD;
 
-const int QCOORD_MIN;
-const int QCOORD_MAX;
+const int TQCOORD_MIN;
+const int TQCOORD_MAX;
 %End
 
-%If (Qt_2_00 -)
-typedef Q_INT32 QCOORD;
+%If (TQt_2_00 -)
+typedef Q_INT32 TQCOORD;
 
-const QCOORD QCOORD_MIN;
-const QCOORD QCOORD_MAX;
+const TQCOORD TQCOORD_MIN;
+const TQCOORD TQCOORD_MAX;
 %End
 
 
-typedef unsigned QRgb;
+typedef unsigned TQRgb;
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 char *qAppName();
 %End
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 const char *qAppName();
 %End
 
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 
 enum GUIStyle {
 	MacStyle,
diff --git a/sip/qt/qwindowdefs_qws.sip b/sip/qt/qwindowdefs_qws.sip
index 53f4b77..e6493df 100644
--- a/sip/qt/qwindowdefs_qws.sip
+++ b/sip/qt/qwindowdefs_qws.sip
@@ -1,23 +1,23 @@
 // This is the SIP interface definition for a variety of constant definitions
-// for Qt/Embedded.
+// for TQt/Embedded.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
diff --git a/sip/qt/qwindowdefs_x11.sip b/sip/qt/qwindowdefs_x11.sip
index 4ddfcd4..a771d63 100644
--- a/sip/qt/qwindowdefs_x11.sip
+++ b/sip/qt/qwindowdefs_x11.sip
@@ -4,31 +4,31 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %If (WS_X11)
 
-%If (- Qt_3_0_0)
+%If (- TQt_3_0_0)
 typedef unsigned HANDLE;
 typedef unsigned WId;
 %End
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 typedef unsigned long WId;
 %End
 
@@ -37,11 +37,11 @@ typedef void Display;
 Display *qt_xdisplay();
 int qt_xscreen();
 WId qt_xrootwin();
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 WId qt_xrootwin(int);
 %End
 
-%If (Qt_3_3_0 -)
+%If (TQt_3_3_0 -)
 const char *qAppClass();
 %End
 
diff --git a/sip/qt/qwindowsstyle.sip b/sip/qt/qwindowsstyle.sip
index 34be426..5f4ed19 100644
--- a/sip/qt/qwindowsstyle.sip
+++ b/sip/qt/qwindowsstyle.sip
@@ -1,27 +1,27 @@
-// This is the SIP interface definition for QWindowsStyle.
+// This is the SIP interface definition for TQWindowsStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QWindowsStyle (Qt v2+)</Title>
+<Sect2><Title>TQWindowsStyle (TQt v2+)</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>getButtonShift</Function></FuncDef>
 	<ParamDef>int &<Parameter>x</Parameter></ParamDef>
@@ -29,12 +29,12 @@
 </FuncSynopsis>
 <Para>
 This takes no parameters and returns a tuple of the <Literal>x</Literal> and
-<Literal>y</Literal> values.  (Qt v2)
+<Literal>y</Literal> values.  (TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>void <Function>scrollBarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>sb</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>sb</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMin</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderMax</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>sliderLength</Parameter></ParamDef>
@@ -44,12 +44,12 @@ This takes no parameters and returns a tuple of the <Literal>x</Literal> and
 This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Literal>sliderMin</Literal>, <Literal>sliderMax</Literal>,
 <Literal>sliderLength</Literal> and <Literal>buttonDim</Literal> values.
-(Qt v2)
+(TQt v2)
 </Para>
 
 <FuncSynopsis>
 	<FuncDef>void <Function>tabbarMetrics</Function></FuncDef>
-	<ParamDef>const QTabBar *<Parameter>t</Parameter></ParamDef>
+	<ParamDef>const TQTabBar *<Parameter>t</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>hframe</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>vframe</Parameter></ParamDef>
 	<ParamDef>int &<Parameter>overlap</Parameter></ParamDef>
@@ -57,134 +57,134 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the
 <Para>
 This takes only the <Literal>t</Literal> parameter and returns a tuple of the
 <Literal>hframe</Literal>, <Literal>vframe</Literal> and
-<Literal>overlap</Literal> values.  (Qt v2)
+<Literal>overlap</Literal> values.  (TQt v2)
 </Para>
 </Sect2>
 %End
  
  
-%If (Qt_STYLE_WINDOWS)
-%If (Qt_2_00 -)
+%If (TQt_STYLE_WINDOWS)
+%If (TQt_2_00 -)
 
-class QWindowsStyle : QCommonStyle
+class TQWindowsStyle : TQCommonStyle
 {
 %TypeHeaderCode
 #include <qwindowsstyle.h>
 %End
 
 public:
-	QWindowsStyle();
+	TQWindowsStyle();
 
-%If (Qt_3_3_0 -)
-	void polish(QApplication *);
-	void unPolish(QApplication *);
+%If (TQt_3_3_0 -)
+	void polish(TQApplication *);
+	void unPolish(TQApplication *);
 
-	void polish(QWidget *);
-	void unPolish(QWidget *);
+	void polish(TQWidget *);
+	void unPolish(TQWidget *);
 
-	void polish(QPalette &);
+	void polish(TQPalette &);
 %End
 
-%If (- Qt_3_0_0)
-	void drawButton(QPainter *,int,int,int,int,const QColorGroup &,
-			bool = 0,const QBrush * = 0);
-	void drawBevelButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,const QBrush * = 0);
-	void drawFocusRect(QPainter *,const QRect &,const QColorGroup &,
-			   const QColor * = 0,bool = 0);
-	void drawPushButton(QPushButton *,QPainter *);
+%If (- TQt_3_0_0)
+	void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			bool = 0,const TQBrush * = 0);
+	void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,const TQBrush * = 0);
+	void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &,
+			   const TQColor * = 0,bool = 0);
+	void drawPushButton(TQPushButton *,TQPainter *);
 
 	void getButtonShift(int &,int &);
 
-	void drawPanel(QPainter *,int,int,int,int,const QColorGroup &,
-		       bool = 0,int = 1,const QBrush * = 0);
-	void drawPopupPanel(QPainter *,int,int,int,int,const QColorGroup &,
-			    int = 2,const QBrush * = 0);
-	void drawArrow(QPainter *,ArrowType,bool,int,int,int,int,
-		       const QColorGroup &,bool,const QBrush * = 0);
-	QSize indicatorSize() const;
-	void drawIndicator(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,
+		       bool = 0,int = 1,const TQBrush * = 0);
+	void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &,
+			    int = 2,const TQBrush * = 0);
+	void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int,
+		       const TQColorGroup &,bool,const TQBrush * = 0);
+	TQSize indicatorSize() const;
+	void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,
 			   int,bool = 0,bool = 1);
-	QSize exclusiveIndicatorSize() const;
-	void drawExclusiveIndicator(QPainter *,int,int,int,int,
-				    const QColorGroup &,bool,bool = 0,bool = 1);
-	void drawExclusiveIndicatorMask(QPainter *,int,int,int,int,bool);
-	void drawComboButton(QPainter *,int,int,int,int,const QColorGroup &,
-			     bool = 0,bool = 0,bool = 1,const QBrush * = 0);
-	QRect comboButtonRect(int,int,int,int);
-	QRect comboButtonFocusRect(int,int,int,int);
+	TQSize exclusiveIndicatorSize() const;
+	void drawExclusiveIndicator(TQPainter *,int,int,int,int,
+				    const TQColorGroup &,bool,bool = 0,bool = 1);
+	void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool);
+	void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &,
+			     bool = 0,bool = 0,bool = 1,const TQBrush * = 0);
+	TQRect comboButtonRect(int,int,int,int);
+	TQRect comboButtonFocusRect(int,int,int,int);
 
-	void tabbarMetrics(const QTabBar *,int &,int &,int &);
+	void tabbarMetrics(const TQTabBar *,int &,int &,int &);
 
-	void drawTab(QPainter *,const QTabBar *,QTab *,bool);
-	void drawTabMask(QPainter *,const QTabBar *,QTab *,bool);
+	void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool);
+	void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool);
 
-	void scrollBarMetrics(const QScrollBar *,int &,int &,int &,int &);
+	void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &);
 
-	void drawScrollBarControls(QPainter *,const QScrollBar *,int,uint,uint);
+	void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint);
 	int sliderLength() const;
-	void drawSlider(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &,
 			Orientation,bool,bool);
-	void drawSliderMask(QPainter *,int,int,int,int,Orientation,bool,bool);
-	void drawSliderGroove(QPainter *,int,int,int,int,const QColorGroup &,
-			      QCOORD,Orientation);
+	void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool);
+	void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &,
+			      TQCOORD,Orientation);
 	int maximumSliderDragDistance() const;
 	int splitterWidth() const;
-	void drawSplitter(QPainter *,int,int,int,int,const QColorGroup &,
+	void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &,
 			  Orientation);
-	void drawCheckMark(QPainter *,int,int,int,int,const QColorGroup &,bool,
+	void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,bool,
 			   bool);
-	void polishPopupMenu(QPopupMenu *);
-	int extraPopupMenuItemWidth(bool,int,QMenuItem *,const QFontMetrics &);
-	int popupMenuItemHeight(bool,QMenuItem *,const QFontMetrics &);
-	void drawPopupMenuItem(QPainter *,bool,int,int,QMenuItem *,
-			       const QPalette &,bool,bool,int,int,int,int);
+	void polishPopupMenu(TQPopupMenu *);
+	int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &);
+	int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &);
+	void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *,
+			       const TQPalette &,bool,bool,int,int,int,int);
 %End
-%If (Qt_3_0_0 -)
-	virtual void polishPopupMenu(QPopupMenu *);
+%If (TQt_3_0_0 -)
+	virtual void polishPopupMenu(TQPopupMenu *);
  
-	void drawPrimitive(PrimitiveElement,QPainter *,const QRect &,
-			   const QColorGroup &,SFlags = Style_Default,
-			   const QStyleOption & = QStyleOption()) const;
+	void drawPrimitive(PrimitiveElement,TQPainter *,const TQRect &,
+			   const TQColorGroup &,SFlags = Style_Default,
+			   const TQStyleOption & = TQStyleOption()) const;
  
-	void drawControl(ControlElement,QPainter *,const QWidget *,
-			 const QRect &,const QColorGroup &,
+	void drawControl(ControlElement,TQPainter *,const TQWidget *,
+			 const TQRect &,const TQColorGroup &,
 			 SFlags = Style_Default,
-			 const QStyleOption & = QStyleOption()) const;
+			 const TQStyleOption & = TQStyleOption()) const;
  
-	void drawComplexControl(ComplexControl,QPainter *,const QWidget *,
-				const QRect &,const QColorGroup &,
+	void drawComplexControl(ComplexControl,TQPainter *,const TQWidget *,
+				const TQRect &,const TQColorGroup &,
 				SFlags = Style_Default,SCFlags = SC_All,
 				SCFlags = SC_None,
-				const QStyleOption & = QStyleOption()) const;
+				const TQStyleOption & = TQStyleOption()) const;
  
-	int pixelMetric(PixelMetric,const QWidget * = 0) const;
+	int pixelMetric(PixelMetric,const TQWidget * = 0) const;
  
-	QSize sizeFromContents(ContentsType,const QWidget *,const QSize &,
-			       const QStyleOption & = QStyleOption()) const; 
+	TQSize sizeFromContents(ContentsType,const TQWidget *,const TQSize &,
+			       const TQStyleOption & = TQStyleOption()) const; 
 
-	int styleHint(StyleHint,const QWidget *,
-		      const QStyleOption & = QStyleOption(),
-		      QStyleHintReturn * = 0) const;
+	int styleHint(StyleHint,const TQWidget *,
+		      const TQStyleOption & = TQStyleOption(),
+		      TQStyleHintReturn * = 0) const;
  
-	QPixmap stylePixmap(StylePixmap,const QWidget * = 0,
-			    const QStyleOption & = QStyleOption()) const;
+	TQPixmap stylePixmap(StylePixmap,const TQWidget * = 0,
+			    const TQStyleOption & = TQStyleOption()) const;
 %End
 
-%If (Qt_3_1_0 -)
-	QRect subRect(SubRect,const QWidget *) const;
+%If (TQt_3_1_0 -)
+	TQRect subRect(SubRect,const TQWidget *) const;
 %End
 
 protected:
-%If (- Qt_3_0_0)
-	void drawWinShades(QPainter *,int,int,int,int,const QColor &,
-			   const QColor &,const QColor &,const QColor &,
-			   const QBrush *);
+%If (- TQt_3_0_0)
+	void drawWinShades(TQPainter *,int,int,int,int,const TQColor &,
+			   const TQColor &,const TQColor &,const TQColor &,
+			   const TQBrush *);
 %End
 
 private:
-%If (Qt_3_0_0 -)
-	QWindowsStyle(const QWindowsStyle &);
+%If (TQt_3_0_0 -)
+	TQWindowsStyle(const TQWindowsStyle &);
 %End
 };
 
diff --git a/sip/qt/qwindowsxpstyle.sip b/sip/qt/qwindowsxpstyle.sip
index 394bfad..121e03b 100644
--- a/sip/qt/qwindowsxpstyle.sip
+++ b/sip/qt/qwindowsxpstyle.sip
@@ -1,29 +1,29 @@
-// This is the SIP interface definition for QWindowsXPStyle.
+// This is the SIP interface definition for TQWindowsXPStyle.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QWindowsXPStyle (Qt v3.0.1+, Windows)</Title>
+<Sect2><Title>TQWindowsXPStyle (TQt v3.0.1+, Windows)</Title>
 <Para>
-<Literal>QWindowsXPStyle</Literal> is fully implemented.
+<Literal>TQWindowsXPStyle</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
diff --git a/sip/qt/qwizard.sip b/sip/qt/qwizard.sip
index c062f65..fd50b45 100644
--- a/sip/qt/qwizard.sip
+++ b/sip/qt/qwizard.sip
@@ -1,100 +1,100 @@
-// This is the SIP interface definition for QWizard.
+// This is the SIP interface definition for TQWizard.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWizard (Qt v2+)</Title>
+<Sect2><Title>TQWizard (TQt v2+)</Title>
 <Para>
-<Literal>QWizard</Literal> is fully implemented.
+<Literal>TQWizard</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
 
 
-%If (Qt_WIZARD)
-%If (Qt_2_00 -)
+%If (TQt_WIZARD)
+%If (TQt_2_00 -)
 
-class QWizard : QDialog
+class TQWizard : TQDialog
 {
 %TypeHeaderCode
 #include <qwizard.h>
 %End
 
 public:
-	QWizard(QWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
+	TQWizard(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,
 		WFlags = 0);
 
 	void show();
 
-	void setFont(const QFont &);
+	void setFont(const TQFont &);
 
-	// The QWidget is passed to QWidgetStack::addWidget().
-	virtual void addPage(QWidget * /Transfer/, const QString &);
-%If (Qt_3_0_0 -)
-	// The QWidget is passed to QWidgetStack::addWidget().
-	virtual void insertPage(QWidget * /Transfer/, const QString &,int);
+	// The TQWidget is passed to TQWidgetStack::addWidget().
+	virtual void addPage(TQWidget * /Transfer/, const TQString &);
+%If (TQt_3_0_0 -)
+	// The TQWidget is passed to TQWidgetStack::addWidget().
+	virtual void insertPage(TQWidget * /Transfer/, const TQString &,int);
 %End
-	virtual void removePage(QWidget *);
+	virtual void removePage(TQWidget *);
 
-	QString title(QWidget *) const;
-%If (Qt_2_2_0 -)
-	void setTitle(QWidget *,const QString &);
+	TQString title(TQWidget *) const;
+%If (TQt_2_2_0 -)
+	void setTitle(TQWidget *,const TQString &);
 %End
-%If (Qt_3_0_0 -)
-	QFont titleFont() const;
-	void setTitleFont(const QFont &);
+%If (TQt_3_0_0 -)
+	TQFont titleFont() const;
+	void setTitleFont(const TQFont &);
 %End
 
-	virtual void showPage(QWidget *);
+	virtual void showPage(TQWidget *);
 
-	QWidget *currentPage() const;
+	TQWidget *currentPage() const;
 
-%If (Qt_2_1_0 -)
-	QWidget *page(int) const;
+%If (TQt_2_1_0 -)
+	TQWidget *page(int) const;
 	int pageCount() const;
 %End
-%If (Qt_3_0_0 -)
-	int indexOf(QWidget *) const;
+%If (TQt_3_0_0 -)
+	int indexOf(TQWidget *) const;
 %End
 
-	virtual bool appropriate(QWidget *) const;
-	virtual void setAppropriate(QWidget *,bool);
+	virtual bool appropriate(TQWidget *) const;
+	virtual void setAppropriate(TQWidget *,bool);
 
-	QPushButton *backButton() const;
-	QPushButton *nextButton() const;
-	QPushButton *finishButton() const;
-	QPushButton *cancelButton() const;
-	QPushButton *helpButton() const;
+	TQPushButton *backButton() const;
+	TQPushButton *nextButton() const;
+	TQPushButton *finishButton() const;
+	TQPushButton *cancelButton() const;
+	TQPushButton *helpButton() const;
 
-	bool eventFilter(QObject *,QEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
 
 public slots:
-	virtual void setBackEnabled(QWidget *,bool);
-	virtual void setNextEnabled(QWidget *,bool);
-	virtual void setFinishEnabled(QWidget *,bool);
+	virtual void setBackEnabled(TQWidget *,bool);
+	virtual void setNextEnabled(TQWidget *,bool);
+	virtual void setFinishEnabled(TQWidget *,bool);
 
-	virtual void setHelpEnabled(QWidget *,bool);
+	virtual void setHelpEnabled(TQWidget *,bool);
 
-%If (- Qt_3_0_0)
-	virtual void setFinish(QWidget *,bool);
+%If (- TQt_3_0_0)
+	virtual void setFinish(TQWidget *,bool);
 %End
 
 protected slots:
@@ -104,17 +104,17 @@ protected slots:
 
 signals:
 	void helpClicked();
-%If (Qt_2_2_0 -)
-	void selected(const QString &);
+%If (TQt_2_2_0 -)
+	void selected(const TQString &);
 %End
 
 protected:
-	virtual void layOutButtonRow(QHBoxLayout *);
-	virtual void layOutTitleRow(QHBoxLayout *,const QString &);
+	virtual void layOutButtonRow(TQHBoxLayout *);
+	virtual void layOutTitleRow(TQHBoxLayout *,const TQString &);
 
 private:
-%If (Qt_2_1_0 -)
-	QWizard(const QWizard &);
+%If (TQt_2_1_0 -)
+	TQWizard(const TQWizard &);
 %End
 };
 
diff --git a/sip/qt/qwmatrix.sip b/sip/qt/qwmatrix.sip
index 1bb8cdc..ee482de 100644
--- a/sip/qt/qwmatrix.sip
+++ b/sip/qt/qwmatrix.sip
@@ -1,38 +1,38 @@
-// This is the SIP interface definition for QWMatrix.
+// This is the SIP interface definition for TQWMatrix.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 %ExportedDoc
-<Sect2><Title>QWMatrix</Title>
+<Sect2><Title>TQWMatrix</Title>
 <Para>
 The Python <Literal>==</Literal>, <Literal>!=</Literal> and
 <Literal>*=</Literal> operators are supported.
 </Para>
 
 <FuncSynopsis>
-        <FuncDef>QWMatrix <Function>invert</Function> const</FuncDef>
+        <FuncDef>TQWMatrix <Function>invert</Function> const</FuncDef>
         <ParamDef>bool *<Parameter>invertible</Parameter> = 0</ParamDef>
 </FuncSynopsis>
 <Para>
-This takes no parameters and returns a tuple of the <Literal>QWMatrix</Literal>
+This takes no parameters and returns a tuple of the <Literal>TQWMatrix</Literal>
 result and the <Literal>invertible</Literal> value.
 </Para>
 
@@ -59,7 +59,7 @@ values.
 <Para>
 This takes the <Literal>x</Literal> and <Literal>y</Literal> parameters and
 returns a tuple containing the <Literal>tx</Literal> and <Literal>ty</Literal>
-values. (Qt v1.x)
+values. (TQt v1.x)
 </Para>
 
 <FuncSynopsis>
@@ -72,67 +72,67 @@ values. (Qt v1.x)
 <Para>
 This takes the <Literal>x</Literal> and <Literal>y</Literal> parameters and
 returns a tuple containing the <Literal>tx</Literal> and <Literal>ty</Literal>
-values. (Qt v2+)
+values. (TQt v2+)
 </Para>
 </Sect2>
 %End
 
 
-class QWMatrix
+class TQWMatrix
 {
 %TypeHeaderCode
 #include <qwmatrix.h>
 %End
 
 public:
-	QWMatrix();
-%If (- Qt_2_00)
-	QWMatrix(float,float,float,float,float,float);
+	TQWMatrix();
+%If (- TQt_2_00)
+	TQWMatrix(float,float,float,float,float,float);
 %End
-%If (Qt_2_00 -)
-	QWMatrix(double,double,double,double,double,double);
+%If (TQt_2_00 -)
+	TQWMatrix(double,double,double,double,double,double);
 %End
 
 	void map(int /Constrained/,int /Constrained/,int *,int *) const;
 
-%If (Qt_3_0_0 -)
-	QRect mapRect(const QRect &) const;
+%If (TQt_3_0_0 -)
+	TQRect mapRect(const TQRect &) const;
 %End
 
-	QPoint map(const QPoint &) const;
-	QRect map(const QRect &); const
-	QPointArray map(const QPointArray &) const;
-%If (Qt_3_1_0 -)
-	QRegion map(const QRegion &) const;
-	QRegion mapToRegion(const QRect &) const;
-	QPointArray mapToPolygon(const QRect &) const;
+	TQPoint map(const TQPoint &) const;
+	TQRect map(const TQRect &); const
+	TQPointArray map(const TQPointArray &) const;
+%If (TQt_3_1_0 -)
+	TQRegion map(const TQRegion &) const;
+	TQRegion mapToRegion(const TQRect &) const;
+	TQPointArray mapToPolygon(const TQRect &) const;
 %End
 
 	void reset();
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool isIdentity() const;
 
 	bool isInvertible() const;
 %End
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	double det() const;
 %End
 
-	QWMatrix invert(bool * = 0) const;
+	TQWMatrix invert(bool * = 0) const;
 
-	bool operator==(const QWMatrix &) const;
-	bool operator!=(const QWMatrix &) const;
-	QWMatrix &operator*=(const QWMatrix &);
+	bool operator==(const TQWMatrix &) const;
+	bool operator!=(const TQWMatrix &) const;
+	TQWMatrix &operator*=(const TQWMatrix &);
 
-%If (Qt_3_0_0 -)
-	// These aren't documented but are used in Qt examples.
-	QPoint operator*(const QPoint &) const;
-	QRegion operator*(const QRect &) const;
-	QRegion operator*(const QRegion &) const;
-	QPointArray operator*(const QPointArray &) const;
+%If (TQt_3_0_0 -)
+	// These aren't documented but are used in TQt examples.
+	TQPoint operator*(const TQPoint &) const;
+	TQRegion operator*(const TQRect &) const;
+	TQRegion operator*(const TQRegion &) const;
+	TQPointArray operator*(const TQPointArray &) const;
 %End
 
-%If (Qt_3_1_0 -)
+%If (TQt_3_1_0 -)
 	enum TransformationMode {
 		Points,
 		Areas
@@ -142,7 +142,7 @@ public:
 	static TransformationMode transformationMode();
 %End
 
-%If (- Qt_2_00)
+%If (- TQt_2_00)
 	void setMatrix(float,float,float,float,float,float);
 	float m11();
 	float m12();
@@ -153,13 +153,13 @@ public:
 
 	void map(float,float,float *,float *) const;
 
-	QWMatrix &translate(float,float);
-	QWMatrix &scale(float,float);
-	QWMatrix &shear(float,float);
-	QWMatrix &rotate(float);
+	TQWMatrix &translate(float,float);
+	TQWMatrix &scale(float,float);
+	TQWMatrix &shear(float,float);
+	TQWMatrix &rotate(float);
 %End
 
-%If (Qt_2_00 -)
+%If (TQt_2_00 -)
 	void setMatrix(double,double,double,double,double,double);
 	double m11();
 	double m12();
@@ -170,9 +170,9 @@ public:
 
 	void map(double,double,double *,double *) const;
 
-	QWMatrix &translate(double,double);
-	QWMatrix &scale(double,double);
-	QWMatrix &shear(double,double);
-	QWMatrix &rotate(double);
+	TQWMatrix &translate(double,double);
+	TQWMatrix &scale(double,double);
+	TQWMatrix &shear(double,double);
+	TQWMatrix &rotate(double);
 %End
 };
diff --git a/sip/qt/qworkspace.sip b/sip/qt/qworkspace.sip
index bbc9dfc..8c7d993 100644
--- a/sip/qt/qworkspace.sip
+++ b/sip/qt/qworkspace.sip
@@ -1,79 +1,79 @@
-// This is the SIP interface definition for QWorkspace.
+// This is the SIP interface definition for TQWorkspace.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  
 %ExportedDoc
-<Sect2><Title>QWorkspace (Qt v2.1+)</Title>
+<Sect2><Title>TQWorkspace (TQt v2.1+)</Title>
 <Para>
-<Literal>QWorkspace</Literal> is fully implemented.
+<Literal>TQWorkspace</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
  
 
-%If (Qt_2_1_0 -)
-%If (Qt_WORKSPACE)
+%If (TQt_2_1_0 -)
+%If (TQt_WORKSPACE)
 
-class QWorkspace : QWidget
+class TQWorkspace : TQWidget
 {
 %TypeHeaderCode
 #include <qworkspace.h>
 %End
 
 public:
-	QWorkspace(QWidget * /TransferThis/ = 0,const char * = 0);
+	TQWorkspace(TQWidget * /TransferThis/ = 0,const char * = 0);
 
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	enum WindowOrder {
 		CreationOrder,
 		StackingOrder
 	};
 %End
 
-	QWidget *activeWindow() const;
-	QWidgetList windowList() const;
-%If (Qt_3_2_0 -)
-	QWidgetList windowList(WindowOrder) const;
+	TQWidget *activeWindow() const;
+	TQWidgetList windowList() const;
+%If (TQt_3_2_0 -)
+	TQWidgetList windowList(WindowOrder) const;
 %End
 
-%If (- Qt_3_0_0)
-	QSizePolicy sizePolicy() const;
+%If (- TQt_3_0_0)
+	TQSizePolicy sizePolicy() const;
 %End
-	QSize sizeHint() const;
+	TQSize sizeHint() const;
 
-%If (Qt_3_0_0 -)
+%If (TQt_3_0_0 -)
 	bool scrollBarsEnabled() const;
 	void setScrollBarsEnabled(bool);
  
-	void setPaletteBackgroundColor(const QColor &);
-	void setPaletteBackgroundPixmap(const QPixmap &);
+	void setPaletteBackgroundColor(const TQColor &);
+	void setPaletteBackgroundPixmap(const TQPixmap &);
 %End
 
 signals:
-	void windowActivated(QWidget *);
+	void windowActivated(TQWidget *);
 
 public slots:
 	void cascade();
 	void tile();
-%If (Qt_3_2_0 -)
+%If (TQt_3_2_0 -)
 	void closeActiveWindow();
 	void closeAllWindows();
 	void activateNextWindow();
@@ -81,20 +81,20 @@ public slots:
 %End
 
 protected:
-%If (Qt_3_0_0 -)
-	void styleChange(QStyle &);
+%If (TQt_3_0_0 -)
+	void styleChange(TQStyle &);
 %End
-	void childEvent(QChildEvent *);
-	void resizeEvent(QResizeEvent *);
-	bool eventFilter(QObject *,QEvent *);
-	void showEvent(QShowEvent *);
-%If (Qt_3_0_0 -)
-	void hideEvent(QHideEvent *);
-	void wheelEvent(QWheelEvent *);
+	void childEvent(TQChildEvent *);
+	void resizeEvent(TQResizeEvent *);
+	bool eventFilter(TQObject *,TQEvent *);
+	void showEvent(TQShowEvent *);
+%If (TQt_3_0_0 -)
+	void hideEvent(TQHideEvent *);
+	void wheelEvent(TQWheelEvent *);
 %End
 
 private:
-	QWorkspace(const QWorkspace &);
+	TQWorkspace(const TQWorkspace &);
 };
 
 %End
diff --git a/sip/qt/versions.sip b/sip/qt/versions.sip
index 09aed5c..0c7a589 100644
--- a/sip/qt/versions.sip
+++ b/sip/qt/versions.sip
@@ -1,33 +1,33 @@
-// This defines the different versions of Qt that PyQt knows about.
+// This defines the different versions of TQt that PyTQt knows about.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
 // 
-// This file is part of PyQt.
+// This file is part of PyTQt.
 // 
-// This copy of PyQt is free software; you can redistribute it and/or modify it
+// This copy of PyTQt is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
 // Software Foundation; either version 2, or (at your option) any later
 // version.
 // 
-// PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
+// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
 // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 // FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 // details.
 // 
 // You should have received a copy of the GNU General Public License along with
-// PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
+// PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 // Specify the releases over time - not all of them, just those that introduce
 // something new.
-%Timeline	{Qt_1_43
-		 Qt_2_00 Qt_2_1_0 Qt_2_2_0 Qt_2_3_0 Qt_2_3_1
-		 Qt_3_0_0 Qt_3_0_1 Qt_3_0_2 Qt_3_0_4 Qt_3_0_5 Qt_3_0_6
-		 Qt_3_1_0 Qt_3_1_1 Qt_3_1_2
-		 Qt_3_2_0
-		 Qt_3_3_0 Qt_3_3_5 Qt_3_3_6}
+%Timeline	{TQt_1_43
+		 TQt_2_00 TQt_2_1_0 TQt_2_2_0 TQt_2_3_0 TQt_2_3_1
+		 TQt_3_0_0 TQt_3_0_1 TQt_3_0_2 TQt_3_0_4 TQt_3_0_5 TQt_3_0_6
+		 TQt_3_1_0 TQt_3_1_1 TQt_3_1_2
+		 TQt_3_2_0
+		 TQt_3_3_0 TQt_3_3_5 TQt_3_3_6}
 
 
 // Specify the platforms.
@@ -35,58 +35,58 @@
 
 
 // Specify the features.
-%Feature	Qt_THREAD_SUPPORT
+%Feature	TQt_THREAD_SUPPORT
 
-%Feature	Qt_ACTION
-%Feature	Qt_ASSISTANTCLIENT
-%Feature	Qt_CLIPBOARD
-%Feature	Qt_CODECS
-%Feature	Qt_COLORDIALOG
-%Feature	Qt_DATASTREAM
-%Feature	Qt_DIAL
-%Feature	Qt_DNS
-%Feature	Qt_DOM
-%Feature	Qt_DRAGANDDROP
-%Feature	Qt_ICONVIEW
-%Feature	Qt_IMAGE_TEXT
-%Feature	Qt_INPUTDIALOG
-%Feature	Qt_FILEDIALOG
-%Feature	Qt_FONTDATABASE
-%Feature	Qt_FONTDIALOG
-%Feature	Qt_MESSAGEBOX
-%Feature	Qt_MIMECLIPBOARD
-%Feature	Qt_NETWORKPROTOCOL
-%Feature	Qt_NETWORKPROTOCOL_FTP
-%Feature	Qt_NETWORKPROTOCOL_HTTP
-%Feature	Qt_PICTURE
-%Feature	Qt_PRINTDIALOG
-%Feature	Qt_PRINTER
-%Feature	Qt_PROGRESSDIALOG
-%Feature	Qt_PROPERTIES
-%Feature	Qt_SEMIMODAL
-%Feature	Qt_SIZEGRIP
-%Feature	Qt_SOUND
-%Feature	Qt_SPLITTER
-%Feature	Qt_STYLE_CDE
-%Feature	Qt_STYLE_INTERLACE
-%Feature	Qt_STYLE_MOTIF
-%Feature	Qt_STYLE_MOTIFPLUS
-%Feature	Qt_STYLE_PLATINUM
-%Feature	Qt_STYLE_SGI
-%Feature	Qt_STYLE_WINDOWS
-%Feature	Qt_STYLE_WINDOWSXP
-%Feature	Qt_TABDIALOG
-%Feature	Qt_TABLE
-%Feature	Qt_TABLEVIEW
-%Feature	Qt_TRANSFORMATIONS
-%Feature	Qt_TRANSLATION
-%Feature	Qt_WIZARD
-%Feature	Qt_WORKSPACE
+%Feature	TQt_ACTION
+%Feature	TQt_ASSISTANTCLIENT
+%Feature	TQt_CLIPBOARD
+%Feature	TQt_CODECS
+%Feature	TQt_COLORDIALOG
+%Feature	TQt_DATASTREAM
+%Feature	TQt_DIAL
+%Feature	TQt_DNS
+%Feature	TQt_DOM
+%Feature	TQt_DRAGANDDROP
+%Feature	TQt_ICONVIEW
+%Feature	TQt_IMAGE_TEXT
+%Feature	TQt_INPUTDIALOG
+%Feature	TQt_FILEDIALOG
+%Feature	TQt_FONTDATABASE
+%Feature	TQt_FONTDIALOG
+%Feature	TQt_MESSAGEBOX
+%Feature	TQt_MIMECLIPBOARD
+%Feature	TQt_NETWORKPROTOCOL
+%Feature	TQt_NETWORKPROTOCOL_FTP
+%Feature	TQt_NETWORKPROTOCOL_HTTP
+%Feature	TQt_PICTURE
+%Feature	TQt_PRINTDIALOG
+%Feature	TQt_PRINTER
+%Feature	TQt_PROGRESSDIALOG
+%Feature	TQt_PROPERTIES
+%Feature	TQt_SEMIMODAL
+%Feature	TQt_SIZEGRIP
+%Feature	TQt_SOUND
+%Feature	TQt_SPLITTER
+%Feature	TQt_STYLE_CDE
+%Feature	TQt_STYLE_INTERLACE
+%Feature	TQt_STYLE_MOTIF
+%Feature	TQt_STYLE_MOTIFPLUS
+%Feature	TQt_STYLE_PLATINUM
+%Feature	TQt_STYLE_SGI
+%Feature	TQt_STYLE_WINDOWS
+%Feature	TQt_STYLE_WINDOWSXP
+%Feature	TQt_TABDIALOG
+%Feature	TQt_TABLE
+%Feature	TQt_TABLEVIEW
+%Feature	TQt_TRANSFORMATIONS
+%Feature	TQt_TRANSLATION
+%Feature	TQt_WIZARD
+%Feature	TQt_WORKSPACE
 
 // On Windows64 Q_LONG is defined as __int64 (which SIP doesn't handle) so
 // this feature is disabled.
-%Feature	Qt_Q_LONG_IS_long
+%Feature	TQt_Q_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.
-%Feature    Qt_SIP_PRE_4_7_2
+%Feature    TQt_SIP_PRE_4_7_2