rename the following methods:

tqparent parent
tqmask mask


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

38 files changed, 71 insertions, 71 deletions

diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp
index a682da7c..cfda7a16 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 *tqparent, const char *name,
+KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-bmp" );
 
diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h
index c2c5c007..050e68d8 100644
--- a/kfile-plugins/bmp/kfile_bmp.h
+++ b/kfile-plugins/bmp/kfile_bmp.h
@@ -30,7 +30,7 @@ class KBmpPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KBmpPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/dds/kfile_dds.cpp b/kfile-plugins/dds/kfile_dds.cpp
index 17321e13..c392685f 100644
--- a/kfile-plugins/dds/kfile_dds.cpp
+++ b/kfile-plugins/dds/kfile_dds.cpp
@@ -90,10 +90,10 @@ namespace {	// Private.
 		uint flags;
 		uint fourcc;
 		uint bitcount;
-		uint rtqmask;
-		uint gtqmask;
-		uint btqmask;
-		uint atqmask;
+		uint rmask;
+		uint gmask;
+		uint bmask;
+		uint amask;
 	};
 
 	TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf )
@@ -102,10 +102,10 @@ namespace {	// Private.
 		s >> pf.flags;
 		s >> pf.fourcc;
 		s >> pf.bitcount;
-		s >> pf.rtqmask;
-		s >> pf.gtqmask;
-		s >> pf.btqmask;
-		s >> pf.atqmask;
+		s >> pf.rmask;
+		s >> pf.gmask;
+		s >> pf.bmask;
+		s >> pf.amask;
 		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 *tqparent, const char *name, const TQStringList &args) : 
-	KFilePlugin(tqparent, name, args)
+KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : 
+	KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" );
 
diff --git a/kfile-plugins/dds/kfile_dds.h b/kfile-plugins/dds/kfile_dds.h
index 19ef6a12..2edaf72e 100644
--- a/kfile-plugins/dds/kfile_dds.h
+++ b/kfile-plugins/dds/kfile_dds.h
@@ -30,7 +30,7 @@ class KDdsPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KDdsPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KDdsPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
index 6d209c2b..445417a2 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
@@ -86,7 +86,7 @@ GooString *TQStringToGooString(const TQString &s)
 }
 
 
-void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items )
+void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items )
 {
     int numItems = items->getLength();
     for ( int i = 0; i < numItems; ++i )
@@ -103,7 +103,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent,
             continue;
 
         TQDomElement item = docSyn->createElement( name );
-        tqparent->appendChild( item );
+        parent->appendChild( item );
 
         // 2. find the page the link refers to
         ::LinkAction * a = outlineItem->getAction();
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
index b1b79084..8152ffd8 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -84,7 +84,7 @@ class DocumentData {
         return m_outputDev;
     }
 
-    void addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items );
+    void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items );
 
   class PDFDoc doc;
   bool locked;
