TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

54 files changed, 391 insertions, 372 deletions

diff --git a/kfile-plugins/RETURNED_ITEMS b/kfile-plugins/RETURNED_ITEMS
index 593d466a..70a3b519 100644
--- a/kfile-plugins/RETURNED_ITEMS
+++ b/kfile-plugins/RETURNED_ITEMS
@@ -50,7 +50,7 @@ String	Camera make
 String  Camera model
 String	Date/time
 Size 	Dimensions Width x Height in pixels
-int	Orientation 	1 - "The 0th row is at the visual top of the image,
+int	Qt::Orientation 	1 - "The 0th row is at the visual top of the image,
 			     and the 0th column is the visual left-hand side."
 			2 - "The 0th row is at the visual top of the image,
 			    and the 0th column is the visual right-hand side."
diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp
index 790161a6..a682da7c 100644
--- a/kfile-plugins/bmp/kfile_bmp.cpp
+++ b/kfile-plugins/bmp/kfile_bmp.cpp
@@ -43,10 +43,10 @@ typedef KGenericFactory<KBmpPlugin> BmpFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" ))
 
-KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name,
+KBmpPlugin::KBmpPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-bmp" );
 
@@ -83,7 +83,7 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     if (!file.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h
index f34e3e86..c2c5c007 100644
--- a/kfile-plugins/bmp/kfile_bmp.h
+++ b/kfile-plugins/bmp/kfile_bmp.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KBmpPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KBmpPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/configure.in.bot b/kfile-plugins/configure.in.bot
index 47308e8b..f03bc711 100644
--- a/kfile-plugins/configure.in.bot
+++ b/kfile-plugins/configure.in.bot
@@ -7,13 +7,13 @@ if test -z "$LIBTIFF"; then
   all_tests=bad
 fi
 
-if test -z "$POPPLER_LIBS"; then
-  echo ""
-  echo "You're missing poppler. The additional info plugin for PDF files"
-  echo "files won't be compiled without poppler >= 0.3.1."
-  echo "You can download poppler from http://poppler.freedesktop.org/"
-  echo ""
-fi
+#if test -z "$POPPLER_LIBS"; then
+#  echo ""
+#  echo "You're missing poppler. The additional info plugin for PDF files"
+#  echo "files won't be compiled without poppler >= 0.3.1."
+#  echo "You can download poppler from http://poppler.freedesktop.org/"
+#  echo ""
+#fi
 
 if test "$EXRSTATUS" = "no"; then
   echo ""
diff --git a/kfile-plugins/dds/kfile_dds.cpp b/kfile-plugins/dds/kfile_dds.cpp
index f8c3346e..17321e13 100644
--- a/kfile-plugins/dds/kfile_dds.cpp
+++ b/kfile-plugins/dds/kfile_dds.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
- * Copyright (C) 2002 Ignacio Castaño <castano@ludicon.com>
+ * Copyright (C) 2002 Ignacio Casta�o <castano@ludicon.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -35,9 +35,9 @@
 
 typedef KGenericFactory<KDdsPlugin> DdsFactory;
 
-typedef Q_UINT32 uint;
-typedef Q_UINT16 ushort;
-typedef Q_UINT8 uchar;
+typedef TQ_UINT32 uint;
+typedef TQ_UINT16 ushort;
+typedef TQ_UINT8 uchar;
 
 namespace {	// Private.
 
@@ -90,10 +90,10 @@ namespace {	// Private.
 		uint flags;
 		uint fourcc;
 		uint bitcount;
-		uint rmask;
-		uint gmask;
-		uint bmask;
-		uint amask;
+		uint rtqmask;
+		uint gtqmask;
+		uint btqmask;
+		uint atqmask;
 	};
 
 	TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf )
@@ -102,10 +102,10 @@ namespace {	// Private.
 		s >> pf.flags;
 		s >> pf.fourcc;
 		s >> pf.bitcount;
-		s >> pf.rmask;
-		s >> pf.gmask;
-		s >> pf.bmask;
-		s >> pf.amask;
+		s >> pf.rtqmask;
+		s >> pf.gtqmask;
+		s >> pf.btqmask;
+		s >> pf.atqmask;
 		return s;
 	}
 
@@ -182,8 +182,8 @@ namespace {	// Private.
 K_EXPORT_COMPONENT_FACTORY(kfile_dds, DdsFactory( "kfile_dds" ))
 
 // Constructor, init mime type info.
-KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : 
-	KFilePlugin(parent, name, args)
+KDdsPlugin::KDdsPlugin(TQObject *tqparent, const char *name, const TQStringList &args) : 
+	KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" );
 
@@ -216,7 +216,7 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 	TQFile file(info.path());
 
 	if (!file.open(IO_ReadOnly)) {
-		kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+		kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
 		return false;
 	}
 
@@ -227,7 +227,7 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 	uint fourcc;
 	s >> fourcc;
 	if( fourcc != FOURCC_DDS ) {
-		kdDebug(7034) << TQFile::encodeName(info.path()) << " is not a DDS file." << endl;
+		kdDebug(7034) << TQFile::encodeName(info.path()).data() << " is not a DDS file." << endl;
 		return false;
 	}
 
@@ -237,7 +237,7 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 
 	// Check image file format.
 	if( s.atEnd() || !IsValid( header ) ) {
-		kdDebug(7034) << TQFile::encodeName(info.path()) << " is not a valid DDS file." << endl;
+		kdDebug(7034) << TQFile::encodeName(info.path()).data() << " is not a valid DDS file." << endl;
 		return false;
 	}
 
diff --git a/kfile-plugins/dds/kfile_dds.h b/kfile-plugins/dds/kfile_dds.h
index 63dd156b..19ef6a12 100644
--- a/kfile-plugins/dds/kfile_dds.h
+++ b/kfile-plugins/dds/kfile_dds.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KDdsPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KDdsPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KDdsPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/dvi/kfile_dvi.cpp b/kfile-plugins/dvi/kfile_dvi.cpp
index e8fb7af7..1d035fa0 100644
--- a/kfile-plugins/dvi/kfile_dvi.cpp
+++ b/kfile-plugins/dvi/kfile_dvi.cpp
@@ -39,8 +39,8 @@
 typedef KGenericFactory<KDviPlugin> DviFactory;
 K_EXPORT_COMPONENT_FACTORY(kfile_dvi, DviFactory("kfile_dvi"))
 
-KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems)
-  : KFilePlugin(parent, name, preferredItems)
+KDviPlugin::KDviPlugin (TQObject * tqparent, const char * name, const TQStringList & preferredItems)
+  : KFilePlugin(tqparent, name, preferredItems)
 {
   kdDebug(7034) << "dvi plugin" << endl;
   
@@ -62,12 +62,12 @@ bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this pl
   KFileMetaInfoGroup GeneralGroup = appendGroup(info, "General");
   TQFile f(info.path());
   TQFileInfo f_info;
-  Q_UINT16 bytes_to_read;
-  Q_UINT8 comment_length;
+  TQ_UINT16 bytes_to_read;
+  TQ_UINT8 comment_length;
   TQString comment;
-  Q_UINT16 pages;
-  Q_UINT8 buffer[270]; // buffer for reading data; no data is read with more than 270 bytes
-  Q_UINT32 ptr;
+  TQ_UINT16 pages;
+  TQ_UINT8 buffer[270]; // buffer for reading data; no data is read with more than 270 bytes
+  TQ_UINT32 ptr;
   int i; // running index
   
   // open file and try to get the comment
@@ -79,7 +79,7 @@ bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this pl
   }
   
   f_info.setFile(f); // create fileinfoobject
-  bytes_to_read = QMIN(f_info.size(), 270); // check, if the file size is smaller than 270 bytes
+  bytes_to_read = TQMIN(f_info.size(), 270); // check, if the file size is smaller than 270 bytes
   // (if the comment is as large as possible, we don't have to
   // read more than 270 bytes)
   
diff --git a/kfile-plugins/dvi/kfile_dvi.h b/kfile-plugins/dvi/kfile_dvi.h
index 60326144..aba32132 100644
--- a/kfile-plugins/dvi/kfile_dvi.h
+++ b/kfile-plugins/dvi/kfile_dvi.h
@@ -28,8 +28,9 @@ class TQStringList;
 class KDviPlugin : public KFilePlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KDviPlugin ( TQObject * parent, const char * name, const TQStringList & preferredItems );
+	KDviPlugin ( TQObject * tqparent, const char * name, const TQStringList & preferredItems );
 
 	virtual bool readInfo (KFileMetaInfo & info, uint what);
 };
diff --git a/kfile-plugins/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp
index e2ae9a06..18432fc8 100644
--- a/kfile-plugins/exr/kfile_exr.cpp
+++ b/kfile-plugins/exr/kfile_exr.cpp
@@ -60,9 +60,9 @@ typedef KGenericFactory<KExrPlugin> ExrFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_exr, ExrFactory("kfile_exr"))
 
-KExrPlugin::KExrPlugin(TQObject *parent, const char *name,
+KExrPlugin::KExrPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     // set up our mime type
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-exr" );
@@ -193,7 +193,7 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 			for ( unsigned int y=0; y < preview.height(); y++ ) {
 				for ( unsigned int x=0; x < preview.width(); x++ ) {
 					const PreviewRgba &q = preview.pixels()[x+(y*preview.width())];
-					qpreview.setPixel( x, y, qRgba(q.r, q.g, q.b, q.a) );
+					qpreview.setPixel( x, y, tqRgba(q.r, q.g, q.b, q.a) );
 				}
 			}
 			appendItem( infogroup, "Thumbnail", qpreview);
@@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 #endif
 			TQString UTCOffset;
 			if (utcOffset(h)>0.0) {
-				UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
+				UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1));
 				UTCOffset.append(" hours behind UTC");
 			} else {
-				UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
+				UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
 				UTCOffset.append(" hours ahead of UTC");
 			}
 			appendItem( stdgroup, "UTC Offset", UTCOffset); 
@@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 		if ( hasLongitude(h) ) {
 			TQString Longitude;
 			if (longitude(h)<0.0) {
-				Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3));
+				Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3));
 				Longitude.append(" deg West");
 			} else {
-				Longitude.append(TQString("%1").arg(longitude(h),0,'f',3));
+				Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3));
 				Longitude.append(" deg East");
 			}
 			appendItem( stdgroup, "Longitude", Longitude);
