Convert to build under tqt3

3 files changed, 514 insertions, 514 deletions

diff --git a/smoke/qt/generate.pl.in b/smoke/qt/generate.pl.in
index 4fa8cd4..d002af8 100644
--- a/smoke/qt/generate.pl.in
+++ b/smoke/qt/generate.pl.in
@@ -38,30 +38,30 @@ 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 = (
-    'qaccessible.h' => 1,  # Accessibility support is not compiled by defaut
-    'qassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1)
-    'qmotif.h' => 1,       # 
-    'qmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1)
-    'qmotifdialog.h' => 1, #
-    'qxt.h' => 1, # Xt
-    'qxtwidget.h' => 1, # Xt
-    'qdns.h' => 1, # internal
-    'qgl.h' => 1, # OpenGL
-    'qglcolormap.h' => 1, # OpenGL
-    'qnp.h' => 1, # NSPlugin
-    'qttableview.h' => 1,  # Not in TQt anymore...
-    'qtmultilineedit.h' => 1,  # Not in TQt anymore...
-    'qwidgetfactory.h' => 1,  # Just an interface
-    'qsharedmemory.h' => 1, # "not part of the TQt API" they say
-    'qwindowsstyle.h' => 1, # TQt windowsstyle, plugin
-    'qmotifstyle.h' => 1,
-    'qcompactstyle.h' => 1,
-    'qinterlacestyle.h' => 1,
-    'qmotifplusstyle.h' => 1,
-    'qsgistyle.h' => 1,
-    'qplatinumstyle.h' => 1,
-    'qcdestyle.h' => 1,
-    'qwindowsxpstyle.h' => 1 # play on the safe side 
+    '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
+    'ntqttableview.h' => 1,  # Not in TQt anymore...
+    'ntqtmultilineedit.h' => 1,  # Not in TQt anymore...
+    '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 
 );
 
 # Some systems have a TQTDIR = KDEDIR = PREFIX
