Initial TQt conversion

30 files changed, 453 insertions, 453 deletions

diff --git a/sip/qtext/copying.sip b/sip/qtext/copying.sip
index 463904b..6da646e 100644
--- a/sip/qtext/copying.sip
+++ b/sip/qtext/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 <[email protected]>
 // 
-// 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 <[email protected]>
 
-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/qtext/qextscintilla.sip b/sip/qtext/qextscintilla.sip
index c03dc56..e7609b9 100644
--- a/sip/qtext/qextscintilla.sip
+++ b/sip/qtext/qextscintilla.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -40,7 +40,7 @@ public:
 	enum AutoCompletionSource {
 		AcsDocument,
 		AcsAPIs,
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		AcsAll,
 %End
 	};
@@ -51,7 +51,7 @@ public:
 		SloppyBraceMatch
 	};
 
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 	enum EdgeMode {
 		EdgeNone,
 		EdgeLine,
@@ -111,12 +111,12 @@ public:
 	enum WrapMode {
 		WrapNone,
 		WrapWord,
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		WrapCharacter,
 %End
 	};
 
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	enum WrapVisualFlag {
 		WrapFlagNone,
 		WrapFlagByText,
@@ -124,11 +124,11 @@ public:
 	};
 %End
 
-	QextScintilla(QWidget * /TransferThis/ = 0,const char * = 0,
+	QextScintilla(TQWidget * /TransferThis/ = 0,const char * = 0,
 		      WFlags = 0);
 
 	bool autoCompletionCaseSensitivity();
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	bool autoCompletionFillupsEnabled();
 %End
 	bool autoCompletionReplaceWord();
@@ -140,18 +140,18 @@ public:
 	void beginUndoAction();
 	BraceMatch braceMatching() const;
 	int callTipsVisible() const;
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	void cancelList();
 %End
 	void clearRegisteredImages();
 	void convertEols(EolMode);
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 	QextScintillaDocument document();
 %End
 	void endUndoAction();
 
-%If (QScintilla_1_4 -)
-	QColor edgeColor();
+%If (TQScintilla_1_4 -)
+	TQColor edgeColor();
 	int edgeColumn();
 	EdgeMode edgeMode();
 %End
@@ -159,22 +159,22 @@ public:
 	EolMode eolMode();
 	bool eolVisibility();
 
-%If (QScintilla_1_7 -)
-	QColor color() const;
-	QColor paper() const;
+%If (TQScintilla_1_7 -)
+	TQColor color() const;
+	TQColor paper() const;
 %End
 
-%If (QScintilla_1_6 -)
-	virtual bool findFirst(const QString &,bool,bool,bool,bool,bool = 1,
+%If (TQScintilla_1_6 -)
+	virtual bool findFirst(const TQString &,bool,bool,bool,bool,bool = 1,
 			       int = -1,int = -1,bool = 1);
 %End
-%If (- QScintilla_1_6)
-	virtual bool findFirst(const QString &,bool,bool,bool,bool,bool = 1,
+%If (- TQScintilla_1_6)
+	virtual bool findFirst(const TQString &,bool,bool,bool,bool,bool = 1,
 			       int = -1,int = -1);
 %End
 	virtual bool findNext();
 
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	int firstVisibleLine();
 %End
 
@@ -189,7 +189,7 @@ public:
 	bool indentationsUseTabs();
 	int indentationWidth();
 
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	bool isCallTipActive();
 	bool isListActive();
 %End
@@ -198,11 +198,11 @@ public:
 	bool isRedoAvailable();
 	bool isUndoAvailable();
 	bool isUtf8();
-	int lineAt(const QPoint &);
+	int lineAt(const TQPoint &);
 	int lineLength(int);
 	int lines();
 	int length();
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	QextScintillaLexer *lexer() const;
 %End
 
@@ -213,7 +213,7 @@ public:
 
 	int markerDefine(MarkerSymbol,int = -1);
 	int markerDefine(char,int = -1);
-	int markerDefine(const QPixmap *,int = -1);
+	int markerDefine(const TQPixmap *,int = -1);
 	int markerAdd(int,int);
 	unsigned markersAtLine(int);
 	void markerDelete(int,int = -1);
@@ -222,74 +222,74 @@ public:
 	int markerLine(int);
 	int markerFindNext(int,unsigned);
 	int markerFindPrevious(int,unsigned);
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 	virtual void recolor(int = 0,int = -1);
 %End
-	void registerImage(int,const QPixmap *);
-	virtual void replace(const QString &);
+	void registerImage(int,const TQPixmap *);
+	virtual void replace(const TQString &);
 	void resetFoldMarginColors();
-	void setFoldMarginColors(const QColor &,const QColor &);
+	void setFoldMarginColors(const TQColor &,const TQColor &);
 
 	void setAutoCompletionAPIs(QextScintillaAPIs * = 0);
 	void setAutoCompletionFillups(const char *);
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	void setAutoCompletionFillupsEnabled(bool);
 	void setAutoCompletionStartCharacters(const char *);
 %End
 
 	void setCallTipsAPIs(QextScintillaAPIs * = 0);
-	void setCallTipsBackgroundColor(const QColor &);
-	void setCallTipsForegroundColor(const QColor &);
-	void setCallTipsHighlightColor(const QColor &);
+	void setCallTipsBackgroundColor(const TQColor &);
+	void setCallTipsForegroundColor(const TQColor &);
+	void setCallTipsHighlightColor(const TQColor &);
 	void setCallTipsVisible(int);
 
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 	void setDocument(const QextScintillaDocument &);
 %End
 
-%If (QScintilla_1_4 -)
-	void setEdgeColor(const QColor &);
+%If (TQScintilla_1_4 -)
+	void setEdgeColor(const TQColor &);
 	void setEdgeColumn(int);
 	void setEdgeMode(EdgeMode);
 %End
 
-%If (QScintilla_1_7 -)
-	virtual void setFont(const QFont &);
+%If (TQScintilla_1_7 -)
+	virtual void setFont(const TQFont &);
 %End
 
-	void setMarkerBackgroundColor(const QColor &,int = -1);
-	void setMarkerForegroundColor(const QColor &,int = -1);
+	void setMarkerBackgroundColor(const TQColor &,int = -1);
+	void setMarkerForegroundColor(const TQColor &,int = -1);
 
-	void setMatchedBraceBackgroundColor(const QColor &);
-	void setMatchedBraceForegroundColor(const QColor &);
-	void setUnmatchedBraceBackgroundColor(const QColor &);
-	void setUnmatchedBraceForegroundColor(const QColor &);
+	void setMatchedBraceBackgroundColor(const TQColor &);
+	void setMatchedBraceForegroundColor(const TQColor &);
+	void setUnmatchedBraceBackgroundColor(const TQColor &);
+	void setUnmatchedBraceForegroundColor(const TQColor &);
 
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	void setWrapVisualFlags(WrapVisualFlag,
 		WrapVisualFlag = QextScintilla::WrapFlagNone, int = 0);
 %End
 
-	QString selectedText();
-%If (QScintilla_1_7 -)
-	void showUserList(int, const QStringList &);
+	TQString selectedText();
+%If (TQScintilla_1_7 -)
+	void showUserList(int, const TQStringList &);
 %End
 	QextScintillaCommandSet *standardCommands() const;
 	bool tabIndents();
 	int tabWidth();
-	QString text();
-	QString text(int);
-%If (QScintilla_1_7 -)
+	TQString text();
+	TQString text(int);
+%If (TQScintilla_1_7 -)
 	int textHeight(int);
 %End
 	WhitespaceVisibility whitespaceVisibility();
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 	WrapMode wrapMode();
 %End
 
 public slots:
-	virtual void append(const QString &);
-%If (QScintilla_1_7 -)
+	virtual void append(const TQString &);
+%If (TQScintilla_1_7 -)
 	virtual void autoCompleteFromAll();
 %End
 	virtual void autoCompleteFromAPIs();
@@ -301,23 +301,23 @@ public slots:
 
 	virtual void ensureCursorVisible();
 	virtual void ensureLineVisible(int);
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	virtual void foldAll(bool = 0);
 %End
-%If (- QScintilla_1_7)
+%If (- TQScintilla_1_7)
 	virtual void foldAll();
 %End
 	virtual void foldLine(int);
 	virtual void indent(int);
-%If (QScintilla_1_4 -)
-	virtual void insert(const QString &);
+%If (TQScintilla_1_4 -)
+	virtual void insert(const TQString &);
 %End
-	virtual void insertAt(const QString &,int,int);
+	virtual void insertAt(const TQString &,int,int);
 	virtual void moveToMatchingBrace();
 	virtual void paste();
 	virtual void redo();
 	virtual void removeSelectedText();
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 	virtual void resetSelectionBackgroundColor();
 	virtual void resetSelectionForegroundColor();
 %End
@@ -332,14 +332,14 @@ public slots:
 	virtual void setAutoIndent(bool);
 	virtual void setBraceMatching(BraceMatch);
 	virtual void setBackspaceUnindents(bool);
-%If (QScintilla_1_3 -)
-	virtual void setCaretForegroundColor(const QColor &);
-	virtual void setCaretLineBackgroundColor(const QColor &);
+%If (TQScintilla_1_3 -)
+	virtual void setCaretForegroundColor(const TQColor &);
+	virtual void setCaretLineBackgroundColor(const TQColor &);
 	virtual void setCaretLineVisible(bool);
 	virtual void setCaretWidth(int);
 %End
-%If (QScintilla_1_7 -)
-	virtual void setColor(const QColor &);
+%If (TQScintilla_1_7 -)
+	virtual void setColor(const TQColor &);
 %End
 	virtual void setCursorPosition(int,int);
 	virtual void setEolMode(EolMode);
@@ -348,39 +348,39 @@ public slots:
 
 	virtual void setIndentation(int,int);
 	virtual void setIndentationGuides(bool);
-	virtual void setIndentationGuidesBackgroundColor(const QColor &);
-	virtual void setIndentationGuidesForegroundColor(const QColor &);
+	virtual void setIndentationGuidesBackgroundColor(const TQColor &);
+	virtual void setIndentationGuidesForegroundColor(const TQColor &);
 	virtual void setIndentationsUseTabs(bool);
 	virtual void setIndentationWidth(int);
 
 	virtual void setLexer(QextScintillaLexer * = 0);
 
-	virtual void setMarginsBackgroundColor(const QColor &);
-	virtual void setMarginsFont(const QFont &);
-	virtual void setMarginsForegroundColor(const QColor &);
+	virtual void setMarginsBackgroundColor(const TQColor &);
+	virtual void setMarginsFont(const TQFont &);
+	virtual void setMarginsForegroundColor(const TQColor &);
 
 	virtual void setMarginLineNumbers(int,bool);
 	virtual void setMarginMarkerMask(int,int);
 	virtual void setMarginSensitivity(int,bool);
 	virtual void setMarginWidth(int,int);
-	virtual void setMarginWidth(int,const QString &);
+	virtual void setMarginWidth(int,const TQString &);
 
 	virtual void setModified(bool);
-%If (QScintilla_1_7 -)
-	virtual void setPaper(const QColor &);
+%If (TQScintilla_1_7 -)
+	virtual void setPaper(const TQColor &);
 %End
 	virtual void setReadOnly(bool);
 	virtual void setSelection(int,int,int,int);
-%If (QScintilla_1_3 -)
-	virtual void setSelectionBackgroundColor(const QColor &);
-	virtual void setSelectionForegroundColor(const QColor &);
+%If (TQScintilla_1_3 -)
+	virtual void setSelectionBackgroundColor(const TQColor &);
+	virtual void setSelectionForegroundColor(const TQColor &);
 %End
 	virtual void setTabIndents(bool);
 	virtual void setTabWidth(int);
-	virtual void setText(const QString &);
+	virtual void setText(const TQString &);
 	virtual void setUtf8(bool);
 	virtual void setWhitespaceVisibility(WhitespaceVisibility);
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 	virtual void setWrapMode(WrapMode);
 %End
 
@@ -396,13 +396,13 @@ public slots:
 signals:
 	void cursorPositionChanged(int,int);
 	void copyAvailable(bool);
-	void marginClicked(int,int,Qt::ButtonState);
+	void marginClicked(int,int,TQt::ButtonState);
 	void modificationAttempted();
 	void modificationChanged(bool);
 	void selectionChanged();
 	void textChanged();
-%If (QScintilla_1_7 -)
-	void userListActivated(int, const QString &);
+%If (TQScintilla_1_7 -)
+	void userListActivated(int, const TQString &);
 %End
 
 private:
diff --git a/sip/qtext/qextscintillaapis.sip b/sip/qtext/qextscintillaapis.sip
index ad388fb..8d92e26 100644
--- a/sip/qtext/qextscintillaapis.sip
+++ b/sip/qtext/qextscintillaapis.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -33,8 +33,8 @@ class QextScintillaAPIs
 public:
 	QextScintillaAPIs();
 
-	void add(const QString &);
-	bool load(const QString &);
+	void add(const TQString &);
+	bool load(const TQString &);
 	void clear();
 
 private:
diff --git a/sip/qtext/qextscintillabase.sip b/sip/qtext/qextscintillabase.sip
index 009ea0b..87f6275 100644
--- a/sip/qtext/qextscintillabase.sip
+++ b/sip/qtext/qextscintillabase.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaBase : QWidget
+class QextScintillaBase : TQWidget
 {
 %TypeHeaderCode
 #include <qextscintillabase.h>
@@ -239,13 +239,13 @@ public:
 		SCI_CALLTIPSETBACK,
 		SCI_CALLTIPSETFORE,
 		SCI_CALLTIPSETFOREHLT,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SCI_AUTOCSETMAXWIDTH,
 		SCI_AUTOCGETMAXWIDTH,
 		SCI_AUTOCSETMAXHEIGHT,
 		SCI_AUTOCGETMAXHEIGHT,
 %End
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SCI_CALLTIPUSESTYLE,
 %End
 		SCI_VISIBLEFROMDOCLINE,
@@ -263,7 +263,7 @@ public:
 		SCI_ENSUREVISIBLE,
 		SCI_SETFOLDFLAGS,
 		SCI_ENSUREVISIBLEENFORCEPOLICY,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SCI_WRAPCOUNT,
 %End
 		SCI_SETTABINDENTS,
@@ -409,13 +409,13 @@ public:
 		SCI_PARADOWNEXTEND,
 		SCI_PARAUP,
 		SCI_PARAUPEXTEND,
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		SCI_POSITIONBEFORE,
 		SCI_POSITIONAFTER,
 		SCI_COPYRANGE,
 		SCI_COPYTEXT,
 %End
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 		SCI_SETSELECTIONMODE,
 		SCI_GETSELECTIONMODE,
 		SCI_GETLINESELSTARTPOSITION,
@@ -448,16 +448,16 @@ public:
 		SCI_LINEENDWRAPEXTEND,
 		SCI_VCHOMEWRAP,
 		SCI_VCHOMEWRAPEXTEND,
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		SCI_LINECOPY,
 %End
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SCI_FINDCOLUMN,
 		SCI_GETCARETSTICKY,
 		SCI_SETCARETSTICKY,
 		SCI_TOGGLECARETSTICKY,
 %End
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 		SCI_SETWRAPVISUALFLAGS,
 		SCI_GETWRAPVISUALFLAGS,
 		SCI_SETWRAPVISUALFLAGSLOCATION,
@@ -465,7 +465,7 @@ public:
 		SCI_SETWRAPSTARTINDENT,
 		SCI_GETWRAPSTARTINDENT,
 %End
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SCI_MARKERADDSET,
 		SCI_SETPASTECONVERTENDINGS
 		SCI_GETPASTECONVERTENDINGS
@@ -484,27 +484,27 @@ public:
 		SCI_SETPROPERTY,
 		SCI_SETKEYWORDS,
 		SCI_SETLEXERLANGUAGE,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SCI_LOADLEXERLIBRARY,
 		SCI_GETPROPERTY,
 		SCI_GETPROPERTYEXPANDED,
 		SCI_GETPROPERTYINT,
 %End
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SCI_GETSTYLEBITSNEEDED,
 %End
 	};
 
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	enum
 	{
 		SC_ALPHA_TRANSPARENT,
-		SC_ALPHA_OPAQUE,
+		SC_ALPHA_OPATQUE,
 		SC_ALPHA_NOALPHA,
 	};
 %End
 
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 	enum
 	{
 		SC_WRAPVISUALFLAG_NONE,
@@ -570,7 +570,7 @@ public:
 		SC_MARK_DOTDOTDOT,
 		SC_MARK_ARROWS,
 		SC_MARK_PIXMAP,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SC_MARK_FULLRECT,
 %End
 		SC_MARK_CHARACTER
@@ -590,7 +590,7 @@ public:
 	enum {
 		SC_MARGIN_SYMBOL,
 		SC_MARGIN_NUMBER,
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SC_MARGIN_BACK,
 		SC_MARGIN_FORE,
 %End
@@ -603,11 +603,11 @@ public:
 		STYLE_BRACEBAD,
 		STYLE_CONTROLCHAR,
 		STYLE_INDENTGUIDE,
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		STYLE_CALLTIP,
 %End
 		STYLE_LASTPREDEFINED,
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 		STYLE_MAX
 %End
 	};
@@ -632,7 +632,7 @@ public:
 		SC_CHARSET_ARABIC,
 		SC_CHARSET_VIETNAMESE,
 		SC_CHARSET_THAI,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SC_CHARSET_8859_15,
 %End
 	};
@@ -646,17 +646,17 @@ public:
 	enum {
 		INDIC_MAX,
 		INDIC_PLAIN,
-		INDIC_SQUIGGLE,
+		INDIC_STQUIGGLE,
 		INDIC_TT,
 		INDIC_DIAGONAL,
 		INDIC_STRIKE,
-%If (QScintilla_1_2 -)
+%If (TQScintilla_1_2 -)
 		INDIC_HIDDEN,
 %End
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 		INDIC_BOX,
 %End
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		INDIC_ROUNDBOX,
 %End
 		INDIC0_MASK,
@@ -709,7 +709,7 @@ public:
 	enum {
 		SC_WRAP_NONE,
 		SC_WRAP_WORD,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SC_WRAP_CHAR,
 %End
 	};
@@ -752,14 +752,14 @@ public:
 		SC_PERFORMED_USER,
 		SC_PERFORMED_UNDO,
 		SC_PERFORMED_REDO,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SC_MULTISTEPUNDOREDO,
 %End
 		SC_LASTSTEPINUNDOREDO,
 		SC_MOD_CHANGEMARKER,
 		SC_MOD_BEFOREINSERT,
 		SC_MOD_BEFOREDELETE,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SC_MULTILINEUNDOREDO,
 %End
 		SC_MODEVENTMASKALL
@@ -786,7 +786,7 @@ public:
 	};
 
 	enum {
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SCMOD_NORM,
 %End
 		SCMOD_SHIFT,
@@ -827,7 +827,7 @@ public:
 		SCLEX_PHP,
 		SCLEX_BAAN,
 		SCLEX_MATLAB,
-%If (QScintilla_1_2 -)
+%If (TQScintilla_1_2 -)
 		SCLEX_SCRIPTOL,
 %End
 		SCLEX_ASM,
@@ -836,16 +836,16 @@ public:
 		SCLEX_F77,
 		SCLEX_CSS,
 		SCLEX_POV,
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		SCLEX_LOUT,
 		SCLEX_ESCRIPT,
 %End
-%If (QScintilla_1_2 -)
+%If (TQScintilla_1_2 -)
 		SCLEX_PS,
 		SCLEX_NSIS,
 		SCLEX_MMIXAL,
 %End
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 		SCLEX_CLW,
 		SCLEX_CLWNOCASE,
 		SCLEX_LOT,
@@ -865,11 +865,11 @@ public:
                 SCLEX_APDL,
                 SCLEX_BASH,
 %End
-%If (QScintilla_1_5 -)
+%If (TQScintilla_1_5 -)
                 SCLEX_ASN1,
                 SCLEX_VHDL,
 %End
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		SCLEX_CAML,
 		SCLEX_BLITZBASIC,
 		SCLEX_PUREBASIC,
@@ -881,7 +881,7 @@ public:
 		SCLEX_FLAGSHIP,
 		SCLEX_CSOUND,
 %End
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		SCLEX_FREEBASIC,
 		SCLEX_INNOSETUP,
 		SCLEX_OPAL,
@@ -889,7 +889,7 @@ public:
 %End
 	};
 
-	QextScintillaBase(QWidget * /TransferThis/,const char *,
+	QextScintillaBase(TQWidget * /TransferThis/,const char *,
 			  WFlags = 0);
 
 %ConvertToSubClassCode
@@ -901,34 +901,34 @@ public:
 		{sipName_QextScintillaLexer,	&sipClass_QextScintillaLexer,	3, 1},
 		{sipName_QextScintillaBase,	&sipClass_QextScintillaBase,	15, 2},
 		{sipName_QextScintillaMacro,	&sipClass_QextScintillaMacro,	-1, -1},
-#if QSCINTILLA_VERSION >= 0x010300
+#if TQSCINTILLA_VERSION >= 0x010300
 		{sipName_QextScintillaLexerPerl,	&sipClass_QextScintillaLexerPerl,	-1, 4},
 #else
 		{NULL,					NULL,					-1, 4},
 #endif
-#if QSCINTILLA_VERSION >= 0x010100
+#if TQSCINTILLA_VERSION >= 0x010100
 		{sipName_QextScintillaLexerHTML,	&sipClass_QextScintillaLexerHTML,	-1, 5},
 #else
 		{NULL,					NULL,					-1, 5},
 #endif
-#if QSCINTILLA_VERSION >= 0x010500
+#if TQSCINTILLA_VERSION >= 0x010500
 		{sipName_QextScintillaLexerRuby,	&sipClass_QextScintillaLexerRuby,	-1, 6},
 #else
 		{NULL,					NULL,					-1, 6},
 #endif
 		{sipName_QextScintillaLexerCPP,	&sipClass_QextScintillaLexerCPP,	11, 7},
 		{sipName_QextScintillaLexerPython,	&sipClass_QextScintillaLexerPython,	-1, 8},
-#if QSCINTILLA_VERSION >= 0x010100
+#if TQSCINTILLA_VERSION >= 0x010100
 		{sipName_QextScintillaLexerSQL,	&sipClass_QextScintillaLexerSQL,	-1, 9},
 #else
 		{NULL,				NULL,					-1, 9},
 #endif
-#if QSCINTILLA_VERSION >= 0x010400
+#if TQSCINTILLA_VERSION >= 0x010400
 		{sipName_QextScintillaLexerBash,	&sipClass_QextScintillaLexerBash,	-1, 10},
 #else
 		{NULL,					NULL,					-1, 10},
 #endif
-#if QSCINTILLA_VERSION >= 0x010500
+#if TQSCINTILLA_VERSION >= 0x010500
 		{sipName_QextScintillaLexerLua,	&sipClass_QextScintillaLexerLua,	-1, -1},
 #else
 		{NULL,					NULL,				-1, -1},
@@ -959,7 +959,7 @@ public:
 	while (i >= 0);
 %End
 
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 	QextScintillaBase *pool();
 %End
 
@@ -970,23 +970,23 @@ public:
 	long SendScintilla(unsigned int,long);
 	//long SendScintilla(unsigned int,int);
 	long SendScintilla(unsigned int,long,long,char *);
-	long SendScintilla(unsigned int,unsigned long,const QColor &);
-	long SendScintilla(unsigned int,const QColor &);
-	long SendScintilla(unsigned int,unsigned long,QPainter *,const QRect &,
+	long SendScintilla(unsigned int,unsigned long,const TQColor &);
+	long SendScintilla(unsigned int,const TQColor &);
+	long SendScintilla(unsigned int,unsigned long,TQPainter *,const TQRect &,
 			   long,long);
-	long SendScintilla(unsigned int,unsigned long,const QPixmap *);
+	long SendScintilla(unsigned int,unsigned long,const TQPixmap *);
 
-	virtual QSize sizeHint() const;
-%If (QScintilla_1_5 -)
-	QWidget *viewport() const;
+	virtual TQSize sizeHint() const;
+%If (TQScintilla_1_5 -)
+	TQWidget *viewport() const;
 %End
 
 signals:
-	void QSCN_SELCHANGED(bool);
+	void TQSCN_SELCHANGED(bool);
 
 	void SCEN_CHANGE();
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 	void SCN_AUTOCSELECTION(const char *,int);
 %End
 	void SCN_CHARADDED(int);
@@ -1010,12 +1010,12 @@ signals:
 	void SCN_ZOOM();
 
 protected:
-        bool eventFilter(QObject *,QEvent *);
-        virtual void keyPressEvent(QKeyEvent *);
-        virtual void focusInEvent(QFocusEvent *);
-        virtual void focusOutEvent(QFocusEvent *);
+        bool eventFilter(TQObject *,TQEvent *);
+        virtual void keyPressEvent(TQKeyEvent *);
+        virtual void focusInEvent(TQFocusEvent *);
+        virtual void focusOutEvent(TQFocusEvent *);
         virtual bool focusNextPrevChild(bool);
-%If (QScintilla_1_5 -)
+%If (TQScintilla_1_5 -)
 	virtual void startDrag();
 %End
 
diff --git a/sip/qtext/qextscintillacommand.sip b/sip/qtext/qextscintillacommand.sip
index 148fdd6..b423a5b 100644
--- a/sip/qtext/qextscintillacommand.sip
+++ b/sip/qtext/qextscintillacommand.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -36,7 +36,7 @@ public:
 	int key() const;
 	int alternateKey() const;
 	static bool validKey(int);
-	QString description() const;
+	TQString description() const;
 
 private:
 	QextScintillaCommand(QextScintilla *,int,int,const char *);
diff --git a/sip/qtext/qextscintillacommandset.sip b/sip/qtext/qextscintillacommandset.sip
index ae1be22..8d04f82 100644
--- a/sip/qtext/qextscintillacommandset.sip
+++ b/sip/qtext/qextscintillacommandset.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -31,17 +31,17 @@ class QextScintillaCommandSet
 %End
 
 public:
-	bool readSettings(QSettings &,const char * = "/Scintilla");
-	bool writeSettings(QSettings &,const char * = "/Scintilla");
+	bool readSettings(TQSettings &,const char * = "/Scintilla");
+	bool writeSettings(TQSettings &,const char * = "/Scintilla");
 
-%If (QScintilla_1_4 -)
-	QPtrList<QextScintillaCommand> &commands();
+%If (TQScintilla_1_4 -)
+	TQPtrList<QextScintillaCommand> &commands();
 %End
-%If (- QScintilla_1_4)
-	const QPtrList<QextScintillaCommand> &commands() const;
+%If (- TQScintilla_1_4)
+	const TQPtrList<QextScintillaCommand> &commands() const;
 %End
 
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 	void clearKeys();
 	void clearAlternateKeys();
 %End
diff --git a/sip/qtext/qextscintilladocument.sip b/sip/qtext/qextscintilladocument.sip
index 9108114..f66166d 100644
--- a/sip/qtext/qextscintilladocument.sip
+++ b/sip/qtext/qextscintilladocument.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 
 class QextScintillaDocument
 {
diff --git a/sip/qtext/qextscintillalexer.sip b/sip/qtext/qextscintillalexer.sip
index ed10f46..4ab290a 100644
--- a/sip/qtext/qextscintillalexer.sip
+++ b/sip/qtext/qextscintillalexer.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,55 +24,55 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexer : QObject
+class QextScintillaLexer : TQObject
 {
 %TypeHeaderCode
 #include <qextscintillalexer.h>
 %End
 
 public:
-	QextScintillaLexer(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexer(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	virtual const char *language() const = 0;
 	virtual const char *lexer() const = 0;
 	int autoIndentStyle();
-	virtual QColor color(int) const;
+	virtual TQColor color(int) const;
 	virtual bool eolFill(int) const;
-	virtual QFont font(int) const;
+	virtual TQFont font(int) const;
 	virtual const char *keywords(int) const;
-	virtual QString description(int) const = 0;
-	virtual QColor paper(int) const;
-	virtual QFont defaultFont() const;
-%If (QScintilla_1_7 -)
-	virtual QColor defaultColor() const;
-	virtual QColor defaultPaper() const;
+	virtual TQString description(int) const = 0;
+	virtual TQColor paper(int) const;
+	virtual TQFont defaultFont() const;
+%If (TQScintilla_1_7 -)
+	virtual TQColor defaultColor() const;
+	virtual TQColor defaultPaper() const;
 %End
 	virtual void refreshProperties();
-	bool readSettings(QSettings &,const char * = "/Scintilla");
-	bool writeSettings(QSettings &,const char * = "/Scintilla") const;
+	bool readSettings(TQSettings &,const char * = "/Scintilla");
+	bool writeSettings(TQSettings &,const char * = "/Scintilla") const;
 
 public slots:
 	virtual void setAutoIndentStyle(int);
-	virtual void setColor(const QColor &,int = -1);
-	virtual void setDefaultFont(const QFont &);
-%If (QScintilla_1_7 -)
-	virtual void setDefaultColor(const QColor &);
-	virtual void setDefaultPaper(const QColor &);
+	virtual void setColor(const TQColor &,int = -1);
+	virtual void setDefaultFont(const TQFont &);
+%If (TQScintilla_1_7 -)
+	virtual void setDefaultColor(const TQColor &);
+	virtual void setDefaultPaper(const TQColor &);
 %End
 	virtual void setEolFill(bool,int = -1);
-	virtual void setFont(const QFont &,int = -1);
-	virtual void setPaper(const QColor &,int = -1);
+	virtual void setFont(const TQFont &,int = -1);
+	virtual void setPaper(const TQColor &,int = -1);
 
 signals:
-	void colorChanged(const QColor &,int);
+	void colorChanged(const TQColor &,int);
 	void eolFillChanged(bool,int);
-	void fontChanged(const QFont &,int);
-	void paperChanged(const QColor &,int);
+	void fontChanged(const TQFont &,int);
+	void paperChanged(const TQColor &,int);
 	void propertyChanged(const char *,const char *);
 
 protected:
-	virtual bool readProperties(QSettings &,const QString &);
-	virtual bool writeProperties(QSettings &,const QString &) const;
+	virtual bool readProperties(TQSettings &,const TQString &);
+	virtual bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexer(const QextScintillaLexer &);
diff --git a/sip/qtext/qextscintillalexerbash.sip b/sip/qtext/qextscintillalexerbash.sip
index 3a4099d..eb71b13 100644
--- a/sip/qtext/qextscintillalexerbash.sip
+++ b/sip/qtext/qextscintillalexerbash.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_4 -)
+%If (TQScintilla_1_4 -)
 
 class QextScintillaLexerBash : QextScintillaLexer
 {
@@ -50,16 +50,16 @@ public:
 		SingleQuotedHereDocument
 	};
 
-	QextScintillaLexerBash(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerBash(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldComments() const;
@@ -70,8 +70,8 @@ public slots:
 	virtual void setFoldCompact(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerBash(const QextScintillaLexerBash &);
diff --git a/sip/qtext/qextscintillalexerbatch.sip b/sip/qtext/qextscintillalexerbatch.sip
index f29f326..aa20a4f 100644
--- a/sip/qtext/qextscintillalexerbatch.sip
+++ b/sip/qtext/qextscintillalexerbatch.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerBatch : QextScintillaLexer
 {
@@ -44,16 +44,16 @@ public:
 		Operator
 	};
 
-	QextScintillaLexerBatch(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerBatch(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 private:
 	QextScintillaLexerBatch(const QextScintillaLexerBatch &);
diff --git a/sip/qtext/qextscintillalexercpp.sip b/sip/qtext/qextscintillalexercpp.sip
index dab8cf2..3ce192d 100644
--- a/sip/qtext/qextscintillalexercpp.sip
+++ b/sip/qtext/qextscintillalexercpp.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -32,7 +32,7 @@ class QextScintillaLexerCPP : QextScintillaLexer
 
 public:
 	enum {
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		Default,
 %End
 		WhiteSpace,
@@ -54,25 +54,25 @@ public:
 		KeywordSet2,
 		CommentDocKeyword,
 		CommentDocKeywordError,
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		GlobalClass,
 %End
 	};
 
-	QextScintillaLexerCPP(QObject * /TransferThis/ = 0,const char * = 0,
+	QextScintillaLexerCPP(TQObject * /TransferThis/ = 0,const char * = 0,
 			      bool = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 	bool foldAtElse() const;
 %End
 	bool foldComments() const;
@@ -81,7 +81,7 @@ public:
 	bool stylePreprocessor() const;
 
 public slots:
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 	virtual void setFoldAtElse(bool);
 %End
 	virtual void setFoldComments(bool);
@@ -90,8 +90,8 @@ public slots:
 	virtual void setStylePreprocessor(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerCPP(const QextScintillaLexerCPP &);
diff --git a/sip/qtext/qextscintillalexercsharp.sip b/sip/qtext/qextscintillalexercsharp.sip
index 9444248..f095269 100644
--- a/sip/qtext/qextscintillalexercsharp.sip
+++ b/sip/qtext/qextscintillalexercsharp.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -31,16 +31,16 @@ class QextScintillaLexerCSharp : QextScintillaLexerCPP
 %End
 
 public:
-	QextScintillaLexerCSharp(QObject * /TransferThis/ = 0,
+	QextScintillaLexerCSharp(TQObject * /TransferThis/ = 0,
 				 const char * = 0);
 
 	const char *language() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 private:
 	QextScintillaLexerCSharp(const QextScintillaLexerCSharp &);
diff --git a/sip/qtext/qextscintillalexercss.sip b/sip/qtext/qextscintillalexercss.sip
index eb02a09..e54b5e1 100644
--- a/sip/qtext/qextscintillalexercss.sip
+++ b/sip/qtext/qextscintillalexercss.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerCSS : QextScintillaLexer
 {
@@ -53,14 +53,14 @@ public:
 		Attribute
 	};
 
-	QextScintillaLexerCSS(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerCSS(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
-	QFont font(int) const;
+	TQColor color(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
+	TQString description(int) const;
 
 	void refreshProperties();
 	bool foldComments() const;
@@ -71,8 +71,8 @@ public slots:
 	virtual void setFoldCompact(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerCSS(const QextScintillaLexerCSS &);
diff --git a/sip/qtext/qextscintillalexerdiff.sip b/sip/qtext/qextscintillalexerdiff.sip
index adfcb77..49d82ad 100644
--- a/sip/qtext/qextscintillalexerdiff.sip
+++ b/sip/qtext/qextscintillalexerdiff.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerDiff : QextScintillaLexer
 {
@@ -43,12 +43,12 @@ public:
 		LineAdded
 	};
 
-	QextScintillaLexerDiff(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerDiff(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
-	QString description(int) const;
+	TQColor color(int) const;
+	TQString description(int) const;
 
 private:
 	QextScintillaLexerDiff(const QextScintillaLexerDiff &);
diff --git a/sip/qtext/qextscintillalexerhtml.sip b/sip/qtext/qextscintillalexerhtml.sip
index 6b59162..deb7320 100644
--- a/sip/qtext/qextscintillalexerhtml.sip
+++ b/sip/qtext/qextscintillalexerhtml.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 
 class QextScintillaLexerHTML : QextScintillaLexer
 {
@@ -146,16 +146,16 @@ public:
 		PHPOperator
 	};
 
-	QextScintillaLexerHTML(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerHTML(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldCompact() const;
@@ -168,8 +168,8 @@ public slots:
 	virtual void setCaseSensitiveTags(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerHTML(const QextScintillaLexerHTML &);
diff --git a/sip/qtext/qextscintillalexeridl.sip b/sip/qtext/qextscintillalexeridl.sip
index cf1fe5a..408d3fe 100644
--- a/sip/qtext/qextscintillalexeridl.sip
+++ b/sip/qtext/qextscintillalexeridl.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -31,12 +31,12 @@ class QextScintillaLexerIDL : QextScintillaLexerCPP
 %End
 
 public:
-	QextScintillaLexerIDL(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerIDL(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
+	TQString description(int) const;
 
 private:
 	QextScintillaLexerIDL(const QextScintillaLexerIDL &);
diff --git a/sip/qtext/qextscintillalexerjava.sip b/sip/qtext/qextscintillalexerjava.sip
index 8db6bd4..dbb8b03 100644
--- a/sip/qtext/qextscintillalexerjava.sip
+++ b/sip/qtext/qextscintillalexerjava.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -31,7 +31,7 @@ class QextScintillaLexerJava : QextScintillaLexerCPP
 %End
 
 public:
-	QextScintillaLexerJava(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerJava(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *keywords(int) const;
diff --git a/sip/qtext/qextscintillalexerjavascript.sip b/sip/qtext/qextscintillalexerjavascript.sip
index 4b3c9a1..a19b902 100644
--- a/sip/qtext/qextscintillalexerjavascript.sip
+++ b/sip/qtext/qextscintillalexerjavascript.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -31,16 +31,16 @@ class QextScintillaLexerJavaScript : QextScintillaLexerCPP
 %End
 
 public:
-	QextScintillaLexerJavaScript(QObject * /TransferThis/ = 0,
+	QextScintillaLexerJavaScript(TQObject * /TransferThis/ = 0,
 				     const char * = 0);
 
 	const char *language() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 private:
 	QextScintillaLexerJavaScript(const QextScintillaLexerJavaScript &);
diff --git a/sip/qtext/qextscintillalexerlua.sip b/sip/qtext/qextscintillalexerlua.sip
index fe05ea1..12c725f 100644
--- a/sip/qtext/qextscintillalexerlua.sip
+++ b/sip/qtext/qextscintillalexerlua.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_5 -)
+%If (TQScintilla_1_5 -)
 
 class QextScintillaLexerLua : QextScintillaLexer
 {
@@ -51,16 +51,16 @@ public:
 		CoroutinesIOSystemFacilities
 	};
 
-	QextScintillaLexerLua(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerLua(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldCompact() const;
@@ -69,8 +69,8 @@ public slots:
 	virtual void setFoldCompact(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerLua(const QextScintillaLexerLua &);
diff --git a/sip/qtext/qextscintillalexermakefile.sip b/sip/qtext/qextscintillalexermakefile.sip
index 83c15b1..90d210e 100644
--- a/sip/qtext/qextscintillalexermakefile.sip
+++ b/sip/qtext/qextscintillalexermakefile.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerMakefile : QextScintillaLexer
 {
@@ -43,15 +43,15 @@ public:
 		Error
 	};
 
-	QextScintillaLexerMakefile(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerMakefile(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQFont font(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 private:
 	QextScintillaLexerMakefile(const QextScintillaLexerMakefile &);
diff --git a/sip/qtext/qextscintillalexerperl.sip b/sip/qtext/qextscintillalexerperl.sip
index a8db0a1..06bdd7c 100644
--- a/sip/qtext/qextscintillalexerperl.sip
+++ b/sip/qtext/qextscintillalexerperl.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_3 -)
+%If (TQScintilla_1_3 -)
 
 class QextScintillaLexerPerl : QextScintillaLexer
 {
@@ -61,21 +61,21 @@ public:
 		QuotedStringQX,
 		QuotedStringQR,
 		QuotedStringQW,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		PODVerbatim,
 %End
 	};
 
-	QextScintillaLexerPerl(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerPerl(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldComments() const;
@@ -86,8 +86,8 @@ public slots:
 	virtual void setFoldCompact(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerPerl(const QextScintillaLexerPerl &);
diff --git a/sip/qtext/qextscintillalexerpov.sip b/sip/qtext/qextscintillalexerpov.sip
index 862e48e..6812baa 100644
--- a/sip/qtext/qextscintillalexerpov.sip
+++ b/sip/qtext/qextscintillalexerpov.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerPOV : QextScintillaLexer
 {
@@ -53,16 +53,16 @@ public:
 		KeywordSet8
 	};
 
-	QextScintillaLexerPOV(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerPOV(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldComments() const;
@@ -75,8 +75,8 @@ public slots:
 	virtual void setFoldDirectives(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerPOV(const QextScintillaLexerPOV &);
diff --git a/sip/qtext/qextscintillalexerproperties.sip b/sip/qtext/qextscintillalexerproperties.sip
index 45c52e5..b880ce9 100644
--- a/sip/qtext/qextscintillalexerproperties.sip
+++ b/sip/qtext/qextscintillalexerproperties.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerProperties : QextScintillaLexer
 {
@@ -41,15 +41,15 @@ public:
 		DefaultValue
 	};
 
-	QextScintillaLexerProperties(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerProperties(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQFont font(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldCompact() const;
@@ -58,8 +58,8 @@ public slots:
 	virtual void setFoldCompact(bool);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerProperties(const QextScintillaLexerProperties &);
diff --git a/sip/qtext/qextscintillalexerpython.sip b/sip/qtext/qextscintillalexerpython.sip
index 3a2bca5..5e3b883 100644
--- a/sip/qtext/qextscintillalexerpython.sip
+++ b/sip/qtext/qextscintillalexerpython.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -32,7 +32,7 @@ class QextScintillaLexerPython : QextScintillaLexer
 
 public:
 	enum {
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 		Default,
 %End
 		WhiteSpace,
@@ -49,7 +49,7 @@ public:
 		Identifier,
 		CommentBlock,
 		UnclosedString,
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 		HighlightedIdentifier,
 		Decorator,
 %End
@@ -63,17 +63,17 @@ public:
 		Tabs
 	};
 
-	QextScintillaLexerPython(QObject * /TransferThis/ = 0,
+	QextScintillaLexerPython(TQObject * /TransferThis/ = 0,
 				 const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
+	TQString description(int) const;
+	TQColor paper(int) const;
 	void refreshProperties();
 
 	bool foldComments() const;
@@ -86,8 +86,8 @@ public slots:
 	virtual void setIndentationWarning(IndentationWarning);
 
 protected:
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
 	QextScintillaLexerPython(const QextScintillaLexerPython &);
diff --git a/sip/qtext/qextscintillalexerruby.sip b/sip/qtext/qextscintillalexerruby.sip
index 77beba0..f7c0a99 100644
--- a/sip/qtext/qextscintillalexerruby.sip
+++ b/sip/qtext/qextscintillalexerruby.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_5 -)
+%If (TQScintilla_1_5 -)
 
 class QextScintillaLexerRuby : QextScintillaLexer
 {
@@ -33,7 +33,7 @@ class QextScintillaLexerRuby : QextScintillaLexer
 %End
 
 public:
-%If (QScintilla_1_7 -)
+%If (TQScintilla_1_7 -)
 	enum {
 		Default,
 		Comment,
@@ -67,7 +67,7 @@ public:
 		Stderr
 	};
 %End
-%If (- QScintilla_1_7)
+%If (- TQScintilla_1_7)
 	enum {
 		Default,
 		WhiteSpace,
@@ -94,31 +94,31 @@ public:
 	};
 %End
 
-	QextScintillaLexerRuby(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerRuby(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	bool eolFill(int) const;
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-	QColor paper(int) const;
-%If (- QScintilla_1_7)
+	TQString description(int) const;
+	TQColor paper(int) const;
+%If (- TQScintilla_1_7)
 	void refreshProperties();
 
 	IndentationWarning indentationWarning() const;
 %End
 
 public slots:
-%If (- QScintilla_1_7)
+%If (- TQScintilla_1_7)
 	virtual void setIndentationWarning(IndentationWarning);
 %End
 
 protected:
-%If (- QScintilla_1_7)
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+%If (- TQScintilla_1_7)
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 %End
 
 private:
diff --git a/sip/qtext/qextscintillalexersql.sip b/sip/qtext/qextscintillalexersql.sip
index 85a5e19..5f601eb 100644
--- a/sip/qtext/qextscintillalexersql.sip
+++ b/sip/qtext/qextscintillalexersql.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_1 -)
+%If (TQScintilla_1_1 -)
 
 class QextScintillaLexerSQL : QextScintillaLexer
 {
@@ -36,24 +36,24 @@ public:
 	enum {
 		Default,
 		Comment,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		CommentLine,
 		CommentDoc,
 %End
 		LineComment,		// Obsolete.
 		Number,
 		Keyword,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		DoubleQuotedString,
 %End
 		SingleQuotedString,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		PlusKeyword,
 		PlusPrompt,
 %End
 		Operator,
 		Identifier,
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 		PlusComment,
 		CommentLineHash,
 		CommentDocKeyword,
@@ -65,19 +65,19 @@ public:
 %End
 	};
 
-	QextScintillaLexerSQL(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerSQL(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
-%If (QScintilla_1_6 -)
+	TQColor color(int) const;
+%If (TQScintilla_1_6 -)
 	bool eolFill(int) const;
 %End
-	QFont font(int) const;
+	TQFont font(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
-%If (QScintilla_1_6 -)
-	QColor paper(int) const;
+	TQString description(int) const;
+%If (TQScintilla_1_6 -)
+	TQColor paper(int) const;
 
 	void refreshProperties();
 	bool foldComments() const;
@@ -86,16 +86,16 @@ public:
 %End
 
 public slots:
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 	virtual void setFoldComments(bool);
 	virtual void setFoldCompact(bool);
 	virtual void setBackslashEscapes(bool);
 %End
 
 protected:
-%If (QScintilla_1_6 -)
-	bool readProperties(QSettings &,const QString &);
-	bool writeProperties(QSettings &,const QString &) const;
+%If (TQScintilla_1_6 -)
+	bool readProperties(TQSettings &,const TQString &);
+	bool writeProperties(TQSettings &,const TQString &) const;
 %End
 
 private:
diff --git a/sip/qtext/qextscintillalexertex.sip b/sip/qtext/qextscintillalexertex.sip
index 668fcd0..8320b59 100644
--- a/sip/qtext/qextscintillalexertex.sip
+++ b/sip/qtext/qextscintillalexertex.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-%If (QScintilla_1_6 -)
+%If (TQScintilla_1_6 -)
 
 class QextScintillaLexerTeX : QextScintillaLexer
 {
@@ -42,13 +42,13 @@ public:
 		Text
 	};
 
-	QextScintillaLexerTeX(QObject * /TransferThis/ = 0,const char * = 0);
+	QextScintillaLexerTeX(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
-	QColor color(int) const;
+	TQColor color(int) const;
 	const char *keywords(int) const;
-	QString description(int) const;
+	TQString description(int) const;
 
 private:
 	QextScintillaLexerTeX(const QextScintillaLexerTeX &);
diff --git a/sip/qtext/qextscintillamacro.sip b/sip/qtext/qextscintillamacro.sip
index 45615af..d5261f1 100644
--- a/sip/qtext/qextscintillamacro.sip
+++ b/sip/qtext/qextscintillamacro.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,7 +24,7 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaMacro : QObject
+class QextScintillaMacro : TQObject
 {
 %TypeHeaderCode
 #include <qextscintillamacro.h>
@@ -32,12 +32,12 @@ class QextScintillaMacro : QObject
 
 public:
 	QextScintillaMacro(QextScintilla * /TransferThis/,const char * = 0);
-	QextScintillaMacro(const QCString &,QextScintilla * /TransferThis/,
+	QextScintillaMacro(const TQCString &,QextScintilla * /TransferThis/,
 			   const char * = 0);
 
 	void clear();
-	bool load(const QCString &);
-	QCString save() const;
+	bool load(const TQCString &);
+	TQCString save() const;
 
 public slots:
 	virtual void play();
diff --git a/sip/qtext/qextscintillaprinter.sip b/sip/qtext/qextscintillaprinter.sip
index dce068b..b19a312 100644
--- a/sip/qtext/qextscintillaprinter.sip
+++ b/sip/qtext/qextscintillaprinter.sip
@@ -3,20 +3,20 @@
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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,16 +24,16 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaPrinter : QPrinter
+class QextScintillaPrinter : TQPrinter
 {
 %TypeHeaderCode
 #include <qextscintillaprinter.h>
 %End
 
 public:
-	QextScintillaPrinter(QPrinter::PrinterMode = QPrinter::ScreenResolution);
+	QextScintillaPrinter(TQPrinter::PrinterMode = TQPrinter::ScreenResolution);
 
-	virtual void formatPage(QPainter &,bool,QRect &,int);
+	virtual void formatPage(TQPainter &,bool,TQRect &,int);
 	virtual int printRange(QextScintillaBase *,int = -1,int = -1);
 	int magnification() const;
 	virtual void setMagnification(int);
diff --git a/sip/qtext/qtextmod.sip b/sip/qtext/qtextmod.sip
index 06024a6..0a831da 100644
--- a/sip/qtext/qtextmod.sip
+++ b/sip/qtext/qtextmod.sip
@@ -1,22 +1,22 @@
-// This is the SIP interface definition for the qtext module of PyQt.
+// This is the SIP interface definition for the qtext module of PyTQt.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <[email protected]>
 // 
-// 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.
 
 
@@ -27,14 +27,14 @@
 %Include copying.sip
 
 
-// The QScintilla versions.
-%Timeline	{QScintilla_1_1 QScintilla_1_2 QScintilla_1_3 QScintilla_1_4
-		 QScintilla_1_5 QScintilla_1_6 QScintilla_1_7}
+// The TQScintilla versions.
+%Timeline	{TQScintilla_1_1 TQScintilla_1_2 TQScintilla_1_3 TQScintilla_1_4
+		 TQScintilla_1_5 TQScintilla_1_6 TQScintilla_1_7}
 
 
-const unsigned QSCINTILLA_VERSION;
-const char *QSCINTILLA_VERSION_STR;
-const char *QSCINTILLA_BUILD;
+const unsigned TQSCINTILLA_VERSION;
+const char *TQSCINTILLA_VERSION_STR;
+const char *TQSCINTILLA_BUILD;
 
 
 %Include qextscintillaapis.sip
@@ -75,20 +75,20 @@ const char *QSCINTILLA_BUILD;
 # Copyright (c) 2007
 # 	Riverbank Computing Limited <[email protected]>
 # 
-# 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.
 
 
@@ -97,7 +97,7 @@ TARGET = @BLX_TARGET_LIB@
 DESTDIR = @PYQT_MODDIR@
 CONFIG += @BLX_CONFIG_LIB@ @PYQT_WARN@
 INCLUDEPATH = @BLX_INCLUDEPATH@ @PYQT_QSCINTILLA_INC@
-DEFINES = @BLX_DEFINES@ QEXTSCINTILLA_DLL
+DEFINES = @BLX_DEFINES@ TQEXTSCINTILLA_DLL
 LIBS += @PYQT_QT_MODULE@ @PYQT_QSCINTILLA_LIB@ @BLX_LIBS@
 macx:QMAKE_LFLAGS += -framework Python