@@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 		if ( hasLatitude(h) ) {
 			TQString Latitude;
 			if (latitude(h)<0.0) {
-				Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3));
+				Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3));
 				Latitude.append(" deg South");
 			} else {
-				Latitude.append(TQString("%1").arg(latitude(h),0,'f',3));
+				Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3));
 				Latitude.append(" deg North");
 			}
 			appendItem( stdgroup, "Latitude", Latitude );
 		}
 		if ( hasAltitude(h) ) {
 			double Altitude = altitude(h);
-			appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) );
+			appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) );
 		}
 		if ( hasIsoSpeed(h) ) {
 			double IsoSpeed = isoSpeed(h);
@@ -344,7 +344,7 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 		// This section deals with some special case stuff for a 3D Studio Max
 		// plugin from Splutterfish. The weird construction is an
 		// attempt to to deal with class conversion. C++ string handling
-		// without Qt is a pain...
+		// without TQt is a pain...
 		const StringAttribute *ver3DSM = h.findTypedAttribute <StringAttribute> ("version3dsMax");
 		if (ver3DSM) {
 			std::string ver3DSMstring = ver3DSM->value();
diff --git a/kfile-plugins/exr/kfile_exr.h b/kfile-plugins/exr/kfile_exr.h
index d3718792..ef718b37 100644
--- a/kfile-plugins/exr/kfile_exr.h
+++ b/kfile-plugins/exr/kfile_exr.h
@@ -29,9 +29,10 @@ class TQStringList;
 class KExrPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KExrPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
+    KExrPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo( KFileMetaInfo& info, uint );
 };
diff --git a/kfile-plugins/gif/gif-info.1 b/kfile-plugins/gif/gif-info.1
index 6c36b1c4..f5397472 100644
--- a/kfile-plugins/gif/gif-info.1
+++ b/kfile-plugins/gif/gif-info.1
@@ -15,7 +15,7 @@ displays information about the given gif (Graphic Interchange Format) image.  If
 .PP
 Write a empty comment ('') to delete the comment block.
 .PP
-The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 unicode format.
+The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 tqunicode format.
 
 .SH "SEE ALSO"
 .BR wrjpgcom (1)
diff --git a/kfile-plugins/gif/kfile_gif.cpp b/kfile-plugins/gif/kfile_gif.cpp
index ce54458b..9c45f257 100644
--- a/kfile-plugins/gif/kfile_gif.cpp
+++ b/kfile-plugins/gif/kfile_gif.cpp
@@ -42,9 +42,9 @@ typedef KGenericFactory<KGifPlugin> GifFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_gif, GifFactory("kfile_gif"))
 
-KGifPlugin::KGifPlugin(TQObject *parent, const char *name,
+KGifPlugin::KGifPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "gif KFileMetaInfo plugin\n";
 
@@ -76,7 +76,7 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what )
     TQFile file(info.path());
 
     if (!file.open(IO_ReadOnly)) {
-	kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+	kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
 	return false;
     }
 
@@ -84,9 +84,9 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     bool isGIF87a = false;
     char magic[7];
-    Q_UINT16 width = 0;
-    Q_UINT16 height = 0;
-    Q_UINT8 miscInfo = 0;
+    TQ_UINT16 width = 0;
+    TQ_UINT16 height = 0;
+    TQ_UINT8 miscInfo = 0;
 
     fstream.readRawBytes( magic, 6 ); 
     magic[6] = 0x00; // null terminate
diff --git a/kfile-plugins/gif/kfile_gif.h b/kfile-plugins/gif/kfile_gif.h
index f4c0be51..a5d69910 100644
--- a/kfile-plugins/gif/kfile_gif.h
+++ b/kfile-plugins/gif/kfile_gif.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KGifPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KGifPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KGifPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo ( KFileMetaInfo& info, uint what );
 };
diff --git a/kfile-plugins/ico/kfile_ico.cpp b/kfile-plugins/ico/kfile_ico.cpp
index e85935fb..2bc46298 100644
--- a/kfile-plugins/ico/kfile_ico.cpp
+++ b/kfile-plugins/ico/kfile_ico.cpp
@@ -44,10 +44,10 @@ typedef KGenericFactory<KIcoPlugin> IcoFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ico, IcoFactory( "kfile_ico" ))
 
-KIcoPlugin::KIcoPlugin(TQObject *parent, const char *name,
+KIcoPlugin::KIcoPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-ico" );
 
@@ -75,7 +75,7 @@ bool KIcoPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     if (!file.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
diff --git a/kfile-plugins/ico/kfile_ico.h b/kfile-plugins/ico/kfile_ico.h
index b354fe22..81ef53af 100644
--- a/kfile-plugins/ico/kfile_ico.h
+++ b/kfile-plugins/ico/kfile_ico.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KIcoPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KIcoPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KIcoPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp
index b6a2f88b..dd93bd7e 100644
--- a/kfile-plugins/jpeg/exif.cpp
+++ b/kfile-plugins/jpeg/exif.cpp
@@ -116,7 +116,7 @@ static int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
 #define TAG_WHITEBALANCE      0x9208
 #define TAG_METERING_MODE     0x9207
 #define TAG_EXPOSURE_PROGRAM  0x8822
-#define TAG_ISO_EQUIVALENT    0x8827
+#define TAG_ISO_ETQUIVALENT    0x8827
 #define TAG_COMPRESSION_LEVEL 0x9102
 
 #define TAG_THUMBNAIL_OFFSET  0x0201
@@ -135,7 +135,7 @@ static int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
   {   0x10F,   "Make"},
   {   0x110,   "Model"},
   {   0x111,   "StripOffsets"},
-  {   0x112,   "Orientation"},
+  {   0x112,   "Qt::Orientation"},
   {   0x115,   "SamplesPerPixel"},
   {   0x116,   "RowsPerStrip"},
   {   0x117,   "StripByteCounts"},
@@ -282,7 +282,7 @@ int ExifData::ReadJpegSections (TQFile & infile, ReadMode_t ReadMode)
                 if (ReadMode & READ_IMAGE){
                     unsigned long size;
 
-                    size = kMax( 0ul, infile.size()-infile.at() );
+                    size = kMax( 0ul, (unsigned long)(infile.size()-infile.at()) );
                     Data = (uchar *)malloc(size);
                     if (Data == NULL){
                         throw FatalError("could not allocate data for entire image");
@@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
         switch(Tag){
 
             case TAG_MAKE:
-                ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31);
+                ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31);
                 break;
 
             case TAG_MODEL:
-                ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39);
+                ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39);
 		break;
 
             case TAG_ORIENTATION:
@@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                 break;
 
             case TAG_DATETIME_ORIGINAL:
-		DateTime = TQString::fromLatin1((const char*)ValuePtr, 19);
+		DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19);
                 break;
 
             case TAG_USERCOMMENT:
@@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                         int c;
                         c = (ValuePtr)[a];
                         if (c != '\0' && c != ' '){
-                            UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199);
+                            UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199);
                             break;
                         }
                     }
                 }else{
-                    UserComment = TQString::fromLatin1((const char*)ValuePtr, 199);
+                    UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199);
                 }
                 break;
 
@@ -660,7 +660,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                 ExifData::ExposureProgram = (int)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
-            case TAG_ISO_EQUIVALENT:
+            case TAG_ISO_ETQUIVALENT:
                 ExifData::ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
                 if ( ExifData::ISOequivalent < 50 ) ExifData::ISOequivalent *= 200;
                 break;
@@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length)
             // printf("Exif section in Motorola order\n");
             MotorolaOrder = 1;
         }else{
-            throw FatalError("Invalid Exif alignment marker.");
+            throw FatalError("Invalid Exif tqalignment marker.");
         }
     }
 
diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp
index 5c7e8076..86170b8b 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.cpp
+++ b/kfile-plugins/jpeg/kfile_jpeg.cpp
@@ -44,9 +44,9 @@ typedef KGenericFactory<KJpegPlugin> JpegFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_jpeg, JpegFactory("kfile_jpeg"))
 
-KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
+KJpegPlugin::KJpegPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args )
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
   kdDebug(7034) << "jpeg plugin\n";
 
@@ -84,7 +84,7 @@ KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
   setHint( item, KFileMimeTypeInfo::Size );
   setUnit( item, KFileMimeTypeInfo::Pixels );
 
-  item = addItemInfo( exifGroup, "Orientation", i18n("Orientation"),
+  item = addItemInfo( exifGroup, "Qt::Orientation", i18n("Qt::Orientation"),
                       TQVariant::Int );
 
   item = addItemInfo( exifGroup, "ColorMode", i18n("Color Mode"),
@@ -148,12 +148,12 @@ KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
 }
 
 TQValidator* KJpegPlugin::createValidator(const KFileMetaInfoItem& /*item*/,
-                                        TQObject */*parent*/,
+                                        TQObject */*tqparent*/,
                                          const char */*name*/ ) const
 {
     // no need to return a validator that validates everything as OK :)
 //     if (item.isEditable())
-//         return new TQRegExpValidator(TQRegExp(".*"), parent, name);
+//         return new TQRegExpValidator(TQRegExp(".*"), tqparent, name);
 //     else
     return 0L;
 }
@@ -178,7 +178,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const
     */
     /*
         The jpeg standard does not regulate the contents of the COM block.
-        I'm assuming the best thing to do here is write as unicode utf-8,
+        I'm assuming the best thing to do here is write as tqunicode utf-8,
         which is fully backwards compatible with readers expecting ascii.
         Readers expecting a national character set are out of luck...
     */
@@ -242,7 +242,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
                                                ImageInfo.getHeight() ) );
 
     if ( ImageInfo.getOrientation() )
-        appendItem( exifGroup, "Orientation", ImageInfo.getOrientation() );
+        appendItem( exifGroup, "Qt::Orientation", ImageInfo.getOrientation() );
 
     appendItem( exifGroup, "ColorMode", ImageInfo.getIsColor() ?
                 i18n("Color") : i18n("Black and white") );
@@ -286,7 +286,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (ImageInfo.getFocalLength()){
     	appendItem( exifGroup, "Focal length",
-                    TQString().sprintf("%4.1f", ImageInfo.getFocalLength()) );
+                    TQString(TQString().sprintf("%4.1f", ImageInfo.getFocalLength()) ));
 
         if (ImageInfo.getCCDWidth()){
             appendItem( exifGroup, "35mm equivalent",
@@ -296,7 +296,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (ImageInfo.getCCDWidth()){
 	appendItem( exifGroup, "CCD width",
-                    TQString().sprintf("%4.2f", ImageInfo.getCCDWidth()) );
+                    TQString(TQString().sprintf("%4.2f", ImageInfo.getCCDWidth()) ));
     }
 
     if (ImageInfo.getExposureTime()){
@@ -310,8 +310,8 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (ImageInfo.getApertureFNumber()){
 	appendItem( exifGroup, "Aperture",
-                    TQString().sprintf("f/%3.1f",
-                                      (double)ImageInfo.getApertureFNumber()));
+                    TQString(TQString().sprintf("f/%3.1f",
+                                      (double)ImageInfo.getApertureFNumber())));
     }
 
     if (ImageInfo.getDistance()){
@@ -325,8 +325,8 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (ImageInfo.getExposureBias()){
 	appendItem( exifGroup, "Exposure bias",
-                    TQString().sprintf("%4.2f",
-                                      (double)ImageInfo.getExposureBias()) );
+                    TQString(TQString().sprintf("%4.2f",
+                                      (double)ImageInfo.getExposureBias()) ));
     }
 
     if (ImageInfo.getWhitebalance() != -1){
@@ -443,8 +443,8 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     if (ImageInfo.getISOequivalent()){
 	appendItem( exifGroup, "ISO equiv.",
-                    TQString().sprintf("%2d",
-                                      (int)ImageInfo.getISOequivalent()) );
+                    TQString(TQString().sprintf("%2d",
+                                      (int)ImageInfo.getISOequivalent()) ));
     }
 
     if (ImageInfo.getCompressionLevel()){
diff --git a/kfile-plugins/jpeg/kfile_jpeg.h b/kfile-plugins/jpeg/kfile_jpeg.h
index 70c14501..ec6861d8 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.h
+++ b/kfile-plugins/jpeg/kfile_jpeg.h
@@ -26,15 +26,16 @@
 class KJpegPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KJpegPlugin( TQObject *parent, const char *name,
+    KJpegPlugin( TQObject *tqparent, const char *name,
                 const TQStringList& args );
 
     virtual bool readInfo ( KFileMetaInfo& info, uint what );
     virtual bool writeInfo( const KFileMetaInfo& info ) const;
     virtual TQValidator* createValidator( const KFileMetaInfoItem& item,
-                                         TQObject* parent, const char* name) const;
+                                         TQObject* tqparent, const char* name) const;
     
 private:
     TQDateTime parseDateTime( const TQString& string ); 
diff --git a/kfile-plugins/pcx/kfile_pcx.cpp b/kfile-plugins/pcx/kfile_pcx.cpp
index 5dceec9d..bd81e3f7 100644
--- a/kfile-plugins/pcx/kfile_pcx.cpp
+++ b/kfile-plugins/pcx/kfile_pcx.cpp
@@ -56,8 +56,8 @@ TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph )
   return s;
 }
 
