10 files changed, 649 insertions, 812 deletions

diff --git a/smoke/smoke.h b/smoke/smoke.h
index c76d7900..4a320d0b 100644
--- a/smoke/smoke.h
+++ b/smoke/smoke.h
@@ -34,7 +34,7 @@
     THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY 1
+#define ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY 1
 
 class SmokeBinding;
 
diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in
index d5d8416d..9a175674 100644
--- a/smoke/tde/generate.pl.in
+++ b/smoke/tde/generate.pl.in
@@ -47,30 +47,22 @@ 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
-    'ntqttableview.h' => 1,  # Not in Qt anymore...
-    'ntqtmultilineedit.h' => 1,  # Not in Qt anymore...
-    '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)
+    'tqdns.h' => 1, # internal
+    'tqgl.h' => 1, # OpenGL
+    'tqglcolormap.h' => 1, # OpenGL
+    '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
@@ -90,7 +82,7 @@ my %kdeexcludes = (
 	'kbookmarkimporter_ie.h' => 1,
 	'kbookmarkimporter_opera.h' => 1,
 	'kbookmarkimporter_ns.h' => 1,
-	'kcrash.h' => 1,
+	'tdecrash.h' => 1,
 	'kdebug.h' => 1,
 	'kdebugclasses.h' => 1,
 	'kde_terminal_interface.h' => 1,
@@ -185,6 +177,7 @@ find(
  );
 
 # Launch kalyptus
+$ENV{KDE_PREFIX} = "@KDE_PREFIX@";
 system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders";
 my $exit = $? >> 8;
 exit $exit if ($exit);
diff --git a/smoke/tde/header_list b/smoke/tde/header_list
index 76b945dc..9ffa4036 100644
--- a/smoke/tde/header_list
+++ b/smoke/tde/header_list
@@ -1,344 +1,286 @@
-ntqabstractlayout.h
-ntqaccel.h
-ntqaccessible.h
-ntqaction.h
-ntqapp.h
-ntqapplication.h
-ntqarray.h
-ntqasciicache.h
-ntqasciidict.h
-ntqassistantclient.h
-ntqasyncimageio.h
-ntqasyncio.h
-ntqbig5codec.h
-ntqbitarray.h
-ntqbitarry.h
-ntqbitmap.h
-ntqbrush.h
-ntqbttngrp.h
-ntqbuffer.h
-ntqbuttongroup.h
-ntqbutton.h
-ntqcache.h
-ntqcanvas.h
-ntqcdestyle.h
-ntqcheckbox.h
-ntqchkbox.h
-ntqcleanuphandler.h
-ntqclipboard.h
-ntqclipbrd.h
-ntqcollect.h
-ntqcollection.h
-ntqcolordialog.h
-ntqcolor.h
-ntqcombobox.h
-ntqcombo.h
-ntqcommonstyle.h
-ntqcompactstyle.h
-ntqconfig-dist.h
-ntqconfig.h
-ntqconnect.h
-ntqconnection.h
-ntqcstring.h
-ntqcursor.h
-ntqdatabrowser.h
-ntqdatastream.h
-ntqdatatable.h
-ntqdataview.h
-ntqdatetimeedit.h
-ntqdatetime.h
-ntqdatetm.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
-ntqdrawutl.h
-ntqdropsite.h
-ntqdstream.h
-ntqeditorfactory.h
-ntqerrormessage.h
-ntqeucjpcodec.h
-ntqeuckrcodec.h
-ntqevent.h
-ntqeventloop.h
-ntqfeatures.h
-ntqfiledef.h
-ntqfiledialog.h
-ntqfiledlg.h
-ntqfile.h
-ntqfileinf.h
-ntqfileinfo.h
-ntqfocusdata.h
-ntqfontdatabase.h
-ntqfontdialog.h
-ntqfontdta.h
-ntqfont.h
-ntqfontinf.h
-ntqfontinfo.h
-ntqfontmet.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
-ntqgrpbox.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
-ntqintcach.h
-ntqintdict.h
-ntqinterlacestyle.h
-ntqiodev.h
-ntqiodevice.h
-ntqjiscodec.h
-ntqjpunicode.h
-ntqkeycode.h
-ntqkeysequence.h
-ntqlabel.h
-ntqlayout.h
-ntqlcdnumber.h
-ntqlcdnum.h
-ntqlocale.h
-ntqlibrary.h
-ntqlined.h
-ntqlineedit.h
-ntqlistbox.h
-ntqlistview.h
-ntqlocalfs.h
-ntqmainwindow.h
-ntqmap.h
-ntqmemarray.h
-ntqmenubar.h
-ntqmenudata.h
-ntqmenudta.h
-ntqmessagebox.h
-ntqmetaobject.h
-ntqmetaobj.h
-ntqmime.h
-ntqmlined.h
-ntqmodules.h
-ntqmotifdialog.h
-ntqmotif.h
-ntqmotifplusstyle.h
-ntqmotifstyle.h
-ntqmotifwidget.h
-ntqmovie.h
-ntqmsgbox.h
-ntqmultilinedit.h
-ntqmultilineedit.h
-ntqmutex.h
-ntqnamespace.h
-ntqnetwork.h
-ntqnetworkprotocol.h
-ntqobjcoll.h
-ntqobjdefs.h
-ntqobjectcleanuphandler.h
-ntqobjectdefs.h
-ntqobjectdict.h
-ntqobject.h
-ntqobjectlist.h
-ntqpaintdevice.h
-ntqpaintdevicemetrics.h
-ntqpainter.h
-ntqpair.h
-ntqpalette.h
-ntqpdevmet.h
-ntqpen.h
-ntqpicture.h
-ntqpixmapcache.h
-ntqpixmap.h
-ntqplatinumstyle.h
-ntqpmcache.h
-ntqpntarry.h
-ntqpointarray.h
-ntqpoint.h
-ntqpolygonscanner.h
-ntqpopmenu.h
-ntqpopupmenu.h
-ntqprintdialog.h
-ntqprinter.h
-ntqprndlg.h
-ntqprocess.h
-ntqprogbar.h
-ntqprogdlg.h
-ntqprogressbar.h
-ntqprogressdialog.h
-ntqpsprn.h
-ntqptrcollection.h
-ntqptrdict.h
-ntqptrlist.h
-ntqptrqueue.h
-ntqptrstack.h
-ntqptrvector.h
-ntqpushbt.h
-ntqpushbutton.h
-ntqqueue.h
-ntqradiobt.h
-ntqradiobutton.h
-ntqrangecontrol.h
-ntqrangect.h
-ntqrect.h
-ntqregexp.h
-ntqregion.h
-ntqremotefactory.h
-ntqremoteplugin.h
-ntqrtlcodec.h
-ntqscopedptr.h
-ntqscrbar.h
-ntqscrollbar.h
-ntqscrollview.h
-ntqsemaphore.h
-ntqsemimodal.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
-ntqsocknot.h
-ntqsortedlist.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
-ntqtabdlg.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
-ntqtmultilineedit.h
-ntqtoolbar.h
-ntqtoolbutton.h
-ntqtoolbox.h
-ntqtooltip.h
-ntqtranslator.h
-ntqtsciicodec.h
-ntqtstream.h
-ntqttableview.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
-ntqwidcoll.h
-ntqwidgetfactory.h
-ntqwidget.h
-ntqwidgetintdict.h
-ntqwidgetlist.h
-ntqwidgetplugin.h
-ntqwidgetstack.h
-ntqwindefs.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
+tqaccel.h
+tqaccessible.h
+tqaction.h
+tqapplication.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
+tqconfig.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
+tqmodules.h
+tqmotifplusstyle.h
+tqmotifstyle.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/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in
index bf115fdc..3c80e1d0 100644
--- a/smoke/tde/qtguess.pl.in
+++ b/smoke/tde/qtguess.pl.in
@@ -263,10 +263,6 @@ our %tests = (
 					£, 5],
  	"TQT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
  	"TQT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_COMPAT" =>		["qfontmetrics.h", q£
-						TQFontMetrics *foo= new TQFontMetrics( TQFont() );
-						int bar = foo->width( 'c' );
-					£, 0],
 	"TQT_NO_COMPONENT" =>		["qapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
@@ -315,7 +311,7 @@ our %tests = (
 						    TQStringList keys() const { return TQStringList(); };
 						    bool installIOHandler( const TQString &format ) { return true; };
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
@@ -398,16 +394,6 @@ our %tests = (
 	"TQT_NO_PROGRESSDIALOG" =>	["qprogressdialog.h", "TQProgressDialog foo;", 13],
 	"TQT_NO_PUSHBUTTON" =>		["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
 	"TQT_NO_PROPERTIES" =>		["qmetaobject.h", "TQMetaProperty foo;", 0],
-#	"TQT_NO_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
-#	"TQT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
-#						class TQFoo: public QtTableView
-#						{
-#						public:
-#							TQFoo() {};
-#							~TQFoo() {};
-#							void paintCell( TQPainter *, int, int) {};
-#						};
-#						£],
 	"TQT_NO_QUUID_STRING" =>		["quuid.h", "TQUuid foo( TQString::null );", 8],
 	"TQT_NO_RANGECONTROL" =>		["qrangecontrol.h", "TQRangeControl foo;", 10],
 	"TQT_NO_REGEXP" =>		["qregexp.h", "TQRegExp foo;", 5],
@@ -423,7 +409,6 @@ our %tests = (
 	"TQT_NO_RICHTEXT" =>		["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
 	"TQT_NO_SCROLLBAR" =>		["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
 	"TQT_NO_SCROLLVIEW" =>		["qscrollview.h", "TQScrollView foo;", 12],
-	"TQT_NO_SEMIMODAL" =>		["qsemimodal.h", "TQSemiModal foo;", 10],
 	"TQT_NO_SESSIONMANAGER" =>	["qapplication.h", q£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
@@ -476,7 +461,7 @@ our %tests = (
                                                     TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;}
                                                     TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;}
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
         "TQT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],
diff --git a/smoke/tde/tde_header_list b/smoke/tde/tde_header_list
index c72c2081..78bc0f3d 100644
--- a/smoke/tde/tde_header_list
+++ b/smoke/tde/tde_header_list
@@ -44,7 +44,6 @@ tdeactionshortcutlist.h
 kactivelabel.h
 kallocator.h
 kanimwidget.h
-kapp.h
 tdeapplication.h
 karchive.h
 kar.h
@@ -100,7 +99,7 @@ tdeconfigbase.h
 tdeconfigdata.h
 tdeconfig.h
 kcpuinfo.h
-kcrash.h
+tdecrash.h
 kcursor.h
 kcustommenueditor.h
 kdatastream.h
@@ -116,7 +115,7 @@ kdcopservicestarter.h
 kdebugclasses.h
 kdebug.h
 kdedmodule.h
-kdesktopfile.h
+tdedesktopfile.h
 kde_terminal_interface.h
 tdeversion.h
 kdialogbase.h
@@ -163,7 +162,7 @@ tdefontcombo.h
 tdefontdialog.h
 tdefontrequester.h
 kgenericfactory.h
-kglobalaccel.h
+tdeglobalaccel.h
 tdeglobal.h
 tdeglobalsettings.h
 kguiitem.h
@@ -184,7 +183,7 @@ kimageeffect.h
 kimagefilepreview.h
 kimageio.h
 kinputdialog.h
-kinstance.h
+tdeinstance.h
 kipc.h
 kjanuswidget.h
 kkeybutton.h
@@ -251,9 +250,9 @@ kpreviewwidgetbase.h
 kprintaction.h
 kprinter.h
 tdeprint/kpreloadobject.h
-kprocctrl.h
-kprocess.h
-kprocio.h
+tdeprocctrl.h
+tdeprocess.h
+tdeprocio.h
 kprogress.h
 kpropertiesdialog.h
 kpropsdlg.h
@@ -290,7 +289,7 @@ kshell.h
 tdeshortcut.h
 tdeshortcutlist.h
 kshred.h
-ksimpleconfig.h
+tdesimpleconfig.h
 ksmimecrypto.h
 ksockaddr.h
 ksock.h
@@ -321,13 +320,12 @@ ksslsigners.h
 ksslutils.h
 ksslx509map.h
 ksslx509v3.h
-kstandarddirs.h
+tdestandarddirs.h
 tdestartupinfo.h
 kstaticdeleter.h
 kstatusbar.h
 tdestdaccel.h
 kstdaction.h
-kstddirs.h
 kstdguiitem.h
 kstringhandler.h
 kstringvalidator.h
@@ -352,8 +350,7 @@ tdetoolbar.h
 tdetoolbarradiogroup.h
 ktrader.h
 ktypelist.h
-kuniqueapp.h
-kuniqueapplication.h
+tdeuniqueapplication.h
 kunload.h
 kurifilter.h
 kurlbar.h
diff --git a/smoke/tqt/configure.in.in b/smoke/tqt/configure.in.in
index d571b95b..f75c8236 100644
--- a/smoke/tqt/configure.in.in
+++ b/smoke/tqt/configure.in.in
@@ -47,17 +47,17 @@ AC_CACHE_VAL(ac_cv_lib_qscintilla,
  kde_libs_save="$LIBS"
  kde_cxxflags_save="$CXXFLAGS"
 
- LIBS="-lqscintilla $LIBTQT $LIBS"
+ LIBS="-ltqscintilla $LIBTQT $LIBS"
  CXXFLAGS="$CXXFLAGS $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
 AC_TRY_LINK([
-   #include <qextscintillabase.h>
+   #include <tqextscintillabase.h>
 ],
 [
-            QextScintillaBase s;
+            TQextScintillaBase s;
 ],
-            eval "ac_cv_lib_qscintilla='-lqscintilla'",
+            eval "ac_cv_lib_qscintilla='-ltqscintilla'",
             eval "ac_cv_lib_qscintilla=no")
 
  LDFLAGS=$kde_ldflags_save
diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in
index f1629222..546f94bb 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -53,31 +53,23 @@ 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
-    'ntqttableview.h' => 1,  # Not in Qt anymore...
-    'ntqtmultilineedit.h' => 1,  # Not in Qt anymore...
-    '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)
+    'tqdns.h' => 1, # internal
+    'tqgl.h' => 1, # OpenGL
+    'tqglcolormap.h' => 1, # OpenGL
+    '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
@@ -132,6 +124,7 @@ foreach $filename (readdir(QT)) {
 closedir QT;
 
 # Launch kalyptus
+$ENV{KDE_PREFIX} = "@KDE_PREFIX@";
 chdir "../smoke/tqt";
 system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers";
 my $exit = $? >> 8;
diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list
index 76b945dc..9ffa4036 100644
--- a/smoke/tqt/header_list
+++ b/smoke/tqt/header_list
@@ -1,344 +1,286 @@
-ntqabstractlayout.h
-ntqaccel.h
-ntqaccessible.h
-ntqaction.h
-ntqapp.h
-ntqapplication.h
-ntqarray.h
-ntqasciicache.h
-ntqasciidict.h
-ntqassistantclient.h
-ntqasyncimageio.h
-ntqasyncio.h
-ntqbig5codec.h
-ntqbitarray.h
-ntqbitarry.h
-ntqbitmap.h
-ntqbrush.h
-ntqbttngrp.h
-ntqbuffer.h
-ntqbuttongroup.h
-ntqbutton.h
-ntqcache.h
-ntqcanvas.h
-ntqcdestyle.h
-ntqcheckbox.h
-ntqchkbox.h
-ntqcleanuphandler.h
-ntqclipboard.h
-ntqclipbrd.h
-ntqcollect.h
-ntqcollection.h
-ntqcolordialog.h
-ntqcolor.h
-ntqcombobox.h
-ntqcombo.h
-ntqcommonstyle.h
-ntqcompactstyle.h
-ntqconfig-dist.h
-ntqconfig.h
-ntqconnect.h
-ntqconnection.h
-ntqcstring.h
-ntqcursor.h
-ntqdatabrowser.h
-ntqdatastream.h
-ntqdatatable.h
-ntqdataview.h
-ntqdatetimeedit.h
-ntqdatetime.h
-ntqdatetm.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
-ntqdrawutl.h
-ntqdropsite.h
-ntqdstream.h
-ntqeditorfactory.h
-ntqerrormessage.h
-ntqeucjpcodec.h
-ntqeuckrcodec.h
-ntqevent.h
-ntqeventloop.h
-ntqfeatures.h
-ntqfiledef.h
-ntqfiledialog.h
-ntqfiledlg.h
-ntqfile.h
-ntqfileinf.h
-ntqfileinfo.h
-ntqfocusdata.h
-ntqfontdatabase.h
-ntqfontdialog.h
-ntqfontdta.h
-ntqfont.h
-ntqfontinf.h
-ntqfontinfo.h
-ntqfontmet.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
-ntqgrpbox.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
-ntqintcach.h
-ntqintdict.h
-ntqinterlacestyle.h
-ntqiodev.h
-ntqiodevice.h
-ntqjiscodec.h
-ntqjpunicode.h
-ntqkeycode.h
-ntqkeysequence.h
-ntqlabel.h
-ntqlayout.h
-ntqlcdnumber.h
-ntqlcdnum.h
-ntqlocale.h
-ntqlibrary.h
-ntqlined.h
-ntqlineedit.h
-ntqlistbox.h
-ntqlistview.h
-ntqlocalfs.h
-ntqmainwindow.h
-ntqmap.h
-ntqmemarray.h
-ntqmenubar.h
-ntqmenudata.h
-ntqmenudta.h
-ntqmessagebox.h
-ntqmetaobject.h
-ntqmetaobj.h
-ntqmime.h
-ntqmlined.h
-ntqmodules.h
-ntqmotifdialog.h
-ntqmotif.h
-ntqmotifplusstyle.h
-ntqmotifstyle.h
-ntqmotifwidget.h
-ntqmovie.h
-ntqmsgbox.h
-ntqmultilinedit.h
-ntqmultilineedit.h
-ntqmutex.h
-ntqnamespace.h
-ntqnetwork.h
-ntqnetworkprotocol.h
-ntqobjcoll.h
-ntqobjdefs.h
-ntqobjectcleanuphandler.h
-ntqobjectdefs.h
-ntqobjectdict.h
-ntqobject.h
-ntqobjectlist.h
-ntqpaintdevice.h
-ntqpaintdevicemetrics.h
-ntqpainter.h
-ntqpair.h
-ntqpalette.h
-ntqpdevmet.h
-ntqpen.h
-ntqpicture.h
-ntqpixmapcache.h
-ntqpixmap.h
-ntqplatinumstyle.h
-ntqpmcache.h
-ntqpntarry.h
-ntqpointarray.h
-ntqpoint.h
-ntqpolygonscanner.h
-ntqpopmenu.h
-ntqpopupmenu.h
-ntqprintdialog.h
-ntqprinter.h
-ntqprndlg.h
-ntqprocess.h
-ntqprogbar.h
-ntqprogdlg.h
-ntqprogressbar.h
-ntqprogressdialog.h
-ntqpsprn.h
-ntqptrcollection.h
-ntqptrdict.h
-ntqptrlist.h
-ntqptrqueue.h
-ntqptrstack.h
-ntqptrvector.h
-ntqpushbt.h
-ntqpushbutton.h
-ntqqueue.h
-ntqradiobt.h
-ntqradiobutton.h
-ntqrangecontrol.h
-ntqrangect.h
-ntqrect.h
-ntqregexp.h
-ntqregion.h
-ntqremotefactory.h
-ntqremoteplugin.h
-ntqrtlcodec.h
-ntqscopedptr.h
-ntqscrbar.h
-ntqscrollbar.h
-ntqscrollview.h
-ntqsemaphore.h
-ntqsemimodal.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
-ntqsocknot.h
-ntqsortedlist.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
-ntqtabdlg.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
-ntqtmultilineedit.h
-ntqtoolbar.h
-ntqtoolbutton.h
-ntqtoolbox.h
-ntqtooltip.h
-ntqtranslator.h
-ntqtsciicodec.h
-ntqtstream.h
-ntqttableview.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
-ntqwidcoll.h
-ntqwidgetfactory.h
-ntqwidget.h
-ntqwidgetintdict.h
-ntqwidgetlist.h
-ntqwidgetplugin.h
-ntqwidgetstack.h
-ntqwindefs.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
+tqaccel.h
+tqaccessible.h
+tqaction.h
+tqapplication.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
+tqconfig.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
+tqmodules.h
+tqmotifplusstyle.h
+tqmotifstyle.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/qscintilla_header_list b/smoke/tqt/qscintilla_header_list
index 0da11cb6..3f7aaccf 100644
--- a/smoke/tqt/qscintilla_header_list
+++ b/smoke/tqt/qscintilla_header_list
@@ -1,22 +1,22 @@
-qextscintilla.h
-qextscintillaapis.h
-qextscintillabase.h
-qextscintillacommand.h
-qextscintillacommandset.h
-qextscintilladocument.h
-qextscintillaglobal.h
-qextscintillalexer.h
-qextscintillalexerbash.h
-qextscintillalexercpp.h
-qextscintillalexercsharp.h
-qextscintillalexerhtml.h
-qextscintillalexeridl.h
-qextscintillalexerjava.h
-qextscintillalexerjavascript.h
-qextscintillalexerlua.h
-qextscintillalexerperl.h
-qextscintillalexerpython.h
-qextscintillalexerruby.h
-qextscintillalexersql.h
-qextscintillamacro.h
-qextscintillaprinter.h
+tqextscintilla.h
+tqextscintillaapis.h
+tqextscintillabase.h
+tqextscintillacommand.h
+tqextscintillacommandset.h
+tqextscintilladocument.h
+tqextscintillaglobal.h
+tqextscintillalexer.h
+tqextscintillalexerbash.h
+tqextscintillalexercpp.h
+tqextscintillalexercsharp.h
+tqextscintillalexerhtml.h
+tqextscintillalexeridl.h
+tqextscintillalexerjava.h
+tqextscintillalexerjavascript.h
+tqextscintillalexerlua.h
+tqextscintillalexerperl.h
+tqextscintillalexerpython.h
+tqextscintillalexerruby.h
+tqextscintillalexersql.h
+tqextscintillamacro.h
+tqextscintillaprinter.h
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index bf115fdc..3c80e1d0 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -263,10 +263,6 @@ our %tests = (
 					£, 5],
  	"TQT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
  	"TQT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_COMPAT" =>		["qfontmetrics.h", q£
-						TQFontMetrics *foo= new TQFontMetrics( TQFont() );
-						int bar = foo->width( 'c' );
-					£, 0],
 	"TQT_NO_COMPONENT" =>		["qapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
@@ -315,7 +311,7 @@ our %tests = (
 						    TQStringList keys() const { return TQStringList(); };
 						    bool installIOHandler( const TQString &format ) { return true; };
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
@@ -398,16 +394,6 @@ our %tests = (
 	"TQT_NO_PROGRESSDIALOG" =>	["qprogressdialog.h", "TQProgressDialog foo;", 13],
 	"TQT_NO_PUSHBUTTON" =>		["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
 	"TQT_NO_PROPERTIES" =>		["qmetaobject.h", "TQMetaProperty foo;", 0],
-#	"TQT_NO_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
-#	"TQT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
-#						class TQFoo: public QtTableView
-#						{
-#						public:
-#							TQFoo() {};
-#							~TQFoo() {};
-#							void paintCell( TQPainter *, int, int) {};
-#						};
-#						£],
 	"TQT_NO_QUUID_STRING" =>		["quuid.h", "TQUuid foo( TQString::null );", 8],
 	"TQT_NO_RANGECONTROL" =>		["qrangecontrol.h", "TQRangeControl foo;", 10],
 	"TQT_NO_REGEXP" =>		["qregexp.h", "TQRegExp foo;", 5],
@@ -423,7 +409,6 @@ our %tests = (
 	"TQT_NO_RICHTEXT" =>		["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
 	"TQT_NO_SCROLLBAR" =>		["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
 	"TQT_NO_SCROLLVIEW" =>		["qscrollview.h", "TQScrollView foo;", 12],
-	"TQT_NO_SEMIMODAL" =>		["qsemimodal.h", "TQSemiModal foo;", 10],
 	"TQT_NO_SESSIONMANAGER" =>	["qapplication.h", q£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
@@ -476,7 +461,7 @@ our %tests = (
                                                     TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;}
                                                     TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;}
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
         "TQT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],