diff --git a/kfile-plugins/dvi/kfile_dvi.cpp b/kfile-plugins/dvi/kfile_dvi.cpp
index 1d035fa0..b449ad1e 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 * tqparent, const char * name, const TQStringList & preferredItems)
-  : KFilePlugin(tqparent, name, preferredItems)
+KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems)
+  : KFilePlugin(parent, name, preferredItems)
 {
   kdDebug(7034) << "dvi plugin" << endl;
   
diff --git a/kfile-plugins/dvi/kfile_dvi.h b/kfile-plugins/dvi/kfile_dvi.h
index aba32132..54cbee51 100644
--- a/kfile-plugins/dvi/kfile_dvi.h
+++ b/kfile-plugins/dvi/kfile_dvi.h
@@ -30,7 +30,7 @@ class KDviPlugin : public KFilePlugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KDviPlugin ( TQObject * tqparent, const char * name, const TQStringList & preferredItems );
+	KDviPlugin ( TQObject * parent, 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 18432fc8..0a85a728 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 *tqparent, const char *name,
+KExrPlugin::KExrPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     // set up our mime type
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-exr" );
diff --git a/kfile-plugins/exr/kfile_exr.h b/kfile-plugins/exr/kfile_exr.h
index ef718b37..19d58e1d 100644
--- a/kfile-plugins/exr/kfile_exr.h
+++ b/kfile-plugins/exr/kfile_exr.h
@@ -32,7 +32,7 @@ class KExrPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KExrPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KExrPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo( KFileMetaInfo& info, uint );
 };
diff --git a/kfile-plugins/gif/kfile_gif.cpp b/kfile-plugins/gif/kfile_gif.cpp
index 9c45f257..009f8cc5 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 *tqparent, const char *name,
+KGifPlugin::KGifPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "gif KFileMetaInfo plugin\n";
 
diff --git a/kfile-plugins/gif/kfile_gif.h b/kfile-plugins/gif/kfile_gif.h
index a5d69910..9e1b9907 100644
--- a/kfile-plugins/gif/kfile_gif.h
+++ b/kfile-plugins/gif/kfile_gif.h
@@ -30,7 +30,7 @@ class KGifPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KGifPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KGifPlugin( TQObject *parent, 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 2bc46298..44fa28d6 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 *tqparent, const char *name,
+KIcoPlugin::KIcoPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-ico" );
 
diff --git a/kfile-plugins/ico/kfile_ico.h b/kfile-plugins/ico/kfile_ico.h
index 81ef53af..e340646a 100644
--- a/kfile-plugins/ico/kfile_ico.h
+++ b/kfile-plugins/ico/kfile_ico.h
@@ -30,7 +30,7 @@ class KIcoPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KIcoPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KIcoPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp
index 2472ac70..5bbd394d 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 *tqparent, const char *name,
+KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
                        const TQStringList &args )
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
   kdDebug(7034) << "jpeg plugin\n";
 
@@ -148,12 +148,12 @@ KJpegPlugin::KJpegPlugin(TQObject *tqparent, const char *name,
 }
 
 TQValidator* KJpegPlugin::createValidator(const KFileMetaInfoItem& /*item*/,
-                                        TQObject */*tqparent*/,
+                                        TQObject */*parent*/,
                                          const char */*name*/ ) const
 {
     // no need to return a validator that validates everything as OK :)
 //     if (item.isEditable())
-//         return new TQRegExpValidator(TQRegExp(".*"), tqparent, name);
+//         return new TQRegExpValidator(TQRegExp(".*"), parent, name);
 //     else
     return 0L;
 }
diff --git a/kfile-plugins/jpeg/kfile_jpeg.h b/kfile-plugins/jpeg/kfile_jpeg.h
index ec6861d8..9a80a7f8 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.h
+++ b/kfile-plugins/jpeg/kfile_jpeg.h
@@ -29,13 +29,13 @@ class KJpegPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KJpegPlugin( TQObject *tqparent, const char *name,
+    KJpegPlugin( TQObject *parent, 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* tqparent, const char* name) const;
+                                         TQObject* parent, 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 bd81e3f7..5dceec9d 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 *tqparent, const char *name,
-        const TQStringList &args ) : KFilePlugin( tqparent, name, args )
+KPcxPlugin::KPcxPlugin( TQObject *parent, const char *name,
+        const TQStringList &args ) : KFilePlugin( parent, 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 f406e79f..942c139e 100644
--- a/kfile-plugins/pcx/kfile_pcx.h
+++ b/kfile-plugins/pcx/kfile_pcx.h
@@ -76,7 +76,7 @@ class KPcxPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-  KPcxPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+  KPcxPlugin(TQObject *parent, const char *name, const TQStringList& args);
   virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp
index d18ada11..89e46297 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 *tqparent, const char *name, const TQStringList &preferredItems)
-    : KFilePlugin(tqparent, name, preferredItems)
+KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems)
+    : KFilePlugin(parent, name, preferredItems)
 {
     kdDebug(7034) << "pdf plugin\n";
 
diff --git a/kfile-plugins/pdf/kfile_pdf.h b/kfile-plugins/pdf/kfile_pdf.h
index b14d3989..f6e279c1 100644
--- a/kfile-plugins/pdf/kfile_pdf.h
+++ b/kfile-plugins/pdf/kfile_pdf.h
@@ -31,7 +31,7 @@ class KPdfPlugin: public KFilePlugin
 Q_OBJECT
   TQ_OBJECT
 public:
-    KPdfPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };
diff --git a/kfile-plugins/png/kfile_png.cpp b/kfile-plugins/png/kfile_png.cpp
index 2f128cf7..531fdfe3 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 *tqparent, const char *name,
+KPngPlugin::KPngPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "png plugin\n";
 