-KPcxPlugin::KPcxPlugin( TQObject *parent, const char *name,
-        const TQStringList &args ) : KFilePlugin( parent, name, args )
+KPcxPlugin::KPcxPlugin( TQObject *tqparent, const char *name,
+        const TQStringList &args ) : KFilePlugin( tqparent, name, args )
 {
   kdDebug(7034) << "PCX file meta info plugin" << endl;
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-pcx" );
diff --git a/kfile-plugins/pcx/kfile_pcx.h b/kfile-plugins/pcx/kfile_pcx.h
index 2d9b772f..f406e79f 100644
--- a/kfile-plugins/pcx/kfile_pcx.h
+++ b/kfile-plugins/pcx/kfile_pcx.h
@@ -26,16 +26,16 @@ struct PALETTE
 {
   struct
   {
-    Q_UINT8 r;
-    Q_UINT8 g;
-    Q_UINT8 b;
+    TQ_UINT8 r;
+    TQ_UINT8 g;
+    TQ_UINT8 b;
   } p[ 16 ];
 };
 
 struct PCXHEADER
 {
-  Q_UINT8  Manufacturer;    // Constant Flag, 10 = ZSoft .pcx
-  Q_UINT8  Version;         // Version information·
+  TQ_UINT8  Manufacturer;    // Constant Flag, 10 = ZSoft .pcx
+  TQ_UINT8  Version;         // Version information·
                             // 0 = Version 2.5 of PC Paintbrush·
                             // 2 = Version 2.8 w/palette information·
                             // 3 = Version 2.8 w/o palette information·
@@ -45,37 +45,38 @@ struct PCXHEADER
                             //     and PC Paintbrush +, includes
                             //     Publisher's Paintbrush . Includes
                             //     24-bit .PCX files·
-  Q_UINT8  Encoding;        // 1 = .PCX run length encoding
-  Q_UINT8  Bpp;             // Number of bits to represent a pixel
+  TQ_UINT8  Encoding;        // 1 = .PCX run length encoding
+  TQ_UINT8  Bpp;             // Number of bits to represent a pixel
                             // (per Plane) - 1, 2, 4, or 8·
-  Q_UINT16 XMin;
-  Q_UINT16 YMin;
-  Q_UINT16 XMax;
-  Q_UINT16 YMax;
-  Q_UINT16 HDpi;
-  Q_UINT16 YDpi;
+  TQ_UINT16 XMin;
+  TQ_UINT16 YMin;
+  TQ_UINT16 XMax;
+  TQ_UINT16 YMax;
+  TQ_UINT16 HDpi;
+  TQ_UINT16 YDpi;
   struct PALETTE Palette;
-  Q_UINT8  Reserved;        // Should be set to 0.
-  Q_UINT8  NPlanes;         // Number of color planes
-  Q_UINT16 BytesPerLine;    // Number of bytes to allocate for a scanline
+  TQ_UINT8  Reserved;        // Should be set to 0.
+  TQ_UINT8  NPlanes;         // Number of color planes
+  TQ_UINT16 BytesPerLine;    // Number of bytes to allocate for a scanline
                             // plane.  MUST be an EVEN number.  Do NOT
                             // calculate from Xmax-Xmin.·
-  Q_UINT16 PaletteInfo;     // How to interpret palette- 1 = Color/BW,
+  TQ_UINT16 PaletteInfo;     // How to interpret palette- 1 = Color/BW,
                             // 2 = Grayscale ( ignored in PB IV/ IV + )·
-  Q_UINT16 HScreenSize;     // Horizontal screen size in pixels. New field
+  TQ_UINT16 HScreenSize;     //Qt::Horizontal screen size in pixels. New field
                             // found only in PB IV/IV Plus
-  Q_UINT16 VScreenSize;     // Vertical screen size in pixels. New field
+  TQ_UINT16 VScreenSize;     //Qt::Vertical screen size in pixels. New field
                             // found only in PB IV/IV Plus
-  Q_UINT8  Filler[ 54 ];    // Blank to fill out 128 byte header.  Set all
+  TQ_UINT8  Filler[ 54 ];    // Blank to fill out 128 byte header.  Set all
                             // bytes to 0
 };
 
 class KPcxPlugin: public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  KPcxPlugin(TQObject *parent, const char *name, const TQStringList& args);
+  KPcxPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
   virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/pdf/Makefile.am b/kfile-plugins/pdf/Makefile.am
index c8af5244..65a7742b 100644
--- a/kfile-plugins/pdf/Makefile.am
+++ b/kfile-plugins/pdf/Makefile.am
@@ -10,6 +10,7 @@ noinst_HEADERS   = kfile_pdf.h
 
 kde_module_LTLIBRARIES = kfile_pdf.la
 
+kfile_pdf_la_COMPILE_FIRST = poppler-qt
 kfile_pdf_la_SOURCES = kfile_pdf.cpp
 kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/pdf/poppler-qt/ -lpoppler-qt
diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp
index a3dcbde7..d18ada11 100644
--- a/kfile-plugins/pdf/kfile_pdf.cpp
+++ b/kfile-plugins/pdf/kfile_pdf.cpp
@@ -27,8 +27,8 @@ typedef KGenericFactory<KPdfPlugin> PdfFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_pdf, PdfFactory("kfile_pdf"))
 
-KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems)
-    : KFilePlugin(parent, name, preferredItems)
+KPdfPlugin::KPdfPlugin(TQObject *tqparent, const char *name, const TQStringList &preferredItems)
+    : KFilePlugin(tqparent, name, preferredItems)
 {
     kdDebug(7034) << "pdf plugin\n";
 
@@ -83,16 +83,16 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */)
     if (doc->isEncrypted())
     {
     	enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)")
-    	.arg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
-    	.arg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
-    	.arg(doc->okToChange() ? i18n("Yes") : i18n("No"))
-    	.arg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
+    	.tqarg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
+    	.tqarg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
+    	.tqarg(doc->okToChange() ? i18n("Yes") : i18n("No"))
+    	.tqarg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
     }
     else enc = i18n("No");
     
     appendItem(generalGroup, "Protected", enc );
     appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") );
-    TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 );
+    TQString versionString = TQString("%1").tqarg( doc->getPDFVersion(), 0, 'f', 1 );
     appendItem(generalGroup, "Version", versionString );
 
     delete doc;
diff --git a/kfile-plugins/pdf/kfile_pdf.h b/kfile-plugins/pdf/kfile_pdf.h
index eaecdb5d..b14d3989 100644
--- a/kfile-plugins/pdf/kfile_pdf.h
+++ b/kfile-plugins/pdf/kfile_pdf.h
@@ -29,8 +29,9 @@ class TQStringList;
 class KPdfPlugin: public KFilePlugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
+    KPdfPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-document.cc b/kfile-plugins/pdf/poppler-qt/poppler-document.cc
index a9a7a319..40e45469 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-document.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-document.cc
@@ -20,7 +20,7 @@
  */
 
 #include <poppler-qt.h>
-#include <qfile.h>
+#include <tqfile.h>
 #include <GlobalParams.h>
 #include <Outline.h>
 #include <PDFDoc.h>
@@ -36,13 +36,13 @@
 
 namespace Poppler {
 
-Document *Document::load(const QString &filePath)
+Document *Document::load(const TQString &filePath)
 {
   if (!globalParams) {
     globalParams = new GlobalParams();
   }
 
-  DocumentData *doc = new DocumentData(new GooString(QFile::encodeName(filePath)), NULL);
+  DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL);
   Document *pdoc;
   if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) {
     pdoc = new Document(doc);
@@ -72,7 +72,7 @@ bool Document::isLocked() const
   return data->locked;
 }
 
-bool Document::unlock(const QCString &password)
+bool Document::unlock(const TQCString &password)
 {
   if (data->locked) {
     /* racier then it needs to be */
@@ -115,14 +115,14 @@ int Document::getNumPages() const
   return data->doc.getNumPages();
 }
 
-QValueList<FontInfo> Document::fonts() const
+TQValueList<FontInfo> Document::fonts() const
 {
-  QValueList<FontInfo> ourList;
+  TQValueList<FontInfo> ourList;
   scanForFonts(getNumPages(), &ourList);
   return ourList;
 }
 
-bool Document::scanForFonts( int numPages, QValueList<FontInfo> *fontList ) const
+bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) const
 {
   GooList *items = data->m_fontInfoScanner->scan( numPages );
 
@@ -130,7 +130,7 @@ bool Document::scanForFonts( int numPages, QValueList<FontInfo> *fontList ) cons
     return false;
 
   for ( int i = 0; i < items->getLength(); ++i ) {
-    QString fontName;
+    TQString fontName;
     if (((::FontInfo*)items->get(i))->getName())
       fontName = ((::FontInfo*)items->get(i))->getName()->getCString();
 
@@ -145,7 +145,7 @@ bool Document::scanForFonts( int numPages, QValueList<FontInfo> *fontList ) cons
 }
 
 /* borrowed from kpdf */
-QString Document::getInfo( const QString & type ) const
+TQString Document::getInfo( const TQString & type ) const
 {
   // [Albert] Code adapted from pdfinfo.cc on xpdf
   Object info;
@@ -156,7 +156,7 @@ QString Document::getInfo( const QString & type ) const
   if ( !info.isDict() )
     return NULL;
 
-  QString result;
+  TQString result;
   Object obj;
   GooString *s1;
   GBool isUnicode;
@@ -189,7 +189,7 @@ QString Document::getInfo( const QString & type ) const
 	u = s1->getChar(i) & 0xff;
 	++i;
       }
-      result += unicodeToQString( &u, 1 );
+      result += tqunicodeToTQString( &u, 1 );
     }
     obj.free();
     info.free();
@@ -201,43 +201,43 @@ QString Document::getInfo( const QString & type ) const
 }
 
 /* borrowed from kpdf */
