QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 296 insertions, 296 deletions

diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 5ab3d1b3..ede21d42 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -141,7 +141,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     TQM_EXPORT_NETWORK => '',
     TQM_EXPORT_SQL => '',
     TQM_EXPORT_WORKSPACE => '',
-    QT_NO_REMOTE => 'QT_NO_REMOTE',
+    TQT_NO_REMOTE => 'TQT_NO_REMOTE',
     QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
     Q_WS_X11 => 'Q_WS_X11',
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
@@ -270,7 +270,7 @@ else
     sub
     {
         my $s = shift;
-        $s =~ m/^\#\s*ifndef\s+QT_NO_(?:REMOTE| # not in the default compile options
+        $s =~ m/^\#\s*ifndef\s+TQT_NO_(?:REMOTE| # not in the default compile options
                                         NIS|    #  ...
                                         XINERAMA|
                                         IMAGEIO_(?:MNG|JPEG)|
@@ -580,7 +580,7 @@ LOOP:
 				if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_WS_/ or
 				     ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or
-				     ($p =~ m/^#\s*ifndef\s+QT_NO_MIMECLIPBOARD/ and $qt_embedded) or
+				     ($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or
 				     ($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or
 				     ($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or
 				     ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or
@@ -600,7 +600,7 @@ LOOP:
 				     $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or
-				     $p =~ m/^#\s*ifndef\s+QT_NO_MEMBER_TEMPLATES/ or
+				     $p =~ m/^#\s*ifndef\s+TQT_NO_MEMBER_TEMPLATES/ or
 				     $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
 				     &$match_qt_defines( $p ) or
 				     $p =~ m/^#\s*if\s+0\s+/ ) {
@@ -610,7 +610,7 @@ LOOP:
 					 last if !defined $p;
 					 $if_depth++ if $p =~ m/^#\s*if/;
 					 $if_depth-- if $p =~ m/^#\s*endif/;
-					 # Exit at #else in the #ifdef QT_NO_ACCEL/#else/#endif case
+					 # Exit at #else in the #ifdef TQT_NO_ACCEL/#else/#endif case
 					 last if $if_depth == 1 && $p =~ m/^#\s*else\s/;
 					 #ignore elif for now
 					 print "Skipping ifdef'ed line: $p" if $debug;
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 038e7699..6fc18ccf 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -83,7 +83,7 @@ private:
   TQBrush stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
 #endif
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index 2c53259a..bbd97489 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -56,7 +56,7 @@
 #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
 #endif
 
-#ifndef QT_NO_CANVAS
+#ifndef TQT_NO_CANVAS
 
 
 class TQCanvasSprite;
@@ -394,7 +394,7 @@ private:
 class TQM_EXPORT_CANVAS TQCanvasPixmap : public TQPixmap
 {
 public:
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQCanvasPixmap(const TQString& datafilename);
 #endif
     TQCanvasPixmap(const TQImage& image);
@@ -429,7 +429,7 @@ class TQM_EXPORT_CANVAS TQCanvasPixmapArray
 {
 public:
     TQCanvasPixmapArray();
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0);
 #endif
     // this form is deprecated
@@ -438,7 +438,7 @@ public:
     TQCanvasPixmapArray(TQValueList<TQPixmap>, TQPointArray hotspots = TQPointArray() );
     ~TQCanvasPixmapArray();
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     bool readPixmaps(const TQString& datafilenamepattern, int framecount=0);
     bool readCollisionMasks(const TQString& filenamepattern);
 #endif
@@ -458,7 +458,7 @@ private:
     TQCanvasPixmapArray( const TQCanvasPixmapArray & );
     TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly);
 #endif
 
@@ -801,6 +801,6 @@ private:
 
 #define Q_DEFINED_QCANVAS
 #include "tqwinexport.h"
-#endif // QT_NO_CANVAS
+#endif // TQT_NO_CANVAS
 
 #endif // TQCANVAS_H
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 34d064b1..7fda3222 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -45,7 +45,7 @@
 #endif // QT_H
 
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 typedef TQPtrList<TQFileInfo> TQFileInfoList;
 typedef TQPtrListIterator<TQFileInfo> TQFileInfoListIterator;
 class TQStringList;
@@ -242,5 +242,5 @@ struct TQDirSortItem {
     TQFileInfo* item;
 };
 
-#endif // QT_NO_DIR
+#endif // TQT_NO_DIR
 #endif // TQDIR_H
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 696b8f78..40e9767e 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -91,7 +91,7 @@ private:
 /*****************************************************************************
   TQPen stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
 #endif
diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/qtruby/rubylib/designer/rbuic/embed.cpp
index 02b88de4..5b4a2fc3 100644
--- a/qtruby/rubylib/designer/rbuic/embed.cpp
+++ b/qtruby/rubylib/designer/rbuic/embed.cpp
@@ -73,7 +73,7 @@ static TQString convertToCIdentifier( const char *s )
 
 static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 {
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     TQByteArray bazip( tqCompress( input, nbytes ) );
     ulong len = bazip.size();
 #else
@@ -88,7 +88,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 	    s.truncate( 0 );
 	}
 	uint v = (uchar)
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 		 bazip
 #else
 		 input
@@ -216,7 +216,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	--indent;
     out << indent << "end" << endl;
     out << indent << endl;
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	out << indent << "baunzip = tqUncompress( @@embed_images[name][0].pack(\"C*\")," << endl;
 	out << indent << "                       @@embed_images[name][0].length )" << endl;
 	out << indent << "img = TQt::Image.new( baunzip.data," << endl;
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
index f8a0f0fd..816a6e74 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
@@ -207,7 +207,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
     r = new WidgetDatabaseRecord;
     r->iconSet = "iconview.xpm";
     r->name = "TQIconView";
@@ -217,7 +217,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
     r = new WidgetDatabaseRecord;
     r->iconSet = "table.xpm";
     r->name = "TQTable";
@@ -227,7 +227,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "datatable.xpm";
     r->includeFile = "tqdatatable.h";
@@ -483,7 +483,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataBrowser";
diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in
index eb224025..d5d8416d 100644
--- a/smoke/tde/generate.pl.in
+++ b/smoke/tde/generate.pl.in
@@ -34,7 +34,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; }
 
 mkdir $finaloutdir unless (-d $finaloutdir);
 
-#  Load the QT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
+#  Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
 my $macros="";
 if ( -e $definespath ){
     print "Found '$defines'. Reading preprocessor symbols from there...\n";
@@ -131,7 +131,7 @@ if("@KDE_HAVE_GL@" eq "yes")
     open(DEFS, $definespath);
     my @defs = <DEFS>;
     close DEFS;
-    if(!grep(/QT_NO_OPENGL/, @defs))
+    if(!grep(/TQT_NO_OPENGL/, @defs))
     {
       $excludes{'qgl.h'} = undef;
       $excludes{'qglcolormap.h'} = undef;
diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in
index 8a5b89a5..bf115fdc 100644
--- a/smoke/tde/qtguess.pl.in
+++ b/smoke/tde/qtguess.pl.in
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# qtguess.pl : check how Qt was compiled. Issue a list of all defined QT_NO_* macros, one per line.
+# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
 #
 # author:  germain Garand <germain@ebooksfrance.com>
 # licence: GPL v.2
@@ -19,7 +19,7 @@ getopts('qo:f:t:');
 # Threshold :
 #	 0 - test basic Qt types/classes
 #	 5 - test higher level, non-gui classes
-#	 8 - test options of the above (ex: QT_NO_IMAGE_SMOOTHSCALE)
+#	 8 - test options of the above (ex: TQT_NO_IMAGE_SMOOTHSCALE)
 #	10 - test basic widgets
 #	12 - test composite widgets
 #	13 - test widgets inheriting composite widgets
@@ -107,7 +107,7 @@ sub grab_qglobal_symbols
 		print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
 		while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm )
 		{
-			$qtundefs{"QT_NO_$1"} = 1;
+			$qtundefs{"TQT_NO_$1"} = 1;
 		}
 		print "Found ". scalar( keys %qtundefs )." undefined symbol".((scalar( keys %qtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtundefs));
                 last;
@@ -248,47 +248,47 @@ BEGIN {
 # "DEFINE" => ["header-1.h,... header-n.h", "main() code", priority, "Definitions (if needed)"]
 
 our %tests = (
-	"QT_NO_ACCEL" => 		["qaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5],
-	"QT_NO_ACTION" =>		["qaction.h", "TQAction foo( (TQObject*)NULL );", 5],
-	"QT_NO_ASYNC_IO" =>		["qasyncio.h", "TQAsyncIO foo();", 5],
-	"QT_NO_ASYNC_IMAGE_IO"=>	["qasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5],
-	"QT_NO_BIG_CODECS" => 		["qbig5codec.h", "TQBig5Codec foo();", 5],
-	"QT_NO_BUTTON" =>		["qbutton.h", "TQButton foo( (TQWidget*)NULL );", 10],
- 	"QT_NO_BUTTONGROUP" =>		["qbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
- 	"QT_NO_CANVAS" =>		["qcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
- 	"QT_NO_CHECKBOX" =>		["qcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
-	"QT_NO_CLIPBOARD" => 		["qapplication.h, qclipboard.h", q£
+	"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£
 						TQApplication foo( argc, argv );
 						TQClipboard *baz= foo.clipboard();
 					£, 5],
- 	"QT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
- 	"QT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
+ 	"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],
-	"QT_NO_COMPONENT" =>		["qapplication.h", q£
+	"TQT_NO_COMPONENT" =>		["qapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
 					£, 5],
- 	"QT_NO_CURSOR" =>		["qcursor.h", "TQCursor foo;", 5],
- 	"QT_NO_DATASTREAM" =>		["qdatastream.h", "TQDataStream foo;", 5],
- 	"QT_NO_DATETIMEEDIT" =>		["qdatetimeedit.h", "TQTimeEdit foo;", 12],
-	"QT_NO_DIAL" =>			["qdial.h", "TQDial foo;", 10],
-	"QT_NO_DIALOG" =>		["qdialog.h", "TQDialog foo;", 12],
-	"QT_NO_DIR" =>			["qdir.h", "TQDir foo;", 5],
-	"QT_NO_DNS" =>			["qdns.h", "TQDns foo;", 5],
-	"QT_NO_DOM" =>			["qdom.h", "TQDomDocumentType foo;", 5],
-	"QT_NO_DRAGANDDROP" =>		["qevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5],
-	"QT_NO_DRAWUTIL" =>		["qdrawutil.h, qcolor.h", "qDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10],
-	"QT_NO_ERRORMESSAGE" => 	["qerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13],
-	"QT_NO_FILEDIALOG" =>		["qfiledialog.h", "TQFileIconProvider foo;", 13],
-
-	"QT_NO_FONTDATABASE" =>		["qfontdatabase.h", "TQFontDatabase foo;", 5],
-	"QT_NO_FONTDIALOG" => 		["qfontdialog.h",   "TQFontDialog::getFont( (bool *)NULL );", 12],
-	"QT_NO_FRAME" => 		["qframe.h", "TQFrame foo;", 10],
-	"QT_NO_GRID" =>			["qgrid.h", "TQGrid foo(5);", 12],
-	"QT_NO_GRIDVIEW" =>		["qgridview.h", "TQFoo foo;", 13, q£
+ 	"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£
 						class TQFoo: public TQGridView
 						{
 						public:
@@ -297,15 +297,15 @@ our %tests = (
 							void paintCell(TQPainter *, int, int){};
 						};
 					£],
-	"QT_NO_GROUPBOX" =>		["qgroupbox.h", "TQGroupBox foo;", 12],
-	"QT_NO_HBOX" =>			["qhbox.h", "TQHBox foo;", 12],
-	"QT_NO_HBUTTONGROUP" =>		["qhbuttongroup.h", "TQHButtonGroup foo;", 13],
-	"QT_NO_HEADER" =>		["qheader.h", "TQHeader foo;", 10],
-	"QT_NO_HGROUPBOX" =>		["qhgroupbox.h", "TQHGroupBox foo;", 13],
-	"QT_NO_ICONSET" =>		["qiconset.h", "TQIconSet foo;", 8],
+	"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],
 
-	"QT_NO_ICONVIEW" =>		["qiconview.h", "TQIconView foo;", 13],
-	"QT_NO_IMAGEFORMATPLUGIN" =>	["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
+	"TQT_NO_ICONVIEW" =>		["qiconview.h", "TQIconView foo;", 13],
+	"TQT_NO_IMAGEFORMATPLUGIN" =>	["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
 
 						class TQFoo: public TQImageFormatPlugin
 						{
@@ -317,40 +317,40 @@ our %tests = (
 						};
 						Q_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"QT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createAlphaMask();
 					£, 8],
- 	"QT_NO_IMAGE_HEURISTIC_MASK" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createHeuristicMask();
 					£, 8],
-	"QT_NO_IMAGE_MIRROR" =>	["qimage.h", q£
+	"TQT_NO_IMAGE_MIRROR" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->mirror();
 					£, 8],
- 	"QT_NO_IMAGE_SMOOTHSCALE" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->smoothScale( 10, 10);
 					£, 8],
- 	"QT_NO_IMAGE_TEXT" =>		["qimage.h", "TQImageTextKeyLang foo;", 8],
- 	"QT_NO_IMAGE_TRANSFORMATION" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TEXT" =>		["qimage.h", "TQImageTextKeyLang foo;", 8],
+ 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->scale( 10, 10);
 					£, 8],
- 	"QT_NO_IMAGE_TRUECOLOR" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TRUECOLOR" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->convertDepthWithPalette( 1, (TQRgb*) NULL, 1 );
 					£, 8],
-	"QT_NO_INPUTDIALOG" =>		["qinputdialog.h, qstring.h", q£QInputDialog::getText( TQString::null, TQString::null);£, 13],
-	"QT_NO_IMAGEIO" => 		["qbitmap.h, qstring.h", q£
+	"TQT_NO_INPUTDIALOG" =>		["qinputdialog.h, qstring.h", q£QInputDialog::getText( TQString::null, TQString::null);£, 13],
+	"TQT_NO_IMAGEIO" => 		["qbitmap.h, qstring.h", q£
 						TQBitmap foo( TQString::fromLatin1("foobar") );
 					£, 5],
-	"QT_NO_IMAGEIO_JPEG" =>		["qjpegio.h", "qInitJpegIO();", 8],
-	"QT_NO_IMAGEIO_MNG" =>		["qmngio.h", "qInitMngIO();", 8],
-	"QT_NO_IMAGEIO_PNG" =>		["qpngio.h", "qInitPngIO();", 8],
-	"QT_NO_LABEL" =>		["qlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10],
-	"QT_NO_LAYOUT" =>		["qlayout.h", "TQFoo foo;", 10, q£
+	"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£
 
  						class TQFoo: public TQLayout
  						{
@@ -363,43 +363,43 @@ our %tests = (
 						    void setGeometry( const TQRect & ) { };
  						};
  					£],
-	"QT_NO_LCDNUMBER" =>		["qlcdnumber.h", "TQLCDNumber foo;", 12],
-	"QT_NO_LINEEDIT" =>		["qlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12],
-	"QT_NO_LISTBOX" =>		["qlistbox.h", "TQListBox foo;", 13],
-	"QT_NO_LISTVIEW" =>		["qlistview.h", "TQListView foo;", 13],
-	"QT_NO_MAINWINDOW" =>		["qmainwindow.h", "TQMainWindow foo;", 13],
-	"QT_NO_MENUBAR" =>		["qmenubar.h", "TQMenuBar foo;", 13],
-	"QT_NO_MOVIE" =>		["qmovie.h", "TQMovie foo;", 5],
-	"QT_NO_MENUDATA" =>		["qmenudata.h", "TQMenuData foo;", 9],
-	"QT_NO_MESSAGEBOX" =>		["qmessagebox.h", "TQMessageBox foo;", 13],
-	"QT_NO_MIME" =>			["qmime.h", "TQMimeSourceFactory foo;", 5],
- 	"QT_NO_MIMECLIPBOARD" => 	["qapplication.h, qclipboard.h", q£
+	"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£
  						TQApplication foo( argc, argv );
  						TQClipboard *baz= foo.clipboard();
 						baz->data();
 					£, 8],
 
-	"QT_NO_MULTILINEEDIT" =>	["qmultilineedit.h", "TQMultiLineEdit foo;", 14],
-	"QT_NO_NETWORK" =>		["qnetwork.h", "qInitNetworkProtocols();", 5],
-	"QT_NO_NETWORKPROTOCOL" =>	["qnetworkprotocol.h", "TQNetworkProtocol foo;", 8],
- 	"QT_NO_NETWORKPROTOCOL_FTP" =>	["qftp.h", "TQFtp foo;", 9],
-	"QT_NO_PALETTE" =>		["qpalette.h", "TQColorGroup foo;", 5],
-	"QT_NO_PICTURE" =>		["qpicture.h", "TQPicture foo;", 5],
-	"QT_NO_PIXMAP_TRANSFORMATION" =>["qbitmap.h, qwmatrix.h", q£
+	"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£
 						TQBitmap *foo= new TQBitmap();
 						TQWMatrix bar;
 						foo->xForm( bar );
 					£, 5],
-	"QT_NO_POPUPMENU" =>		["qpopupmenu.h", "TQPopupMenu foo;", 12],
-	"QT_NO_PRINTER" =>		["qprinter.h", "TQPrinter foo;", 5],
-	"QT_NO_PRINTDIALOG" =>		["qprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13],
-	"QT_NO_PROCESS" =>		["qprocess.h", "TQProcess foo;", 5],
-	"QT_NO_PROGRESSBAR" =>		["qprogressbar.h", "TQProgressBar foo;", 12],
-	"QT_NO_PROGRESSDIALOG" =>	["qprogressdialog.h", "TQProgressDialog foo;", 13],
-	"QT_NO_PUSHBUTTON" =>		["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
-	"QT_NO_PROPERTIES" =>		["qmetaobject.h", "TQMetaProperty foo;", 0],
-#	"QT_NO_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
-#	"QT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
+	"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_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
+#	"TQT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
 #						class TQFoo: public QtTableView
 #						{
 #						public:
@@ -408,63 +408,63 @@ our %tests = (
 #							void paintCell( TQPainter *, int, int) {};
 #						};
 #						£],
-	"QT_NO_QUUID_STRING" =>		["quuid.h", "TQUuid foo( TQString::null );", 8],
-	"QT_NO_RANGECONTROL" =>		["qrangecontrol.h", "TQRangeControl foo;", 10],
-	"QT_NO_REGEXP" =>		["qregexp.h", "TQRegExp foo;", 5],
-	"QT_NO_REGEXP_WILDCARD" =>	["qregexp.h", q£
+	"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],
+	"TQT_NO_REGEXP_WILDCARD" =>	["qregexp.h", q£
 						TQRegExp foo;
 						foo.wildcard();
 					£, 8],
-	"QT_NO_REMOTE" =>		["qapplication.h", q£
+	"TQT_NO_REMOTE" =>		["qapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.remoteControlEnabled();
 					£, 15],
-	"QT_NO_RADIOBUTTON" =>		["qradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12],
-	"QT_NO_RICHTEXT" =>		["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
-	"QT_NO_SCROLLBAR" =>		["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
-	"QT_NO_SCROLLVIEW" =>		["qscrollview.h", "TQScrollView foo;", 12],
-	"QT_NO_SEMIMODAL" =>		["qsemimodal.h", "TQSemiModal foo;", 10],
-	"QT_NO_SESSIONMANAGER" =>	["qapplication.h", q£
+	"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£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
 					£, 15],
-	"QT_NO_SETTINGS" =>		["qsettings.h", "TQSettings foo;", 5],
-	"QT_NO_SIGNALMAPPER" =>		["qsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0],
-	"QT_NO_SIZEGRIP" =>		["qsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10],
-	"QT_NO_SLIDER" =>		["qslider.h", "TQSlider foo( (TQWidget *) NULL );", 12],
-	"QT_NO_SOUND" =>		["qsound.h", "TQSound foo( TQString::null );", 5],
+	"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],
 
 
-	"QT_NO_SPINWIDGET" =>		["qrangecontrol.h", "TQSpinWidget foo;", 10],
-	"QT_NO_SPRINTF" =>		["qcolor.h", q£
+	"TQT_NO_SPINWIDGET" =>		["qrangecontrol.h", "TQSpinWidget foo;", 10],
+	"TQT_NO_SPRINTF" =>		["qcolor.h", q£
 						TQColor foo;
 						foo.name();
 					£, 0],
 
 
 
-	"QT_NO_SQL" =>			["qsqlcursor.h", "TQSqlCursor foo;", 5],
-	"QT_NO_STRINGLIST" =>		["qstringlist.h", "TQStringList foo;", 0],
-	"QT_NO_STYLE" =>		["qapplication.h", q£
+	"TQT_NO_SQL" =>			["qsqlcursor.h", "TQSqlCursor foo;", 5],
+	"TQT_NO_STRINGLIST" =>		["qstringlist.h", "TQStringList foo;", 0],
+	"TQT_NO_STYLE" =>		["qapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.style();
  					£, 15],
 
-#	"QT_NO_STYLE_CDE" =>		["qcdestyle.h", "TQCDEStyle foo;", 16],
-# 	"QT_NO_STYLE_COMPACT" =>	["qcompactstyle.h", "TQCompactStyle foo;", 16],
-#	"QT_NO_STYLE_INTERLACE" =>	["qinterlacestyle.h", "TQInterlaceStyle foo;", 16],
-#	"QT_NO_STYLE_PLATINUM" =>	["qplatinumstyle.h", "TQPlatinumStyle foo;", 16],
-#	"QT_NO_STYLE_MOTIF" =>		["qmotifstyle.h", "TQMotifStyle foo;", 16],
-#	"QT_NO_STYLE_MOTIFPLUS" =>	["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
-#	"QT_NO_STYLE_SGI" =>		["qsgistyle.h", "TQSGIStyle foo;", 16],
-#	"QT_NO_STYLE_WINDOWS" =>	["qwindowsstyle.h", "TQWindowsStyle foo;", 16],
-        "QT_NO_TABBAR" =>               ["qtabbar.h", "TQTabBar foo;", 10],
-        "QT_NO_TABDIALOG" =>            ["qtabdialog.h", "TQTabDialog foo;", 12],
-        "QT_NO_TABLE" =>                ["qtable.h", "TQTable foo;", 10],
-        "QT_NO_TABWIDGET" =>            ["qtabwidget.h", "TQTabWidget foo;", 10],
-        "QT_NO_TEXTBROWSER" =>          ["qtextbrowser.h", "TQTextBrowser foo;", 14],
-        "QT_NO_TEXTCODEC" =>            ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
-        "QT_NO_TEXTCODECPLUGIN" =>      ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ 
+#	"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£ 
 	
 						class TQFoo: public TQTextCodecPlugin
 						{
@@ -478,24 +478,24 @@ our %tests = (
 						};
 						Q_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"QT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
-        "QT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],
-        "QT_NO_TEXTVIEW" =>             ["qtextview.h", "TQTextView foo;", 14], #Obsolete
-        "QT_NO_TOOLBAR" =>              ["qtoolbar.h", "TQToolBar foo;", 10],
-        "QT_NO_TOOLBUTTON" =>           ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
-        "QT_NO_TOOLTIP" =>              ["qtooltip.h", "TQToolTip::hide();", 10],
+ 	"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],
         
-	"QT_NO_TRANSFORMATIONS" =>	["qpainter.h", q£
+	"TQT_NO_TRANSFORMATIONS" =>	["qpainter.h", q£
 						TQPainter *foo= new TQPainter();
 						foo->setViewXForm( true );£, 5],
-        "QT_NO_VARIANT" =>              ["qvariant.h", "TQVariant foo;", 0],
-        "QT_NO_WHATSTHIS" =>            ["qwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10],
-	"QT_NO_WHEELEVENT" =>		["qevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5],
-        "QT_NO_WIDGET_TOPEXTRA" =>      ["qwidget.h", "TQWidget foo; foo.caption();", 9],
-        "QT_NO_WIDGETSTACK" =>          ["qwidgetstack.h", "TQWidgetStack foo;", 13],
-        "QT_NO_WIZARD" =>               ["qwizard.h", "TQWizard foo;", 13],
-	"QT_NO_WMATRIX" =>		["qwmatrix.h", "TQWMatrix foo;", 0],
-	"QT_NO_XML" =>			["qxml.h", "TQXmlNamespaceSupport foo;", 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],
 	);
 
 }
diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in
index 49b41b9a..f1629222 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -39,7 +39,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; }
 
 mkdir $finaloutdir unless (-d $finaloutdir);
 
-#  Load the QT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
+#  Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus
 my $macros="";
 if ( -e $definespath ){
     print "Found '$defines'. Reading preprocessor symbols from there...\n";
@@ -101,7 +101,7 @@ if("@KDE_HAVE_GL@" eq "yes")
     open(DEFS, $definespath);
     my @defs = <DEFS>;
     close DEFS;
-    if(!grep(/QT_NO_OPENGL/, @defs))
+    if(!grep(/TQT_NO_OPENGL/, @defs))
     {
       $excludes{'qgl.h'} = undef;
       $excludes{'qglcolormap.h'} = undef;
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index 8a5b89a5..bf115fdc 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# qtguess.pl : check how Qt was compiled. Issue a list of all defined QT_NO_* macros, one per line.
+# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line.
 #
 # author:  germain Garand <germain@ebooksfrance.com>
 # licence: GPL v.2
@@ -19,7 +19,7 @@ getopts('qo:f:t:');
 # Threshold :
 #	 0 - test basic Qt types/classes
 #	 5 - test higher level, non-gui classes
-#	 8 - test options of the above (ex: QT_NO_IMAGE_SMOOTHSCALE)
+#	 8 - test options of the above (ex: TQT_NO_IMAGE_SMOOTHSCALE)
 #	10 - test basic widgets
 #	12 - test composite widgets
 #	13 - test widgets inheriting composite widgets
@@ -107,7 +107,7 @@ sub grab_qglobal_symbols
 		print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs));
 		while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm )
 		{
-			$qtundefs{"QT_NO_$1"} = 1;
+			$qtundefs{"TQT_NO_$1"} = 1;
 		}
 		print "Found ". scalar( keys %qtundefs )." undefined symbol".((scalar( keys %qtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtundefs));
                 last;
@@ -248,47 +248,47 @@ BEGIN {
 # "DEFINE" => ["header-1.h,... header-n.h", "main() code", priority, "Definitions (if needed)"]
 
 our %tests = (
-	"QT_NO_ACCEL" => 		["qaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5],
-	"QT_NO_ACTION" =>		["qaction.h", "TQAction foo( (TQObject*)NULL );", 5],
-	"QT_NO_ASYNC_IO" =>		["qasyncio.h", "TQAsyncIO foo();", 5],
-	"QT_NO_ASYNC_IMAGE_IO"=>	["qasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5],
-	"QT_NO_BIG_CODECS" => 		["qbig5codec.h", "TQBig5Codec foo();", 5],
-	"QT_NO_BUTTON" =>		["qbutton.h", "TQButton foo( (TQWidget*)NULL );", 10],
- 	"QT_NO_BUTTONGROUP" =>		["qbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
- 	"QT_NO_CANVAS" =>		["qcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
- 	"QT_NO_CHECKBOX" =>		["qcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
-	"QT_NO_CLIPBOARD" => 		["qapplication.h, qclipboard.h", q£
+	"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£
 						TQApplication foo( argc, argv );
 						TQClipboard *baz= foo.clipboard();
 					£, 5],
- 	"QT_NO_COLORDIALOG" =>		["qcolordialog.h", "TQColorDialog::customCount();", 12],
- 	"QT_NO_COMBOBOX" =>		["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
+ 	"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],
-	"QT_NO_COMPONENT" =>		["qapplication.h", q£
+	"TQT_NO_COMPONENT" =>		["qapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
 					£, 5],
- 	"QT_NO_CURSOR" =>		["qcursor.h", "TQCursor foo;", 5],
- 	"QT_NO_DATASTREAM" =>		["qdatastream.h", "TQDataStream foo;", 5],
- 	"QT_NO_DATETIMEEDIT" =>		["qdatetimeedit.h", "TQTimeEdit foo;", 12],
-	"QT_NO_DIAL" =>			["qdial.h", "TQDial foo;", 10],
-	"QT_NO_DIALOG" =>		["qdialog.h", "TQDialog foo;", 12],
-	"QT_NO_DIR" =>			["qdir.h", "TQDir foo;", 5],
-	"QT_NO_DNS" =>			["qdns.h", "TQDns foo;", 5],
-	"QT_NO_DOM" =>			["qdom.h", "TQDomDocumentType foo;", 5],
-	"QT_NO_DRAGANDDROP" =>		["qevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5],
-	"QT_NO_DRAWUTIL" =>		["qdrawutil.h, qcolor.h", "qDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10],
-	"QT_NO_ERRORMESSAGE" => 	["qerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13],
-	"QT_NO_FILEDIALOG" =>		["qfiledialog.h", "TQFileIconProvider foo;", 13],
-
-	"QT_NO_FONTDATABASE" =>		["qfontdatabase.h", "TQFontDatabase foo;", 5],
-	"QT_NO_FONTDIALOG" => 		["qfontdialog.h",   "TQFontDialog::getFont( (bool *)NULL );", 12],
-	"QT_NO_FRAME" => 		["qframe.h", "TQFrame foo;", 10],
-	"QT_NO_GRID" =>			["qgrid.h", "TQGrid foo(5);", 12],
-	"QT_NO_GRIDVIEW" =>		["qgridview.h", "TQFoo foo;", 13, q£
+ 	"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£
 						class TQFoo: public TQGridView
 						{
 						public:
@@ -297,15 +297,15 @@ our %tests = (
 							void paintCell(TQPainter *, int, int){};
 						};
 					£],
-	"QT_NO_GROUPBOX" =>		["qgroupbox.h", "TQGroupBox foo;", 12],
-	"QT_NO_HBOX" =>			["qhbox.h", "TQHBox foo;", 12],
-	"QT_NO_HBUTTONGROUP" =>		["qhbuttongroup.h", "TQHButtonGroup foo;", 13],
-	"QT_NO_HEADER" =>		["qheader.h", "TQHeader foo;", 10],
-	"QT_NO_HGROUPBOX" =>		["qhgroupbox.h", "TQHGroupBox foo;", 13],
-	"QT_NO_ICONSET" =>		["qiconset.h", "TQIconSet foo;", 8],
+	"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],
 
-	"QT_NO_ICONVIEW" =>		["qiconview.h", "TQIconView foo;", 13],
-	"QT_NO_IMAGEFORMATPLUGIN" =>	["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
+	"TQT_NO_ICONVIEW" =>		["qiconview.h", "TQIconView foo;", 13],
+	"TQT_NO_IMAGEFORMATPLUGIN" =>	["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£
 
 						class TQFoo: public TQImageFormatPlugin
 						{
@@ -317,40 +317,40 @@ our %tests = (
 						};
 						Q_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"QT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createAlphaMask();
 					£, 8],
- 	"QT_NO_IMAGE_HEURISTIC_MASK" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_HEURISTIC_MASK" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->createHeuristicMask();
 					£, 8],
-	"QT_NO_IMAGE_MIRROR" =>	["qimage.h", q£
+	"TQT_NO_IMAGE_MIRROR" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->mirror();
 					£, 8],
- 	"QT_NO_IMAGE_SMOOTHSCALE" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_SMOOTHSCALE" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->smoothScale( 10, 10);
 					£, 8],
- 	"QT_NO_IMAGE_TEXT" =>		["qimage.h", "TQImageTextKeyLang foo;", 8],
- 	"QT_NO_IMAGE_TRANSFORMATION" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TEXT" =>		["qimage.h", "TQImageTextKeyLang foo;", 8],
+ 	"TQT_NO_IMAGE_TRANSFORMATION" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->scale( 10, 10);
 					£, 8],
- 	"QT_NO_IMAGE_TRUECOLOR" =>	["qimage.h", q£
+ 	"TQT_NO_IMAGE_TRUECOLOR" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
 						foo->convertDepthWithPalette( 1, (TQRgb*) NULL, 1 );
 					£, 8],
-	"QT_NO_INPUTDIALOG" =>		["qinputdialog.h, qstring.h", q£QInputDialog::getText( TQString::null, TQString::null);£, 13],
-	"QT_NO_IMAGEIO" => 		["qbitmap.h, qstring.h", q£
+	"TQT_NO_INPUTDIALOG" =>		["qinputdialog.h, qstring.h", q£QInputDialog::getText( TQString::null, TQString::null);£, 13],
+	"TQT_NO_IMAGEIO" => 		["qbitmap.h, qstring.h", q£
 						TQBitmap foo( TQString::fromLatin1("foobar") );
 					£, 5],
-	"QT_NO_IMAGEIO_JPEG" =>		["qjpegio.h", "qInitJpegIO();", 8],
-	"QT_NO_IMAGEIO_MNG" =>		["qmngio.h", "qInitMngIO();", 8],
-	"QT_NO_IMAGEIO_PNG" =>		["qpngio.h", "qInitPngIO();", 8],
-	"QT_NO_LABEL" =>		["qlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10],
-	"QT_NO_LAYOUT" =>		["qlayout.h", "TQFoo foo;", 10, q£
+	"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£
 
  						class TQFoo: public TQLayout
  						{
@@ -363,43 +363,43 @@ our %tests = (
 						    void setGeometry( const TQRect & ) { };
  						};
  					£],
-	"QT_NO_LCDNUMBER" =>		["qlcdnumber.h", "TQLCDNumber foo;", 12],
-	"QT_NO_LINEEDIT" =>		["qlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12],
-	"QT_NO_LISTBOX" =>		["qlistbox.h", "TQListBox foo;", 13],
-	"QT_NO_LISTVIEW" =>		["qlistview.h", "TQListView foo;", 13],
-	"QT_NO_MAINWINDOW" =>		["qmainwindow.h", "TQMainWindow foo;", 13],
-	"QT_NO_MENUBAR" =>		["qmenubar.h", "TQMenuBar foo;", 13],
-	"QT_NO_MOVIE" =>		["qmovie.h", "TQMovie foo;", 5],
-	"QT_NO_MENUDATA" =>		["qmenudata.h", "TQMenuData foo;", 9],
-	"QT_NO_MESSAGEBOX" =>		["qmessagebox.h", "TQMessageBox foo;", 13],
-	"QT_NO_MIME" =>			["qmime.h", "TQMimeSourceFactory foo;", 5],
- 	"QT_NO_MIMECLIPBOARD" => 	["qapplication.h, qclipboard.h", q£
+	"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£
  						TQApplication foo( argc, argv );
  						TQClipboard *baz= foo.clipboard();
 						baz->data();
 					£, 8],
 
-	"QT_NO_MULTILINEEDIT" =>	["qmultilineedit.h", "TQMultiLineEdit foo;", 14],
-	"QT_NO_NETWORK" =>		["qnetwork.h", "qInitNetworkProtocols();", 5],
-	"QT_NO_NETWORKPROTOCOL" =>	["qnetworkprotocol.h", "TQNetworkProtocol foo;", 8],
- 	"QT_NO_NETWORKPROTOCOL_FTP" =>	["qftp.h", "TQFtp foo;", 9],
-	"QT_NO_PALETTE" =>		["qpalette.h", "TQColorGroup foo;", 5],
-	"QT_NO_PICTURE" =>		["qpicture.h", "TQPicture foo;", 5],
-	"QT_NO_PIXMAP_TRANSFORMATION" =>["qbitmap.h, qwmatrix.h", q£
+	"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£
 						TQBitmap *foo= new TQBitmap();
 						TQWMatrix bar;
 						foo->xForm( bar );
 					£, 5],
-	"QT_NO_POPUPMENU" =>		["qpopupmenu.h", "TQPopupMenu foo;", 12],
-	"QT_NO_PRINTER" =>		["qprinter.h", "TQPrinter foo;", 5],
-	"QT_NO_PRINTDIALOG" =>		["qprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13],
-	"QT_NO_PROCESS" =>		["qprocess.h", "TQProcess foo;", 5],
-	"QT_NO_PROGRESSBAR" =>		["qprogressbar.h", "TQProgressBar foo;", 12],
-	"QT_NO_PROGRESSDIALOG" =>	["qprogressdialog.h", "TQProgressDialog foo;", 13],
-	"QT_NO_PUSHBUTTON" =>		["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12],
-	"QT_NO_PROPERTIES" =>		["qmetaobject.h", "TQMetaProperty foo;", 0],
-#	"QT_NO_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
-#	"QT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
+	"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_QTMULTILINEEDIT" =>	["qtmultilineedit.h", "QtMultiLineEdit foo;", 15],
+#	"TQT_NO_QTTABLEVIEW" =>		["qttableview.h", "TQFoo foo;", 16, q£
 #						class TQFoo: public QtTableView
 #						{
 #						public:
@@ -408,63 +408,63 @@ our %tests = (
 #							void paintCell( TQPainter *, int, int) {};
 #						};
 #						£],
-	"QT_NO_QUUID_STRING" =>		["quuid.h", "TQUuid foo( TQString::null );", 8],
-	"QT_NO_RANGECONTROL" =>		["qrangecontrol.h", "TQRangeControl foo;", 10],
-	"QT_NO_REGEXP" =>		["qregexp.h", "TQRegExp foo;", 5],
-	"QT_NO_REGEXP_WILDCARD" =>	["qregexp.h", q£
+	"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],
+	"TQT_NO_REGEXP_WILDCARD" =>	["qregexp.h", q£
 						TQRegExp foo;
 						foo.wildcard();
 					£, 8],
-	"QT_NO_REMOTE" =>		["qapplication.h", q£
+	"TQT_NO_REMOTE" =>		["qapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.remoteControlEnabled();
 					£, 15],
-	"QT_NO_RADIOBUTTON" =>		["qradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12],
-	"QT_NO_RICHTEXT" =>		["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
-	"QT_NO_SCROLLBAR" =>		["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
-	"QT_NO_SCROLLVIEW" =>		["qscrollview.h", "TQScrollView foo;", 12],
-	"QT_NO_SEMIMODAL" =>		["qsemimodal.h", "TQSemiModal foo;", 10],
-	"QT_NO_SESSIONMANAGER" =>	["qapplication.h", q£
+	"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£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
 					£, 15],
-	"QT_NO_SETTINGS" =>		["qsettings.h", "TQSettings foo;", 5],
-	"QT_NO_SIGNALMAPPER" =>		["qsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0],
-	"QT_NO_SIZEGRIP" =>		["qsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10],
-	"QT_NO_SLIDER" =>		["qslider.h", "TQSlider foo( (TQWidget *) NULL );", 12],
-	"QT_NO_SOUND" =>		["qsound.h", "TQSound foo( TQString::null );", 5],
+	"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],
 
 
-	"QT_NO_SPINWIDGET" =>		["qrangecontrol.h", "TQSpinWidget foo;", 10],
-	"QT_NO_SPRINTF" =>		["qcolor.h", q£
+	"TQT_NO_SPINWIDGET" =>		["qrangecontrol.h", "TQSpinWidget foo;", 10],
+	"TQT_NO_SPRINTF" =>		["qcolor.h", q£
 						TQColor foo;
 						foo.name();
 					£, 0],
 
 
 
-	"QT_NO_SQL" =>			["qsqlcursor.h", "TQSqlCursor foo;", 5],
-	"QT_NO_STRINGLIST" =>		["qstringlist.h", "TQStringList foo;", 0],
-	"QT_NO_STYLE" =>		["qapplication.h", q£
+	"TQT_NO_SQL" =>			["qsqlcursor.h", "TQSqlCursor foo;", 5],
+	"TQT_NO_STRINGLIST" =>		["qstringlist.h", "TQStringList foo;", 0],
+	"TQT_NO_STYLE" =>		["qapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.style();
  					£, 15],
 
-#	"QT_NO_STYLE_CDE" =>		["qcdestyle.h", "TQCDEStyle foo;", 16],
-# 	"QT_NO_STYLE_COMPACT" =>	["qcompactstyle.h", "TQCompactStyle foo;", 16],
-#	"QT_NO_STYLE_INTERLACE" =>	["qinterlacestyle.h", "TQInterlaceStyle foo;", 16],
-#	"QT_NO_STYLE_PLATINUM" =>	["qplatinumstyle.h", "TQPlatinumStyle foo;", 16],
-#	"QT_NO_STYLE_MOTIF" =>		["qmotifstyle.h", "TQMotifStyle foo;", 16],
-#	"QT_NO_STYLE_MOTIFPLUS" =>	["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16],
-#	"QT_NO_STYLE_SGI" =>		["qsgistyle.h", "TQSGIStyle foo;", 16],
-#	"QT_NO_STYLE_WINDOWS" =>	["qwindowsstyle.h", "TQWindowsStyle foo;", 16],
-        "QT_NO_TABBAR" =>               ["qtabbar.h", "TQTabBar foo;", 10],
-        "QT_NO_TABDIALOG" =>            ["qtabdialog.h", "TQTabDialog foo;", 12],
-        "QT_NO_TABLE" =>                ["qtable.h", "TQTable foo;", 10],
-        "QT_NO_TABWIDGET" =>            ["qtabwidget.h", "TQTabWidget foo;", 10],
-        "QT_NO_TEXTBROWSER" =>          ["qtextbrowser.h", "TQTextBrowser foo;", 14],
-        "QT_NO_TEXTCODEC" =>            ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5],
-        "QT_NO_TEXTCODECPLUGIN" =>      ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ 
+#	"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£ 
 	
 						class TQFoo: public TQTextCodecPlugin
 						{
@@ -478,24 +478,24 @@ our %tests = (
 						};
 						Q_EXPORT_PLUGIN( TQFoo )
 					£],
- 	"QT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
-        "QT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],
-        "QT_NO_TEXTVIEW" =>             ["qtextview.h", "TQTextView foo;", 14], #Obsolete
-        "QT_NO_TOOLBAR" =>              ["qtoolbar.h", "TQToolBar foo;", 10],
-        "QT_NO_TOOLBUTTON" =>           ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12],
-        "QT_NO_TOOLTIP" =>              ["qtooltip.h", "TQToolTip::hide();", 10],
+ 	"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],
         
-	"QT_NO_TRANSFORMATIONS" =>	["qpainter.h", q£
+	"TQT_NO_TRANSFORMATIONS" =>	["qpainter.h", q£
 						TQPainter *foo= new TQPainter();
 						foo->setViewXForm( true );£, 5],
-        "QT_NO_VARIANT" =>              ["qvariant.h", "TQVariant foo;", 0],
-        "QT_NO_WHATSTHIS" =>            ["qwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10],
-	"QT_NO_WHEELEVENT" =>		["qevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5],
-        "QT_NO_WIDGET_TOPEXTRA" =>      ["qwidget.h", "TQWidget foo; foo.caption();", 9],
-        "QT_NO_WIDGETSTACK" =>          ["qwidgetstack.h", "TQWidgetStack foo;", 13],
-        "QT_NO_WIZARD" =>               ["qwizard.h", "TQWizard foo;", 13],
-	"QT_NO_WMATRIX" =>		["qwmatrix.h", "TQWMatrix foo;", 0],
-	"QT_NO_XML" =>			["qxml.h", "TQXmlNamespaceSupport foo;", 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],
 	);
 
 }