diff --git a/kfile-plugins/png/kfile_png.h b/kfile-plugins/png/kfile_png.h
index 1622efbe..bffc7e0b 100644
--- a/kfile-plugins/png/kfile_png.h
+++ b/kfile-plugins/png/kfile_png.h
@@ -32,7 +32,7 @@ class KPngPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KPngPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KPngPlugin( TQObject *parent, 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 ae54b78d..6c965e65 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 *tqparent, const char *name, const TQStringList &args) : KFilePlugin(tqparent, name, args) 
+KPnmPlugin::KPnmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) 
 {
 	makeMimeTypeInfo( "image/x-portable-bitmap" );
 	makeMimeTypeInfo( "image/x-portable-greymap" );
diff --git a/kfile-plugins/pnm/kfile_pnm.h b/kfile-plugins/pnm/kfile_pnm.h
index 3b54bdbe..bfd12f48 100644
--- a/kfile-plugins/pnm/kfile_pnm.h
+++ b/kfile-plugins/pnm/kfile_pnm.h
@@ -30,7 +30,7 @@ class KPnmPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-	KPnmPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+	KPnmPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 	virtual bool readInfo( KFileMetaInfo& info, uint );
 
 private:
diff --git a/kfile-plugins/ps/kfile_ps.cpp b/kfile-plugins/ps/kfile_ps.cpp
index 7121af1b..01136d88 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 *tqparent, const char *name,
+KPSPlugin::KPSPlugin(TQObject *parent, const char *name,
                        const TQStringList &preferredItems) : 
-    KFilePlugin( tqparent, name, preferredItems )
+    KFilePlugin( parent, name, preferredItems )
 {
     kdDebug(7034) << "ps plugin\n";
     
diff --git a/kfile-plugins/ps/kfile_ps.h b/kfile-plugins/ps/kfile_ps.h
index 1b978713..c47f3bb7 100644
--- a/kfile-plugins/ps/kfile_ps.h
+++ b/kfile-plugins/ps/kfile_ps.h
@@ -32,7 +32,7 @@ class KPSPlugin: public KFilePlugin, public KDSCCommentHandler
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPSPlugin( TQObject *tqparent, const char *name,
+    KPSPlugin( TQObject *parent, 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 62b00404..8a0b0ce8 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 *tqparent, const char *name,
+KCameraRawPlugin::KCameraRawPlugin(TQObject *parent, const char *name,
 				   const TQStringList &args )
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
   kdDebug(7034) << "KCameraRawPlugin c'tor" << endl;
 
diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/kfile-plugins/raw/kcamerarawplugin.h
index fa583c4f..4f441234 100644
--- a/kfile-plugins/raw/kcamerarawplugin.h
+++ b/kfile-plugins/raw/kcamerarawplugin.h
@@ -29,7 +29,7 @@ class KCameraRawPlugin: public KFilePlugin {
   TQ_OBJECT
 
 public:
-    KCameraRawPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    KCameraRawPlugin(TQObject *parent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp
index ff6dadde..41bd8c28 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 *tqparent, const char *name, const TQStringList &args) :
-	KFilePlugin(tqparent, name, args)
+KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &args) :
+	KFilePlugin(parent, name, args)
 {
 	KFileMimeTypeInfo* info = addMimeTypeInfo("image/x-rgb");
 
@@ -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* tqparent, const char* name) const
+		const TQString &, TQObject* parent, const char* name) const
 {
-	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), tqparent, name);
+	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), parent, name);
 }
 
 