-QDateTime Document::getDate( const QString & type ) const
+TQDateTime Document::getDate( const TQString & type ) const
 {
   // [Albert] Code adapted from pdfinfo.cc on xpdf
   if ( data->locked )
-    return QDateTime();
+    return TQDateTime();
 
   Object info;
   data->doc.getDocInfo( &info );
   if ( !info.isDict() ) {
     info.free();
-    return QDateTime();
+    return TQDateTime();
   }
 
   Object obj;
   int year, mon, day, hour, min, sec, tz_hour, tz_minute;
   char tz;
   Dict *infoDict = info.getDict();
-  QString result;
+  TQString result;
 
   if ( infoDict->lookup( (char*)type.latin1(), &obj )->isString() )
   {
-    QString s = UnicodeParsedString(obj.getString());
+    TQString s = UnicodeParsedString(obj.getString());
     // TODO do something with the timezone information
     if ( parseDateString( s.latin1(), &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute ) )
     {
-      QDate d( year, mon, day );  //CHECK: it was mon-1, Jan->0 (??)
-      QTime t( hour, min, sec );
+      TQDate d( year, mon, day );  //CHECK: it was mon-1, Jan->0 (??)
+      TQTime t( hour, min, sec );
       if ( d.isValid() && t.isValid() ) {
 	obj.free();
 	info.free();
-	return QDateTime( d, t );
+	return TQDateTime( d, t );
       }
     }
   }
   obj.free();
   info.free();
-  return QDateTime();
+  return TQDateTime();
 }
 
 bool Document::isEncrypted() const
@@ -283,7 +283,7 @@ void Document::getPdfVersion(int *major, int *minor) const
     *minor = data->doc.getPDFMinorVersion();
 }
 
-QDomDocument *Document::toc() const
+TQDomDocument *Document::toc() const
 {
   Outline * outline = data->doc.getOutline();
   if ( !outline )
@@ -293,33 +293,33 @@ QDomDocument *Document::toc() const
   if ( !items || items->getLength() < 1 )
     return NULL;
 
-  QDomDocument *toc = new QDomDocument();
+  TQDomDocument *toc = new TQDomDocument();
   if ( items->getLength() > 0 )
     data->addTocChildren( toc, toc, items );
 
   return toc;
 }
 
-LinkDestination *Document::linkDestination( const QString &name )
+LinkDestination *Document::linkDestination( const TQString &name )
 {
-  GooString * namedDest = QStringToGooString( name );
+  GooString * namedDest = TQStringToGooString( name );
   LinkDestinationData ldd(NULL, namedDest, data);
   LinkDestination *ld = new LinkDestination(ldd);
   delete namedDest;
   return ld;
 }
 
-bool Document::print(const QString &fileName, QValueList<int> pageList, double hDPI, double vDPI, int rotate)
+bool Document::print(const TQString &fileName, TQValueList<int> pageList, double hDPI, double vDPI, int rotate)
 {
   return print(fileName, pageList, hDPI, vDPI, rotate, -1, -1);
 }
 
-bool Document::print(const QString &file, QValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
+bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
 {
   PSOutputDev *psOut = new PSOutputDev(file.latin1(), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
   
   if (psOut->isOk()) {
-    QValueList<int>::iterator it;
+    TQValueList<int>::iterator it;
     for (it = pageList.begin(); it != pageList.end(); ++it )
       data->doc.displayPage(psOut, *it, hDPI, vDPI, rotate, gFalse, gTrue, gTrue);
     
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc b/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc
index 6eb9d26f..c0e777a7 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc
@@ -23,13 +23,13 @@ namespace Poppler {
 class FontInfoData
 {
 	public:
-		QString fontName;
+		TQString fontName;
 		bool isEmbedded;
 		bool isSubset;
 		FontInfo::Type type;
 };
 
-FontInfo::FontInfo( const QString &fontName, const bool isEmbedded, const bool isSubset, Type type )
+FontInfo::FontInfo( const TQString &fontName, const bool isEmbedded, const bool isSubset, Type type )
 {
 	data = new FontInfoData();
 	data->fontName = fontName;
@@ -60,7 +60,7 @@ FontInfo::~FontInfo()
 	delete data;
 }
 
-const QString &FontInfo::name() const
+const TQString &FontInfo::name() const
 {
 	return data->fontName;
 }
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h b/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h
index 82127207..fc22d8ed 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h
+++ b/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h
@@ -21,8 +21,8 @@
 #ifndef _POPPLER_LINK_H_
 #define _POPPLER_LINK_H_
 
-#include <qstring.h>
-#include <qrect.h>
+#include <tqstring.h>
+#include <tqrect.h>
 
 namespace Poppler {
 
@@ -44,7 +44,7 @@ class LinkDestination
 		};
 
 		LinkDestination(const LinkDestinationData &data);
-		LinkDestination(const QString &description);
+		LinkDestination(const TQString &description);
 
 		// Accessors.
 		Kind kind() const;
@@ -58,7 +58,7 @@ class LinkDestination
 		bool isChangeTop() const;
 		bool isChangeZoom() const;
 
-		QString toString() const;
+		TQString toString() const;
 
 	private:
 		Kind m_kind; // destination type
@@ -80,7 +80,7 @@ class LinkDestination
 class Link
 {
 	public:
-		Link( const QRect &linkArea );
+		Link( const TQRect &linkArea );
 		
 		// get link type (inherited classes mustreturn an unique identifier)
 		enum LinkType { None, Goto, Execute, Browse, Action, Movie };
@@ -89,10 +89,10 @@ class Link
 		// virtual destructor
 		virtual ~Link();
 		
-		QRect linkArea() const;
+		TQRect linkArea() const;
 		
 	private:
-		QRect m_linkArea;
+		TQRect m_linkArea;
 };
 
 
@@ -100,16 +100,16 @@ class Link
 class LinkGoto : public Link
 {
 	public:
-		LinkGoto( const QRect &linkArea, QString extFileName, const LinkDestination & destination );
+		LinkGoto( const TQRect &linkArea, TQString extFileName, const LinkDestination & destination );
 		
 		// query for goto parameters
 		bool isExternal() const;
-		const QString & fileName() const;
+		const TQString & fileName() const;
 		const LinkDestination & destination() const;
 		LinkType linkType() const;
 
 	private:
-		QString m_extFileName;
+		TQString m_extFileName;
 		LinkDestination m_destination;
 };
 
@@ -118,16 +118,16 @@ class LinkExecute : public Link
 {
 	public:
 		// query for filename / parameters
-		const QString & fileName() const;
-		const QString & parameters() const;
+		const TQString & fileName() const;
+		const TQString & parameters() const;
 
 		// create a Link_Execute
-		LinkExecute( const QRect &linkArea, const QString & file, const QString & params );
+		LinkExecute( const TQRect &linkArea, const TQString & file, const TQString & params );
 		LinkType linkType() const;
 
 	private:
-		QString m_fileName;
-		QString m_parameters;
+		TQString m_fileName;
+		TQString m_parameters;
 };
 
 /** Browse: an URL to open, ranging from 'http://' to 'mailto:' etc.. **/
@@ -135,14 +135,14 @@ class LinkBrowse : public Link
 {
 	public:
 		// query for URL
-		const QString & url() const;
+		const TQString & url() const;
 
 		// create a Link_Browse
-		LinkBrowse( const QRect &linkArea, const QString &url );
+		LinkBrowse( const TQRect &linkArea, const TQString &url );
 		LinkType linkType() const;
 
 	private:
-		QString m_url;
+		TQString m_url;
 };	
 
 /** Action: contains an action to perform on document / viewer **/
@@ -167,7 +167,7 @@ class LinkAction : public Link
 		ActionType actionType() const;
 
 		// create a Link_Action
-		LinkAction( const QRect &linkArea, ActionType actionType );
+		LinkAction( const TQRect &linkArea, ActionType actionType );
 		LinkType linkType() const;
 
 	private:
@@ -179,7 +179,7 @@ class LinkMovie : public Link
 // TODO this (Movie link)
 {
 	public:
-		LinkMovie( const QRect &linkArea );
+		LinkMovie( const TQRect &linkArea );
 		LinkType linkType() const;
 };
 
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-link.cc b/kfile-plugins/pdf/poppler-qt/poppler-link.cc
index af6d6452..72db1fff 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-link.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-link.cc
@@ -21,7 +21,7 @@
 #include <poppler-qt.h>
 #include <poppler-private.h>
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include <Link.h>
 
@@ -80,9 +80,9 @@ namespace Poppler {
 		if (deleteDest) delete ld;
 	}
 	
-	LinkDestination::LinkDestination(const QString &description)
+	LinkDestination::LinkDestination(const TQString &description)
 	{
-		QStringList tokens = QStringList::split(';', description);
+		TQStringList tokens = TQStringList::split(';', description);
 		m_kind = static_cast<Kind>(tokens[0].toInt());
 		m_pageNum = tokens[1].toInt();
 		m_left = tokens[2].toDouble();
@@ -145,18 +145,18 @@ namespace Poppler {
 		return m_changeZoom;
 	}
 	
-	QString LinkDestination::toString() const
-	{
-		QString s = QString::number( (Q_INT8)m_kind );
-		s += ";" + QString::number( m_pageNum );
-		s += ";" + QString::number( m_left );
-		s += ";" + QString::number( m_bottom );
-		s += ";" + QString::number( m_right );
-		s += ";" + QString::number( m_top );
-		s += ";" + QString::number( m_zoom );
-		s += ";" + QString::number( (Q_INT8)m_changeLeft );
-		s += ";" + QString::number( (Q_INT8)m_changeTop );
-		s += ";" + QString::number( (Q_INT8)m_changeZoom );
+	TQString LinkDestination::toString() const
+	{
+		TQString s = TQString::number( (TQ_INT8)m_kind );
+		s += ";" + TQString::number( m_pageNum );
+		s += ";" + TQString::number( m_left );
+		s += ";" + TQString::number( m_bottom );
+		s += ";" + TQString::number( m_right );
+		s += ";" + TQString::number( m_top );
+		s += ";" + TQString::number( m_zoom );
+		s += ";" + TQString::number( (TQ_INT8)m_changeLeft );
+		s += ";" + TQString::number( (TQ_INT8)m_changeTop );
+		s += ";" + TQString::number( (TQ_INT8)m_changeZoom );
 		return s;
 	}
 	
@@ -166,7 +166,7 @@ namespace Poppler {
 	{
 	}
 	
-	Link::Link(const QRect &linkArea) : m_linkArea(linkArea)
+	Link::Link(const TQRect &linkArea) : m_linkArea(linkArea)
 	{
 	}
 	
@@ -175,13 +175,13 @@ namespace Poppler {
 		return None;
 	}
 	
-	QRect Link::linkArea() const
+	TQRect Link::linkArea() const
 	{
 		return m_linkArea;
 	}
 	
 	// LinkGoto
-	LinkGoto::LinkGoto( const QRect &linkArea, QString extFileName, const LinkDestination & destination ) : Link(linkArea), m_extFileName(extFileName), m_destination(destination)
+	LinkGoto::LinkGoto( const TQRect &linkArea, TQString extFileName, const LinkDestination & destination ) : Link(linkArea), m_extFileName(extFileName), m_destination(destination)
 	{
 	}
 	
@@ -190,7 +190,7 @@ namespace Poppler {
 		return !m_extFileName.isEmpty();
 	}
 	
-	const QString &LinkGoto::fileName() const
+	const TQString &LinkGoto::fileName() const
 	{
 		return m_extFileName;
 	}
@@ -206,15 +206,15 @@ namespace Poppler {
 	}
 	
 	// LinkExecute
-	LinkExecute::LinkExecute( const QRect &linkArea, const QString & file, const QString & params ) : Link(linkArea), m_fileName(file), m_parameters(params)
+	LinkExecute::LinkExecute( const TQRect &linkArea, const TQString & file, const TQString & params ) : Link(linkArea), m_fileName(file), m_parameters(params)
 	{
 	}
 	
-	const QString & LinkExecute::fileName() const
+	const TQString & LinkExecute::fileName() const
 	{
 		return m_fileName;
 	}
-	const QString & LinkExecute::parameters() const
+	const TQString & LinkExecute::parameters() const
 	{
 		return m_parameters;
 	}
@@ -225,11 +225,11 @@ namespace Poppler {
 	}
 
 	// LinkBrowse
-	LinkBrowse::LinkBrowse( const QRect &linkArea, const QString &url ) : Link(linkArea), m_url(url)
+	LinkBrowse::LinkBrowse( const TQRect &linkArea, const TQString &url ) : Link(linkArea), m_url(url)
 	{
 	}
 	
-	const QString & LinkBrowse::url() const
+	const TQString & LinkBrowse::url() const
 	{
 		return m_url;
 	}
@@ -240,7 +240,7 @@ namespace Poppler {
 	}
 
 	// LinkAction
-	LinkAction::LinkAction( const QRect &linkArea, ActionType actionType ) : Link(linkArea), m_type(actionType)
+	LinkAction::LinkAction( const TQRect &linkArea, ActionType actionType ) : Link(linkArea), m_type(actionType)
 	{
 	}
 		
@@ -255,7 +255,7 @@ namespace Poppler {
 	}
 
 	// LinkMovie
-	LinkMovie::LinkMovie( const QRect &linkArea ) : Link(linkArea)
+	LinkMovie::LinkMovie( const TQRect &linkArea ) : Link(linkArea)
 	{
 	}
 	
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc b/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc
index cde8818d..9998f738 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc
@@ -68,7 +68,7 @@ int PageTransition::duration() const
   return data->pt->getDuration();
 }
 
-PageTransition::Alignment PageTransition::alignment() const
+PageTransition::Alignment PageTransition::tqalignment() const
 {
   return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
 }
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h b/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h
index 53002ff9..f33a014c 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h
+++ b/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h
@@ -60,7 +60,7 @@ class PageTransition {
     Fade
   };
   
-  /** \brief alignment of the transition effect that shall be used
+  /** \brief tqalignment of the transition effect that shall be used
    */
   // if changed remember to keep in sync with PageTransition.h enum
   enum Alignment {
@@ -114,7 +114,7 @@ class PageTransition {
   /**
      \brief Get dimension in which the transition effect occurs.
   */
-  Alignment alignment() const;
+  Alignment tqalignment() const;
   
   /**
      \brief Get direction of motion of the transition effect.
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page.cc b/kfile-plugins/pdf/poppler-qt/poppler-page.cc
index a42aa15c..b6be9bd1 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-page.cc
@@ -23,8 +23,8 @@
  */
 
 #include <poppler-qt.h>
-#include <qfile.h>
-#include <qimage.h>
+#include <tqfile.h>
+#include <tqimage.h>
 #include <config.h>
 #include <GlobalParams.h>
 #include <PDFDoc.h>
@@ -62,18 +62,18 @@ Page::~Page()
   delete data;
 }
 
-void Page::renderToPixmap(QPixmap **q, int x, int y, int w, int h, bool doLinks) const
+void Page::renderToPixmap(TQPixmap **q, int x, int y, int w, int h, bool doLinks) const
 {
   renderToPixmap(q, x, y, w, h, 72.0, 72.0, doLinks);
 }
 
-void Page::renderToPixmap(QPixmap **q, int x, int y, int w, int h, double xres, double yres, bool doLinks) const
+void Page::renderToPixmap(TQPixmap **q, int x, int y, int w, int h, double xres, double yres, bool doLinks) const
 {
-  QImage img = renderToImage(xres, yres, doLinks);
-  *q = new QPixmap( img );
+  TQImage img = renderToImage(xres, yres, doLinks);
+  *q = new TQPixmap( img );
 }
 
-QImage Page::renderToImage(double xres, double yres, bool doLinks) const
+TQImage Page::renderToImage(double xres, double yres, bool doLinks) const
 {
 #if defined(HAVE_SPLASH)
   SplashOutputDev *output_dev;
@@ -89,7 +89,7 @@ QImage Page::renderToImage(double xres, double yres, bool doLinks) const
   int bh = output_dev->getBitmap()->getHeight();
   SplashColorPtr dataPtr = output_dev->getBitmap()->getDataPtr();
   
-  if (QImage::BigEndian == QImage::systemByteOrder())
+  if (TQImage::BigEndian == TQImage::systemByteOrder())
   {
     uchar c;
     int count = bw * bh * 4;
@@ -106,7 +106,7 @@ QImage Page::renderToImage(double xres, double yres, bool doLinks) const
   }
   
   // construct a qimage SHARING the raw bitmap data in memory
-  QImage img( dataPtr, bw, bh, 32, 0, 0, QImage::IgnoreEndian );
+  TQImage img( dataPtr, bw, bh, 32, 0, 0, TQImage::IgnoreEndian );
   img = img.copy();
   // unload underlying xpdf bitmap
   output_dev->startPage( 0, NULL );
@@ -117,16 +117,16 @@ QImage Page::renderToImage(double xres, double yres, bool doLinks) const
   (void)xres;
   (void)doLinks;
 
-  return QImage();
+  return TQImage();
 #endif
 }
 
-QString Page::getText(const Rectangle &r) const
+TQString Page::getText(const Rectangle &r) const
 {
   TextOutputDev *output_dev;
   GooString *s;
   PDFRectangle *rect;
-  QString result;
+  TQString result;
   ::Page *p;
   
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -147,18 +147,18 @@ QString Page::getText(const Rectangle &r) const
     s = output_dev->getText(r.m_x1, y1, r.m_x2, y2);
   }
 
-  result = QString::fromUtf8(s->getCString());
+  result = TQString::fromUtf8(s->getCString());
 
   delete output_dev;
   delete s;
   return result;
 }
 
-QValueList<TextBox*> Page::textList() const
+TQValueList<TextBox*> Page::textList() const
 {
   TextOutputDev *output_dev;
   
-  QValueList<TextBox*> output_list;
+  TQValueList<TextBox*> output_list;
   
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
 
@@ -175,7 +175,7 @@ QValueList<TextBox*> Page::textList() const
   for (int i = 0; i < word_list->getLength(); i++) {
     TextWord *word = word_list->get(i);
     GooString *word_str = word->getText();
-    QString string = QString::fromUtf8(word_str->getCString());
+    TQString string = TQString::fromUtf8(word_str->getCString());
     delete word_str;
     double xMin, yMin, xMax, yMax;
     word->getBBox(&xMin, &yMin, &xMax, &yMax);
@@ -204,15 +204,15 @@ PageTransition *Page::getTransition() const
   return data->transition;
 }
 
-QSize Page::pageSize() const
+TQSize Page::pageSize() const
 {
   ::Page *p;
 
   p = data->doc->data->doc.getCatalog()->getPage(data->index + 1);
   if ( ( Page::Landscape == orientation() ) || (Page::Seascape == orientation() ) ) {
-    return QSize( (int)p->getCropHeight(), (int)p->getCropWidth() );
+    return TQSize( (int)p->getCropHeight(), (int)p->getCropWidth() );
   } else {
-    return QSize( (int)p->getCropWidth(), (int)p->getCropHeight() );
+    return TQSize( (int)p->getCropWidth(), (int)p->getCropHeight() );
   }
 }
 
@@ -236,9 +236,9 @@ Page::Orientation Page::orientation() const
   }
 }
 
-QValueList<Link*> Page::links() const
+TQValueList<Link*> Page::links() const
 {
-  QValueList<Link*> popplerLinks;
+  TQValueList<Link*> popplerLinks;
 
 #if defined(HAVE_SPLASH)
   Links *xpdfLinks = data->doc->data->doc.getLinks(data->index + 1);
@@ -249,7 +249,7 @@ QValueList<Link*> Page::links() const
     double left, top, right, bottom;
     int leftAux, topAux, rightAux, bottomAux;
     xpdfLink->getRect( &left, &top, &right, &bottom );
-    QRect linkArea;
+    TQRect linkArea;
     
     data->doc->data->m_outputDev->cvtUserToDev( left, top, &leftAux, &topAux );
     data->doc->data->m_outputDev->cvtUserToDev( right, bottom, &rightAux, &bottomAux );
@@ -270,7 +270,7 @@ QValueList<Link*> Page::links() const
         {
           LinkGoTo * g = (LinkGoTo *) a;
           // create link: no ext file, namedDest, object pointer
-          popplerLink = new LinkGoto( linkArea, QString::null, LinkDestination( LinkDestinationData(g->getDest(), g->getNamedDest(), data->doc->data ) ) );
+          popplerLink = new LinkGoto( linkArea, TQString(), LinkDestination( LinkDestinationData(g->getDest(), g->getNamedDest(), data->doc->data ) ) );
         }
         break;
 
@@ -278,7 +278,7 @@ QValueList<Link*> Page::links() const
         {
           LinkGoToR * g = (LinkGoToR *) a;
           // copy link file
-          const QString fileName = UnicodeParsedString( g->getFileName() );
+          const TQString fileName = UnicodeParsedString( g->getFileName() );
           // ceate link: fileName, namedDest, object pointer
           popplerLink = new LinkGoto( linkArea, fileName, LinkDestination( LinkDestinationData(g->getDest(), g->getNamedDest(), data->doc->data ) ) );
         }
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-private.cc b/kfile-plugins/pdf/poppler-qt/poppler-private.cc
index 2388a1b5..6d209c2b 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-private.cc
+++ b/kfile-plugins/pdf/poppler-qt/poppler-private.cc
@@ -23,7 +23,7 @@
 #include "poppler-private.h"
 #include "poppler-link-qt3.h"
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <Outline.h>
 #include <Link.h>
@@ -31,22 +31,22 @@
 namespace Poppler {
 
 /* borrowed from kpdf */
-QString unicodeToQString(Unicode* u, int len)
+TQString tqunicodeToTQString(Unicode* u, int len)
 {
-    QString ret;
+    TQString ret;
     ret.setLength(len);
-    QChar* qch = (QChar*) ret.unicode();
+    TQChar* qch = (TQChar*) ret.tqunicode();
     for (;len;--len)
-      *qch++ = (QChar) *u++;
+      *qch++ = (TQChar) *u++;
     return ret;
 }
 
-QString UnicodeParsedString(GooString *s1)
+TQString UnicodeParsedString(GooString *s1)
 {
     GBool isUnicode;
     int i;
     Unicode u;
-    QString result;
+    TQString result;
     if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff )
     {
         isUnicode = gTrue;
@@ -69,24 +69,24 @@ QString UnicodeParsedString(GooString *s1)
             u = s1->getChar(i) & 0xff;
             ++i;
         }
-        result += unicodeToQString( &u, 1 );
+        result += tqunicodeToTQString( &u, 1 );
     }
     return result;
 }
 
-GooString *QStringToGooString(const QString &s)
+GooString *TQStringToGooString(const TQString &s)
 {
     int len = s.length();
     char *cstring = (char *)gmallocn(s.length(), sizeof(char));
     for (int i = 0; i < len; ++i)
-      cstring[i] = s.at(i).unicode();
+      cstring[i] = s.tqat(i).tqunicode();
     GooString *ret = new GooString(cstring, len);
     gfree(cstring);
     return ret;
 }
 
 
-void DocumentData::addTocChildren( QDomDocument * docSyn, QDomNode * parent, GooList * items )
+void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items )
 {
     int numItems = items->getLength();
     for ( int i = 0; i < numItems; ++i )
@@ -95,15 +95,15 @@ void DocumentData::addTocChildren( QDomDocument * docSyn, QDomNode * parent, Goo
         OutlineItem * outlineItem = (OutlineItem *)items->get( i );
 
         // 1. create element using outlineItem's title as tagName
-        QString name;
+        TQString name;
         Unicode * uniChar = outlineItem->getTitle();
         int titleLength = outlineItem->getTitleLength();
-        name = unicodeToQString(uniChar, titleLength);
+        name = tqunicodeToTQString(uniChar, titleLength);
         if ( name.isEmpty() )
             continue;
 
-        QDomElement item = docSyn->createElement( name );
-        parent->appendChild( item );
+        TQDomElement item = docSyn->createElement( name );
+        tqparent->appendChild( item );
 
         // 2. find the page the link refers to
         ::LinkAction * a = outlineItem->getAction();
@@ -118,9 +118,9 @@ void DocumentData::addTocChildren( QDomDocument * docSyn, QDomNode * parent, Goo
                 // get the destination for the page now, but it's VERY time consuming,
                 // so better storing the reference and provide the viewport on demand
                 GooString *s = g->getNamedDest();
-                QChar *charArray = new QChar[s->getLength()];
-                for (int i = 0; i < s->getLength(); ++i) charArray[i] = QChar(s->getCString()[i]);
-                    QString aux(charArray, s->getLength());
+                TQChar *charArray = new TQChar[s->getLength()];
+                for (int i = 0; i < s->getLength(); ++i) charArray[i] = TQChar(s->getCString()[i]);
+                    TQString aux(charArray, s->getLength());
                     item.setAttribute( "DestinationName", aux );
                     delete[] charArray;
                 }
@@ -136,11 +136,11 @@ void DocumentData::addTocChildren( QDomDocument * docSyn, QDomNode * parent, Goo
                 }
             }
 
-        // 3. recursively descend over children
+        // 3. recursively descend over tqchildren
         outlineItem->open();
-        GooList * children = outlineItem->getKids();
-        if ( children )
-            addTocChildren( docSyn, &item, children );
+        GooList * tqchildren = outlineItem->getKids();
+        if ( tqchildren )
+            addTocChildren( docSyn, &item, tqchildren );
     }
 }
 
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-private.h b/kfile-plugins/pdf/poppler-qt/poppler-private.h
index 0d68e505..b1b79084 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-private.h
+++ b/kfile-plugins/pdf/poppler-qt/poppler-private.h
@@ -23,7 +23,7 @@
 #ifndef POPPLER_PRIVATE_H
 #define POPPLER_PRIVATE_H
 
-#include <qdom.h>
+#include <tqdom.h>
 
 #include <config.h>
 #include <Object.h>
@@ -39,11 +39,11 @@ namespace Poppler {
     
 class DocumentData;
 
-QString unicodeToQString(Unicode* u, int len);
+TQString tqunicodeToTQString(Unicode* u, int len);
 
-QString UnicodeParsedString(GooString *s1);
+TQString UnicodeParsedString(GooString *s1);
 
-GooString *QStringToGooString(const QString &s);
+GooString *TQStringToGooString(const TQString &s);
 
 class LinkDestinationData {
   public:
@@ -84,7 +84,7 @@ class DocumentData {
         return m_outputDev;
     }
 
-    void addTocChildren( QDomDocument * docSyn, QDomNode * parent, GooList * items );
+    void addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items );
 
   class PDFDoc doc;
   bool locked;
diff --git a/kfile-plugins/pdf/poppler-qt/poppler-qt.h b/kfile-plugins/pdf/poppler-qt/poppler-qt.h
index a6b1e6ec..9150ee3b 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-qt.h
+++ b/kfile-plugins/pdf/poppler-qt/poppler-qt.h
@@ -20,16 +20,16 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __POPPLER_QT_H__
-#define __POPPLER_QT_H__
+#ifndef __POPPLER_TQT_H__
+#define __POPPLER_TQT_H__
 
 #include "poppler-link-qt3.h"
 #include "poppler-page-transition.h"
 
-#include <qcstring.h>
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qpixmap.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
+#include <tqdom.h>
+#include <tqpixmap.h>
 
 namespace Poppler {
 
@@ -53,14 +53,14 @@ class Rectangle
 class TextBox
 {
  public:
-    TextBox(const QString& text, const Rectangle &bBox) :
+    TextBox(const TQString& text, const Rectangle &bBox) :
     m_text(text), m_bBox(bBox) {};
 
-    QString getText() const { return m_text; };
+    TQString getText() const { return m_text; };
     Rectangle getBoundingBox() const { return m_bBox; };
 
   private:
-    QString m_text;
+    TQString m_text;
     Rectangle m_bBox;
 };
 
@@ -89,7 +89,7 @@ public:
   /**
     Create a new font information container
   */
-  FontInfo( const QString &fontName, const bool isEmbedded,
+  FontInfo( const TQString &fontName, const bool isEmbedded,
             const bool isSubset, Type type );
 
   FontInfo();
@@ -99,9 +99,9 @@ public:
   ~FontInfo();
 
   /**
-    The name of the font. Can be QString::null if the font has no name
+    The name of the font. Can be TQString() if the font has no name
   */
-  const QString &name() const;
+  const TQString &name() const;
 
   /**
     Whether the font is embedded in the file, or not
@@ -123,7 +123,7 @@ public:
   */
   Type type() const;
 
-  const QString &typeName() const;
+  const TQString &typeName() const;
 
 private:
   FontInfoData *data;
@@ -134,7 +134,7 @@ class Page {
   friend class Document;
   public:
     ~Page();
-    void renderToPixmap(QPixmap **q, int x, int y, int w, int h, double xres, double yres, bool doLinks = false) const;
+    void renderToPixmap(TQPixmap **q, int x, int y, int w, int h, double xres, double yres, bool doLinks = false) const;
 
     /**
       This is a convenience function that is equivalent to
@@ -143,12 +143,12 @@ class Page {
 
       \sa renderToImage()
      */
-    void renderToPixmap(QPixmap **q, int x, int y, int w, int h, bool doLinks = false) const;
+    void renderToPixmap(TQPixmap **q, int x, int y, int w, int h, bool doLinks = false) const;
 
     /**
-      \brief Render the page to a QImage using the Splash renderer
+      \brief Render the page to a TQImage using the Splash renderer
 
-     This method can be used to render the page to a QImage. It
+     This method can be used to render the page to a TQImage. It
      uses the "Splash" rendering engine.
 
      \param xres horizontal resolution of the graphics device,
@@ -157,24 +157,24 @@ class Page {
      \param yres vertical resolution of the graphics device, in
      dots per inch (defaults to 72 dpi)
 
-     \returns a QImage of the page.
+     \returns a TQImage of the page.
 
      \sa renderToPixmap()
     */
-    QImage renderToImage(double xres = 72.0, double yres = 72.0, bool doLinks = false) const;
+    TQImage renderToImage(double xres = 72.0, double yres = 72.0, bool doLinks = false) const;
 
     /**
      * Returns the size of the page in points
      **/
-    QSize pageSize() const;
+    TQSize pageSize() const;
 
     /**
     * Returns the text that is inside the Rectangle r
     * If r is a null Rectangle all text of the page is given
     **/
-    QString getText(const Rectangle &r) const;
+    TQString getText(const Rectangle &r) const;
 
-    QValueList<TextBox*> textList() const;
+    TQValueList<TextBox*> textList() const;
 
     /**
     * Returns the transition of this page
@@ -196,7 +196,7 @@ class Page {
     /**
       Gets the links of the page once it has been rendered if doLinks was true
     */
-    QValueList<Link*> links() const;
+    TQValueList<Link*> links() const;
 
   private:
     Page(const Document *doc, int index);
@@ -217,7 +217,7 @@ public:
     UseOC
   };
   
-  static Document *load(const QString & filePath);
+  static Document *load(const TQString & filePath);
   
   Page *getPage(int index) const{ return new Page(this, index); }
   
@@ -225,12 +225,12 @@ public:
   
   PageMode getPageMode() const;
   
-  bool unlock(const QCString &password);
+  bool unlock(const TQCString &password);
   
   bool isLocked() const;
   
-  QDateTime getDate( const QString & data ) const;
-  QString getInfo( const QString & data ) const;
+  TQDateTime getDate( const TQString & data ) const;
+  TQString getInfo( const TQString & data ) const;
   bool isEncrypted() const;
   bool isLinearized() const;
   bool okToPrint() const;
@@ -251,16 +251,16 @@ public:
   */
   void getPdfVersion(int *major, int *minor) const;
 
-  bool print(const QString &fileName, QValueList<int> pageList, double hDPI, double vDPI, int rotate);
+  bool print(const TQString &fileName, TQValueList<int> pageList, double hDPI, double vDPI, int rotate);
 
-  // If you are using QPrinter you can get paper size doing
-  // QPrinter dummy(QPrinter::PrinterResolution);
+  // If you are using TQPrinter you can get paper size doing
+  // TQPrinter dummy(TQPrinter::PrinterResolution);
   // dummy.setFullPage(true);
   // dummy.setPageSize(thePageSizeYouWant);
-  // QPaintDeviceMetrics metrics(&dummy);
+  // TQPaintDeviceMetrics metrics(&dummy);
   // int width = metrics.width();
   // int height = metrics.height();
-  bool print(const QString &fileName, QValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight);
+  bool print(const TQString &fileName, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight);
 
   /**
     The fonts within the PDF document.
@@ -269,7 +269,7 @@ public:
     document. You may wish to use the call below if you have more
     than say 20 pages
   */
-  QValueList<FontInfo> fonts() const;
+  TQValueList<FontInfo> fonts() const;
 
   /**
     \overload
@@ -280,7 +280,7 @@ public:
 
     \return false if the end of the document has been reached
   */
-  bool scanForFonts( int numPages, QValueList<FontInfo> *fontList ) const;
+  bool scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) const;
 
   /**
     Gets the TOC of the Document, it is application responsabiliy to delete
@@ -295,9 +295,9 @@ public:
 
      \returns NULL if the Document does not have TOC
   */
-  QDomDocument *toc() const;
+  TQDomDocument *toc() const;
 
-  LinkDestination *linkDestination( const QString &name );
+  LinkDestination *linkDestination( const TQString &name );
 
   ~Document();
   
diff --git a/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp b/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp
index d97954b8..d616290d 100644
--- a/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp
+++ b/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp
@@ -1,27 +1,27 @@
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qfile.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqmessagebox.h>
+#include <tqfile.h>
 #include <ctype.h>
 #include <poppler-qt.h>
 #include <stdlib.h>
 
-class PDFDisplay : public QWidget           // picture display widget
+class PDFDisplay : public TQWidget           // picture display widget
 {
 public:
     PDFDisplay( Poppler::Document *d );
    ~PDFDisplay();
 protected:
-    void        paintEvent( QPaintEvent * );
-    void        keyPressEvent( QKeyEvent * );
+    void        paintEvent( TQPaintEvent * );
+    void        keyPressEvent( TQKeyEvent * );
 private:
     void display();
     
     int currentPage;
-    QPixmap	*pixmap;
+    TQPixmap	*pixmap;
     Poppler::Document *doc;
 };
 
@@ -39,16 +39,16 @@ PDFDisplay::~PDFDisplay()
   delete pixmap;
 }
 
-void PDFDisplay::paintEvent( QPaintEvent *e )
+void PDFDisplay::paintEvent( TQPaintEvent *e )
 {
-  QPainter paint( this );                     // paint widget
+  TQPainter paint( this );                     // paint widget
   if (pixmap)
     paint.drawPixmap(0, 0, *pixmap);
 }
 
-void PDFDisplay::keyPressEvent( QKeyEvent *e )
+void PDFDisplay::keyPressEvent( TQKeyEvent *e )
 {
-  if (e->key() == Qt::Key_Down)
+  if (e->key() == TQt::Key_Down)
   {
     if (currentPage + 1 < doc->getNumPages())
     {
@@ -56,7 +56,7 @@ void PDFDisplay::keyPressEvent( QKeyEvent *e )
       display();
     }
   }
-  else if (e->key() == Qt::Key_Up)
+  else if (e->key() == TQt::Key_Up)
   {
     if (currentPage > 0)
     {
@@ -83,7 +83,7 @@ void PDFDisplay::display()
 
 int main( int argc, char **argv )
 {
-  QApplication a( argc, argv );               // QApplication required!
+  TQApplication a( argc, argv );               // TQApplication required!
 
   if ( argc < 2  || (argc == 3 && strcmp(argv[2], "-extract") != 0) || argc > 3)
   {
@@ -103,7 +103,7 @@ int main( int argc, char **argv )
   {  
     PDFDisplay test( doc );        // create picture display
     a.setMainWidget( &test);                // set main widget
-    test.setCaption("Poppler-Qt Test");
+    test.setCaption("Poppler-TQt Test");
     test.show();                            // show it
 
     return a.exec();                        // start event loop
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
   {
     Poppler::Page *page = doc->getPage(0);
 
-    QLabel *l = new QLabel(page->getText(Poppler::Rectangle()), 0);
+    TQLabel *l = new TQLabel(page->getText(Poppler::Rectangle()), 0);
     l->show();
     a.setMainWidget(l);                // set main widget
     delete page;
diff --git a/kfile-plugins/png/kfile_png.cpp b/kfile-plugins/png/kfile_png.cpp
index 531fdfe3..2f128cf7 100644
--- a/kfile-plugins/png/kfile_png.cpp
+++ b/kfile-plugins/png/kfile_png.cpp
@@ -87,9 +87,9 @@ typedef KGenericFactory<KPngPlugin> PngFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_png, PngFactory("kfile_png"))
 
-KPngPlugin::KPngPlugin(TQObject *parent, const char *name,
+KPngPlugin::KPngPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "png plugin\n";
 
diff --git a/kfile-plugins/png/kfile_png.h b/kfile-plugins/png/kfile_png.h
index 54e626de..1622efbe 100644
--- a/kfile-plugins/png/kfile_png.h
+++ b/kfile-plugins/png/kfile_png.h
@@ -29,9 +29,10 @@ class TQStringList;
 class KPngPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KPngPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
+    KPngPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo( KFileMetaInfo& info, uint );
 };
diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/kfile-plugins/pnm/kfile_pnm.cpp
index abe576b4..ae54b78d 100644
--- a/kfile-plugins/pnm/kfile_pnm.cpp
+++ b/kfile-plugins/pnm/kfile_pnm.cpp
@@ -33,7 +33,7 @@ typedef KGenericFactory<KPnmPlugin> PnmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_pnm, PnmFactory("kfile_pnm"))
 
-KPnmPlugin::KPnmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) 
+KPnmPlugin::KPnmPlugin(TQObject *tqparent, const char *name, const TQStringList &args) : KFilePlugin(tqparent, name, args) 
 {
 	makeMimeTypeInfo( "image/x-portable-bitmap" );
 	makeMimeTypeInfo( "image/x-portable-greymap" );
@@ -93,7 +93,7 @@ bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 			comments += '\n';
 		}
 		// image size
-		// unfortunately Qt doesn't have some kind of push-back method for 
+		// unfortunately TQt doesn't have some kind of push-back method for 
 		// TQTextStream, so we need to manually decode the first part of the 
 		// image size.
 		if( c >= '0' && c <= '9' ) {
diff --git a/kfile-plugins/pnm/kfile_pnm.h b/kfile-plugins/pnm/kfile_pnm.h
index 59b146e5..3b54bdbe 100644
--- a/kfile-plugins/pnm/kfile_pnm.h
+++ b/kfile-plugins/pnm/kfile_pnm.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KPnmPlugin: public KFilePlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
     
 public:
-	KPnmPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
+	KPnmPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
 	virtual bool readInfo( KFileMetaInfo& info, uint );
 
 private:
diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp
index 0f0c50e8..9a9bafd7 100644
--- a/kfile-plugins/ps/gscreator.cpp
+++ b/kfile-plugins/ps/gscreator.cpp
@@ -20,7 +20,7 @@
 */
 
 /*  This function gets a path of a DVI, EPS, PS or PDF file and
-    produces a PNG-Thumbnail which is stored as a QImage
+    produces a PNG-Thumbnail which is stored as a TQImage
 
     The program works as follows
 
@@ -46,7 +46,7 @@
     9. Turn the PS,PDF or EPS file into a PNG file using gs
 
     10. Parent process (1)
-        store data in a QImage
+        store data in a TQImage
 */
 
 #ifdef HAVE_CONFIG_H
@@ -176,7 +176,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
 {
 // The code in the loop (when testing whether got_sig_term got set)
 // should read some variation of:
-// 		parentJob()->wasKilled()
+// 		tqparentJob()->wasKilled()
 //
 // Unfortunatelly, that's currently impossible without breaking BIC.
 // So we need to catch the signal ourselves.
@@ -234,7 +234,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
   }
 
   const bool is_encapsulated = no_dvi &&
-    (path.find(TQRegExp("\\.epsi?$", false, false)) > 0) &&
+    (path.tqfind(TQRegExp("\\.epsi?$", false, false)) > 0) &&
     (dsc.bbox()->width() > 0) && (dsc.bbox()->height() > 0) && 
     (dsc.page_count() <= 1);
 
@@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
     return false;
   }
 
-  TQString previewstr = TQString::fromLatin1(buf);
+  TQString previewstr = TQString::tqfromLatin1(buf);
   free(buf);
 
   int offset = 0;
@@ -567,7 +567,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
     for (unsigned int gray = 0; gray < colors; gray++) {
       unsigned int grayvalue = (255U * (colors - 1 - gray)) / 
 	(colors - 1);
-      img.setColor(gray, qRgb(grayvalue, grayvalue, grayvalue));
+      img.setColor(gray, tqRgb(grayvalue, grayvalue, grayvalue));
     }
   }
 
diff --git a/kfile-plugins/ps/kfile_ps.cpp b/kfile-plugins/ps/kfile_ps.cpp
index 01136d88..7121af1b 100644
--- a/kfile-plugins/ps/kfile_ps.cpp
+++ b/kfile-plugins/ps/kfile_ps.cpp
@@ -30,9 +30,9 @@ typedef KGenericFactory<KPSPlugin> PSFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ps, PSFactory("kfile_ps"))
 
-KPSPlugin::KPSPlugin(TQObject *parent, const char *name,
+KPSPlugin::KPSPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &preferredItems) : 
-    KFilePlugin( parent, name, preferredItems )
+    KFilePlugin( tqparent, name, preferredItems )
 {
     kdDebug(7034) << "ps plugin\n";
     
diff --git a/kfile-plugins/ps/kfile_ps.h b/kfile-plugins/ps/kfile_ps.h
index 96a400a8..1b978713 100644
--- a/kfile-plugins/ps/kfile_ps.h
+++ b/kfile-plugins/ps/kfile_ps.h
@@ -30,8 +30,9 @@ class TQStringList;
 class KPSPlugin: public KFilePlugin, public KDSCCommentHandler
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KPSPlugin( TQObject *parent, const char *name,
+    KPSPlugin( TQObject *tqparent, const char *name,
                 const TQStringList& preferredItems );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
diff --git a/kfile-plugins/raw/kcamerarawplugin.cpp b/kfile-plugins/raw/kcamerarawplugin.cpp
index 8a0b0ce8..62b00404 100644
--- a/kfile-plugins/raw/kcamerarawplugin.cpp
+++ b/kfile-plugins/raw/kcamerarawplugin.cpp
@@ -83,9 +83,9 @@ bool KCameraRawPlugin::createPreview(const TQString &path, TQImage &img)
   return true;	
 }
 
-KCameraRawPlugin::KCameraRawPlugin(TQObject *parent, const char *name,
+KCameraRawPlugin::KCameraRawPlugin(TQObject *tqparent, const char *name,
 				   const TQStringList &args )
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
   kdDebug(7034) << "KCameraRawPlugin c'tor" << endl;
 
diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/kfile-plugins/raw/kcamerarawplugin.h
index e205aa37..fa583c4f 100644
--- a/kfile-plugins/raw/kcamerarawplugin.h
+++ b/kfile-plugins/raw/kcamerarawplugin.h
@@ -26,9 +26,10 @@ class TQImage;
 
 class KCameraRawPlugin: public KFilePlugin {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KCameraRawPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    KCameraRawPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/raw/parse.c b/kfile-plugins/raw/parse.c
index 1abbbfce..a256f04e 100644
--- a/kfile-plugins/raw/parse.c
+++ b/kfile-plugins/raw/parse.c
@@ -284,7 +284,7 @@ int parse_tiff_ifd (int base, int level)
       case 0x111:			/* StripOffset */
 	if (!offset || is_dng) offset = val;
 	break;
-      case 0x112:           /* Orientation */
+      case 0x112:           /* Qt::Orientation */
 	flip = flip_map[(val-1) & 7];
 	break;
       case 0x117:			/* StripByteCounts */
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp
index cf832343..3c8b416e 100644
--- a/kfile-plugins/rgb/kfile_rgb.cpp
+++ b/kfile-plugins/rgb/kfile_rgb.cpp
@@ -32,8 +32,8 @@ typedef KGenericFactory<KRgbPlugin> RgbFactory;
 K_EXPORT_COMPONENT_FACTORY(kfile_rgb, RgbFactory("kfile_rgb"))
 
 
-KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &args) :
-	KFilePlugin(parent, name, args)
+KRgbPlugin::KRgbPlugin(TQObject *tqparent, const char *name, const TQStringList &args) :
+	KFilePlugin(tqparent, name, args)
 {
 	KFileMimeTypeInfo* info = addMimeTypeInfo("image/x-rgb");
 
@@ -71,24 +71,24 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 	TQFile file(info.path());
 
 	if (!file.open(IO_ReadOnly)) {
-		kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+		kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
 		return false;
 	}
 
 	TQDataStream dstream(&file);
 
-	Q_UINT16 magic;
-	Q_UINT8  storage;
-	Q_UINT8  bpc;
-	Q_UINT16 dimension;
-	Q_UINT16 xsize;
-	Q_UINT16 ysize;
-	Q_UINT16 zsize;
-	Q_UINT32 pixmin;
-	Q_UINT32 pixmax;
-	Q_UINT32 dummy;
+	TQ_UINT16 magic;
+	TQ_UINT8  storage;
+	TQ_UINT8  bpc;
+	TQ_UINT16 dimension;
+	TQ_UINT16 xsize;
+	TQ_UINT16 ysize;
+	TQ_UINT16 zsize;
+	TQ_UINT32 pixmin;
+	TQ_UINT32 pixmax;
+	TQ_UINT32 dummy;
 	char     imagename[80];
-	Q_UINT32 colormap;
+	TQ_UINT32 colormap;
 
 	dstream >> magic;
 	dstream >> storage;
@@ -103,7 +103,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 	dstream.readRawBytes(imagename, 80);
 	imagename[79] = '\0';
 	dstream >> colormap;
-	Q_UINT8 u8;
+	TQ_UINT8 u8;
 	for (uint i = 0; i < 404; i++)
 		dstream >> u8;
 
@@ -134,17 +134,17 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 		long compressed = file.size() - 512;
 		long verbatim = xsize * ysize * zsize;
 		appendItem(group, "Compression", i18n("Runlength Encoded")
-				+ TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1));
+				+ TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1));
 
 		long k;
-		Q_UINT32 offs;
-		TQMap<Q_UINT32, uint> map;
-		TQMap<Q_UINT32, uint>::Iterator it;
-		TQMap<Q_UINT32, uint>::Iterator end = map.end();
+		TQ_UINT32 offs;
+		TQMap<TQ_UINT32, uint> map;
+		TQMap<TQ_UINT32, uint>::Iterator it;
+		TQMap<TQ_UINT32, uint>::Iterator end = map.end();
 		for (k = 0; k < (ysize * zsize); k++) {
 			dstream >> offs;
-			if ((it = map.find(offs)) != end)
-				map.replace(offs, it.data() + 1);
+			if ((it = map.tqfind(offs)) != end)
+				map.tqreplace(offs, it.data() + 1);
 			else
 				map[offs] = 0;
 		}
@@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 			k += it.data();
 
 		if (k)
-			appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0
+			appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0
 					/ (ysize * zsize), 0, 'f', 1));
 		else
 			appendItem(group, "SharedRows", i18n("None"));
@@ -173,7 +173,7 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const
 	TQFile file(info.path());
 
 	if (!file.open(IO_WriteOnly|IO_Raw)) {
-		kdDebug(7034) << "couldn't open " << TQFile::encodeName(info.path()) << endl;
+		kdDebug(7034) << "couldn't open " << TQFile::encodeName(info.path()).data() << endl;
 		return false;
 	}
 
@@ -188,9 +188,9 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const
 
 	unsigned i;
 	for (i = 0; i < s.length(); i++)
-		dstream << Q_UINT8(s.latin1()[i]);
+		dstream << TQ_UINT8(s.latin1()[i]);
 	for (; i < 80; i++)
-		dstream << Q_UINT8(0);
+		dstream << TQ_UINT8(0);
 
 	file.close();
 	return true;
@@ -199,9 +199,9 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const
 
 // restrict to 79 ASCII characters
 TQValidator* KRgbPlugin::createValidator(const TQString&, const TQString &,
-		const TQString &, TQObject* parent, const char* name) const
+		const TQString &, TQObject* tqparent, const char* name) const
 {
-	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), parent, name);
+	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), tqparent, name);
 }
 
 
diff --git a/kfile-plugins/rgb/kfile_rgb.h b/kfile-plugins/rgb/kfile_rgb.h
index c00ddfb5..bbbfd1b4 100644
--- a/kfile-plugins/rgb/kfile_rgb.h
+++ b/kfile-plugins/rgb/kfile_rgb.h
@@ -27,14 +27,15 @@ class TQStringList;
 class KRgbPlugin : public KFilePlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KRgbPlugin(TQObject *parent, const char *name, const TQStringList& args);
+	KRgbPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
 	virtual bool readInfo(KFileMetaInfo& info, uint what);
 	virtual bool writeInfo(const KFileMetaInfo& info) const;
 	virtual TQValidator* createValidator(const TQString& mimetype,
 			const TQString &group, const TQString &key,
-			TQObject* parent, const char* name) const;
+			TQObject* tqparent, const char* name) const;
 
 };
 
diff --git a/kfile-plugins/tga/kfile_tga.cpp b/kfile-plugins/tga/kfile_tga.cpp
index 21d2c6d2..46176e3e 100644
--- a/kfile-plugins/tga/kfile_tga.cpp
+++ b/kfile-plugins/tga/kfile_tga.cpp
@@ -44,10 +44,10 @@ typedef KGenericFactory<KTgaPlugin> TgaFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_tga, TgaFactory( "kfile_tga" ))
 
-KTgaPlugin::KTgaPlugin(TQObject *parent, const char *name,
+KTgaPlugin::KTgaPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-targa" );
 
@@ -77,7 +77,7 @@ bool KTgaPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     if (!file.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
diff --git a/kfile-plugins/tga/kfile_tga.h b/kfile-plugins/tga/kfile_tga.h
index 8b130e49..ccd5b69d 100644
--- a/kfile-plugins/tga/kfile_tga.h
+++ b/kfile-plugins/tga/kfile_tga.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KTgaPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KTgaPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KTgaPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/tiff/kfile_tiff.cpp b/kfile-plugins/tiff/kfile_tiff.cpp
index ce55e5b3..7e1e86be 100644
--- a/kfile-plugins/tiff/kfile_tiff.cpp
+++ b/kfile-plugins/tiff/kfile_tiff.cpp
@@ -34,8 +34,8 @@ typedef KGenericFactory<KTiffPlugin> TiffFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_tiff, TiffFactory("kfile_tiff"))
 
-KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name,
-        const TQStringList &args) : KFilePlugin(parent, name, args)
+KTiffPlugin::KTiffPlugin(TQObject *tqparent, const char *name,
+        const TQStringList &args) : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "TIFF file meta info plugin" << endl;
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/tiff" );
@@ -90,7 +90,7 @@ KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name,
     m_colorMode.insert(PHOTOMETRIC_PALETTE,
                 new TQString(I18N_NOOP("Palette color")));
     m_colorMode.insert(PHOTOMETRIC_MASK,
-                new TQString(I18N_NOOP("Transparency mask")));
+                new TQString(I18N_NOOP("Transparency tqmask")));
     m_colorMode.insert(PHOTOMETRIC_SEPARATED,
                 new TQString(I18N_NOOP("Color separations")));
     m_colorMode.insert(PHOTOMETRIC_YCBCR,
@@ -248,7 +248,7 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint)
 
     int imageBpp = bitsPerSample*samplesPerPixel;
     if (imageAlpha && colorMode==PHOTOMETRIC_RGB)
