Adapt to latest tqt3 version

Signed-off-by: Michele Calgaro <[email protected]>

15 files changed, 631 insertions, 637 deletions

diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index d2311562..5cb85c63 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -40,8 +40,8 @@
 #include <tqtoolbox.h>
 #include <tqmenudata.h>
 
-#include <private/qucom_p.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucom_p.h>
+#include <private/tqucomextra_p.h>
 
 #ifndef QT_ONLY
 
diff --git a/kjsembed/jsbinding.cpp b/kjsembed/jsbinding.cpp
index d015e7b5..8d4a5b8e 100644
--- a/kjsembed/jsbinding.cpp
+++ b/kjsembed/jsbinding.cpp
@@ -1,5 +1,5 @@
 #include <tqmetaobject.h>
-#include <private/qucom_p.h>
+#include <private/tqucom_p.h>
 
 #include <tqpen.h>
 #include <tqpixmap.h>
diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp
index 3b5c327d..08ba67bd 100644
--- a/kjsembed/jsobjectproxy.cpp
+++ b/kjsembed/jsobjectproxy.cpp
@@ -25,7 +25,7 @@
 #include <tqstrlist.h>
 #include <tqvariant.h>
 
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 
 #include <kjs/interpreter.h>
 #include <kjs/types.h>
diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp
index bfceb419..c9365502 100644
--- a/kjsembed/jsobjectproxy_imp.cpp
+++ b/kjsembed/jsobjectproxy_imp.cpp
@@ -30,8 +30,8 @@
 #include <tqtimer.h>
 #include <tqvariant.h>
 
-#include <private/qucom_p.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucom_p.h>
+#include <private/tqucomextra_p.h>
 
 #include <kjs/interpreter.h>
 #include <kjs/types.h>
diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp
index 8f6a8f98..bf1fe509 100644
--- a/kjsembed/slotutils.cpp
+++ b/kjsembed/slotutils.cpp
@@ -31,8 +31,8 @@
 #include <tqdatetime.h>
 #include <tqstringlist.h>
 
-#include <private/qucom_p.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucom_p.h>
+#include <private/tqucomextra_p.h>
 
 #ifndef QT_ONLY
 #include <tdelistview.h>
diff --git a/qtjava/javalib/qtjava/TQHebrewCodec.cpp b/qtjava/javalib/qtjava/TQHebrewCodec.cpp
index 47236f08..85d97194 100644
--- a/qtjava/javalib/qtjava/TQHebrewCodec.cpp
+++ b/qtjava/javalib/qtjava/TQHebrewCodec.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqrtlcodec.h>
+#include <tqhebrewcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.h b/qtruby/rubylib/designer/rbuic/widgetdatabase.h
index 63ccd829..9f241c15 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.h
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.h
@@ -24,7 +24,7 @@
 #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/qtruby/rubylib/designer/rbuic/widgetinterface.h b/qtruby/rubylib/designer/rbuic/widgetinterface.h
index 1296f162..d8e3d208 100644
--- a/qtruby/rubylib/designer/rbuic/widgetinterface.h
+++ b/qtruby/rubylib/designer/rbuic/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/qtruby/rubylib/examples/ruboids/index.html b/qtruby/rubylib/examples/ruboids/index.html
index 787038f8..e7eba997 100644
--- a/qtruby/rubylib/examples/ruboids/index.html
+++ b/qtruby/rubylib/examples/ruboids/index.html
@@ -21,7 +21,7 @@ PREFIX = "../../"; // -->
 <IMG src="../../images/KeyMaster.gif"
 width="32" height="32" alt="Home" border="0"></A><BR>
 <A href="../../index.html">Home</A><BR>
-<A href="../nqxml/index.html">NTQXML</A><BR>
+<A href="../tqxml/index.html">TQXML</A><BR>
 RuBoids<BR>
 <A href="../../computers.html">Computers</A><BR>
 <A href="../../java.html">Java</A><BR>
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 7032a205..035204a2 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -28,7 +28,7 @@
 #include <tqintdict.h>
 #include <tqapplication.h>
 #include <tqmetaobject.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tqvariant.h>
 #include <tqcursor.h>
 #include <tqobjectlist.h>
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 12cb70ac..5efad017 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -23,7 +23,7 @@
 #include <tqhostaddress.h>
 #include <tqpair.h>
 
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 
 #include "smoke.h"
 
diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in
index 511d3d61..e9ecf05c 100644
--- a/smoke/tde/generate.pl.in
+++ b/smoke/tde/generate.pl.in
@@ -47,28 +47,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 Qt (introduced in Qt-3.1)
-    'ntqmotif.h' => 1,       # 
-    'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-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 Qt API" they say
-    'ntqwindowsstyle.h' => 1, # Qt 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 Qt (introduced in Qt-3.1)
+    'tqmotif.h' => 1,       # 
+    'tqmotifwidget.h' => 1, # Motif extension (introduced in Qt-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 Qt API" they say
+    'tqwindowsstyle.h' => 1, # Qt 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/tde/header_list b/smoke/tde/header_list
index 87bb9d98..7bee0845 100644
--- a/smoke/tde/header_list
+++ b/smoke/tde/header_list
@@ -1,292 +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
-ntqlocale.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/generate.pl.in b/smoke/tqt/generate.pl.in
index 686c6a27..b8a3e530 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -53,29 +53,29 @@ 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 Qt (introduced in Qt-3.1)
-    'ntqmotif.h' => 1,       # 
-    'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-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 Qt API" they say
-    'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
-    'ntqmotifstyle.h' => 1,
-    'ntqcompactstyle.h' => 1,
-    'ntqinterlacestyle.h' => 1,
-    'ntqmotifplusstyle.h' => 1,
-    'ntqsgistyle.h' => 1,
-    'ntqplatinumstyle.h' => 1,
-    'ntqcdestyle.h' => 1,
-    'ntqworkspace.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 Qt (introduced in Qt-3.1)
+    'tqmotif.h' => 1,       # 
+    'tqmotifwidget.h' => 1, # Motif extension (introduced in Qt-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 Qt API" they say
+    'tqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
+    'tqmotifstyle.h' => 1,
+    'tqcompactstyle.h' => 1,
+    'tqinterlacestyle.h' => 1,
+    'tqmotifplusstyle.h' => 1,
+    'tqsgistyle.h' => 1,
+    'tqplatinumstyle.h' => 1,
+    'tqcdestyle.h' => 1,
+    'tqworkspace.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 87bb9d98..7bee0845 100644
--- a/smoke/tqt/header_list
+++ b/smoke/tqt/header_list
@@ -1,292 +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
-ntqlocale.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