diff --git a/kfile-plugins/rgb/kfile_rgb.h b/kfile-plugins/rgb/kfile_rgb.h
index bbbfd1b4..8e507820 100644
--- a/kfile-plugins/rgb/kfile_rgb.h
+++ b/kfile-plugins/rgb/kfile_rgb.h
@@ -30,12 +30,12 @@ class KRgbPlugin : public KFilePlugin
   TQ_OBJECT
 
 public:
-	KRgbPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+	KRgbPlugin(TQObject *parent, 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* tqparent, const char* name) const;
+			TQObject* parent, const char* name) const;
 
 };
 
diff --git a/kfile-plugins/tga/kfile_tga.cpp b/kfile-plugins/tga/kfile_tga.cpp
index 46176e3e..b102deb6 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 *tqparent, const char *name,
+KTgaPlugin::KTgaPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-targa" );
 
diff --git a/kfile-plugins/tga/kfile_tga.h b/kfile-plugins/tga/kfile_tga.h
index ccd5b69d..09ca11a8 100644
--- a/kfile-plugins/tga/kfile_tga.h
+++ b/kfile-plugins/tga/kfile_tga.h
@@ -30,7 +30,7 @@ class KTgaPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KTgaPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KTgaPlugin( TQObject *parent, 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 1d8b08f1..ce55e5b3 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 *tqparent, const char *name,
-        const TQStringList &args) : KFilePlugin(tqparent, name, args)
+KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name,
+        const TQStringList &args) : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "TIFF file meta info plugin" << endl;
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/tiff" );
@@ -90,7 +90,7 @@ KTiffPlugin::KTiffPlugin(TQObject *tqparent, const char *name,
     m_colorMode.insert(PHOTOMETRIC_PALETTE,
                 new TQString(I18N_NOOP("Palette color")));
     m_colorMode.insert(PHOTOMETRIC_MASK,
-                new TQString(I18N_NOOP("Transparency tqmask")));
+                new TQString(I18N_NOOP("Transparency mask")));
     m_colorMode.insert(PHOTOMETRIC_SEPARATED,
                 new TQString(I18N_NOOP("Color separations")));
     m_colorMode.insert(PHOTOMETRIC_YCBCR,
diff --git a/kfile-plugins/tiff/kfile_tiff.h b/kfile-plugins/tiff/kfile_tiff.h
index 26ad4765..cf168943 100644
--- a/kfile-plugins/tiff/kfile_tiff.h
+++ b/kfile-plugins/tiff/kfile_tiff.h
@@ -30,7 +30,7 @@ class KTiffPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KTiffPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    KTiffPlugin(TQObject *parent, 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 7929a1bd..2d246c97 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 *tqparent, const char *name,
+KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xbm" );
 
diff --git a/kfile-plugins/xbm/kfile_xbm.h b/kfile-plugins/xbm/kfile_xbm.h
index b30e04cb..e4033b43 100644
--- a/kfile-plugins/xbm/kfile_xbm.h
+++ b/kfile-plugins/xbm/kfile_xbm.h
@@ -30,7 +30,7 @@ class KXbmPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KXbmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KXbmPlugin( TQObject *parent, 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 bc6806cf..a121a359 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 *tqparent, const char *name, const TQStringList &args)
-  : KFilePlugin(tqparent, name, args)
+xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args)
+  : KFilePlugin(parent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" );
 
diff --git a/kfile-plugins/xpm/kfile_xpm.h b/kfile-plugins/xpm/kfile_xpm.h
index abebe119..d43e80bf 100644
--- a/kfile-plugins/xpm/kfile_xpm.h
+++ b/kfile-plugins/xpm/kfile_xpm.h
@@ -37,7 +37,7 @@ class xpmPlugin: public KFilePlugin
   TQ_OBJECT
 
   public:
-    xpmPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    xpmPlugin(TQObject *parent, const char *name, const TQStringList& args);
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };