diff --git a/PerlTQt/TQt.xs b/PerlTQt/TQt.xs
index e80e459..6a06b7d 100644
--- a/PerlTQt/TQt.xs
+++ b/PerlTQt/TQt.xs
@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include <ntqglobal.h>
-#include <ntqstring.h>
+#include <tqglobal.h>
+#include <tqstring.h>
 #include <ntqapplication.h>
-#include <ntqmetaobject.h>
-#include <private/qucomextra_p.h>
+#include <tqmetaobject.h>
+#include <private/tqucomextra_p.h>
 #include "smoke.h"
 
 #undef DEBUG
diff --git a/PerlTQt/handlers.cpp b/PerlTQt/handlers.cpp
index 280336a..bf95de1 100644
--- a/PerlTQt/handlers.cpp
+++ b/PerlTQt/handlers.cpp
@@ -1,18 +1,18 @@
-#include <ntqstring.h>
-#include <ntqregexp.h>
+#include <tqstring.h>
+#include <tqregexp.h>
 #include <ntqapplication.h>
-#include <ntqmetaobject.h>
-#include <ntqvaluelist.h>
-#include <ntqwidgetlist.h>
-#include <ntqcanvas.h>
-#include <ntqobjectlist.h>
-#include <ntqintdict.h>
-#include <ntqtoolbar.h>
-#include <ntqtabbar.h>
-#include <ntqdir.h>
-#include <ntqdockwindow.h>
-#include <ntqnetworkprotocol.h>
-#include <private/qucomextra_p.h>
+#include <tqmetaobject.h>
+#include <tqvaluelist.h>
+#include <tqwidgetlist.h>
+#include <tqcanvas.h>
+#include <tqobjectlist.h>
+#include <tqintdict.h>
+#include <tqtoolbar.h>
+#include <tqtabbar.h>
+#include <tqdir.h>
+#include <tqdockwindow.h>
+#include <tqnetworkprotocol.h>
+#include <private/tqucomextra_p.h>
 #include "smoke.h"
 
 #undef DEBUG
@@ -30,7 +30,7 @@
 #include "XSUB.h"
 
 #if PERL_VERSION == 6 && PERL_SUBVERSION == 0
-  #include <ntqtextcodec.h>
+  #include <tqtextcodec.h>
 #endif
 
 #include "marshall.h"
diff --git a/acinclude.m4 b/acinclude.m4
index 74e3fe2..bfad197 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1018,14 +1018,14 @@ AC_DEFUN(KDE_PRINT_TQT_PROGRAM,
 AC_REQUIRE([KDE_USE_TQT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
-#include <ntqglobal.h>
+#include <tqglobal.h>
 #include <ntqapplication.h>
 EOF
 if test "$kde_qtver" = "2"; then
 cat >> conftest.$ac_ext <<EOF
-#include <ntqevent.h>
-#include <ntqstring.h>
-#include <ntqstyle.h>
+#include <tqevent.h>
+#include <tqstring.h>
+#include <tqstyle.h>
 EOF
 
 if test $kde_qtsubver -gt 0; then
@@ -1039,9 +1039,9 @@ fi
 
 if test "$kde_qtver" = "3"; then
 cat >> conftest.$ac_ext <<EOF
-#include <ntqcursor.h>
-#include <ntqstylefactory.h>
-#include <private/qucomextra_p.h>
+#include <tqcursor.h>
+#include <tqstylefactory.h>
+#include <private/tqucomextra_p.h>
 EOF
 fi
 
@@ -1373,9 +1373,9 @@ if test ! "$ac_tqt_includes" = "NO"; then
 fi
 
 if test "$kde_qtver" != "1"; then
-  kde_qt_header=ntqstyle.h
+  kde_qt_header=tqstyle.h
 else
-  kde_qt_header=ntqglobal.h
+  kde_qt_header=tqglobal.h
 fi
 
 AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
diff --git a/aclocal.m4 b/aclocal.m4
index aad8434..f471bd5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1053,7 +1053,7 @@ if test "$kde_qtver" = "3"; then
 cat >> conftest.$ac_ext <<EOF
 #include <qcursor.h>
 #include <qstylefactory.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 EOF
 fi
 
diff --git a/puic/domtool.cpp b/puic/domtool.cpp
index 6c2809f..90f367f 100644
--- a/puic/domtool.cpp
+++ b/puic/domtool.cpp
@@ -26,14 +26,14 @@
 
 #include "domtool.h"
 
-#include <ntqsizepolicy.h>
-#include <ntqcolor.h>
-#include <ntqcursor.h>
-#include <ntqdatetime.h>
-#include <ntqrect.h>
-#include <ntqsize.h>
-#include <ntqfont.h>
-#include <ntqdom.h>
+#include <tqsizepolicy.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqdatetime.h>
+#include <tqrect.h>
+#include <tqsize.h>
+#include <tqfont.h>
+#include <tqdom.h>
 
 /*!
   \class DomTool domtool.h
diff --git a/puic/domtool.h b/puic/domtool.h
index a7bc157..efa67f0 100644
--- a/puic/domtool.h
+++ b/puic/domtool.h
@@ -27,8 +27,8 @@
 #ifndef DOMTOOL_H
 #define DOMTOOL_H
 
-#include <ntqvariant.h>
-#include <ntqnamespace.h>
+#include <tqvariant.h>
+#include <tqnamespace.h>
 
 class TQDomElement;
 class TQDomDocument;
diff --git a/puic/embed.cpp b/puic/embed.cpp
index 303c671..c3eedcf 100644
--- a/puic/embed.cpp
+++ b/puic/embed.cpp
@@ -30,14 +30,14 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <ntqfile.h>
-#include <ntqimage.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
-#include <ntqfileinfo.h>
+#include <tqfile.h>
+#include <tqimage.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqfileinfo.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/puic/form.cpp b/puic/form.cpp
index 473eda3..86faa6d 100644
--- a/puic/form.cpp
+++ b/puic/form.cpp
@@ -32,12 +32,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqstringlist.h>
-#include <ntqvaluelist.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #if( TQT_VERSION < 0x030101 )
diff --git a/puic/globaldefs.h b/puic/globaldefs.h
index 9901979..45698cd 100644
--- a/puic/globaldefs.h
+++ b/puic/globaldefs.h
@@ -21,7 +21,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/puic/main.cpp b/puic/main.cpp
index d6411ee..6c0b25f 100644
--- a/puic/main.cpp
+++ b/puic/main.cpp
@@ -32,9 +32,9 @@
 #include "widgetdatabase.h"
 #include "domtool.h"
 #include <ntqapplication.h>
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <stdio.h>
diff --git a/puic/object.cpp b/puic/object.cpp
index 21f532e..ccc4785 100644
--- a/puic/object.cpp
+++ b/puic/object.cpp
@@ -23,9 +23,9 @@
 #include "widgetinterface.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqregexp.h>
-#include <ntqsizepolicy.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqsizepolicy.h>
+#include <tqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
diff --git a/puic/parser.cpp b/puic/parser.cpp
index 4d8616b..85446fa 100644
--- a/puic/parser.cpp
+++ b/puic/parser.cpp
@@ -19,8 +19,8 @@
 **********************************************************************/
 
 #include "parser.h"
-#include <ntqobject.h>
-#include <ntqstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 class NormalizeObject : public TQObject
 {
diff --git a/puic/parser.h b/puic/parser.h
index 01ca1ca..5fdbdc2 100644
--- a/puic/parser.h
+++ b/puic/parser.h
@@ -21,7 +21,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 class Parser
 {
diff --git a/puic/subclassing.cpp b/puic/subclassing.cpp
index 7f0e127..fb7329f 100644
--- a/puic/subclassing.cpp
+++ b/puic/subclassing.cpp
@@ -22,12 +22,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/puic/uic.cpp b/puic/uic.cpp
index 67ec24b..e50cae5 100644
--- a/puic/uic.cpp
+++ b/puic/uic.cpp
@@ -32,12 +32,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/puic/uic.h b/puic/uic.h
index 75b3c1c..bed1455 100644
--- a/puic/uic.h
+++ b/puic/uic.h
@@ -21,13 +21,13 @@
 
 #ifndef UIC_H
 #define UIC_H
-#include <ntqdom.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqmap.h>
-#include <ntqtextstream.h>
-#include <ntqpalette.h>
-#include <ntqvariant.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
+#include <tqvariant.h>
 
 #ifndef TQ_DUMMY_COMPARISON_OPERATOR
 # warning "Defining TQ_DUMMY_COMPARISON_OPERATOR"
diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp
index d94ebce..284023f 100644
--- a/puic/widgetdatabase.cpp
+++ b/puic/widgetdatabase.cpp
@@ -30,12 +30,12 @@
 #include <ntqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqstrlist.h>
-#include <ntqdict.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <ntqcleanuphandler.h>
-#include <ntqfeatures.h>
+#include <tqstrlist.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqcleanuphandler.h>
+#include <tqfeatures.h>
 
 #include <stdlib.h>
 
diff --git a/puic/widgetdatabase.h b/puic/widgetdatabase.h
index c671b4f..2db524d 100644
--- a/puic/widgetdatabase.h
+++ b/puic/widgetdatabase.h
@@ -21,10 +21,10 @@
 #ifndef WIDGETDATABASE_H
 #define WIDGETDATABASE_H
 
-#include <ntqiconset.h>
-#include <ntqstring.h>
+#include <tqiconset.h>
+#include <tqstring.h>
 #include "widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 
 
 extern TQPluginManager<WidgetInterface> *widgetManager();
diff --git a/puic/widgetinterface.h b/puic/widgetinterface.h
index 50f8e6d..7d32414 100644
--- a/puic/widgetinterface.h
+++ b/puic/widgetinterface.h
@@ -21,7 +21,7 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/qwidgetinterface_p.h>
+#include <private/tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
 #define IID_Widget IID_QWidgetFactory
diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in
index 078e93f..5a7d351 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -38,28 +38,28 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change
 # Find out which header files we need to parse
 # We don't want all of them - e.g. not template-based stuff
 my %excludes = (
-    'ntqaccessible.h' => 1,  # Accessibility support is not compiled by defaut
-    'ntqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1)
-    'ntqmotif.h' => 1,       # 
-    'ntqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1)
-    'ntqmotifdialog.h' => 1, #
-    'ntqxt.h' => 1, # Xt
-    'ntqxtwidget.h' => 1, # Xt
-    'ntqdns.h' => 1, # internal
-    'ntqgl.h' => 1, # OpenGL
-    'ntqglcolormap.h' => 1, # OpenGL
-    'ntqnp.h' => 1, # NSPlugin
-    'ntqwidgetfactory.h' => 1,  # Just an interface
-    'ntqsharedmemory.h' => 1, # "not part of the TQt API" they say
-    'ntqwindowsstyle.h' => 1, # TQt windowsstyle, plugin
-    'ntqmotifstyle.h' => 1,
-    'ntqcompactstyle.h' => 1,
-    'ntqinterlacestyle.h' => 1,
-    'ntqmotifplusstyle.h' => 1,
-    'ntqsgistyle.h' => 1,
-    'ntqplatinumstyle.h' => 1,
-    'ntqcdestyle.h' => 1,
-    'ntqwindowsxpstyle.h' => 1 # play on the safe side 
+    'tqaccessible.h' => 1,  # Accessibility support is not compiled by defaut
+    'tqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1)
+    'tqmotif.h' => 1,       # 
+    'tqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1)
+    'tqmotifdialog.h' => 1, #
+    'tqxt.h' => 1, # Xt
+    'tqxtwidget.h' => 1, # Xt
+    'tqdns.h' => 1, # internal
+    'tqgl.h' => 1, # OpenGL
+    'tqglcolormap.h' => 1, # OpenGL
+    'tqnp.h' => 1, # NSPlugin
+    'tqwidgetfactory.h' => 1,  # Just an interface
+    'tqsharedmemory.h' => 1, # "not part of the TQt API" they say
+    'tqwindowsstyle.h' => 1, # TQt windowsstyle, plugin
+    'tqmotifstyle.h' => 1,
+    'tqcompactstyle.h' => 1,
+    'tqinterlacestyle.h' => 1,
+    'tqmotifplusstyle.h' => 1,
+    'tqsgistyle.h' => 1,
+    'tqplatinumstyle.h' => 1,
+    'tqcdestyle.h' => 1,
+    'tqwindowsxpstyle.h' => 1 # play on the safe side 
 );
 
 # Some systems have a TQTDIR = TDEDIR = PREFIX
diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list
index 0bddd84..7bee084 100644
--- a/smoke/tqt/header_list
+++ b/smoke/tqt/header_list
@@ -1,291 +1,289 @@
-ntqabstractlayout.h
-ntqaccel.h
-ntqaccessible.h
-ntqaction.h
+tqaccel.h
+tqaccessible.h
+tqaction.h
 ntqapplication.h
-ntqasciicache.h
-ntqasciidict.h
-ntqassistantclient.h
-ntqasyncimageio.h
-ntqasyncio.h
-ntqbig5codec.h
-ntqbitarray.h
-ntqbitmap.h
-ntqbrush.h
-ntqbuffer.h
-ntqbuttongroup.h
-ntqbutton.h
-ntqcache.h
-ntqcanvas.h
-ntqcdestyle.h
-ntqcheckbox.h
-ntqcleanuphandler.h
-ntqclipboard.h
-ntqcolordialog.h
-ntqcolor.h
-ntqcombobox.h
-ntqcommonstyle.h
-ntqcompactstyle.h
-ntqconfig-dist.h
+tqasciicache.h
+tqasciidict.h
+tqassistantclient.h
+tqasyncimageio.h
+tqasyncio.h
+tqbig5codec.h
+tqbitarray.h
+tqbitmap.h
+tqbrush.h
+tqbuffer.h
+tqbuttongroup.h
+tqbutton.h
+tqcache.h
+tqcanvas.h
+tqcdestyle.h
+tqcheckbox.h
+tqcleanuphandler.h
+tqclipboard.h
+tqcolordialog.h
+tqcolor.h
+tqcombobox.h
+tqcommonstyle.h
+tqcompactstyle.h
 ntqconfig.h
-ntqconnection.h
-ntqcstring.h
-ntqcursor.h
-ntqdatabrowser.h
-ntqdatastream.h
-ntqdatatable.h
-ntqdataview.h
-ntqdatetimeedit.h
-ntqdatetime.h
-ntqdeepcopy.h
-ntqdesktopwidget.h
-ntqdial.h
-ntqdialog.h
-ntqdict.h
-ntqdir.h
-ntqdns.h
-ntqdockarea.h
-ntqdockwindow.h
-ntqdom.h
-ntqdragobject.h
-ntqdrawutil.h
-ntqdropsite.h
-ntqeditorfactory.h
-ntqerrormessage.h
-ntqeucjpcodec.h
-ntqeuckrcodec.h
-ntqevent.h
-ntqeventloop.h
-ntqfeatures.h
-ntqfiledialog.h
-ntqfile.h
-ntqfileinfo.h
-ntqfocusdata.h
-ntqfontdatabase.h
-ntqfontdialog.h
-ntqfontdta.h
-ntqfont.h
-ntqfontinfo.h
-ntqfontmetrics.h
-ntqframe.h
-ntqftp.h
-ntqgarray.h
-ntqgb18030codec.h
-ntqgbkcodec.h
-ntqgcache.h
-ntqgdict.h
-ntqgeneric.h
-ntqgif.h
-ntqglcolormap.h
-ntqgl.h
-ntqglist.h
-ntqglobal.h
-ntqgplugin.h
-ntqgrid.h
-ntqgridview.h
-ntqgroupbox.h
-ntqguardedptr.h
-ntqgvector.h
-ntqhbox.h
-ntqhbuttongroup.h
-ntqheader.h
-ntqhgroupbox.h
-ntqhostaddress.h
-ntqhttp.h
-ntqiconset.h
-ntqiconview.h
-ntqimageformatplugin.h
-ntqimage.h
-ntqinputdialog.h
-ntqintcache.h
-ntqintdict.h
-ntqinterlacestyle.h
-ntqiodevice.h
-ntqjiscodec.h
-ntqjpunicode.h
-ntqkeycode.h
-ntqkeysequence.h
-ntqlabel.h
-ntqlayout.h
-ntqlcdnumber.h
-ntqlibrary.h
-ntqlineedit.h
-ntqlistbox.h
-ntqlistview.h
-ntqlocalfs.h
-ntqmainwindow.h
-ntqmap.h
-ntqmemarray.h
-ntqmenubar.h
-ntqmenudata.h
-ntqmessagebox.h
-ntqmetaobject.h
-ntqmime.h
+tqconnection.h
+tqcstring.h
+tqcursor.h
+tqdatabrowser.h
+tqdatastream.h
+tqdatatable.h
+tqdataview.h
+tqdatetimeedit.h
+tqdatetime.h
+tqdeepcopy.h
+tqdesktopwidget.h
+tqdial.h
+tqdialog.h
+tqdict.h
+tqdir.h
+tqdns.h
+tqdockarea.h
+tqdockwindow.h
+tqdom.h
+tqdragobject.h
+tqdrawutil.h
+tqdropsite.h
+tqeditorfactory.h
+tqerrormessage.h
+tqeucjpcodec.h
+tqeuckrcodec.h
+tqevent.h
+tqeventloop.h
+tqfeatures.h
+tqfiledialog.h
+tqfile.h
+tqfileinfo.h
+tqfocusdata.h
+tqfontdatabase.h
+tqfontdialog.h
+tqfontdta.h
+tqfont.h
+tqfontinfo.h
+tqfontmetrics.h
+tqframe.h
+tqftp.h
+tqgarray.h
+tqgb18030codec.h
+tqgbkcodec.h
+tqgcache.h
+tqgdict.h
+tqgif.h
+tqglcolormap.h
+tqgl.h
+tqglist.h
+tqglobal.h
+tqgplugin.h
+tqgrid.h
+tqgridview.h
+tqgroupbox.h
+tqguardedptr.h
+tqgvector.h
+tqhbox.h
+tqhbuttongroup.h
+tqheader.h
+tqhebrewcodec
+tqhgroupbox.h
+tqhostaddress.h
+tqhttp.h
+tqiconset.h
+tqiconview.h
+tqimageformatplugin.h
+tqimage.h
+tqinputdialog.h
+tqintcache.h
+tqintdict.h
+tqinterlacestyle.h
+tqiodevice.h
+tqjiscodec.h
+tqjpunicode.h
+tqkeycode.h
+tqkeysequence.h
+tqlabel.h
+tqlayout.h
+tqlcdnumber.h
+tqlocale.h
+tqlibrary.h
+tqlineedit.h
+tqlistbox.h
+tqlistview.h
+tqlocalfs.h
+tqmainwindow.h
+tqmap.h
+tqmemarray.h
+tqmenubar.h
+tqmenudata.h
+tqmessagebox.h
+tqmetaobject.h
+tqmime.h
 ntqmodules.h
-ntqmotifdialog.h
-ntqmotif.h
-ntqmotifplusstyle.h
-ntqmotifstyle.h
-ntqmotifwidget.h
-ntqmovie.h
-ntqmultilineedit.h
-ntqmutex.h
-ntqnamespace.h
-ntqnetwork.h
-ntqnetworkprotocol.h
-ntqobjectcleanuphandler.h
-ntqobjectdefs.h
-ntqobjectdict.h
-ntqobject.h
-ntqobjectlist.h
-ntqpaintdevice.h
-ntqpaintdevicemetrics.h
-ntqpainter.h
-ntqpair.h
-ntqpalette.h
-ntqpen.h
-ntqpicture.h
-ntqpixmapcache.h
-ntqpixmap.h
-ntqplatinumstyle.h
-ntqpointarray.h
-ntqpoint.h
-ntqpolygonscanner.h
-ntqpopupmenu.h
-ntqprintdialog.h
-ntqprinter.h
-ntqprocess.h
-ntqprogressbar.h
-ntqprogressdialog.h
-ntqptrcollection.h
-ntqptrdict.h
-ntqptrlist.h
-ntqptrqueue.h
-ntqptrstack.h
-ntqptrvector.h
-ntqpushbutton.h
-ntqradiobutton.h
-ntqrangecontrol.h
-ntqrect.h
-ntqregexp.h
-ntqregion.h
-ntqremotefactory.h
-ntqremoteplugin.h
-ntqrtlcodec.h
-ntqscopedptr.h
-ntqscrollbar.h
-ntqscrollview.h
-ntqsemaphore.h
-ntqserversocket.h
-ntqsession.h
-ntqsessionmanager.h
-ntqsettings.h
-ntqsgistyle.h
-ntqshared.h
-ntqsignal.h
-ntqsignalmapper.h
-ntqsignalslotimp.h
-ntqsimplerichtext.h
-ntqsizegrip.h
-ntqsize.h
-ntqsizepolicy.h
-ntqsjiscodec.h
-ntqslider.h
-ntqsocketdevice.h
-ntqsocket.h
-ntqsocketnotifier.h
-ntqsound.h
-ntqspinbox.h
-ntqsplashscreen.h
-ntqsplitter.h
-ntqsqlcursor.h
-ntqsqldatabase.h
-ntqsqldriver.h
-ntqsqldriverplugin.h
-ntqsqleditorfactory.h
-ntqsqlerror.h
-ntqsqlfield.h
-ntqsqlform.h
-ntqsql.h
-ntqsqlindex.h
-ntqsqlpropertymap.h
-ntqsqlquery.h
-ntqsqlrecord.h
-ntqsqlresult.h
-ntqsqlselectcursor.h
-ntqstatusbar.h
-ntqstring.h
-ntqstringlist.h
-ntqstrlist.h
-ntqstrvec.h
-ntqstylefactory.h
-ntqstyle.h
-ntqstyleplugin.h
-ntqstylesheet.h
-ntqsyntaxhighlighter.h
-ntqtabbar.h
-ntqtabdialog.h
-ntqtable.h
-ntqtabwidget.h
-ntqtextbrowser.h
-ntqtextcodecfactory.h
-ntqtextcodec.h
-ntqtextcodecplugin.h
-ntqtextedit.h
-ntqtextstream.h
-ntqtextview.h
-ntqt.h
-ntqthread.h
-ntqtimer.h
-ntqtl.h
-ntqtoolbar.h
-ntqtoolbutton.h
-ntqtoolbox.h
-ntqtooltip.h
-ntqtranslator.h
-ntqtsciicodec.h
-ntqurl.h
-ntqurlinfo.h
-ntqurloperator.h
-ntqutfcodec.h
-ntquuid.h
-ntqvalidator.h
-ntqvaluelist.h
-ntqvaluestack.h
-ntqvaluevector.h
-ntqvariant.h
-ntqvbox.h
-ntqvbuttongroup.h
-ntqvgroupbox.h
-ntqwaitcondition.h
-ntqwhatsthis.h
-ntqwidgetfactory.h
-ntqwidget.h
-ntqwidgetintdict.h
-ntqwidgetlist.h
-ntqwidgetplugin.h
-ntqwidgetstack.h
-ntqwindowdefs.h
-ntqwindow.h
-ntqwindowsstyle.h
-ntqwizard.h
-ntqwmatrix.h
-ntqworkspace.h
-ntqwsbeosdecoration_qws.h
-ntqwscommand_qws.h
-ntqwscursor_qws.h
-ntqwsdecoration_qws.h
-ntqwsdefaultdecoration_qws.h
-ntqwsdisplay_qws.h
-ntqwsevent_qws.h
-ntqwshydrodecoration_qws.h
-ntqwskde2decoration_qws.h
-ntqwskdedecoration_qws.h
-ntqwsmanager_qws.h
-ntqwsmouse_qws.h
-ntqwsproperty_qws.h
-ntqwsregionmanager_qws.h
-ntqwssocket_qws.h
-ntqwsutils_qws.h
-ntqwswindowsdecoration_qws.h
-ntqxml.h
+tqmotifdialog.h
+tqmotif.h
+tqmotifplusstyle.h
+tqmotifstyle.h
+tqmotifwidget.h
+tqmovie.h
+tqmultilineedit.h
+tqmutex.h
+tqnamespace.h
+tqnetwork.h
+tqnetworkprotocol.h
+tqobjectcleanuphandler.h
+tqobjectdefs.h
+tqobjectdict.h
+tqobject.h
+tqobjectlist.h
+tqpaintdevice.h
+tqpaintdevicemetrics.h
+tqpainter.h
+tqpair.h
+tqpalette.h
+tqpen.h
+tqpicture.h
+tqpixmapcache.h
+tqpixmap.h
+tqplatinumstyle.h
+tqpointarray.h
+tqpoint.h
+tqpolygonscanner.h
+tqpopupmenu.h
+tqprintdialog.h
+tqprinter.h
+tqprocess.h
+tqprogressbar.h
+tqprogressdialog.h
+tqptrcollection.h
+tqptrdict.h
+tqptrlist.h
+tqptrqueue.h
+tqptrstack.h
+tqptrvector.h
+tqpushbutton.h
+tqradiobutton.h
+tqrangecontrol.h
+tqrect.h
+tqregexp.h
+tqregion.h
+tqremotefactory.h
+tqremoteplugin.h
+tqscopedptr.h
+tqscrollbar.h
+tqscrollview.h
+tqsemaphore.h
+tqserversocket.h
+tqsession.h
+tqsessionmanager.h
+tqsettings.h
+tqsgistyle.h
+tqshared.h
+tqsignal.h
+tqsignalmapper.h
+tqsignalslotimp.h
+tqsimplerichtext.h
+tqsizegrip.h
+tqsize.h
+tqsizepolicy.h
+tqsjiscodec.h
+tqslider.h
+tqsocketdevice.h
+tqsocket.h
+tqsocketnotifier.h
+tqsound.h
+tqspinbox.h
+tqsplashscreen.h
+tqsplitter.h
+tqsqlcursor.h
+tqsqldatabase.h
+tqsqldriver.h
+tqsqldriverplugin.h
+tqsqleditorfactory.h
+tqsqlerror.h
+tqsqlfield.h
+tqsqlform.h
+tqsql.h
+tqsqlindex.h
+tqsqlpropertymap.h
+tqsqlquery.h
+tqsqlrecord.h
+tqsqlresult.h
+tqsqlselectcursor.h
+tqstatusbar.h
+tqstring.h
+tqstringlist.h
+tqstrlist.h
+tqstrvec.h
+tqstylefactory.h
+tqstyle.h
+tqstyleplugin.h
+tqstylesheet.h
+tqsyntaxhighlighter.h
+tqtabbar.h
+tqtabdialog.h
+tqtable.h
+tqtabwidget.h
+tqtextbrowser.h
+tqtextcodecfactory.h
+tqtextcodec.h
+tqtextcodecplugin.h
+tqtextedit.h
+tqtextstream.h
+tqtextview.h
+tqt.h
+tqthread.h
+tqtimer.h
+tqtl.h
+tqtoolbar.h
+tqtoolbutton.h
+tqtoolbox.h
+tqtooltip.h
+tqtranslator.h
+tqtsciicodec.h
+tqurl.h
+tqurlinfo.h
+tqurloperator.h
+tqutfcodec.h
+tquuid.h
+tqvalidator.h
+tqvaluelist.h
+tqvaluestack.h
+tqvaluevector.h
+tqvariant.h
+tqvbox.h
+tqvbuttongroup.h
+tqvgroupbox.h
+tqwaitcondition.h
+tqwhatsthis.h
+tqwidgetfactory.h
+tqwidget.h
+tqwidgetintdict.h
+tqwidgetlist.h
+tqwidgetplugin.h
+tqwidgetstack.h
+tqwindowdefs.h
+tqwindow.h
+tqwindowsstyle.h
+tqwizard.h
+tqwmatrix.h
+tqworkspace.h
+tqwsbeosdecoration_qws.h
+tqwscommand_qws.h
+tqwscursor_qws.h
+tqwsdecoration_qws.h
+tqwsdefaultdecoration_qws.h
+tqwsdisplay_qws.h
+tqwsevent_qws.h
+tqwshydrodecoration_qws.h
+tqwskde2decoration_qws.h
+tqwskdedecoration_qws.h
+tqwsmanager_qws.h
+tqwsmouse_qws.h
+tqwsproperty_qws.h
+tqwsregionmanager_qws.h
+tqwssocket_qws.h
+tqwsutils_qws.h
+tqwswindowsdecoration_qws.h
+tqxml.h
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index a3859b9..37eaa90 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -52,7 +52,7 @@ $x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g;
 
 $qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
 
- -e "$qtinc/ntqglobal.h" or die "Invalid TQt directory.\n";
+ -e "$qtinc/tqglobal.h" or die "Invalid TQt directory.\n";
 
 my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
 
@@ -66,7 +66,7 @@ my($count, $used, $total);
 map{ $tests{$_}->[2]>=$threshold ? ($used++, $total++):$total++ } keys %tests;
 
 print "Number of defines to be tested : $used/$total\n\n" unless $opt_q;
-open( TQTDEFS, ">".($opt_o || "ntqtdefines") ) or die "Can't open output file: $!\n";
+open( TQTDEFS, ">".($opt_o || "tqtdefines") ) or die "Can't open output file: $!\n";
 
 grab_qglobal_symbols();
 preliminary_test();
@@ -94,7 +94,7 @@ sub gettmpfile
 
 sub grab_qglobal_symbols
 {
-	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/ntqglobal.h 2>/dev/null";
+	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/tqglobal.h 2>/dev/null";
 	my $symbols = `$cmd`;
         for(0..1)
         {
@@ -115,7 +115,7 @@ sub grab_qglobal_symbols
 	    elsif(! $_) # first try
 	    {
 		print  "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
-                $cmd = "$cc -E -dM -I$qtinc $qtinc/ntqglobal.h 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtinc $qtinc/tqglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
@@ -168,7 +168,7 @@ sub perform_all_tests
 		$tests{$_}->[2] < $threshold and next;
 		($qtdefs{$_} || $qtundefs{$_}) and do
 		{
-			print "\rSkipping $_ (in ntqglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
+			print "\rSkipping $_ (in tqglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
 			next
 		};
 		print "\rTesting $_".( " " x ($nspaces - length($_)) );
@@ -181,7 +181,7 @@ sub perform_all_tests
 		{
 			print OUT "#include <$inc>\n";
 		}
-		print OUT "#include <ntqfeatures.h>\n";
+		print OUT "#include <tqfeatures.h>\n";
 		print OUT $tests{$_}->[3] if $tests{$_}->[3]; # need to define some classes ?
 		print OUT qq£
 
@@ -248,43 +248,43 @@ BEGIN {
 # "DEFINE" => ["header-1.h,... header-n.h", "main() code", priority, "Definitions (if needed)"]
 
 our %tests = (
-	"TQT_NO_ACCEL" => 		["ntqaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5],
-	"TQT_NO_ACTION" =>		["ntqaction.h", "TQAction foo( (TQObject*)NULL );", 5],
-	"TQT_NO_ASYNC_IO" =>		["ntqasyncio.h", "TQAsyncIO foo();", 5],
-	"TQT_NO_ASYNC_IMAGE_IO"=>	["ntqasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5],
-	"TQT_NO_BIG_CODECS" => 		["ntqbig5codec.h", "TQBig5Codec foo();", 5],
-	"TQT_NO_BUTTON" =>		["ntqbutton.h", "TQButton foo( (TQWidget*)NULL );", 10],
- 	"TQT_NO_BUTTONGROUP" =>		["ntqbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
- 	"TQT_NO_CANVAS" =>		["ntqcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
- 	"TQT_NO_CHECKBOX" =>		["ntqcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
+	"TQT_NO_ACCEL" => 		["tqaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5],
+	"TQT_NO_ACTION" =>		["tqaction.h", "TQAction foo( (TQObject*)NULL );", 5],
+	"TQT_NO_ASYNC_IO" =>		["tqasyncio.h", "TQAsyncIO foo();", 5],
+	"TQT_NO_ASYNC_IMAGE_IO"=>	["tqasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5],
+	"TQT_NO_BIG_CODECS" => 		["tqbig5codec.h", "TQBig5Codec foo();", 5],
+	"TQT_NO_BUTTON" =>		["tqbutton.h", "TQButton foo( (TQWidget*)NULL );", 10],
+ 	"TQT_NO_BUTTONGROUP" =>		["tqbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
+ 	"TQT_NO_CANVAS" =>		["tqcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
+ 	"TQT_NO_CHECKBOX" =>		["tqcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
 	"TQT_NO_CLIPBOARD" => 		["ntqapplication.h, qclipboard.h", q£
 						TQApplication foo( argc, argv );
 						TQClipboard *baz= foo.clipboard();
 					£, 5],
- 	"TQT_NO_COLORDIALOG" =>		["ntqcolordialog.h", "TQColorDialog::customCount();", 12],
- 	"TQT_NO_COMBOBOX" =>		["ntqcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
+ 	"TQT_NO_COLORDIALOG" =>		["tqcolordialog.h", "TQColorDialog::customCount();", 12],
+ 	"TQT_NO_COMBOBOX" =>		["tqcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
 	"TQT_NO_COMPONENT" =>		["ntqapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
 					£, 5],
- 	"TQT_NO_CURSOR" =>		["ntqcursor.h", "TQCursor foo;", 5],
- 	"TQT_NO_DATASTREAM" =>		["ntqdatastream.h", "TQDataStream foo;", 5],
- 	"TQT_NO_DATETIMEEDIT" =>		["ntqdatetimeedit.h", "TQTimeEdit foo;", 12],
-	"TQT_NO_DIAL" =>			["ntqdial.h", "TQDial foo;", 10],
-	"TQT_NO_DIALOG" =>		["ntqdialog.h", "TQDialog foo;", 12],
-	"TQT_NO_DIR" =>			["ntqdir.h", "TQDir foo;", 5],
-	"TQT_NO_DNS" =>			["ntqdns.h", "TQDns foo;", 5],
-	"TQT_NO_DOM" =>			["ntqdom.h", "TQDomDocumentType foo;", 5],
-	"TQT_NO_DRAGANDDROP" =>		["ntqevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5],
-	"TQT_NO_DRAWUTIL" =>		["ntqdrawutil.h, qcolor.h", "ntqDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10],
-	"TQT_NO_ERRORMESSAGE" => 	["ntqerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13],
-	"TQT_NO_FILEDIALOG" =>		["ntqfiledialog.h", "TQFileIconProvider foo;", 13],
-
-	"TQT_NO_FONTDATABASE" =>		["ntqfontdatabase.h", "TQFontDatabase foo;", 5],
-	"TQT_NO_FONTDIALOG" => 		["ntqfontdialog.h",   "TQFontDialog::getFont( (bool *)NULL );", 12],
-	"TQT_NO_FRAME" => 		["ntqframe.h", "TQFrame foo;", 10],
-	"TQT_NO_GRID" =>			["ntqgrid.h", "TQGrid foo(5);", 12],
-	"TQT_NO_GRIDVIEW" =>		["ntqgridview.h", "TQFoo foo;", 13, q£
+ 	"TQT_NO_CURSOR" =>		["tqcursor.h", "TQCursor foo;", 5],
+ 	"TQT_NO_DATASTREAM" =>		["tqdatastream.h", "TQDataStream foo;", 5],
+ 	"TQT_NO_DATETIMEEDIT" =>		["tqdatetimeedit.h", "TQTimeEdit foo;", 12],
+	"TQT_NO_DIAL" =>			["tqdial.h", "TQDial foo;", 10],
+	"TQT_NO_DIALOG" =>		["tqdialog.h", "TQDialog foo;", 12],
+	"TQT_NO_DIR" =>			["tqdir.h", "TQDir foo;", 5],
+	"TQT_NO_DNS" =>			["tqdns.h", "TQDns foo;", 5],
+	"TQT_NO_DOM" =>			["tqdom.h", "TQDomDocumentType foo;", 5],
+	"TQT_NO_DRAGANDDROP" =>		["tqevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5],
+	"TQT_NO_DRAWUTIL" =>		["tqdrawutil.h, qcolor.h", "tqDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10],
+	"TQT_NO_ERRORMESSAGE" => 	["tqerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13],
+	"TQT_NO_FILEDIALOG" =>		["tqfiledialog.h", "TQFileIconProvider foo;", 13],
+
+	"TQT_NO_FONTDATABASE" =>		["tqfontdatabase.h", "TQFontDatabase foo;", 5],
+	"TQT_NO_FONTDIALOG" => 		["tqfontdialog.h",   "TQFontDialog::getFont( (bool *)NULL );", 12],
+	"TQT_NO_FRAME" => 		["tqframe.h", "TQFrame foo;", 10],
+	"TQT_NO_GRID" =>			["tqgrid.h", "TQGrid foo(5);", 12],
+	"TQT_NO_GRIDVIEW" =>		["tqgridview.h", "TQFoo foo;", 13, q£
 						class TQFoo: public TQGridView
 						{
 						public:
@@ -293,15 +293,15 @@ our %tests = (
 							void paintCell(TQPainter *, int, int){};
 						};
 					£],
-	"TQT_NO_GROUPBOX" =>		["ntqgroupbox.h", "TQGroupBox foo;", 12],
-	"TQT_NO_HBOX" =>			["ntqhbox.h", "TQHBox foo;", 12],
-	"TQT_NO_HBUTTONGROUP" =>		["ntqhbuttongroup.h", "TQHButtonGroup foo;", 13],
-	"TQT_NO_HEADER" =>		["ntqheader.h", "TQHeader foo;", 10],
-	"TQT_NO_HGROUPBOX" =>		["ntqhgroupbox.h", "TQHGroupBox foo;", 13],
-	"TQT_NO_ICONSET" =>		["ntqiconset.h", "TQIconSet foo;", 8],
+	"TQT_NO_GROUPBOX" =>		["tqgroupbox.h", "TQGroupBox foo;", 12],
+	"TQT_NO_HBOX" =>			["tqhbox.h", "TQHBox foo;", 12],
+	"TQT_NO_HBUTTONGROUP" =>		["tqhbuttongroup.h", "TQHButtonGroup foo;", 13],
+	"TQT_NO_HEADER" =>		["tqheader.h", "TQHeader foo;", 10],
+	"TQT_NO_HGROUPBOX" =>		["tqhgroupbox.h", "TQHGroupBox foo;", 13],
+	"TQT_NO_ICONSET" =>		["tqiconset.h", "TQIconSet foo;", 8],
 
-	"TQT_NO_ICONVIEW" =>		["ntqiconview.h", "TQIconView foo;", 13],
-	"TQT_NO_IMAGEFORMATPLUGIN" =>	["ntqimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
+	"TQT_NO_ICONVIEW" =>		["tqiconview.h", "TQIconView foo;", 13],
+	"TQT_NO_IMAGEFORMATPLUGIN" =>	["tqimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
 
 						class TQFoo: public TQImageFormatPlugin
 						{
@@ -313,40 +313,40 @@ our %tests = (
 						};
 						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["ntqimage.h", q£
+ 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createAlphaMask();
 					£, 8],
- 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["ntqimage.h", q£
+ 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createHeuristicMask();
 					£, 8],
-	"TQT_NO_IMAGE_MIRROR" =>	["ntqimage.h", q£
+	"TQT_NO_IMAGE_MIRROR" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->mirror();
 					£, 8],
- 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["ntqimage.h", q£
+ 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->smoothScale( 10, 10);
 					£, 8],
- 	"TQT_NO_IMAGE_TEXT" =>		["ntqimage.h", "TQImageTextKeyLang foo;", 8],
- 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["ntqimage.h", q£
+ 	"TQT_NO_IMAGE_TEXT" =>		["tqimage.h", "TQImageTextKeyLang foo;", 8],
+ 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->scale( 10, 10);
 					£, 8],
- 	"TQT_NO_IMAGE_TRUECOLOR" =>	["ntqimage.h", q£
+ 	"TQT_NO_IMAGE_TRUECOLOR" =>	["tqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->convertDepthWithPalette( 1, (TQRgb*) NULL, 1 );
 					£, 8],
-	"TQT_NO_INPUTDIALOG" =>		["ntqinputdialog.h, qstring.h", q£TQInputDialog::getText( TQString::null, TQString::null);£, 13],
-	"TQT_NO_IMAGEIO" => 		["ntqbitmap.h, qstring.h", q£
+	"TQT_NO_INPUTDIALOG" =>		["tqinputdialog.h, qstring.h", q£TQInputDialog::getText( TQString::null, TQString::null);£, 13],
+	"TQT_NO_IMAGEIO" => 		["tqbitmap.h, qstring.h", q£
 						TQBitmap foo( TQString::fromLatin1("foobar") );
 					£, 5],
-	"TQT_NO_IMAGEIO_JPEG" =>		["ntqjpegio.h", "ntqInitJpegIO();", 8],
-	"TQT_NO_IMAGEIO_MNG" =>		["ntqmngio.h", "ntqInitMngIO();", 8],
-	"TQT_NO_IMAGEIO_PNG" =>		["ntqpngio.h", "ntqInitPngIO();", 8],
-	"TQT_NO_LABEL" =>		["ntqlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10],
-	"TQT_NO_LAYOUT" =>		["ntqlayout.h", "TQFoo foo;", 10, q£
+	"TQT_NO_IMAGEIO_JPEG" =>		["tqjpegio.h", "tqInitJpegIO();", 8],
+	"TQT_NO_IMAGEIO_MNG" =>		["tqmngio.h", "tqInitMngIO();", 8],
+	"TQT_NO_IMAGEIO_PNG" =>		["tqpngio.h", "tqInitPngIO();", 8],
+	"TQT_NO_LABEL" =>		["tqlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10],
+	"TQT_NO_LAYOUT" =>		["tqlayout.h", "TQFoo foo;", 10, q£
 
  						class TQFoo: public TQLayout
  						{
@@ -359,45 +359,45 @@ our %tests = (
 						    void setGeometry( const TQRect & ) { };
  						};
  					£],
-	"TQT_NO_LCDNUMBER" =>		["ntqlcdnumber.h", "TQLCDNumber foo;", 12],
-	"TQT_NO_LINEEDIT" =>		["ntqlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_LISTBOX" =>		["ntqlistbox.h", "TQListBox foo;", 13],
-	"TQT_NO_LISTVIEW" =>		["ntqlistview.h", "TQListView foo;", 13],
-	"TQT_NO_MAINWINDOW" =>		["ntqmainwindow.h", "TQMainWindow foo;", 13],
-	"TQT_NO_MENUBAR" =>		["ntqmenubar.h", "TQMenuBar foo;", 13],
-	"TQT_NO_MOVIE" =>		["ntqmovie.h", "TQMovie foo;", 5],
-	"TQT_NO_MENUDATA" =>		["ntqmenudata.h", "TQMenuData foo;", 9],
-	"TQT_NO_MESSAGEBOX" =>		["ntqmessagebox.h", "TQMessageBox foo;", 13],
-	"TQT_NO_MIME" =>			["ntqmime.h", "TQMimeSourceFactory foo;", 5],
+	"TQT_NO_LCDNUMBER" =>		["tqlcdnumber.h", "TQLCDNumber foo;", 12],
+	"TQT_NO_LINEEDIT" =>		["tqlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12],
+	"TQT_NO_LISTBOX" =>		["tqlistbox.h", "TQListBox foo;", 13],
+	"TQT_NO_LISTVIEW" =>		["tqlistview.h", "TQListView foo;", 13],
+	"TQT_NO_MAINWINDOW" =>		["tqmainwindow.h", "TQMainWindow foo;", 13],
+	"TQT_NO_MENUBAR" =>		["tqmenubar.h", "TQMenuBar foo;", 13],
+	"TQT_NO_MOVIE" =>		["tqmovie.h", "TQMovie foo;", 5],
+	"TQT_NO_MENUDATA" =>		["tqmenudata.h", "TQMenuData foo;", 9],
+	"TQT_NO_MESSAGEBOX" =>		["tqmessagebox.h", "TQMessageBox foo;", 13],
+	"TQT_NO_MIME" =>			["tqmime.h", "TQMimeSourceFactory foo;", 5],
  	"TQT_NO_MIMECLIPBOARD" => 	["ntqapplication.h, qclipboard.h", q£
  						TQApplication foo( argc, argv );
  						TQClipboard *baz= foo.clipboard();
 						baz->data();
 					£, 8],
 
-	"TQT_NO_MULTILINEEDIT" =>	["ntqmultilineedit.h", "TQMultiLineEdit foo;", 14],
-	"TQT_NO_NETWORK" =>		["ntqnetwork.h", "ntqInitNetworkProtocols();", 5],
-	"TQT_NO_NETWORKPROTOCOL" =>	["ntqnetworkprotocol.h", "TQNetworkProtocol foo;", 8],
- 	"TQT_NO_NETWORKPROTOCOL_FTP" =>	["ntqftp.h", "TQFtp foo;", 9],
-	"TQT_NO_PALETTE" =>		["ntqpalette.h", "TQColorGroup foo;", 5],
-	"TQT_NO_PICTURE" =>		["ntqpicture.h", "TQPicture foo;", 5],
-	"TQT_NO_PIXMAP_TRANSFORMATION" =>["ntqbitmap.h, qwmatrix.h", q£
+	"TQT_NO_MULTILINEEDIT" =>	["tqmultilineedit.h", "TQMultiLineEdit foo;", 14],
+	"TQT_NO_NETWORK" =>		["tqnetwork.h", "tqInitNetworkProtocols();", 5],
+	"TQT_NO_NETWORKPROTOCOL" =>	["tqnetworkprotocol.h", "TQNetworkProtocol foo;", 8],
+ 	"TQT_NO_NETWORKPROTOCOL_FTP" =>	["tqftp.h", "TQFtp foo;", 9],
+	"TQT_NO_PALETTE" =>		["tqpalette.h", "TQColorGroup foo;", 5],
+	"TQT_NO_PICTURE" =>		["tqpicture.h", "TQPicture foo;", 5],
+	"TQT_NO_PIXMAP_TRANSFORMATION" =>["tqbitmap.h, qwmatrix.h", q£
 						TQBitmap *foo= new TQBitmap();
 						TQWMatrix bar;
 						foo->xForm( bar );
 					£, 5],
-	"TQT_NO_POPUPMENU" =>		["ntqpopupmenu.h", "TQPopupMenu foo;", 12],
-	"TQT_NO_PRINTER" =>		["ntqprinter.h", "TQPrinter foo;", 5],
-	"TQT_NO_PRINTDIALOG" =>		["ntqprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13],
-	"TQT_NO_PROCESS" =>		["ntqprocess.h", "TQProcess foo;", 5],
-	"TQT_NO_PROGRESSBAR" =>		["ntqprogressbar.h", "TQProgressBar foo;", 12],
-	"TQT_NO_PROGRESSDIALOG" =>	["ntqprogressdialog.h", "TQProgressDialog foo;", 13],
-	"TQT_NO_PUSHBUTTON" =>		["ntqpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_PROPERTIES" =>		["ntqmetaobject.h", "TQMetaProperty foo;", 0],
-	"TQT_NO_TQUUID_STRING" =>		["ntquuid.h", "TQUuid foo( TQString::null );", 8],
-	"TQT_NO_RANGECONTROL" =>		["ntqrangecontrol.h", "TQRangeControl foo;", 10],
-	"TQT_NO_REGEXP" =>		["ntqregexp.h", "TQRegExp foo;", 5],
-	"TQT_NO_REGEXP_WILDCARD" =>	["ntqregexp.h", q£
+	"TQT_NO_POPUPMENU" =>		["tqpopupmenu.h", "TQPopupMenu foo;", 12],
+	"TQT_NO_PRINTER" =>		["tqprinter.h", "TQPrinter foo;", 5],
+	"TQT_NO_PRINTDIALOG" =>		["tqprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13],
+	"TQT_NO_PROCESS" =>		["tqprocess.h", "TQProcess foo;", 5],
+	"TQT_NO_PROGRESSBAR" =>		["tqprogressbar.h", "TQProgressBar foo;", 12],
+	"TQT_NO_PROGRESSDIALOG" =>	["tqprogressdialog.h", "TQProgressDialog foo;", 13],
+	"TQT_NO_PUSHBUTTON" =>		["tqpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
+	"TQT_NO_PROPERTIES" =>		["tqmetaobject.h", "TQMetaProperty foo;", 0],
+	"TQT_NO_TQUUID_STRING" =>		["tquuid.h", "TQUuid foo( TQString::null );", 8],
+	"TQT_NO_RANGECONTROL" =>		["tqrangecontrol.h", "TQRangeControl foo;", 10],
+	"TQT_NO_REGEXP" =>		["tqregexp.h", "TQRegExp foo;", 5],
+	"TQT_NO_REGEXP_WILDCARD" =>	["tqregexp.h", q£
 						TQRegExp foo;
 						foo.wildcard();
 					£, 8],
@@ -405,51 +405,51 @@ our %tests = (
    						TQApplication foo( argc, argv );
    						foo.remoteControlEnabled();
 					£, 15],
-	"TQT_NO_RADIOBUTTON" =>		["ntqradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_RICHTEXT" =>		["ntqsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
-	"TQT_NO_SCROLLBAR" =>		["ntqscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_SCROLLVIEW" =>		["ntqscrollview.h", "TQScrollView foo;", 12],
+	"TQT_NO_RADIOBUTTON" =>		["tqradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12],
+	"TQT_NO_RICHTEXT" =>		["tqsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
+	"TQT_NO_SCROLLBAR" =>		["tqscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
+	"TQT_NO_SCROLLVIEW" =>		["tqscrollview.h", "TQScrollView foo;", 12],
 	"TQT_NO_SESSIONMANAGER" =>	["ntqapplication.h", q£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
 					£, 15],
-	"TQT_NO_SETTINGS" =>		["ntqsettings.h", "TQSettings foo;", 5],
-	"TQT_NO_SIGNALMAPPER" =>		["ntqsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0],
-	"TQT_NO_SIZEGRIP" =>		["ntqsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10],
-	"TQT_NO_SLIDER" =>		["ntqslider.h", "TQSlider foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_SOUND" =>		["ntqsound.h", "TQSound foo( TQString::null );", 5],
+	"TQT_NO_SETTINGS" =>		["tqsettings.h", "TQSettings foo;", 5],
+	"TQT_NO_SIGNALMAPPER" =>		["tqsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0],
+	"TQT_NO_SIZEGRIP" =>		["tqsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10],
+	"TQT_NO_SLIDER" =>		["tqslider.h", "TQSlider foo( (TQWidget *) NULL );", 12],
+	"TQT_NO_SOUND" =>		["tqsound.h", "TQSound foo( TQString::null );", 5],
 
 
-	"TQT_NO_SPINWIDGET" =>		["ntqrangecontrol.h", "TQSpinWidget foo;", 10],
-	"TQT_NO_SPRINTF" =>		["ntqcolor.h", q£
+	"TQT_NO_SPINWIDGET" =>		["tqrangecontrol.h", "TQSpinWidget foo;", 10],
+	"TQT_NO_SPRINTF" =>		["tqcolor.h", q£
 						TQColor foo;
 						foo.name();
 					£, 0],
 
 
 
-	"TQT_NO_SQL" =>			["ntqsqlcursor.h", "TQSqlCursor foo;", 5],
-	"TQT_NO_STRINGLIST" =>		["ntqstringlist.h", "TQStringList foo;", 0],
+	"TQT_NO_SQL" =>			["tqsqlcursor.h", "TQSqlCursor foo;", 5],
+	"TQT_NO_STRINGLIST" =>		["tqstringlist.h", "TQStringList foo;", 0],
 	"TQT_NO_STYLE" =>		["ntqapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.style();
  					£, 15],
 
-#	"TQT_NO_STYLE_CDE" =>		["ntqcdestyle.h", "TQCDEStyle foo;", 16],
-# 	"TQT_NO_STYLE_COMPACT" =>	["ntqcompactstyle.h", "TQCompactStyle foo;", 16],
-#	"TQT_NO_STYLE_INTERLACE" =>	["ntqinterlacestyle.h", "TQInterlaceStyle foo;", 16],
-#	"TQT_NO_STYLE_PLATINUM" =>	["ntqplatinumstyle.h", "TQPlatinumStyle foo;", 16],
-#	"TQT_NO_STYLE_MOTIF" =>		["ntqmotifstyle.h", "TQMotifStyle foo;", 16],
-#	"TQT_NO_STYLE_MOTIFPLUS" =>	["ntqmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
-#	"TQT_NO_STYLE_SGI" =>		["ntqsgistyle.h", "TQSGIStyle foo;", 16],
-#	"TQT_NO_STYLE_WINDOWS" =>	["ntqwindowsstyle.h", "TQWindowsStyle foo;", 16],
-        "TQT_NO_TABBAR" =>               ["ntqtabbar.h", "TQTabBar foo;", 10],
-        "TQT_NO_TABDIALOG" =>            ["ntqtabdialog.h", "TQTabDialog foo;", 12],
-        "TQT_NO_TABLE" =>                ["ntqtable.h", "TQTable foo;", 10],
-        "TQT_NO_TABWIDGET" =>            ["ntqtabwidget.h", "TQTabWidget foo;", 10],
-        "TQT_NO_TEXTBROWSER" =>          ["ntqtextbrowser.h", "TQTextBrowser foo;", 14],
-        "TQT_NO_TEXTCODEC" =>            ["ntqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
-        "TQT_NO_TEXTCODECPLUGIN" =>      ["ntqtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ 
+#	"TQT_NO_STYLE_CDE" =>		["tqcdestyle.h", "TQCDEStyle foo;", 16],
+# 	"TQT_NO_STYLE_COMPACT" =>	["tqcompactstyle.h", "TQCompactStyle foo;", 16],
+#	"TQT_NO_STYLE_INTERLACE" =>	["tqinterlacestyle.h", "TQInterlaceStyle foo;", 16],
+#	"TQT_NO_STYLE_PLATINUM" =>	["tqplatinumstyle.h", "TQPlatinumStyle foo;", 16],
+#	"TQT_NO_STYLE_MOTIF" =>		["tqmotifstyle.h", "TQMotifStyle foo;", 16],
+#	"TQT_NO_STYLE_MOTIFPLUS" =>	["tqmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
+#	"TQT_NO_STYLE_SGI" =>		["tqsgistyle.h", "TQSGIStyle foo;", 16],
+#	"TQT_NO_STYLE_WINDOWS" =>	["tqwindowsstyle.h", "TQWindowsStyle foo;", 16],
+        "TQT_NO_TABBAR" =>               ["tqtabbar.h", "TQTabBar foo;", 10],
+        "TQT_NO_TABDIALOG" =>            ["tqtabdialog.h", "TQTabDialog foo;", 12],
+        "TQT_NO_TABLE" =>                ["tqtable.h", "TQTable foo;", 10],
+        "TQT_NO_TABWIDGET" =>            ["tqtabwidget.h", "TQTabWidget foo;", 10],
+        "TQT_NO_TEXTBROWSER" =>          ["tqtextbrowser.h", "TQTextBrowser foo;", 14],
+        "TQT_NO_TEXTCODEC" =>            ["tqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
+        "TQT_NO_TEXTCODECPLUGIN" =>      ["tqtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ 
 	
 						class TQFoo: public TQTextCodecPlugin
 						{
@@ -463,24 +463,24 @@ our %tests = (
 						};
 						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"TQT_NO_TEXTEDIT" =>		["ntqtextedit.h", "TQTextEdit foo;", 13], 
-        "TQT_NO_TEXTSTREAM" =>           ["ntqtextstream.h", "TQTextStream foo;", 5],
-        "TQT_NO_TEXTVIEW" =>             ["ntqtextview.h", "TQTextView foo;", 14], #Obsolete
-        "TQT_NO_TOOLBAR" =>              ["ntqtoolbar.h", "TQToolBar foo;", 10],
-        "TQT_NO_TOOLBUTTON" =>           ["ntqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
-        "TQT_NO_TOOLTIP" =>              ["ntqtooltip.h", "TQToolTip::hide();", 10],
+ 	"TQT_NO_TEXTEDIT" =>		["tqtextedit.h", "TQTextEdit foo;", 13], 
+        "TQT_NO_TEXTSTREAM" =>           ["tqtextstream.h", "TQTextStream foo;", 5],
+        "TQT_NO_TEXTVIEW" =>             ["tqtextview.h", "TQTextView foo;", 14], #Obsolete
+        "TQT_NO_TOOLBAR" =>              ["tqtoolbar.h", "TQToolBar foo;", 10],
+        "TQT_NO_TOOLBUTTON" =>           ["tqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
+        "TQT_NO_TOOLTIP" =>              ["tqtooltip.h", "TQToolTip::hide();", 10],
         
-	"TQT_NO_TRANSFORMATIONS" =>	["ntqpainter.h", q£
+	"TQT_NO_TRANSFORMATIONS" =>	["tqpainter.h", q£
 						TQPainter *foo= new TQPainter();
 						foo->setViewXForm( true );£, 5],
-        "TQT_NO_VARIANT" =>              ["ntqvariant.h", "TQVariant foo;", 0],
-        "TQT_NO_WHATSTHIS" =>            ["ntqwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10],
-	"TQT_NO_WHEELEVENT" =>		["ntqevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5],
-        "TQT_NO_WIDGET_TOPEXTRA" =>      ["ntqwidget.h", "TQWidget foo; foo.caption();", 9],
-        "TQT_NO_WIDGETSTACK" =>          ["ntqwidgetstack.h", "TQWidgetStack foo;", 13],
-        "TQT_NO_WIZARD" =>               ["ntqwizard.h", "TQWizard foo;", 13],
-	"TQT_NO_WMATRIX" =>		["ntqwmatrix.h", "TQWMatrix foo;", 0],
-	"TQT_NO_XML" =>			["ntqxml.h", "TQXmlNamespaceSupport foo;", 5],
+        "TQT_NO_VARIANT" =>              ["tqvariant.h", "TQVariant foo;", 0],
+        "TQT_NO_WHATSTHIS" =>            ["tqwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10],
+	"TQT_NO_WHEELEVENT" =>		["tqevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5],
+        "TQT_NO_WIDGET_TOPEXTRA" =>      ["tqwidget.h", "TQWidget foo; foo.caption();", 9],
+        "TQT_NO_WIDGETSTACK" =>          ["tqwidgetstack.h", "TQWidgetStack foo;", 13],
+        "TQT_NO_WIZARD" =>               ["tqwizard.h", "TQWizard foo;", 13],
+	"TQT_NO_WMATRIX" =>		["tqwmatrix.h", "TQWMatrix foo;", 0],
+	"TQT_NO_XML" =>			["tqxml.h", "TQXmlNamespaceSupport foo;", 5],
 	);
 
 }