-        m_colorMode.replace(PHOTOMETRIC_RGB, new TQString(I18N_NOOP("RGBA")));
+        m_colorMode.tqreplace(PHOTOMETRIC_RGB, new TQString(I18N_NOOP("RGBA")));
 
     KFileMetaInfoGroup group = appendGroup(info, "General");
     if (description)
diff --git a/kfile-plugins/tiff/kfile_tiff.h b/kfile-plugins/tiff/kfile_tiff.h
index 54087ea4..26ad4765 100644
--- a/kfile-plugins/tiff/kfile_tiff.h
+++ b/kfile-plugins/tiff/kfile_tiff.h
@@ -27,9 +27,10 @@
 class KTiffPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KTiffPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    KTiffPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/xbm/kfile_xbm.cpp b/kfile-plugins/xbm/kfile_xbm.cpp
index 755201a3..7929a1bd 100644
--- a/kfile-plugins/xbm/kfile_xbm.cpp
+++ b/kfile-plugins/xbm/kfile_xbm.cpp
@@ -42,10 +42,10 @@ typedef KGenericFactory<KXbmPlugin> XbmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_xbm, XbmFactory( "kfile_xbm" ))
 
-KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name,
+KXbmPlugin::KXbmPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xbm" );
 
@@ -100,7 +100,7 @@ bool KXbmPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     if (!file.open(IO_ReadOnly))
     {
-        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+        kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
         return false;
     }
 
diff --git a/kfile-plugins/xbm/kfile_xbm.h b/kfile-plugins/xbm/kfile_xbm.h
index 7b62047c..b30e04cb 100644
--- a/kfile-plugins/xbm/kfile_xbm.h
+++ b/kfile-plugins/xbm/kfile_xbm.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KXbmPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KXbmPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KXbmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
     
diff --git a/kfile-plugins/xpm/kfile_xpm.cpp b/kfile-plugins/xpm/kfile_xpm.cpp
index c0e80027..bc6806cf 100644
--- a/kfile-plugins/xpm/kfile_xpm.cpp
+++ b/kfile-plugins/xpm/kfile_xpm.cpp
@@ -32,8 +32,8 @@ K_EXPORT_COMPONENT_FACTORY(kfile_xpm, xpmFactory( "kfile_xpm" ))
 
 //--------------------------------------------------------------------------------
 
-xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args)
-  : KFilePlugin(parent, name, args)
+xpmPlugin::xpmPlugin(TQObject *tqparent, const char *name, const TQStringList &args)
+  : KFilePlugin(tqparent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" );
 
@@ -62,7 +62,7 @@ bool xpmPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 
   KFileMetaInfoGroup group = appendGroup(info, "xpmInfo");
 
-  appendItem(group, "Dimension", pix.size());
+  appendItem(group, "Dimension", TQSize(pix.size()));
   appendItem(group, "BitDepth", pix.depth());
 
   return true;
diff --git a/kfile-plugins/xpm/kfile_xpm.h b/kfile-plugins/xpm/kfile_xpm.h
index f4660c45..abebe119 100644
--- a/kfile-plugins/xpm/kfile_xpm.h
+++ b/kfile-plugins/xpm/kfile_xpm.h
@@ -34,9 +34,10 @@ class TQStringList;
 class xpmPlugin: public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    xpmPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    xpmPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };