Update after rename QScintilla => TQScintilla.

This relates to issue TDE/tqscintilla#2.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

35 files changed, 353 insertions, 353 deletions

diff --git a/build.py b/build.py
index 5440c2b..8fb16b5 100644
--- a/build.py
+++ b/build.py
@@ -174,12 +174,12 @@ def checkTQScintilla():
     """See if TQScintilla can be found and what its version is.
     """
     # Find the TQScintilla header files.
-    sciglobal = os.path.join(sciIncDir, "qextscintillaglobal.h")
+    sciglobal = os.path.join(sciIncDir, "tqextscintillaglobal.h")
 
     if os.access(sciglobal,os.F_OK):
         config.patches["@PYQT_QSCINTILLA_INC@"] = sciIncDir
 
-        sipconfig.inform("%s contains qextscintillaglobal.h." % (sciIncDir))
+        sipconfig.inform("%s contains tqextscintillaglobal.h." % (sciIncDir))
 
         # Get the TQScintilla version number.
         global sciVersion
@@ -195,9 +195,9 @@ def checkTQScintilla():
 
         # Find the TQScintilla library.
         if sys.platform == "win32":
-            lpatt = "qscintilla.lib"
+            lpatt = "tqscintilla.lib"
         else:
-            lpatt = "libqscintilla.*"
+            lpatt = "libtqscintilla.*"
 
         if len(glob.glob(os.path.join(sciLibDir, lpatt))):
             sipconfig.inform("%s contains the TQScintilla library." % sciLibDir)
@@ -205,9 +205,9 @@ def checkTQScintilla():
             global sciLib
 
             if sys.platform == "win32":
-                sciLib = sipconfig.escape(os.path.join(sciLibDir, "qscintilla.lib"))
+                sciLib = sipconfig.escape(os.path.join(sciLibDir, "tqscintilla.lib"))
             else:
-                sciLib = sipconfig.escape("-L" + sciLibDir) + " -lqscintilla"
+                sciLib = sipconfig.escape("-L" + sciLibDir) + " -ltqscintilla"
 
             config.patches["@PYQT_QSCINTILLA_LIB@"] = sciLib
         else:
@@ -215,7 +215,7 @@ def checkTQScintilla():
 
             sciVersion = -1
     else:
-        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % sciIncDir)
+        sipconfig.inform("tqextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % sciIncDir)
 
         sciVersion = -1
 
@@ -267,7 +267,7 @@ def moduleChecks(maindir):
         config.patches["@TEST_QSCINTILLA_LIB@"] = sciLib
         config.create_makefile("qttest.pro")
 
-        tryModule(maindir,"qtext", "qextscintillabase.h", "QextScintillaBase()")
+        tryModule(maindir,"qtext", "tqextscintillabase.h", "TQextScintillaBase()")
 
         # Put things back.
         config.patches["@TEST_QSCINTILLA_INC@"] = ""
diff --git a/configure.py b/configure.py
index de047fb..d56307e 100644
--- a/configure.py
+++ b/configure.py
@@ -215,7 +215,7 @@ class ConfigurePyTQt3(ConfigureBase):
                     check_module("qtaxcontainer", "qaxobject.h", "TQAxObject()", lib="qaxcontainer")
 
         if qsci_version:
-            check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
+            check_module("qtext", "tqextscintillabase.h", "TQextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="tqscintilla")
 
         if opt_qtpetag:
             pyqt_modules.append("qtpe")
@@ -266,7 +266,7 @@ class ConfigurePyTQt3(ConfigureBase):
         generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
 
         if "qtext" in pyqt_modules:
-            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"]+extra_libs, sip_flags=qtext_sip_flags)
+            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["tqscintilla"]+extra_libs, sip_flags=qtext_sip_flags)
 
         if "qtgl" in pyqt_modules:
             generate_code("qtgl", opengl=1, extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
@@ -566,7 +566,7 @@ def check_qscintilla():
         opt_qscilibdir = qt_libdir
 
     # Find the TQScintilla header files.
-    sciglobal = os.path.join(opt_qsciincdir, "qextscintillaglobal.h")
+    sciglobal = os.path.join(opt_qsciincdir, "tqextscintillaglobal.h")
 
     if os.access(sciglobal, os.F_OK):
         # Get the TQScintilla version number.
@@ -574,7 +574,7 @@ def check_qscintilla():
 
         qsci_version, sciversstr = sipconfig.read_version(sciglobal, "TQScintilla", "TQSCINTILLA_VERSION", "TQSCINTILLA_VERSION_STR")
 
-        if glob.glob(os.path.join(opt_qscilibdir, "*qscintilla*")):
+        if glob.glob(os.path.join(opt_qscilibdir, "*tqscintilla*")):
             sipconfig.inform("TQScintilla %s is being used." % sciversstr)
 
             # If we find a snapshot then set a negative version number as a
@@ -584,7 +584,7 @@ def check_qscintilla():
         else:
             sipconfig.inform("The TQScintilla library could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -o argument to explicitly specify the correct directory." % opt_qscilibdir)
     else:
-        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % opt_qsciincdir)
+        sipconfig.inform("tqextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % opt_qsciincdir)
 
 
 def check_vendorid():
diff --git a/doc/PyQt.html b/doc/PyQt.html
index 5c3cf29..eb196f1 100644
--- a/doc/PyQt.html
+++ b/doc/PyQt.html
@@ -10502,7 +10502,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3940"
->QextScintilla</A
+>TQextScintilla</A
 ></H3
 ><DIV
 CLASS="FUNCSYNOPSIS"
@@ -10562,12 +10562,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3968"
->QextScintillaAPIs</A
+>TQextScintillaAPIs</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaAPIs</TT
+>TQextScintillaAPIs</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10576,12 +10576,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3972"
->QextScintillaBase</A
+>TQextScintillaBase</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaBase</TT
+>TQextScintillaBase</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10590,12 +10590,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3976"
->QextScintillaCommand</A
+>TQextScintillaCommand</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaCommand</TT
+>TQextScintillaCommand</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10604,12 +10604,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3980"
->QextScintillaCommandSet</A
+>TQextScintillaCommandSet</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaCommandSet</TT
+>TQextScintillaCommandSet</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10618,12 +10618,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3984"
->QextScintillaDocument</A
+>TQextScintillaDocument</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaDocument</TT
+>TQextScintillaDocument</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10632,12 +10632,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3988"
->QextScintillaLexer</A
+>TQextScintillaLexer</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexer</TT
+>TQextScintillaLexer</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10646,12 +10646,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3992"
->QextScintillaLexerBash (TQScintilla v1.4+)</A
+>TQextScintillaLexerBash (TQScintilla v1.4+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerBash</TT
+>TQextScintillaLexerBash</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10660,12 +10660,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN3996"
->QextScintillaLexerBatch (TQScintilla v1.6+)</A
+>TQextScintillaLexerBatch (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerBatch</TT
+>TQextScintillaLexerBatch</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10674,12 +10674,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4000"
->QextScintillaLexerCPP</A
+>TQextScintillaLexerCPP</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerCPP</TT
+>TQextScintillaLexerCPP</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10688,12 +10688,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4004"
->QextScintillaLexerCSharp</A
+>TQextScintillaLexerCSharp</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerCSharp</TT
+>TQextScintillaLexerCSharp</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10702,12 +10702,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4008"
->QextScintillaLexerCSS (TQScintilla v1.6+)</A
+>TQextScintillaLexerCSS (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerCSS</TT
+>TQextScintillaLexerCSS</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10716,12 +10716,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4012"
->QextScintillaLexerDiff (TQScintilla v1.6+)</A
+>TQextScintillaLexerDiff (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerDiff</TT
+>TQextScintillaLexerDiff</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10730,12 +10730,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4016"
->QextScintillaLexerHTML (TQScintilla v1.1+)</A
+>TQextScintillaLexerHTML (TQScintilla v1.1+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerHTML</TT
+>TQextScintillaLexerHTML</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10744,12 +10744,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4020"
->QextScintillaLexerIDL</A
+>TQextScintillaLexerIDL</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerIDL</TT
+>TQextScintillaLexerIDL</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10758,12 +10758,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4024"
->QextScintillaLexerJava</A
+>TQextScintillaLexerJava</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerJava</TT
+>TQextScintillaLexerJava</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10772,12 +10772,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4028"
->QextScintillaLexerJavaScript</A
+>TQextScintillaLexerJavaScript</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerJavaScript</TT
+>TQextScintillaLexerJavaScript</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10786,12 +10786,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4032"
->QextScintillaLexerLua (TQScintilla v1.5+)</A
+>TQextScintillaLexerLua (TQScintilla v1.5+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerLua</TT
+>TQextScintillaLexerLua</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10800,12 +10800,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4036"
->QextScintillaLexerMakefile (TQScintilla v1.6+)</A
+>TQextScintillaLexerMakefile (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerMakefile</TT
+>TQextScintillaLexerMakefile</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10814,12 +10814,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4040"
->QextScintillaLexerPerl</A
+>TQextScintillaLexerPerl</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerPerl</TT
+>TQextScintillaLexerPerl</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10828,12 +10828,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4044"
->QextScintillaLexerPOV (TQScintilla v1.6+)</A
+>TQextScintillaLexerPOV (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerPOV</TT
+>TQextScintillaLexerPOV</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10842,12 +10842,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4048"
->QextScintillaLexerProperties (TQScintilla v1.6+)</A
+>TQextScintillaLexerProperties (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerProperties</TT
+>TQextScintillaLexerProperties</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10856,12 +10856,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4052"
->QextScintillaLexerPython</A
+>TQextScintillaLexerPython</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerPython</TT
+>TQextScintillaLexerPython</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10870,12 +10870,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4056"
->QextScintillaLexerRuby (TQScintilla v1.5+)</A
+>TQextScintillaLexerRuby (TQScintilla v1.5+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerRuby</TT
+>TQextScintillaLexerRuby</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10884,12 +10884,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4060"
->QextScintillaLexerSQL (TQScintilla v1.1+)</A
+>TQextScintillaLexerSQL (TQScintilla v1.1+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerSQL</TT
+>TQextScintillaLexerSQL</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10898,12 +10898,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4064"
->QextScintillaLexerTeX (TQScintilla v1.6+)</A
+>TQextScintillaLexerTeX (TQScintilla v1.6+)</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaLexerTeX</TT
+>TQextScintillaLexerTeX</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10912,12 +10912,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4068"
->QextScintillaMacro</A
+>TQextScintillaMacro</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaMacro</TT
+>TQextScintillaMacro</TT
 > is fully implemented.</P
 ></DIV
 ><DIV
@@ -10926,12 +10926,12 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN4072"
->QextScintillaPrinter</A
+>TQextScintillaPrinter</A
 ></H3
 ><P
 ><TT
 CLASS="LITERAL"
->QextScintillaPrinter</TT
+>TQextScintillaPrinter</TT
 > is fully implemented.</P
 ></DIV
 ></DIV
diff --git a/doc/PyQt.sgml b/doc/PyQt.sgml
index ac788e7..e7893f6 100644
--- a/doc/PyQt.sgml
+++ b/doc/PyQt.sgml
@@ -4853,7 +4853,7 @@ The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances.
 </Sect1>
 <Sect1><Title><Literal>qtext</Literal> Module Reference</Title>
 
-<Sect2><Title>QextScintilla</Title>
+<Sect2><Title>TQextScintilla</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>getCursorPosition</Function></FuncDef>
 	<ParamDef>int *<Parameter>line</Parameter></ParamDef>
@@ -4878,165 +4878,165 @@ This takes no parameters and returns a tuple of the values returned by the
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaAPIs</Title>
+<Sect2><Title>TQextScintillaAPIs</Title>
 <Para>
-<Literal>QextScintillaAPIs</Literal> is fully implemented.
+<Literal>TQextScintillaAPIs</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaBase</Title>
+<Sect2><Title>TQextScintillaBase</Title>
 <Para>
-<Literal>QextScintillaBase</Literal> is fully implemented.
+<Literal>TQextScintillaBase</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaCommand</Title>
+<Sect2><Title>TQextScintillaCommand</Title>
 <Para>
-<Literal>QextScintillaCommand</Literal> is fully implemented.
+<Literal>TQextScintillaCommand</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaCommandSet</Title>
+<Sect2><Title>TQextScintillaCommandSet</Title>
 <Para>
-<Literal>QextScintillaCommandSet</Literal> is fully implemented.
+<Literal>TQextScintillaCommandSet</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaDocument</Title>
+<Sect2><Title>TQextScintillaDocument</Title>
 <Para>
-<Literal>QextScintillaDocument</Literal> is fully implemented.
+<Literal>TQextScintillaDocument</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexer</Title>
+<Sect2><Title>TQextScintillaLexer</Title>
 <Para>
-<Literal>QextScintillaLexer</Literal> is fully implemented.
+<Literal>TQextScintillaLexer</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerBash (TQScintilla v1.4+)</Title>
+<Sect2><Title>TQextScintillaLexerBash (TQScintilla v1.4+)</Title>
 <Para>
-<Literal>QextScintillaLexerBash</Literal> is fully implemented.
+<Literal>TQextScintillaLexerBash</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerBatch (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerBatch (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerBatch</Literal> is fully implemented.
+<Literal>TQextScintillaLexerBatch</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCPP</Title>
+<Sect2><Title>TQextScintillaLexerCPP</Title>
 <Para>
-<Literal>QextScintillaLexerCPP</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCPP</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCSharp</Title>
+<Sect2><Title>TQextScintillaLexerCSharp</Title>
 <Para>
-<Literal>QextScintillaLexerCSharp</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCSharp</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCSS (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerCSS (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerCSS</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCSS</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerDiff (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerDiff (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerDiff</Literal> is fully implemented.
+<Literal>TQextScintillaLexerDiff</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerHTML (TQScintilla v1.1+)</Title>
+<Sect2><Title>TQextScintillaLexerHTML (TQScintilla v1.1+)</Title>
 <Para>
-<Literal>QextScintillaLexerHTML</Literal> is fully implemented.
+<Literal>TQextScintillaLexerHTML</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerIDL</Title>
+<Sect2><Title>TQextScintillaLexerIDL</Title>
 <Para>
-<Literal>QextScintillaLexerIDL</Literal> is fully implemented.
+<Literal>TQextScintillaLexerIDL</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerJava</Title>
+<Sect2><Title>TQextScintillaLexerJava</Title>
 <Para>
-<Literal>QextScintillaLexerJava</Literal> is fully implemented.
+<Literal>TQextScintillaLexerJava</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerJavaScript</Title>
+<Sect2><Title>TQextScintillaLexerJavaScript</Title>
 <Para>
-<Literal>QextScintillaLexerJavaScript</Literal> is fully implemented.
+<Literal>TQextScintillaLexerJavaScript</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerLua (TQScintilla v1.5+)</Title>
+<Sect2><Title>TQextScintillaLexerLua (TQScintilla v1.5+)</Title>
 <Para>
-<Literal>QextScintillaLexerLua</Literal> is fully implemented.
+<Literal>TQextScintillaLexerLua</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerMakefile (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerMakefile (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerMakefile</Literal> is fully implemented.
+<Literal>TQextScintillaLexerMakefile</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPerl</Title>
+<Sect2><Title>TQextScintillaLexerPerl</Title>
 <Para>
-<Literal>QextScintillaLexerPerl</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPerl</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPOV (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerPOV (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerPOV</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPOV</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerProperties (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerProperties (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerProperties</Literal> is fully implemented.
+<Literal>TQextScintillaLexerProperties</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPython</Title>
+<Sect2><Title>TQextScintillaLexerPython</Title>
 <Para>
-<Literal>QextScintillaLexerPython</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPython</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerRuby (TQScintilla v1.5+)</Title>
+<Sect2><Title>TQextScintillaLexerRuby (TQScintilla v1.5+)</Title>
 <Para>
-<Literal>QextScintillaLexerRuby</Literal> is fully implemented.
+<Literal>TQextScintillaLexerRuby</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerSQL (TQScintilla v1.1+)</Title>
+<Sect2><Title>TQextScintillaLexerSQL (TQScintilla v1.1+)</Title>
 <Para>
-<Literal>QextScintillaLexerSQL</Literal> is fully implemented.
+<Literal>TQextScintillaLexerSQL</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerTeX (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerTeX (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerTeX</Literal> is fully implemented.
+<Literal>TQextScintillaLexerTeX</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaMacro</Title>
+<Sect2><Title>TQextScintillaMacro</Title>
 <Para>
-<Literal>QextScintillaMacro</Literal> is fully implemented.
+<Literal>TQextScintillaMacro</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaPrinter</Title>
+<Sect2><Title>TQextScintillaPrinter</Title>
 <Para>
-<Literal>QextScintillaPrinter</Literal> is fully implemented.
+<Literal>TQextScintillaPrinter</Literal> is fully implemented.
 </Para>
 </Sect2>
 </Sect1>
diff --git a/doc/qtdocs.sip b/doc/qtdocs.sip
index 14dde83..ab4d36d 100644
--- a/doc/qtdocs.sip
+++ b/doc/qtdocs.sip
@@ -1487,7 +1487,7 @@ Classes that are not mentioned have not yet been implemented.
 %ExportedDoc
 <Sect1><Title><Literal>qtext</Literal> Module Reference</Title>
 
-<Sect2><Title>QextScintilla</Title>
+<Sect2><Title>TQextScintilla</Title>
 <FuncSynopsis>
 	<FuncDef>void <Function>getCursorPosition</Function></FuncDef>
 	<ParamDef>int *<Parameter>line</Parameter></ParamDef>
@@ -1512,165 +1512,165 @@ This takes no parameters and returns a tuple of the values returned by the
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaAPIs</Title>
+<Sect2><Title>TQextScintillaAPIs</Title>
 <Para>
-<Literal>QextScintillaAPIs</Literal> is fully implemented.
+<Literal>TQextScintillaAPIs</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaBase</Title>
+<Sect2><Title>TQextScintillaBase</Title>
 <Para>
-<Literal>QextScintillaBase</Literal> is fully implemented.
+<Literal>TQextScintillaBase</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaCommand</Title>
+<Sect2><Title>TQextScintillaCommand</Title>
 <Para>
-<Literal>QextScintillaCommand</Literal> is fully implemented.
+<Literal>TQextScintillaCommand</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaCommandSet</Title>
+<Sect2><Title>TQextScintillaCommandSet</Title>
 <Para>
-<Literal>QextScintillaCommandSet</Literal> is fully implemented.
+<Literal>TQextScintillaCommandSet</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaDocument</Title>
+<Sect2><Title>TQextScintillaDocument</Title>
 <Para>
-<Literal>QextScintillaDocument</Literal> is fully implemented.
+<Literal>TQextScintillaDocument</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexer</Title>
+<Sect2><Title>TQextScintillaLexer</Title>
 <Para>
-<Literal>QextScintillaLexer</Literal> is fully implemented.
+<Literal>TQextScintillaLexer</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerBash (TQScintilla v1.4+)</Title>
+<Sect2><Title>TQextScintillaLexerBash (TQScintilla v1.4+)</Title>
 <Para>
-<Literal>QextScintillaLexerBash</Literal> is fully implemented.
+<Literal>TQextScintillaLexerBash</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerBatch (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerBatch (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerBatch</Literal> is fully implemented.
+<Literal>TQextScintillaLexerBatch</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCPP</Title>
+<Sect2><Title>TQextScintillaLexerCPP</Title>
 <Para>
-<Literal>QextScintillaLexerCPP</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCPP</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCSharp</Title>
+<Sect2><Title>TQextScintillaLexerCSharp</Title>
 <Para>
-<Literal>QextScintillaLexerCSharp</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCSharp</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerCSS (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerCSS (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerCSS</Literal> is fully implemented.
+<Literal>TQextScintillaLexerCSS</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerDiff (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerDiff (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerDiff</Literal> is fully implemented.
+<Literal>TQextScintillaLexerDiff</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerHTML (TQScintilla v1.1+)</Title>
+<Sect2><Title>TQextScintillaLexerHTML (TQScintilla v1.1+)</Title>
 <Para>
-<Literal>QextScintillaLexerHTML</Literal> is fully implemented.
+<Literal>TQextScintillaLexerHTML</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerIDL</Title>
+<Sect2><Title>TQextScintillaLexerIDL</Title>
 <Para>
-<Literal>QextScintillaLexerIDL</Literal> is fully implemented.
+<Literal>TQextScintillaLexerIDL</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerJava</Title>
+<Sect2><Title>TQextScintillaLexerJava</Title>
 <Para>
-<Literal>QextScintillaLexerJava</Literal> is fully implemented.
+<Literal>TQextScintillaLexerJava</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerJavaScript</Title>
+<Sect2><Title>TQextScintillaLexerJavaScript</Title>
 <Para>
-<Literal>QextScintillaLexerJavaScript</Literal> is fully implemented.
+<Literal>TQextScintillaLexerJavaScript</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerLua (TQScintilla v1.5+)</Title>
+<Sect2><Title>TQextScintillaLexerLua (TQScintilla v1.5+)</Title>
 <Para>
-<Literal>QextScintillaLexerLua</Literal> is fully implemented.
+<Literal>TQextScintillaLexerLua</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerMakefile (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerMakefile (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerMakefile</Literal> is fully implemented.
+<Literal>TQextScintillaLexerMakefile</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPerl</Title>
+<Sect2><Title>TQextScintillaLexerPerl</Title>
 <Para>
-<Literal>QextScintillaLexerPerl</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPerl</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPOV (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerPOV (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerPOV</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPOV</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerProperties (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerProperties (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerProperties</Literal> is fully implemented.
+<Literal>TQextScintillaLexerProperties</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerPython</Title>
+<Sect2><Title>TQextScintillaLexerPython</Title>
 <Para>
-<Literal>QextScintillaLexerPython</Literal> is fully implemented.
+<Literal>TQextScintillaLexerPython</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerRuby (TQScintilla v1.5+)</Title>
+<Sect2><Title>TQextScintillaLexerRuby (TQScintilla v1.5+)</Title>
 <Para>
-<Literal>QextScintillaLexerRuby</Literal> is fully implemented.
+<Literal>TQextScintillaLexerRuby</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerSQL (TQScintilla v1.1+)</Title>
+<Sect2><Title>TQextScintillaLexerSQL (TQScintilla v1.1+)</Title>
 <Para>
-<Literal>QextScintillaLexerSQL</Literal> is fully implemented.
+<Literal>TQextScintillaLexerSQL</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaLexerTeX (TQScintilla v1.6+)</Title>
+<Sect2><Title>TQextScintillaLexerTeX (TQScintilla v1.6+)</Title>
 <Para>
-<Literal>QextScintillaLexerTeX</Literal> is fully implemented.
+<Literal>TQextScintillaLexerTeX</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaMacro</Title>
+<Sect2><Title>TQextScintillaMacro</Title>
 <Para>
-<Literal>QextScintillaMacro</Literal> is fully implemented.
+<Literal>TQextScintillaMacro</Literal> is fully implemented.
 </Para>
 </Sect2>
 
-<Sect2><Title>QextScintillaPrinter</Title>
+<Sect2><Title>TQextScintillaPrinter</Title>
 <Para>
-<Literal>QextScintillaPrinter</Literal> is fully implemented.
+<Literal>TQextScintillaPrinter</Literal> is fully implemented.
 </Para>
 </Sect2>
 %End
diff --git a/pyqtconfig.py.in b/pyqtconfig.py.in
index ee3809c..a838543 100644
--- a/pyqtconfig.py.in
+++ b/pyqtconfig.py.in
@@ -104,7 +104,7 @@ class TQtExtModuleMakefile(TQtModuleMakefile):
         self.extra_defines.extend(self.config._pyqt_qscintilla_defines)
         self.extra_include_dirs.append(self.config._pyqt_qscintilla_inc_dir)
         self.extra_lib_dirs.append(self.config._pyqt_qscintilla_lib_dir)
-        self.extra_libs.append("qscintilla")
+        self.extra_libs.append("tqscintilla")
 
         TQtModuleMakefile.finalise(self)
 
diff --git a/pyuic3/form.cpp b/pyuic3/form.cpp
index df2636d..d0e6d7f 100644
--- a/pyuic3/form.cpp
+++ b/pyuic3/form.cpp
@@ -263,8 +263,8 @@ void Uic::createFormImpl( const TQDomElement &e )
     if (!axwidgets.empty())
 	out << indent << "from python_tqt.qtaxcontainer import TQAxWidget" << endl;
 
-    if (globalIncludes.findIndex("qextscintilla.h") >= 0)
-	out << indent << "from python_tqt.qtext import QextScintilla" << endl;
+    if (globalIncludes.findIndex("tqextscintilla.h") >= 0)
+	out << indent << "from python_tqt.qtext import TQextScintilla" << endl;
 
     registerDatabases( e );
     dbConnections = unique( dbConnections );
diff --git a/sip/qtext/qextscintilla.sip b/sip/qtext/qextscintilla.sip
index e7609b9..f9a7592 100644
--- a/sip/qtext/qextscintilla.sip
+++ b/sip/qtext/qextscintilla.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintilla.
+// This is the SIP interface definition for TQextScintilla.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintilla : QextScintillaBase
+class TQextScintilla : TQextScintillaBase
 {
 %TypeHeaderCode
-#include <qextscintilla.h>
+#include <tqextscintilla.h>
 %End
 
 public:
@@ -124,7 +124,7 @@ public:
 	};
 %End
 
-	QextScintilla(TQWidget * /TransferThis/ = 0,const char * = 0,
+	TQextScintilla(TQWidget * /TransferThis/ = 0,const char * = 0,
 		      WFlags = 0);
 
 	bool autoCompletionCaseSensitivity();
@@ -146,7 +146,7 @@ public:
 	void clearRegisteredImages();
 	void convertEols(EolMode);
 %If (TQScintilla_1_3 -)
-	QextScintillaDocument document();
+	TQextScintillaDocument document();
 %End
 	void endUndoAction();
 
@@ -203,7 +203,7 @@ public:
 	int lines();
 	int length();
 %If (TQScintilla_1_7 -)
-	QextScintillaLexer *lexer() const;
+	TQextScintillaLexer *lexer() const;
 %End
 
 	bool marginLineNumbers(int);
@@ -230,21 +230,21 @@ public:
 	void resetFoldMarginColors();
 	void setFoldMarginColors(const TQColor &,const TQColor &);
 
-	void setAutoCompletionAPIs(QextScintillaAPIs * = 0);
+	void setAutoCompletionAPIs(TQextScintillaAPIs * = 0);
 	void setAutoCompletionFillups(const char *);
 %If (TQScintilla_1_7 -)
 	void setAutoCompletionFillupsEnabled(bool);
 	void setAutoCompletionStartCharacters(const char *);
 %End
 
-	void setCallTipsAPIs(QextScintillaAPIs * = 0);
+	void setCallTipsAPIs(TQextScintillaAPIs * = 0);
 	void setCallTipsBackgroundColor(const TQColor &);
 	void setCallTipsForegroundColor(const TQColor &);
 	void setCallTipsHighlightColor(const TQColor &);
 	void setCallTipsVisible(int);
 
 %If (TQScintilla_1_3 -)
-	void setDocument(const QextScintillaDocument &);
+	void setDocument(const TQextScintillaDocument &);
 %End
 
 %If (TQScintilla_1_4 -)
@@ -267,14 +267,14 @@ public:
 
 %If (TQScintilla_1_7 -)
 	void setWrapVisualFlags(WrapVisualFlag,
-		WrapVisualFlag = QextScintilla::WrapFlagNone, int = 0);
+		WrapVisualFlag = TQextScintilla::WrapFlagNone, int = 0);
 %End
 
 	TQString selectedText();
 %If (TQScintilla_1_7 -)
 	void showUserList(int, const TQStringList &);
 %End
-	QextScintillaCommandSet *standardCommands() const;
+	TQextScintillaCommandSet *standardCommands() const;
 	bool tabIndents();
 	int tabWidth();
 	TQString text();
@@ -353,7 +353,7 @@ public slots:
 	virtual void setIndentationsUseTabs(bool);
 	virtual void setIndentationWidth(int);
 
-	virtual void setLexer(QextScintillaLexer * = 0);
+	virtual void setLexer(TQextScintillaLexer * = 0);
 
 	virtual void setMarginsBackgroundColor(const TQColor &);
 	virtual void setMarginsFont(const TQFont &);
@@ -406,6 +406,6 @@ signals:
 %End
 
 private:
-	QextScintilla(const QextScintilla &);
+	TQextScintilla(const TQextScintilla &);
 
 };
diff --git a/sip/qtext/qextscintillaapis.sip b/sip/qtext/qextscintillaapis.sip
index 8d92e26..170a80b 100644
--- a/sip/qtext/qextscintillaapis.sip
+++ b/sip/qtext/qextscintillaapis.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaAPIs.
+// This is the SIP interface definition for TQextScintillaAPIs.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,19 +24,19 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaAPIs
+class TQextScintillaAPIs
 {
 %TypeHeaderCode
-#include <qextscintillaapis.h>
+#include <tqextscintillaapis.h>
 %End
 
 public:
-	QextScintillaAPIs();
+	TQextScintillaAPIs();
 
 	void add(const TQString &);
 	bool load(const TQString &);
 	void clear();
 
 private:
-	QextScintillaAPIs(const QextScintillaAPIs &);
+	TQextScintillaAPIs(const TQextScintillaAPIs &);
 };
diff --git a/sip/qtext/qextscintillabase.sip b/sip/qtext/qextscintillabase.sip
index e85c2c5..23a2a65 100644
--- a/sip/qtext/qextscintillabase.sip
+++ b/sip/qtext/qextscintillabase.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaBase.
+// This is the SIP interface definition for TQextScintillaBase.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaBase : TQWidget
+class TQextScintillaBase : TQWidget
 {
 %TypeHeaderCode
-#include <qextscintillabase.h>
+#include <tqextscintillabase.h>
 %End
 
 public:
@@ -889,7 +889,7 @@ public:
 %End
 	};
 
-	QextScintillaBase(TQWidget * /TransferThis/,const char *,
+	TQextScintillaBase(TQWidget * /TransferThis/,const char *,
 			  WFlags = 0);
 
 %ConvertToSubClassCode
@@ -898,46 +898,46 @@ public:
 		sipWrapperType **type;
 		int yes, no;
 	} graph[] = {
-		{sipName_QextScintillaLexer,	&sipClass_QextScintillaLexer,	3, 1},
-		{sipName_QextScintillaBase,	&sipClass_QextScintillaBase,	15, 2},
-		{sipName_QextScintillaMacro,	&sipClass_QextScintillaMacro,	-1, -1},
+		{sipName_TQextScintillaLexer,	&sipClass_TQextScintillaLexer,	3, 1},
+		{sipName_TQextScintillaBase,	&sipClass_TQextScintillaBase,	15, 2},
+		{sipName_TQextScintillaMacro,	&sipClass_TQextScintillaMacro,	-1, -1},
 #if TQSCINTILLA_VERSION >= 0x010300
-		{sipName_QextScintillaLexerPerl,	&sipClass_QextScintillaLexerPerl,	-1, 4},
+		{sipName_TQextScintillaLexerPerl,	&sipClass_TQextScintillaLexerPerl,	-1, 4},
 #else
 		{NULL,					NULL,					-1, 4},
 #endif
 #if TQSCINTILLA_VERSION >= 0x010100
-		{sipName_QextScintillaLexerHTML,	&sipClass_QextScintillaLexerHTML,	-1, 5},
+		{sipName_TQextScintillaLexerHTML,	&sipClass_TQextScintillaLexerHTML,	-1, 5},
 #else
 		{NULL,					NULL,					-1, 5},
 #endif
 #if TQSCINTILLA_VERSION >= 0x010500
-		{sipName_QextScintillaLexerRuby,	&sipClass_QextScintillaLexerRuby,	-1, 6},
+		{sipName_TQextScintillaLexerRuby,	&sipClass_TQextScintillaLexerRuby,	-1, 6},
 #else
 		{NULL,					NULL,					-1, 6},
 #endif
-		{sipName_QextScintillaLexerCPP,	&sipClass_QextScintillaLexerCPP,	11, 7},
-		{sipName_QextScintillaLexerPython,	&sipClass_QextScintillaLexerPython,	-1, 8},
+		{sipName_TQextScintillaLexerCPP,	&sipClass_TQextScintillaLexerCPP,	11, 7},
+		{sipName_TQextScintillaLexerPython,	&sipClass_TQextScintillaLexerPython,	-1, 8},
 #if TQSCINTILLA_VERSION >= 0x010100
-		{sipName_QextScintillaLexerSQL,	&sipClass_QextScintillaLexerSQL,	-1, 9},
+		{sipName_TQextScintillaLexerSQL,	&sipClass_TQextScintillaLexerSQL,	-1, 9},
 #else
 		{NULL,				NULL,					-1, 9},
 #endif
 #if TQSCINTILLA_VERSION >= 0x010400
-		{sipName_QextScintillaLexerBash,	&sipClass_QextScintillaLexerBash,	-1, 10},
+		{sipName_TQextScintillaLexerBash,	&sipClass_TQextScintillaLexerBash,	-1, 10},
 #else
 		{NULL,					NULL,					-1, 10},
 #endif
 #if TQSCINTILLA_VERSION >= 0x010500
-		{sipName_QextScintillaLexerLua,	&sipClass_QextScintillaLexerLua,	-1, -1},
+		{sipName_TQextScintillaLexerLua,	&sipClass_TQextScintillaLexerLua,	-1, -1},
 #else
 		{NULL,					NULL,				-1, -1},
 #endif
-		{sipName_QextScintillaLexerIDL,	&sipClass_QextScintillaLexerIDL,	-1, 12},
-		{sipName_QextScintillaLexerJavaScript,	&sipClass_QextScintillaLexerJavaScript,	-1, 13},
-		{sipName_QextScintillaLexerCSharp,	&sipClass_QextScintillaLexerCSharp,	-1, 14},
-		{sipName_QextScintillaLexerJava,	&sipClass_QextScintillaLexerJava,	-1, -1},
-		{sipName_QextScintilla,	&sipClass_QextScintilla,	-1, -1},
+		{sipName_TQextScintillaLexerIDL,	&sipClass_TQextScintillaLexerIDL,	-1, 12},
+		{sipName_TQextScintillaLexerJavaScript,	&sipClass_TQextScintillaLexerJavaScript,	-1, 13},
+		{sipName_TQextScintillaLexerCSharp,	&sipClass_TQextScintillaLexerCSharp,	-1, 14},
+		{sipName_TQextScintillaLexerJava,	&sipClass_TQextScintillaLexerJava,	-1, -1},
+		{sipName_TQextScintilla,	&sipClass_TQextScintilla,	-1, -1},
 	};
 
 	int i = 0;
@@ -960,7 +960,7 @@ public:
 %End
 
 %If (TQScintilla_1_3 -)
-	QextScintillaBase *pool();
+	TQextScintillaBase *pool();
 %End
 
 	long SendScintilla(unsigned int,unsigned long = 0,long = 0);
@@ -1020,5 +1020,5 @@ protected:
 %End
 
 private:
-	QextScintillaBase(const QextScintillaBase &);
+	TQextScintillaBase(const TQextScintillaBase &);
 };
diff --git a/sip/qtext/qextscintillacommand.sip b/sip/qtext/qextscintillacommand.sip
index b423a5b..77dfb56 100644
--- a/sip/qtext/qextscintillacommand.sip
+++ b/sip/qtext/qextscintillacommand.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaCommand.
+// This is the SIP interface definition for TQextScintillaCommand.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaCommand
+class TQextScintillaCommand
 {
 %TypeHeaderCode
-#include <qextscintillacommand.h>
+#include <tqextscintillacommand.h>
 %End
 
 public:
@@ -39,6 +39,6 @@ public:
 	TQString description() const;
 
 private:
-	QextScintillaCommand(QextScintilla *,int,int,const char *);
-	QextScintillaCommand(const QextScintillaCommand &);
+	TQextScintillaCommand(TQextScintilla *,int,int,const char *);
+	TQextScintillaCommand(const TQextScintillaCommand &);
 };
diff --git a/sip/qtext/qextscintillacommandset.sip b/sip/qtext/qextscintillacommandset.sip
index 8d04f82..b472345 100644
--- a/sip/qtext/qextscintillacommandset.sip
+++ b/sip/qtext/qextscintillacommandset.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for the QextScintillaCommandSet.
+// This is the SIP interface definition for the TQextScintillaCommandSet.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaCommandSet
+class TQextScintillaCommandSet
 {
 %TypeHeaderCode
-#include <qextscintillacommandset.h>
+#include <tqextscintillacommandset.h>
 %End
 
 public:
@@ -35,10 +35,10 @@ public:
 	bool writeSettings(TQSettings &,const char * = "/Scintilla");
 
 %If (TQScintilla_1_4 -)
-	TQPtrList<QextScintillaCommand> &commands();
+	TQPtrList<TQextScintillaCommand> &commands();
 %End
 %If (- TQScintilla_1_4)
-	const TQPtrList<QextScintillaCommand> &commands() const;
+	const TQPtrList<TQextScintillaCommand> &commands() const;
 %End
 
 %If (TQScintilla_1_4 -)
@@ -47,6 +47,6 @@ public:
 %End
 
 private:
-	QextScintillaCommandSet(QextScintilla *);
-	QextScintillaCommandSet(const QextScintillaCommandSet &);
+	TQextScintillaCommandSet(TQextScintilla *);
+	TQextScintillaCommandSet(const TQextScintillaCommandSet &);
 };
diff --git a/sip/qtext/qextscintilladocument.sip b/sip/qtext/qextscintilladocument.sip
index f66166d..9c656b8 100644
--- a/sip/qtext/qextscintilladocument.sip
+++ b/sip/qtext/qextscintilladocument.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaDocument.
+// This is the SIP interface definition for TQextScintillaDocument.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,17 +26,17 @@
 
 %If (TQScintilla_1_3 -)
 
-class QextScintillaDocument
+class TQextScintillaDocument
 {
 %TypeHeaderCode
-#include <qextscintilladocument.h>
+#include <tqextscintilladocument.h>
 %End
 
 public:
-	QextScintillaDocument();
-	virtual ~QextScintillaDocument();
+	TQextScintillaDocument();
+	virtual ~TQextScintillaDocument();
 
-	QextScintillaDocument(const QextScintillaDocument &);
+	TQextScintillaDocument(const TQextScintillaDocument &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexer.sip b/sip/qtext/qextscintillalexer.sip
index 4ab290a..b13b14d 100644
--- a/sip/qtext/qextscintillalexer.sip
+++ b/sip/qtext/qextscintillalexer.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexer.
+// This is the SIP interface definition for TQextScintillaLexer.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,14 +24,14 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexer : TQObject
+class TQextScintillaLexer : TQObject
 {
 %TypeHeaderCode
-#include <qextscintillalexer.h>
+#include <tqextscintillalexer.h>
 %End
 
 public:
-	QextScintillaLexer(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexer(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	virtual const char *language() const = 0;
 	virtual const char *lexer() const = 0;
@@ -75,6 +75,6 @@ protected:
 	virtual bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexer(const QextScintillaLexer &);
+	TQextScintillaLexer(const TQextScintillaLexer &);
 
 };
diff --git a/sip/qtext/qextscintillalexerbash.sip b/sip/qtext/qextscintillalexerbash.sip
index eb71b13..0a3b95c 100644
--- a/sip/qtext/qextscintillalexerbash.sip
+++ b/sip/qtext/qextscintillalexerbash.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerBash.
+// This is the SIP interface definition for TQextScintillaLexerBash.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_4 -)
 
-class QextScintillaLexerBash : QextScintillaLexer
+class TQextScintillaLexerBash : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerbash.h>
+#include <tqextscintillalexerbash.h>
 %End
 
 public:
@@ -50,7 +50,7 @@ public:
 		SingleQuotedHereDocument
 	};
 
-	QextScintillaLexerBash(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerBash(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -74,7 +74,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerBash(const QextScintillaLexerBash &);
+	TQextScintillaLexerBash(const TQextScintillaLexerBash &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerbatch.sip b/sip/qtext/qextscintillalexerbatch.sip
index aa20a4f..fa660f0 100644
--- a/sip/qtext/qextscintillalexerbatch.sip
+++ b/sip/qtext/qextscintillalexerbatch.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerBatch.
+// This is the SIP interface definition for TQextScintillaLexerBatch.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerBatch : QextScintillaLexer
+class TQextScintillaLexerBatch : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerbatch.h>
+#include <tqextscintillalexerbatch.h>
 %End
 
 public:
@@ -44,7 +44,7 @@ public:
 		Operator
 	};
 
-	QextScintillaLexerBatch(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerBatch(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -56,7 +56,7 @@ public:
 	TQColor paper(int) const;
 
 private:
-	QextScintillaLexerBatch(const QextScintillaLexerBatch &);
+	TQextScintillaLexerBatch(const TQextScintillaLexerBatch &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexercpp.sip b/sip/qtext/qextscintillalexercpp.sip
index 3ce192d..786893d 100644
--- a/sip/qtext/qextscintillalexercpp.sip
+++ b/sip/qtext/qextscintillalexercpp.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerCPP.
+// This is the SIP interface definition for TQextScintillaLexerCPP.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerCPP : QextScintillaLexer
+class TQextScintillaLexerCPP : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexercpp.h>
+#include <tqextscintillalexercpp.h>
 %End
 
 public:
@@ -59,7 +59,7 @@ public:
 %End
 	};
 
-	QextScintillaLexerCPP(TQObject * /TransferThis/ = 0,const char * = 0,
+	TQextScintillaLexerCPP(TQObject * /TransferThis/ = 0,const char * = 0,
 			      bool = 0);
 
 	const char *language() const;
@@ -94,5 +94,5 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerCPP(const QextScintillaLexerCPP &);
+	TQextScintillaLexerCPP(const TQextScintillaLexerCPP &);
 };
diff --git a/sip/qtext/qextscintillalexercsharp.sip b/sip/qtext/qextscintillalexercsharp.sip
index f095269..cf5aafb 100644
--- a/sip/qtext/qextscintillalexercsharp.sip
+++ b/sip/qtext/qextscintillalexercsharp.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerCSharp.
+// This is the SIP interface definition for TQextScintillaLexerCSharp.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,14 +24,14 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerCSharp : QextScintillaLexerCPP
+class TQextScintillaLexerCSharp : TQextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexercsharp.h>
+#include <tqextscintillalexercsharp.h>
 %End
 
 public:
-	QextScintillaLexerCSharp(TQObject * /TransferThis/ = 0,
+	TQextScintillaLexerCSharp(TQObject * /TransferThis/ = 0,
 				 const char * = 0);
 
 	const char *language() const;
@@ -43,5 +43,5 @@ public:
 	TQColor paper(int) const;
 
 private:
-	QextScintillaLexerCSharp(const QextScintillaLexerCSharp &);
+	TQextScintillaLexerCSharp(const TQextScintillaLexerCSharp &);
 };
diff --git a/sip/qtext/qextscintillalexercss.sip b/sip/qtext/qextscintillalexercss.sip
index e54b5e1..adc5672 100644
--- a/sip/qtext/qextscintillalexercss.sip
+++ b/sip/qtext/qextscintillalexercss.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerCSS.
+// This is the SIP interface definition for TQextScintillaLexerCSS.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerCSS : QextScintillaLexer
+class TQextScintillaLexerCSS : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexercss.h>
+#include <tqextscintillalexercss.h>
 %End
 
 public:
@@ -53,7 +53,7 @@ public:
 		Attribute
 	};
 
-	QextScintillaLexerCSS(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerCSS(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -75,7 +75,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerCSS(const QextScintillaLexerCSS &);
+	TQextScintillaLexerCSS(const TQextScintillaLexerCSS &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerdiff.sip b/sip/qtext/qextscintillalexerdiff.sip
index 49d82ad..576c826 100644
--- a/sip/qtext/qextscintillalexerdiff.sip
+++ b/sip/qtext/qextscintillalexerdiff.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerDiff.
+// This is the SIP interface definition for TQextScintillaLexerDiff.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerDiff : QextScintillaLexer
+class TQextScintillaLexerDiff : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerdiff.h>
+#include <tqextscintillalexerdiff.h>
 %End
 
 public:
@@ -43,7 +43,7 @@ public:
 		LineAdded
 	};
 
-	QextScintillaLexerDiff(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerDiff(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -51,7 +51,7 @@ public:
 	TQString description(int) const;
 
 private:
-	QextScintillaLexerDiff(const QextScintillaLexerDiff &);
+	TQextScintillaLexerDiff(const TQextScintillaLexerDiff &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerhtml.sip b/sip/qtext/qextscintillalexerhtml.sip
index deb7320..6133b98 100644
--- a/sip/qtext/qextscintillalexerhtml.sip
+++ b/sip/qtext/qextscintillalexerhtml.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerHTML.
+// This is the SIP interface definition for TQextScintillaLexerHTML.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_1 -)
 
-class QextScintillaLexerHTML : QextScintillaLexer
+class TQextScintillaLexerHTML : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerhtml.h>
+#include <tqextscintillalexerhtml.h>
 %End
 
 public:
@@ -146,7 +146,7 @@ public:
 		PHPOperator
 	};
 
-	QextScintillaLexerHTML(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerHTML(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -172,7 +172,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerHTML(const QextScintillaLexerHTML &);
+	TQextScintillaLexerHTML(const TQextScintillaLexerHTML &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexeridl.sip b/sip/qtext/qextscintillalexeridl.sip
index 408d3fe..8ae2a83 100644
--- a/sip/qtext/qextscintillalexeridl.sip
+++ b/sip/qtext/qextscintillalexeridl.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerIDL.
+// This is the SIP interface definition for TQextScintillaLexerIDL.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,14 +24,14 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerIDL : QextScintillaLexerCPP
+class TQextScintillaLexerIDL : TQextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexeridl.h>
+#include <tqextscintillalexeridl.h>
 %End
 
 public:
-	QextScintillaLexerIDL(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerIDL(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	TQColor color(int) const;
@@ -39,5 +39,5 @@ public:
 	TQString description(int) const;
 
 private:
-	QextScintillaLexerIDL(const QextScintillaLexerIDL &);
+	TQextScintillaLexerIDL(const TQextScintillaLexerIDL &);
 };
diff --git a/sip/qtext/qextscintillalexerjava.sip b/sip/qtext/qextscintillalexerjava.sip
index dbb8b03..7ffb790 100644
--- a/sip/qtext/qextscintillalexerjava.sip
+++ b/sip/qtext/qextscintillalexerjava.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerJava.
+// This is the SIP interface definition for TQextScintillaLexerJava.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,18 +24,18 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerJava : QextScintillaLexerCPP
+class TQextScintillaLexerJava : TQextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexerjava.h>
+#include <tqextscintillalexerjava.h>
 %End
 
 public:
-	QextScintillaLexerJava(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerJava(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *keywords(int) const;
 
 private:
-	QextScintillaLexerJava(const QextScintillaLexerJava &);
+	TQextScintillaLexerJava(const TQextScintillaLexerJava &);
 };
diff --git a/sip/qtext/qextscintillalexerjavascript.sip b/sip/qtext/qextscintillalexerjavascript.sip
index a19b902..0624788 100644
--- a/sip/qtext/qextscintillalexerjavascript.sip
+++ b/sip/qtext/qextscintillalexerjavascript.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerJavaScript.
+// This is the SIP interface definition for TQextScintillaLexerJavaScript.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,14 +24,14 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerJavaScript : QextScintillaLexerCPP
+class TQextScintillaLexerJavaScript : TQextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <qextscintillalexerjavascript.h>
+#include <tqextscintillalexerjavascript.h>
 %End
 
 public:
-	QextScintillaLexerJavaScript(TQObject * /TransferThis/ = 0,
+	TQextScintillaLexerJavaScript(TQObject * /TransferThis/ = 0,
 				     const char * = 0);
 
 	const char *language() const;
@@ -43,5 +43,5 @@ public:
 	TQColor paper(int) const;
 
 private:
-	QextScintillaLexerJavaScript(const QextScintillaLexerJavaScript &);
+	TQextScintillaLexerJavaScript(const TQextScintillaLexerJavaScript &);
 };
diff --git a/sip/qtext/qextscintillalexerlua.sip b/sip/qtext/qextscintillalexerlua.sip
index 12c725f..3a70a01 100644
--- a/sip/qtext/qextscintillalexerlua.sip
+++ b/sip/qtext/qextscintillalexerlua.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerLua.
+// This is the SIP interface definition for TQextScintillaLexerLua.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_5 -)
 
-class QextScintillaLexerLua : QextScintillaLexer
+class TQextScintillaLexerLua : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerlua.h>
+#include <tqextscintillalexerlua.h>
 %End
 
 public:
@@ -51,7 +51,7 @@ public:
 		CoroutinesIOSystemFacilities
 	};
 
-	QextScintillaLexerLua(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerLua(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -73,7 +73,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerLua(const QextScintillaLexerLua &);
+	TQextScintillaLexerLua(const TQextScintillaLexerLua &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexermakefile.sip b/sip/qtext/qextscintillalexermakefile.sip
index 90d210e..d15259e 100644
--- a/sip/qtext/qextscintillalexermakefile.sip
+++ b/sip/qtext/qextscintillalexermakefile.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerMakefile.
+// This is the SIP interface definition for TQextScintillaLexerMakefile.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerMakefile : QextScintillaLexer
+class TQextScintillaLexerMakefile : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexermakefile.h>
+#include <tqextscintillalexermakefile.h>
 %End
 
 public:
@@ -43,7 +43,7 @@ public:
 		Error
 	};
 
-	QextScintillaLexerMakefile(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerMakefile(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -54,7 +54,7 @@ public:
 	TQColor paper(int) const;
 
 private:
-	QextScintillaLexerMakefile(const QextScintillaLexerMakefile &);
+	TQextScintillaLexerMakefile(const TQextScintillaLexerMakefile &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerperl.sip b/sip/qtext/qextscintillalexerperl.sip
index 06bdd7c..e63e71b 100644
--- a/sip/qtext/qextscintillalexerperl.sip
+++ b/sip/qtext/qextscintillalexerperl.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerPerl.
+// This is the SIP interface definition for TQextScintillaLexerPerl.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_3 -)
 
-class QextScintillaLexerPerl : QextScintillaLexer
+class TQextScintillaLexerPerl : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerperl.h>
+#include <tqextscintillalexerperl.h>
 %End
 
 public:
@@ -66,7 +66,7 @@ public:
 %End
 	};
 
-	QextScintillaLexerPerl(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerPerl(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -90,7 +90,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerPerl(const QextScintillaLexerPerl &);
+	TQextScintillaLexerPerl(const TQextScintillaLexerPerl &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerpov.sip b/sip/qtext/qextscintillalexerpov.sip
index 6812baa..f4f87ad 100644
--- a/sip/qtext/qextscintillalexerpov.sip
+++ b/sip/qtext/qextscintillalexerpov.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerPOV.
+// This is the SIP interface definition for TQextScintillaLexerPOV.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerPOV : QextScintillaLexer
+class TQextScintillaLexerPOV : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerpov.h>
+#include <tqextscintillalexerpov.h>
 %End
 
 public:
@@ -53,7 +53,7 @@ public:
 		KeywordSet8
 	};
 
-	QextScintillaLexerPOV(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerPOV(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -79,7 +79,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerPOV(const QextScintillaLexerPOV &);
+	TQextScintillaLexerPOV(const TQextScintillaLexerPOV &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerproperties.sip b/sip/qtext/qextscintillalexerproperties.sip
index b880ce9..b3be195 100644
--- a/sip/qtext/qextscintillalexerproperties.sip
+++ b/sip/qtext/qextscintillalexerproperties.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerProperties.
+// This is the SIP interface definition for TQextScintillaLexerProperties.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerProperties : QextScintillaLexer
+class TQextScintillaLexerProperties : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerproperties.h>
+#include <tqextscintillalexerproperties.h>
 %End
 
 public:
@@ -41,7 +41,7 @@ public:
 		DefaultValue
 	};
 
-	QextScintillaLexerProperties(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerProperties(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -62,7 +62,7 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerProperties(const QextScintillaLexerProperties &);
+	TQextScintillaLexerProperties(const TQextScintillaLexerProperties &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexerpython.sip b/sip/qtext/qextscintillalexerpython.sip
index 5e3b883..d14a51d 100644
--- a/sip/qtext/qextscintillalexerpython.sip
+++ b/sip/qtext/qextscintillalexerpython.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerPython.
+// This is the SIP interface definition for TQextScintillaLexerPython.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,10 +24,10 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaLexerPython : QextScintillaLexer
+class TQextScintillaLexerPython : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerpython.h>
+#include <tqextscintillalexerpython.h>
 %End
 
 public:
@@ -63,7 +63,7 @@ public:
 		Tabs
 	};
 
-	QextScintillaLexerPython(TQObject * /TransferThis/ = 0,
+	TQextScintillaLexerPython(TQObject * /TransferThis/ = 0,
 				 const char * = 0);
 
 	const char *language() const;
@@ -90,5 +90,5 @@ protected:
 	bool writeProperties(TQSettings &,const TQString &) const;
 
 private:
-	QextScintillaLexerPython(const QextScintillaLexerPython &);
+	TQextScintillaLexerPython(const TQextScintillaLexerPython &);
 };
diff --git a/sip/qtext/qextscintillalexerruby.sip b/sip/qtext/qextscintillalexerruby.sip
index f7c0a99..257aad2 100644
--- a/sip/qtext/qextscintillalexerruby.sip
+++ b/sip/qtext/qextscintillalexerruby.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerRuby.
+// This is the SIP interface definition for TQextScintillaLexerRuby.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_5 -)
 
-class QextScintillaLexerRuby : QextScintillaLexer
+class TQextScintillaLexerRuby : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexerruby.h>
+#include <tqextscintillalexerruby.h>
 %End
 
 public:
@@ -94,7 +94,7 @@ public:
 	};
 %End
 
-	QextScintillaLexerRuby(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerRuby(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -122,7 +122,7 @@ protected:
 %End
 
 private:
-	QextScintillaLexerRuby(const QextScintillaLexerRuby &);
+	TQextScintillaLexerRuby(const TQextScintillaLexerRuby &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexersql.sip b/sip/qtext/qextscintillalexersql.sip
index 5f601eb..418351f 100644
--- a/sip/qtext/qextscintillalexersql.sip
+++ b/sip/qtext/qextscintillalexersql.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerSQL.
+// This is the SIP interface definition for TQextScintillaLexerSQL.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_1 -)
 
-class QextScintillaLexerSQL : QextScintillaLexer
+class TQextScintillaLexerSQL : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexersql.h>
+#include <tqextscintillalexersql.h>
 %End
 
 public:
@@ -65,7 +65,7 @@ public:
 %End
 	};
 
-	QextScintillaLexerSQL(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerSQL(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -99,7 +99,7 @@ protected:
 %End
 
 private:
-	QextScintillaLexerSQL(const QextScintillaLexerSQL &);
+	TQextScintillaLexerSQL(const TQextScintillaLexerSQL &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillalexertex.sip b/sip/qtext/qextscintillalexertex.sip
index 8320b59..24f42fe 100644
--- a/sip/qtext/qextscintillalexertex.sip
+++ b/sip/qtext/qextscintillalexertex.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaLexerTeX.
+// This is the SIP interface definition for TQextScintillaLexerTeX.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -26,10 +26,10 @@
 
 %If (TQScintilla_1_6 -)
 
-class QextScintillaLexerTeX : QextScintillaLexer
+class TQextScintillaLexerTeX : TQextScintillaLexer
 {
 %TypeHeaderCode
-#include <qextscintillalexertex.h>
+#include <tqextscintillalexertex.h>
 %End
 
 public:
@@ -42,7 +42,7 @@ public:
 		Text
 	};
 
-	QextScintillaLexerTeX(TQObject * /TransferThis/ = 0,const char * = 0);
+	TQextScintillaLexerTeX(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	const char *language() const;
 	const char *lexer() const;
@@ -51,7 +51,7 @@ public:
 	TQString description(int) const;
 
 private:
-	QextScintillaLexerTeX(const QextScintillaLexerTeX &);
+	TQextScintillaLexerTeX(const TQextScintillaLexerTeX &);
 };
 
 %End
diff --git a/sip/qtext/qextscintillamacro.sip b/sip/qtext/qextscintillamacro.sip
index d5261f1..e29ab1f 100644
--- a/sip/qtext/qextscintillamacro.sip
+++ b/sip/qtext/qextscintillamacro.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaMacro.
+// This is the SIP interface definition for TQextScintillaMacro.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,15 +24,15 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaMacro : TQObject
+class TQextScintillaMacro : TQObject
 {
 %TypeHeaderCode
-#include <qextscintillamacro.h>
+#include <tqextscintillamacro.h>
 %End
 
 public:
-	QextScintillaMacro(QextScintilla * /TransferThis/,const char * = 0);
-	QextScintillaMacro(const TQCString &,QextScintilla * /TransferThis/,
+	TQextScintillaMacro(TQextScintilla * /TransferThis/,const char * = 0);
+	TQextScintillaMacro(const TQCString &,TQextScintilla * /TransferThis/,
 			   const char * = 0);
 
 	void clear();
@@ -45,5 +45,5 @@ public slots:
 	virtual void endRecording();
 
 private:
-	QextScintillaMacro(const QextScintillaMacro &);
+	TQextScintillaMacro(const TQextScintillaMacro &);
 };
diff --git a/sip/qtext/qextscintillaprinter.sip b/sip/qtext/qextscintillaprinter.sip
index b19a312..b5ee0d6 100644
--- a/sip/qtext/qextscintillaprinter.sip
+++ b/sip/qtext/qextscintillaprinter.sip
@@ -1,4 +1,4 @@
-// This is the SIP interface definition for QextScintillaPrinter.
+// This is the SIP interface definition for TQextScintillaPrinter.
 //
 // Copyright (c) 2007
 // 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -24,22 +24,22 @@
 // enough to handle the resulting %Timeline complexity.
 
 
-class QextScintillaPrinter : TQPrinter
+class TQextScintillaPrinter : TQPrinter
 {
 %TypeHeaderCode
-#include <qextscintillaprinter.h>
+#include <tqextscintillaprinter.h>
 %End
 
 public:
-	QextScintillaPrinter(TQPrinter::PrinterMode = TQPrinter::ScreenResolution);
+	TQextScintillaPrinter(TQPrinter::PrinterMode = TQPrinter::ScreenResolution);
 
 	virtual void formatPage(TQPainter &,bool,TQRect &,int);
-	virtual int printRange(QextScintillaBase *,int = -1,int = -1);
+	virtual int printRange(TQextScintillaBase *,int = -1,int = -1);
 	int magnification() const;
 	virtual void setMagnification(int);
-	QextScintilla::WrapMode wrapMode() const;
-	virtual void setWrapMode(QextScintilla::WrapMode);
+	TQextScintilla::WrapMode wrapMode() const;
+	virtual void setWrapMode(TQextScintilla::WrapMode);
 
 private:
-	QextScintillaPrinter(const QextScintillaPrinter &);
+	TQextScintillaPrinter(const TQextScintillaPrinter &);
 };