diff --git a/smoke/qt/header_list b/smoke/qt/header_list
index 9594c7d..be1fcb2 100644
--- a/smoke/qt/header_list
+++ b/smoke/qt/header_list
@@ -1,350 +1,350 @@
-q1xcompatibility.h
-qabstractlayout.h
-qaccel.h
-qaccessible.h
-qaction.h
-qapp.h
-qapplication.h
-qarray.h
-qasciicache.h
-qasciidict.h
-qassistantclient.h
-qasyncimageio.h
-qasyncio.h
-qbig5codec.h
-qbitarray.h
-qbitarry.h
-qbitmap.h
-qbrush.h
-qbttngrp.h
-qbuffer.h
-qbuttongroup.h
-qbutton.h
-qcache.h
-qcanvas.h
-qcdestyle.h
-qcheckbox.h
-qchkbox.h
-qcleanuphandler.h
-qclipboard.h
-qclipbrd.h
-qcollect.h
-qcollection.h
-qcolordialog.h
-qcolor.h
-qcombobox.h
-qcombo.h
-qcommonstyle.h
-qcompactstyle.h
-qconfig-dist.h
-qconfig.h
-qconnect.h
-qconnection.h
-qcstring.h
-qcursor.h
-qdatabrowser.h
-qdatastream.h
-qdatatable.h
-qdataview.h
-qdatetimeedit.h
-qdatetime.h
-qdatetm.h
-qdeepcopy.h
-qdesktopwidget.h
-qdial.h
-qdialog.h
-qdict.h
-qdir.h
-qdns.h
-qdockarea.h
-qdockwindow.h
-qdom.h
-qdragobject.h
-qdrawutil.h
-qdrawutl.h
-qdropsite.h
-qdstream.h
-qeditorfactory.h
-qerrormessage.h
-qeucjpcodec.h
-qeuckrcodec.h
-qevent.h
-qeventloop.h
-qfeatures.h
-qfiledef.h
-qfiledialog.h
-qfiledlg.h
-qfile.h
-qfileinf.h
-qfileinfo.h
-qfocusdata.h
-qfontdatabase.h
-qfontdialog.h
-qfontdta.h
-qfont.h
-qfontinf.h
-qfontinfo.h
-qfontmet.h
-qfontmetrics.h
-qframe.h
-qftp.h
-qgarray.h
-qgb18030codec.h
-qgbkcodec.h
-qgcache.h
-qgdict.h
-qgeneric.h
-qgif.h
-qglcolormap.h
-qgl.h
-qglist.h
-qglobal.h
-qgplugin.h
-qgrid.h
-qgridview.h
-qgroupbox.h
-qgrpbox.h
-qguardedptr.h
-qgvector.h
-qhbox.h
-qhbuttongroup.h
-qheader.h
-qhgroupbox.h
-qhostaddress.h
-qhttp.h
-qiconset.h
-qiconview.h
-qimageformatplugin.h
-qimage.h
-qinputdialog.h
-qintcache.h
-qintcach.h
-qintdict.h
-qinterlacestyle.h
-qiodev.h
-qiodevice.h
-qjiscodec.h
-qjpunicode.h
-qkeycode.h
-qkeysequence.h
-qlabel.h
-qlayout.h
-qlcdnumber.h
-qlcdnum.h
-qlibrary.h
-qlined.h
-qlineedit.h
-qlistbox.h
-qlist.h
-qlistview.h
-qlocalfs.h
-qmainwindow.h
-qmap.h
-qmemarray.h
-qmenubar.h
-qmenudata.h
-qmenudta.h
-qmessagebox.h
-qmetaobject.h
-qmetaobj.h
-qmime.h
-qmlined.h
-qmodules.h
-qmotifdialog.h
-qmotif.h
-qmotifplusstyle.h
-qmotifstyle.h
-qmotifwidget.h
-qmovie.h
-qmsgbox.h
-qmultilinedit.h
-qmultilineedit.h
-qmutex.h
-qnamespace.h
-qnetwork.h
-qnetworkprotocol.h
-qobjcoll.h
-qobjdefs.h
-qobjectcleanuphandler.h
-qobjectdefs.h
-qobjectdict.h
-qobject.h
-qobjectlist.h
-qpaintdc.h
-qpaintdevicedefs.h
-qpaintdevice.h
-qpaintdevicemetrics.h
-qpaintd.h
-qpainter.h
-qpair.h
-qpalette.h
-qpdevmet.h
-qpen.h
-qpicture.h
-qpixmapcache.h
-qpixmap.h
-qplatinumstyle.h
-qpmcache.h
-qpntarry.h
-qpointarray.h
-qpoint.h
-qpolygonscanner.h
-qpopmenu.h
-qpopupmenu.h
-qprintdialog.h
-qprinter.h
-qprndlg.h
-qprocess.h
-qprogbar.h
-qprogdlg.h
-qprogressbar.h
-qprogressdialog.h
-qpsprn.h
-qptrcollection.h
-qptrdict.h
-qptrlist.h
-qptrqueue.h
-qptrstack.h
-qptrvector.h
-qpushbt.h
-qpushbutton.h
-qqueue.h
-qradiobt.h
-qradiobutton.h
-qrangecontrol.h
-qrangect.h
-qrect.h
-qregexp.h
-qregion.h
-qremotefactory.h
-qremoteplugin.h
-qrtlcodec.h
-qscopedptr.h
-qscrbar.h
-qscrollbar.h
-qscrollview.h
-qsemaphore.h
-qsemimodal.h
-qserversocket.h
-qsession.h
-qsessionmanager.h
-qsettings.h
-qsgistyle.h
-qshared.h
-qsignal.h
-qsignalmapper.h
-qsignalslotimp.h
-qsimplerichtext.h
-qsizegrip.h
-qsize.h
-qsizepolicy.h
-qsjiscodec.h
-qslider.h
-qsocketdevice.h
-qsocket.h
-qsocketnotifier.h
-qsocknot.h
-qsortedlist.h
-qsound.h
-qspinbox.h
-qsplashscreen.h
-qsplitter.h
-qsqlcursor.h
-qsqldatabase.h
-qsqldriver.h
-qsqldriverplugin.h
-qsqleditorfactory.h
-qsqlerror.h
-qsqlfield.h
-qsqlform.h
-qsql.h
-qsqlindex.h
-qsqlpropertymap.h
-qsqlquery.h
-qsqlrecord.h
-qsqlresult.h
-qsqlselectcursor.h
-qstack.h
-qstatusbar.h
-qstring.h
-qstringlist.h
-qstrlist.h
-qstrvec.h
-qstylefactory.h
-qstyle.h
-qstyleplugin.h
-qstylesheet.h
-qsyntaxhighlighter.h
-qtabbar.h
-qtabdialog.h
-qtabdlg.h
-qtable.h
-qtabwidget.h
-qtextbrowser.h
-qtextcodecfactory.h
-qtextcodec.h
-qtextcodecplugin.h
-qtextedit.h
-qtextstream.h
-qtextview.h
-qt.h
-qthread.h
-qtimer.h
-qtl.h
-qtmultilineedit.h
-qtoolbar.h
-qtoolbutton.h
-qtoolbox.h
-qtooltip.h
-qtranslator.h
-qtsciicodec.h
-qtstream.h
-qttableview.h
-qurl.h
-qurlinfo.h
-qurloperator.h
-qutfcodec.h
-quuid.h
-qvalidator.h
-qvaluelist.h
-qvaluestack.h
-qvaluevector.h
-qvariant.h
-qvbox.h
-qvbuttongroup.h
-qvector.h
-qvgroupbox.h
-qwaitcondition.h
-qwhatsthis.h
-qwidcoll.h
-qwidgetfactory.h
-qwidget.h
-qwidgetintdict.h
-qwidgetlist.h
-qwidgetplugin.h
-qwidgetstack.h
-qwindefs.h
-qwindowdefs.h
-qwindow.h
-qwindowsstyle.h
-qwizard.h
-qwmatrix.h
-qworkspace.h
-qwsbeosdecoration_qws.h
-qwscommand_qws.h
-qwscursor_qws.h
-qwsdecoration_qws.h
-qwsdefaultdecoration_qws.h
-qwsdisplay_qws.h
-qwsevent_qws.h
-qwshydrodecoration_qws.h
-qwskde2decoration_qws.h
-qwskdedecoration_qws.h
-qwsmanager_qws.h
-qwsmouse_qws.h
-qwsproperty_qws.h
-qwsregionmanager_qws.h
-qwssocket_qws.h
-qwsutils_qws.h
-qwswindowsdecoration_qws.h
-qxml.h
+ntq1xcompatibility.h
+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
+ntqlibrary.h
+ntqlined.h
+ntqlineedit.h
+ntqlistbox.h
+ntqlist.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
+ntqpaintdc.h
+ntqpaintdevicedefs.h
+ntqpaintdevice.h
+ntqpaintdevicemetrics.h
+ntqpaintd.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
+ntqstack.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
+ntqvector.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
diff --git a/smoke/qt/qtguess.pl.in b/smoke/qt/qtguess.pl.in
index c23530e..9f6d011 100644
--- a/smoke/qt/qtguess.pl.in
+++ b/smoke/qt/qtguess.pl.in
@@ -52,7 +52,7 @@ $x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g;
 
 $qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
 
- -e "$qtinc/qglobal.h" or die "Invalid TQt directory.\n";
+ -e "$qtinc/ntqglobal.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 || "qtdefines") ) or die "Can't open output file: $!\n";
+open( TQTDEFS, ">".($opt_o || "ntqtdefines") ) 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/qglobal.h 2>/dev/null";
+	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/ntqglobal.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/qglobal.h 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtinc $qtinc/ntqglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
@@ -130,7 +130,7 @@ sub preliminary_test
 	print $msg, " " x ($nspaces - length($msg) + 8);
 	open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n";
 	my $simple=q£
-		#include <qapplication.h>
+		#include <ntqapplication.h>
 		int main( int argc, char **argv )
 		{
 			TQApplication foo( argc, argv );
@@ -168,7 +168,7 @@ sub perform_all_tests
 		$tests{$_}->[2] < $threshold and next;
 		($qtdefs{$_} || $qtundefs{$_}) and do
 		{
-			print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n");
+			print "\rSkipping $_ (in ntqglobal.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 <qfeatures.h>\n";
+		print OUT "#include <ntqfeatures.h>\n";
 		print OUT $tests{$_}->[3] if $tests{$_}->[3]; # need to define some classes ?
 		print OUT qq£
 
@@ -248,47 +248,47 @@ BEGIN {
 # "DEFINE" => ["header-1.h,... header-n.h", "main() code", priority, "Definitions (if needed)"]
 
 our %tests = (
-	"TQT_NO_ACCEL" => 		["qaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5],
-	"TQT_NO_ACTION" =>		["qaction.h", "TQAction foo( (TQObject*)NULL );", 5],
-	"TQT_NO_ASYNC_IO" =>		["qasyncio.h", "TQAsyncIO foo();", 5],
-	"TQT_NO_ASYNC_IMAGE_IO"=>	["qasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5],
-	"TQT_NO_BIG_CODECS" => 		["qbig5codec.h", "TQBig5Codec foo();", 5],
-	"TQT_NO_BUTTON" =>		["qbutton.h", "TQButton foo( (TQWidget*)NULL );", 10],
- 	"TQT_NO_BUTTONGROUP" =>		["qbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
- 	"TQT_NO_CANVAS" =>		["qcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
- 	"TQT_NO_CHECKBOX" =>		["qcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_CLIPBOARD" => 		["qapplication.h, qclipboard.h", q£
+	"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_CLIPBOARD" => 		["ntqapplication.h, qclipboard.h", q£
 						TQApplication foo( argc, argv );
 						TQClipboard *baz= foo.clipboard();
 					£, 5],
- 	"TQT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
- 	"TQT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_COMPAT" =>		["qfontmetrics.h", q£
+ 	"TQT_NO_COLORDIALOG" =>		["ntqcolordialog.h", "TQColorDialog::customCount();", 12],
+ 	"TQT_NO_COMBOBOX" =>		["ntqcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
+	"TQT_NO_COMPAT" =>		["ntqfontmetrics.h", q£
 						TQFontMetrics *foo= new TQFontMetrics( TQFont() );
 						int bar = foo->width( 'c' );
 					£, 0],
-	"TQT_NO_COMPONENT" =>		["qapplication.h", q£
+	"TQT_NO_COMPONENT" =>		["ntqapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
 					£, 5],
- 	"TQT_NO_CURSOR" =>		["qcursor.h", "TQCursor foo;", 5],
- 	"TQT_NO_DATASTREAM" =>		["qdatastream.h", "TQDataStream foo;", 5],
- 	"TQT_NO_DATETIMEEDIT" =>		["qdatetimeedit.h", "TQTimeEdit foo;", 12],
-	"TQT_NO_DIAL" =>			["qdial.h", "TQDial foo;", 10],
-	"TQT_NO_DIALOG" =>		["qdialog.h", "TQDialog foo;", 12],
-	"TQT_NO_DIR" =>			["qdir.h", "TQDir foo;", 5],
-	"TQT_NO_DNS" =>			["qdns.h", "TQDns foo;", 5],
-	"TQT_NO_DOM" =>			["qdom.h", "TQDomDocumentType foo;", 5],
-	"TQT_NO_DRAGANDDROP" =>		["qevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5],
-	"TQT_NO_DRAWUTIL" =>		["qdrawutil.h, qcolor.h", "qDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10],
-	"TQT_NO_ERRORMESSAGE" => 	["qerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13],
-	"TQT_NO_FILEDIALOG" =>		["qfiledialog.h", "TQFileIconProvider foo;", 13],
-
-	"TQT_NO_FONTDATABASE" =>		["qfontdatabase.h", "TQFontDatabase foo;", 5],
-	"TQT_NO_FONTDIALOG" => 		["qfontdialog.h",   "TQFontDialog::getFont( (bool *)NULL );", 12],
-	"TQT_NO_FRAME" => 		["qframe.h", "TQFrame foo;", 10],
-	"TQT_NO_GRID" =>			["qgrid.h", "TQGrid foo(5);", 12],
-	"TQT_NO_GRIDVIEW" =>		["qgridview.h", "TQFoo foo;", 13, q£
+ 	"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£
 						class TQFoo: public TQGridView
 						{
 						public:
@@ -297,15 +297,15 @@ our %tests = (
 							void paintCell(TQPainter *, int, int){};
 						};
 					£],
-	"TQT_NO_GROUPBOX" =>		["qgroupbox.h", "TQGroupBox foo;", 12],
-	"TQT_NO_HBOX" =>			["qhbox.h", "TQHBox foo;", 12],
-	"TQT_NO_HBUTTONGROUP" =>		["qhbuttongroup.h", "TQHButtonGroup foo;", 13],
-	"TQT_NO_HEADER" =>		["qheader.h", "TQHeader foo;", 10],
-	"TQT_NO_HGROUPBOX" =>		["qhgroupbox.h", "TQHGroupBox foo;", 13],
-	"TQT_NO_ICONSET" =>		["qiconset.h", "TQIconSet foo;", 8],
+	"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_ICONVIEW" =>		["qiconview.h", "TQIconView foo;", 13],
-	"TQT_NO_IMAGEFORMATPLUGIN" =>	["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
+	"TQT_NO_ICONVIEW" =>		["ntqiconview.h", "TQIconView foo;", 13],
+	"TQT_NO_IMAGEFORMATPLUGIN" =>	["ntqimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
 
 						class TQFoo: public TQImageFormatPlugin
 						{
@@ -317,40 +317,40 @@ our %tests = (
 						};
 						TTQ_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createAlphaMask();
 					£, 8],
- 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createHeuristicMask();
 					£, 8],
-	"TQT_NO_IMAGE_MIRROR" =>	["qimage.h", q£
+	"TQT_NO_IMAGE_MIRROR" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->mirror();
 					£, 8],
- 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->smoothScale( 10, 10);
 					£, 8],
- 	"TQT_NO_IMAGE_TEXT" =>		["qimage.h", "TQImageTextKeyLang foo;", 8],
- 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TEXT" =>		["ntqimage.h", "TQImageTextKeyLang foo;", 8],
+ 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->scale( 10, 10);
 					£, 8],
- 	"TQT_NO_IMAGE_TRUECOLOR" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TRUECOLOR" =>	["ntqimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->convertDepthWithPalette( 1, (TQRgb*) NULL, 1 );
 					£, 8],
-	"TQT_NO_INPUTDIALOG" =>		["qinputdialog.h, qstring.h", q£TQInputDialog::getText( TQString::null, TQString::null);£, 13],
-	"TQT_NO_IMAGEIO" => 		["qbitmap.h, qstring.h", q£
+	"TQT_NO_INPUTDIALOG" =>		["ntqinputdialog.h, qstring.h", q£TQInputDialog::getText( TQString::null, TQString::null);£, 13],
+	"TQT_NO_IMAGEIO" => 		["ntqbitmap.h, qstring.h", q£
 						TQBitmap foo( TQString::fromLatin1("foobar") );
 					£, 5],
-	"TQT_NO_IMAGEIO_JPEG" =>		["qjpegio.h", "qInitJpegIO();", 8],
-	"TQT_NO_IMAGEIO_MNG" =>		["qmngio.h", "qInitMngIO();", 8],
-	"TQT_NO_IMAGEIO_PNG" =>		["qpngio.h", "qInitPngIO();", 8],
-	"TQT_NO_LABEL" =>		["qlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10],
-	"TQT_NO_LAYOUT" =>		["qlayout.h", "TQFoo foo;", 10, q£
+	"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£
 
  						class TQFoo: public TQLayout
  						{
@@ -363,43 +363,43 @@ our %tests = (
 						    void setGeometry( const TQRect & ) { };
  						};
  					£],
-	"TQT_NO_LCDNUMBER" =>		["qlcdnumber.h", "TQLCDNumber foo;", 12],
-	"TQT_NO_LINEEDIT" =>		["qlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_LISTBOX" =>		["qlistbox.h", "TQListBox foo;", 13],
-	"TQT_NO_LISTVIEW" =>		["qlistview.h", "TQListView foo;", 13],
-	"TQT_NO_MAINWINDOW" =>		["qmainwindow.h", "TQMainWindow foo;", 13],
-	"TQT_NO_MENUBAR" =>		["qmenubar.h", "TQMenuBar foo;", 13],
-	"TQT_NO_MOVIE" =>		["qmovie.h", "TQMovie foo;", 5],
-	"TQT_NO_MENUDATA" =>		["qmenudata.h", "TQMenuData foo;", 9],
-	"TQT_NO_MESSAGEBOX" =>		["qmessagebox.h", "TQMessageBox foo;", 13],
-	"TQT_NO_MIME" =>			["qmime.h", "TQMimeSourceFactory foo;", 5],
- 	"TQT_NO_MIMECLIPBOARD" => 	["qapplication.h, qclipboard.h", q£
+	"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_MIMECLIPBOARD" => 	["ntqapplication.h, qclipboard.h", q£
  						TQApplication foo( argc, argv );
  						TQClipboard *baz= foo.clipboard();
 						baz->data();
 					£, 8],
 
-	"TQT_NO_MULTILINEEDIT" =>	["qmultilineedit.h", "TQMultiLineEdit foo;", 14],
-	"TQT_NO_NETWORK" =>		["qnetwork.h", "qInitNetworkProtocols();", 5],
-	"TQT_NO_NETWORKPROTOCOL" =>	["qnetworkprotocol.h", "TQNetworkProtocol foo;", 8],
- 	"TQT_NO_NETWORKPROTOCOL_FTP" =>	["qftp.h", "TQFtp foo;", 9],
-	"TQT_NO_PALETTE" =>		["qpalette.h", "TQColorGroup foo;", 5],
-	"TQT_NO_PICTURE" =>		["qpicture.h", "TQPicture foo;", 5],
-	"TQT_NO_PIXMAP_TRANSFORMATION" =>["qbitmap.h, qwmatrix.h", q£
+	"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£
 						TQBitmap *foo= new TQBitmap();
 						TQWMatrix bar;
 						foo->xForm( bar );
 					£, 5],
-	"TQT_NO_POPUPMENU" =>		["qpopupmenu.h", "TQPopupMenu foo;", 12],
-	"TQT_NO_PRINTER" =>		["qprinter.h", "TQPrinter foo;", 5],
-	"TQT_NO_PRINTDIALOG" =>		["qprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13],
-	"TQT_NO_PROCESS" =>		["qprocess.h", "TQProcess foo;", 5],
-	"TQT_NO_PROGRESSBAR" =>		["qprogressbar.h", "TQProgressBar foo;", 12],
-	"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_TQTMULTILINEEDIT" =>	["qtmultilineedit.h", "TQtMultiLineEdit foo;", 15],
-#	"TQT_NO_TQTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
+	"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_TQTMULTILINEEDIT" =>	["ntqtmultilineedit.h", "TQtMultiLineEdit foo;", 15],
+#	"TQT_NO_TQTTABLEVIEW" =>		["ntqttableview.h", "TQFoo foo;", 16, q£
 #						class TQFoo: public TQtTableView
 #						{
 #						public:
@@ -408,63 +408,63 @@ our %tests = (
 #							void paintCell( TQPainter *, int, int) {};
 #						};
 #						£],
-	"TQT_NO_TQUUID_STRING" =>		["quuid.h", "TQUuid foo( TQString::null );", 8],
-	"TQT_NO_RANGECONTROL" =>		["qrangecontrol.h", "TQRangeControl foo;", 10],
-	"TQT_NO_REGEXP" =>		["qregexp.h", "TQRegExp foo;", 5],
-	"TQT_NO_REGEXP_WILDCARD" =>	["qregexp.h", q£
+	"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£
 						TQRegExp foo;
 						foo.wildcard();
 					£, 8],
-	"TQT_NO_REMOTE" =>		["qapplication.h", q£
+	"TQT_NO_REMOTE" =>		["ntqapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.remoteControlEnabled();
 					£, 15],
-	"TQT_NO_RADIOBUTTON" =>		["qradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12],
-	"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£
+	"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_SEMIMODAL" =>		["ntqsemimodal.h", "TQSemiModal foo;", 10],
+	"TQT_NO_SESSIONMANAGER" =>	["ntqapplication.h", q£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
 					£, 15],
-	"TQT_NO_SETTINGS" =>		["qsettings.h", "TQSettings foo;", 5],
-	"TQT_NO_SIGNALMAPPER" =>		["qsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0],
-	"TQT_NO_SIZEGRIP" =>		["qsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10],
-	"TQT_NO_SLIDER" =>		["qslider.h", "TQSlider foo( (TQWidget *) NULL );", 12],
-	"TQT_NO_SOUND" =>		["qsound.h", "TQSound foo( TQString::null );", 5],
+	"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_SPINWIDGET" =>		["qrangecontrol.h", "TQSpinWidget foo;", 10],
-	"TQT_NO_SPRINTF" =>		["qcolor.h", q£
+	"TQT_NO_SPINWIDGET" =>		["ntqrangecontrol.h", "TQSpinWidget foo;", 10],
+	"TQT_NO_SPRINTF" =>		["ntqcolor.h", q£
 						TQColor foo;
 						foo.name();
 					£, 0],
 
 
 
-	"TQT_NO_SQL" =>			["qsqlcursor.h", "TQSqlCursor foo;", 5],
-	"TQT_NO_STRINGLIST" =>		["qstringlist.h", "TQStringList foo;", 0],
-	"TQT_NO_STYLE" =>		["qapplication.h", q£
+	"TQT_NO_SQL" =>			["ntqsqlcursor.h", "TQSqlCursor foo;", 5],
+	"TQT_NO_STRINGLIST" =>		["ntqstringlist.h", "TQStringList foo;", 0],
+	"TQT_NO_STYLE" =>		["ntqapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.style();
  					£, 15],
 
-#	"TQT_NO_STYLE_CDE" =>		["qcdestyle.h", "TQCDEStyle foo;", 16],
-# 	"TQT_NO_STYLE_COMPACT" =>	["qcompactstyle.h", "TQCompactStyle foo;", 16],
-#	"TQT_NO_STYLE_INTERLACE" =>	["qinterlacestyle.h", "TQInterlaceStyle foo;", 16],
-#	"TQT_NO_STYLE_PLATINUM" =>	["qplatinumstyle.h", "TQPlatinumStyle foo;", 16],
-#	"TQT_NO_STYLE_MOTIF" =>		["qmotifstyle.h", "TQMotifStyle foo;", 16],
-#	"TQT_NO_STYLE_MOTIFPLUS" =>	["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
-#	"TQT_NO_STYLE_SGI" =>		["qsgistyle.h", "TQSGIStyle foo;", 16],
-#	"TQT_NO_STYLE_WINDOWS" =>	["qwindowsstyle.h", "TQWindowsStyle foo;", 16],
-        "TQT_NO_TABBAR" =>               ["qtabbar.h", "TQTabBar foo;", 10],
-        "TQT_NO_TABDIALOG" =>            ["qtabdialog.h", "TQTabDialog foo;", 12],
-        "TQT_NO_TABLE" =>                ["qtable.h", "TQTable foo;", 10],
-        "TQT_NO_TABWIDGET" =>            ["qtabwidget.h", "TQTabWidget foo;", 10],
-        "TQT_NO_TEXTBROWSER" =>          ["qtextbrowser.h", "TQTextBrowser foo;", 14],
-        "TQT_NO_TEXTCODEC" =>            ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
-        "TQT_NO_TEXTCODECPLUGIN" =>      ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ 
+#	"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£ 
 	
 						class TQFoo: public TQTextCodecPlugin
 						{
@@ -478,24 +478,24 @@ our %tests = (
 						};
 						TTQ_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"TQT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
-        "TQT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],
-        "TQT_NO_TEXTVIEW" =>             ["qtextview.h", "TQTextView foo;", 14], #Obsolete
-        "TQT_NO_TOOLBAR" =>              ["qtoolbar.h", "TQToolBar foo;", 10],
-        "TQT_NO_TOOLBUTTON" =>           ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
-        "TQT_NO_TOOLTIP" =>              ["qtooltip.h", "TQToolTip::hide();", 10],
+ 	"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_TRANSFORMATIONS" =>	["qpainter.h", q£
+	"TQT_NO_TRANSFORMATIONS" =>	["ntqpainter.h", q£
 						TQPainter *foo= new TQPainter();
 						foo->setViewXForm( true );£, 5],
-        "TQT_NO_VARIANT" =>              ["qvariant.h", "TQVariant foo;", 0],
-        "TQT_NO_WHATSTHIS" =>            ["qwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10],
-	"TQT_NO_WHEELEVENT" =>		["qevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5],
-        "TQT_NO_WIDGET_TOPEXTRA" =>      ["qwidget.h", "TQWidget foo; foo.caption();", 9],
-        "TQT_NO_WIDGETSTACK" =>          ["qwidgetstack.h", "TQWidgetStack foo;", 13],
-        "TQT_NO_WIZARD" =>               ["qwizard.h", "TQWizard foo;", 13],
-	"TQT_NO_WMATRIX" =>		["qwmatrix.h", "TQWMatrix foo;", 0],
-	"TQT_NO_XML" =>			["qxml.h", "TQXmlNamespaceSupport foo;", 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],
 	);
 
 }