rename the following methods:

tqparent parent
tqmask mask


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

17 files changed, 106 insertions, 106 deletions

diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index a92eb567..203a741f 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -31,8 +31,8 @@
 #include "arealistview.h"
 
 
-AreaListView::AreaListView(TQWidget *tqparent, const char *name)
-  : TQVBox(tqparent, name)
+AreaListView::AreaListView(TQWidget *parent, const char *name)
+  : TQVBox(parent, name)
 {
   listView = new KListView(this);
   listView->addColumn(i18n("Areas"));
diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h
index 8b640828..4010f51d 100644
--- a/kimagemapeditor/arealistview.h
+++ b/kimagemapeditor/arealistview.h
@@ -36,7 +36,7 @@ class AreaListView : public TQVBox
   TQ_OBJECT
 
 public:
-  AreaListView(TQWidget *tqparent, const char *name);
+  AreaListView(TQWidget *parent, const char *name);
   ~AreaListView();
   
   KListView* listView;
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index 275fb86f..ba1ea48d 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -37,8 +37,8 @@
 
 #include "kimecommon.h"
 
-DrawZone::DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor)
-	: TQScrollView(tqparent)
+DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor)
+	: TQScrollView(parent)
 {
 	imageMapEditor=_imageMapEditor;
 //	setPicture(TQImage());
@@ -175,7 +175,7 @@ void DrawZone::setZoom(double z)
 	pix.convertFromImage(image);
 	// if the picture has transparent areas,
 	// fill them with Gimp like background
-	if (pix.tqmask()) {
+	if (pix.mask()) {
   	TQPixmap backPix(32,32);
   	TQPainter p2(&backPix);
   	p2.fillRect(0,0,32,32,TQColor(156,149,156));
diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h
index 35838619..0bd03dc6 100644
--- a/kimagemapeditor/drawzone.h
+++ b/kimagemapeditor/drawzone.h
@@ -38,7 +38,7 @@ class Area;
 class DrawZone : public TQScrollView  {
 public:
 
-  DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor);
+  DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor);
   ~DrawZone();
 
   TQImage picture() const;
diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp
index c332ea26..04c1908e 100644
--- a/kimagemapeditor/imagemap.cpp
+++ b/kimagemapeditor/imagemap.cpp
@@ -28,8 +28,8 @@ int round(double d) {
 		return ((int) d)+1;
 }
 
-ImageMap::ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor)
-	: TQScrollView(tqparent)
+ImageMap::ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor)
+	: TQScrollView(parent)
 {
 	imageMapEditor=_imageMapEditor;
 //	setPicture(TQImage());
@@ -63,7 +63,7 @@ void ImageMap::setZoom(double z) {
 	pix.convertFromImage(image);
 	// if the picture has transparent areas,
 	// fill them with Gimp like background
-	if (pix.tqmask()) {
+	if (pix.mask()) {
   	TQPixmap backPix(32,32);
   	TQPainter p2(&backPix);
   	p2.fillRect(0,0,32,32,TQColor(156,149,156));
diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h
index eb31cc1c..fe14c9d4 100644
--- a/kimagemapeditor/imagemap.h
+++ b/kimagemapeditor/imagemap.h
@@ -51,7 +51,7 @@ private:
 	KImageMapEditor *imageMapEditor;
 	double _zoom;
 public:
-	ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor);
+	ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor);
 	~ImageMap();
 	void setZoom(double z);
 	void setPicture(const TQImage &_image);
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp
index c62dffdd..7db15e1e 100644
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@@ -26,8 +26,8 @@
 // locale 
 #include "imageslistview.h"
 
-ImagesListViewItem::ImagesListViewItem(ImagesListView* tqparent, ImageTag* tag) 
-  : TQListViewItem(tqparent) 
+ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag) 
+  : TQListViewItem(parent) 
 {
     _imageTag = tag;
     update();
@@ -51,8 +51,8 @@ ImageTag* ImagesListViewItem::imageTag() {
 }
 
 
-ImagesListView::ImagesListView(TQWidget *tqparent, const char *name)
-  : KListView(tqparent, name)
+ImagesListView::ImagesListView(TQWidget *parent, const char *name)
+  : KListView(parent, name)
 {
   addColumn(i18n("Images"));
   addColumn(i18n("Usemap"));
diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h
index 5155bfc4..5b4aa4d8 100644
--- a/kimagemapeditor/imageslistview.h
+++ b/kimagemapeditor/imageslistview.h
@@ -50,7 +50,7 @@ class ImagesListView : public KListView
   TQ_OBJECT
 
 public:
-  ImagesListView(TQWidget *tqparent, const char *name);
+  ImagesListView(TQWidget *parent, const char *name);
   virtual ~ImagesListView();
   
   /**
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 5a08d551..5a57b250 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -85,8 +85,8 @@ typedef KParts::GenericFactory<KImageMapEditor> KimeFactory;
 K_EXPORT_COMPONENT_FACTORY( libkimagemapeditor , KimeFactory )
 
 KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
-            TQObject *tqparent, const char *name, const TQStringList & )
-  : KParts::ReadWritePart(tqparent,name)
+            TQObject *parent, const char *name, const TQStringList & )
+  : KParts::ReadWritePart(parent,name)
 {
   setInstance( KimeFactory::instance() );
 
@@ -94,7 +94,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
 
   // Test if the MainWindow can handle DockWindows, if so create DockWidgets
   // instead of a Splitter
-  mainDock = dynamic_cast<KDockMainWindow*>(tqparent) ;
+  mainDock = dynamic_cast<KDockMainWindow*>(parent) ;
   TQSplitter * splitter = 0L;
   tabWidget = 0L;
 
@@ -333,7 +333,7 @@ void KImageMapEditor::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our tqparent to do it's thing
+    // in any event, we want our parent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index f2dd74c1..e3a3655a 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -135,7 +135,7 @@ public :
     enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint };
 
     KImageMapEditor(TQWidget *parentWidget, const char *,
-                    TQObject *tqparent, const char *name, const TQStringList & args = TQStringList());
+                    TQObject *parent, const char *name, const TQStringList & args = TQStringList());
     virtual ~KImageMapEditor();
 
     static KAboutData *createAboutData();
diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp
index e3cb169f..52cccf9f 100644
--- a/kimagemapeditor/kimearea.cpp
+++ b/kimagemapeditor/kimearea.cpp
@@ -477,12 +477,12 @@ TQPixmap Area::cutOut(const TQImage & image)
 		return dummyPix;
 	}
 
-	// Get the tqmask from the subclasses
-	TQBitmap tqmask=getMask();
+	// Get the mask from the subclasses
+	TQBitmap mask=getMask();
 			
 	// The rectangle which is part of the image
 	TQRect partOfImage=rect();
-	TQRect partOfMask(0,0,tqmask.width(),tqmask.height());
+	TQRect partOfMask(0,0,mask.width(),mask.height());
 	
 	
 	// If the area is outside of the image make the
@@ -507,8 +507,8 @@ TQPixmap Area::cutOut(const TQImage & image)
 		partOfMask.setY(myabs(rect().y()));
 	}
 		
-  TQImage tempImage=tqmask.convertToImage().copy(partOfMask);
-	tqmask.convertFromImage(tempImage);
+  TQImage tempImage=mask.convertToImage().copy(partOfMask);
+	mask.convertFromImage(tempImage);
 
 //  partOfImage = partOfImage.normalize();
 	TQImage cut=image.copy(partOfImage);
@@ -521,23 +521,23 @@ TQPixmap Area::cutOut(const TQImage & image)
 	            << partOfMask.width() << "," << partOfMask.height() << "," << endl;
 
 /*	            	
-	TQBitmap tqmask2(partOfMask.width(), partOfMask.height());
-	TQPainter p4(&tqmask2);
-	p4.drawPixmap( TQPoint(0,0) ,tqmask,partOfMask);
+	TQBitmap mask2(partOfMask.width(), partOfMask.height());
+	TQPainter p4(&mask2);
+	p4.drawPixmap( TQPoint(0,0) ,mask,partOfMask);
 	p4.flush();
 	p4.end();
 */
 	
 	pix.convertFromImage(cut);
 
-	setHighlightedPixmap(cut, tqmask);
+	setHighlightedPixmap(cut, mask);
 		
 	TQPixmap retPix(pix.width(),pix.height());
   TQPainter p3(&retPix);
 	
 	// if transparent image fill the background
 	// with gimp-like rectangles
-	if (pix.tqmask()) {
+	if (pix.mask()) {
   	TQPixmap backPix(32,32);
   	
   	// Gimp like transparent rectangle
@@ -555,7 +555,7 @@ TQPixmap Area::cutOut(const TQImage & image)
 	p3.drawPixmap(TQPoint(0,0),pix);
 	p3.flush();
 	p3.end();
-	retPix.setMask(tqmask);
+	retPix.setMask(mask);
 
 	return retPix;
 }
@@ -566,7 +566,7 @@ TQBitmap Area::getMask() const
 	return b;
 }
 
-void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask )
+void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask )
 {
   if (!Area::highlightArea)
      return;
@@ -598,7 +598,7 @@ void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask )
 
   _highlightedPixmap = new TQPixmap();
   _highlightedPixmap->convertFromImage( image );
-  _highlightedPixmap->setMask( tqmask );
+  _highlightedPixmap->setMask( mask );
 
   if (_highlightedPixmap->isNull())
      kdDebug() << "HighlightedPixmap is null" << endl;
@@ -659,17 +659,17 @@ void RectArea::draw(TQPainter & p)
 
 TQBitmap RectArea::getMask() const
 {
-	TQBitmap tqmask(rect().width(),rect().height());
+	TQBitmap mask(rect().width(),rect().height());
 	
-	tqmask.fill(TQt::color0);
-	TQPainter p(&tqmask);
+	mask.fill(TQt::color0);
+	TQPainter p(&mask);
 	p.setBackgroundColor(TQt::color0);
 	p.setPen(TQt::color1);
 	p.setBrush(TQt::color1);
-	tqmask.fill(TQt::color1);
+	mask.fill(TQt::color1);
 	p.end();
 	
-	return tqmask;
+	return mask;
 }
 
 TQString RectArea::coordsToString() const
@@ -815,10 +815,10 @@ void CircleArea::draw(TQPainter & p)
 
 TQBitmap CircleArea::getMask() const
 {
-	TQBitmap tqmask(_rect.width(),_rect.height());
+	TQBitmap mask(_rect.width(),_rect.height());
 	
-	tqmask.fill(TQt::color0);
-	TQPainter p(&tqmask);
+	mask.fill(TQt::color0);
+	TQPainter p(&mask);
 	p.setBackgroundColor(TQt::color0);
 	p.setPen(TQt::color1);
 	p.setBrush(TQt::color1);
@@ -827,7 +827,7 @@ TQBitmap CircleArea::getMask() const
 	p.end();
 	
 	
-	return tqmask;
+	return mask;
 
 }
 
@@ -1009,10 +1009,10 @@ void PolyArea::draw(TQPainter & p)
 
 TQBitmap PolyArea::getMask() const
 {
-	TQBitmap tqmask(_rect.width(),_rect.height());
+	TQBitmap mask(_rect.width(),_rect.height());
 	
-	tqmask.fill(TQt::color0);
-	TQPainter p(&tqmask);
+	mask.fill(TQt::color0);
+	TQPainter p(&mask);
 	p.setBackgroundColor(TQt::color0);
 	p.setPen(TQt::color1);
 	p.setBrush(TQt::color1);
@@ -1024,7 +1024,7 @@ TQBitmap PolyArea::getMask() const
  	p.flush();
 	p.end();
 	
-	return tqmask;
+	return mask;
 }
 
 TQString PolyArea::coordsToString() const
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index cd7999f0..c2e50c7c 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -47,8 +47,8 @@
 // LOCAL
 #include "kimedialogs.h"
 
-CoordsEdit::CoordsEdit(TQWidget *tqparent, Area* a)
-  : TQWidget(tqparent)
+CoordsEdit::CoordsEdit(TQWidget *parent, Area* a)
+  : TQWidget(parent)
 {
   area=a;
 }
@@ -66,8 +66,8 @@ CoordsEdit::~CoordsEdit()
 {
 }
 
-RectCoordsEdit::RectCoordsEdit(TQWidget *tqparent, Area* a)
-  : CoordsEdit(tqparent,a)
+RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a)
+  : CoordsEdit(parent,a)
 {
   TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5);
 
@@ -127,8 +127,8 @@ void RectCoordsEdit::applyChanges() {
   area->setRect(r);
 }
 
-CircleCoordsEdit::CircleCoordsEdit(TQWidget *tqparent, Area* a)
-  : CoordsEdit(tqparent,a)
+CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a)
+  : CoordsEdit(parent,a)
 {
   TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5);
 
@@ -180,8 +180,8 @@ void CircleCoordsEdit::applyChanges() {
   area->setRect(r);
 }
 
-PolyCoordsEdit::PolyCoordsEdit(TQWidget *tqparent, Area* a)
-  : CoordsEdit(tqparent,a)
+PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
+  : CoordsEdit(parent,a)
 {
   if (!a) return;
   TQVBoxLayout *tqlayout= new TQVBoxLayout(this);
@@ -274,8 +274,8 @@ void PolyCoordsEdit::applyChanges() {
   }
 }
 
-SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *tqparent, Area* a)
-  : CoordsEdit(tqparent,a)
+SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a)
+  : CoordsEdit(parent,a)
 {
   TQGridLayout *tqlayout= new TQGridLayout(this,2,2);
 
@@ -308,11 +308,11 @@ void SelectionCoordsEdit::applyChanges() {
 
 
 
-TQLineEdit* AreaDialog::createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name)
+TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name)
 {
-  TQLineEdit* edit=new TQLineEdit(value,tqparent);
+  TQLineEdit* edit=new TQLineEdit(value,parent);
   tqlayout->addWidget(edit,y,2);
-  TQLabel* lbl=new TQLabel(name,tqparent);
+  TQLabel* lbl=new TQLabel(name,parent);
   lbl->setBuddy(edit);
   tqlayout->addWidget(lbl,y,1);
 
@@ -408,17 +408,17 @@ TQWidget* AreaDialog::createButtonBar()
 
 }
 
-AreaDialog::AreaDialog(KImageMapEditor* tqparent,Area * a)
-  : KDialog(tqparent->widget(),"",true)
-// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,tqparent,"")
-//	: KDialogBase(tqparent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true)
+AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
+  : KDialog(parent->widget(),"",true)
+// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,parent,"")
+//	: KDialogBase(parent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true)
 {
   if (!a) {
    slotCancel();
    return;  
   }
 
-  _document=tqparent;
+  _document=parent;
 
   setCaption(i18n("Area Tag Editor"));
 
@@ -485,23 +485,23 @@ AreaDialog::~AreaDialog() {
   delete oldArea;
 }
 
-CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *tqparent, Area *a) {
+CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *parent, Area *a) {
   if (!a) return 0;
   switch (a->type()) {
     case Area::Rectangle :
-        return new RectCoordsEdit(tqparent,a);
+        return new RectCoordsEdit(parent,a);
       break;
     case Area::Circle :
-        return new CircleCoordsEdit(tqparent,a);
+        return new CircleCoordsEdit(parent,a);
       break;
     case Area::Polygon :
-        return new PolyCoordsEdit(tqparent,a);
+        return new PolyCoordsEdit(parent,a);
       break;
     case Area::Selection :
-        return new SelectionCoordsEdit(tqparent,a);
+        return new SelectionCoordsEdit(parent,a);
       break;
-    case Area::Default : return new CoordsEdit(tqparent,a); break;
-    default : return new CoordsEdit(tqparent,a);break;
+    case Area::Default : return new CoordsEdit(parent,a); break;
+    default : return new CoordsEdit(parent,a);break;
   }
 }
 
@@ -570,8 +570,8 @@ void AreaDialog::slotUpdateArea() {
     oldArea->setRect(area->rect());
 }
 
-ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl)
-  : KDialogBase(tqparent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true)
+ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl)
+  : KDialogBase(parent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true)
 {
   baseUrl=_baseUrl;
   maps=_maps;
@@ -648,29 +648,29 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag>
   resize(510,460);
 }
 
-void ImageMapChooseDialog::initImageListTable(TQWidget* tqparent) {
+void ImageMapChooseDialog::initImageListTable(TQWidget* parent) {
 
 
   if (images->isEmpty()) {
-    imageListTable= new TQTable(1,1,tqparent);
+    imageListTable= new TQTable(1,1,parent);
     imageListTable->setText(0,0,i18n("No images found"));
     imageListTable->setEnabled(false);
     imageListTable->horizontalHeader()->hide();
     imageListTable->setTopMargin(0);
     imageListTable->setColumnStretchable(0,true);
   } else {
-    imageListTable= new TQTable(images->count(),2,tqparent);
+    imageListTable= new TQTable(images->count(),2,parent);
     imageListTable->setColumnStretchable(0,true);
   }
 
   imageListTable->verticalHeader()->hide();
   imageListTable->setLeftMargin(0);
 
-  TQLabel *lbl= new TQLabel(i18n("&Images"),tqparent);
+  TQLabel *lbl= new TQLabel(i18n("&Images"),parent);
   lbl->setBuddy(imageListTable);
 
-  tqparent->tqlayout()->add(lbl);
-  tqparent->tqlayout()->add(imageListTable);
+  parent->tqlayout()->add(lbl);
+  parent->tqlayout()->add(imageListTable);
 
   if (images->isEmpty())
     return;
@@ -749,8 +749,8 @@ void ImageMapChooseDialog::slotMapChanged(int i) {
   selectImageWithUsemap(currentMap->name);
 }
 
-PreferencesDialog::PreferencesDialog(TQWidget *tqparent, KConfig* conf)
-  : KDialogBase(tqparent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true)
+PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf)
+  : KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true)
 {
   config = conf;
   TQVBox *page=new TQVBox(this);
@@ -836,8 +836,8 @@ void PreferencesDialog::slotApply( void ) {
   emit applyClicked();
 }
 
-HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* tqparent, KURL url, const TQString & htmlCode)
-  : KDialogBase(tqparent, "", true, i18n("Preview"), KDialogBase::Ok)
+HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString & htmlCode)
+  : KDialogBase(parent, "", true, i18n("Preview"), KDialogBase::Ok)
 {
   tempFile = new KTempFile(url.directory(false), ".html");
   tempFile->setAutoDelete(true);
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 90b445a2..d829193c 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -35,7 +35,7 @@ class CoordsEdit : public TQWidget {
 Q_OBJECT
   TQ_OBJECT
 	public :
-		CoordsEdit(TQWidget *tqparent, Area* a);
+		CoordsEdit(TQWidget *parent, Area* a);
 		virtual ~CoordsEdit();
 		virtual void applyChanges();
 	protected:
@@ -48,7 +48,7 @@ Q_OBJECT
 
 class RectCoordsEdit : public CoordsEdit {
 	public:
-		RectCoordsEdit(TQWidget *tqparent, Area* a);
+		RectCoordsEdit(TQWidget *parent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *topXSpin;
@@ -59,7 +59,7 @@ class RectCoordsEdit : public CoordsEdit {
 
 class CircleCoordsEdit : public CoordsEdit {
 	public:
-		CircleCoordsEdit(TQWidget *tqparent, Area* a);
+		CircleCoordsEdit(TQWidget *parent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *centerXSpin;
@@ -73,7 +73,7 @@ class PolyCoordsEdit : public CoordsEdit {
     Q_OBJECT
     TQ_OBJECT
 	public:
-		PolyCoordsEdit(TQWidget *tqparent, Area* a);
+		PolyCoordsEdit(TQWidget *parent, Area* a);
 		~PolyCoordsEdit();
 		virtual void applyChanges();
 	private:
@@ -89,7 +89,7 @@ class SelectionCoordsEdit : public CoordsEdit {
     Q_OBJECT
     TQ_OBJECT
 	public:
-		SelectionCoordsEdit(TQWidget *tqparent, Area* a);
+		SelectionCoordsEdit(TQWidget *parent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *topXSpin;
@@ -122,13 +122,13 @@ class AreaDialog : public KDialog {
 		TQLineEdit *onMouseOutEdit;
 		
 		CoordsEdit *coordsEdit;
-		CoordsEdit* createCoordsEdit(TQWidget *tqparent, Area *a);
+		CoordsEdit* createCoordsEdit(TQWidget *parent, Area *a);
 		TQCheckBox *defaultAreaChk;
 		KImageMapEditor *_document;
 		
 
 	public:
-		AreaDialog(KImageMapEditor* tqparent,Area * a);
+		AreaDialog(KImageMapEditor* parent,Area * a);
 		~AreaDialog();
 	protected slots:
 		virtual void slotOk();
@@ -137,7 +137,7 @@ class AreaDialog : public KDialog {
 		void slotChooseHref();
 		void slotUpdateArea();
 		
-    TQLineEdit* createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name);
+    TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name);
 	  TQWidget* createGeneralPage();
 	  TQWidget* createCoordsPage();
 	  TQWidget* createJavascriptPage();
@@ -164,7 +164,7 @@ class ImageMapChooseDialog : public KDialogBase {
 		KURL baseUrl;
     void initImageListTable(TQWidget*);    
 	public:
-		ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl);
+		ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl);
 		~ImageMapChooseDialog();
 		KURL pixUrl;
 		MapTag* currentMap;
@@ -181,7 +181,7 @@ class PreferencesDialog : public KDialogBase {
   Q_OBJECT
   TQ_OBJECT
 	public:
-		PreferencesDialog(TQWidget *tqparent,KConfig*);
+		PreferencesDialog(TQWidget *parent,KConfig*);
 		~PreferencesDialog();
 	protected slots:
 	  virtual void slotDefault( void );
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index b3a2758d..252afdb8 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -23,8 +23,8 @@
 #include "mapslistview.h"
 
 
-MapsListView::MapsListView(TQWidget *tqparent, const char *name)
-: TQVBox(tqparent, name) {
+MapsListView::MapsListView(TQWidget *parent, const char *name)
+: TQVBox(parent, name) {
     _listView = new KListView(this);
     _listView->addColumn(i18n("Maps"));
     _listView->setFullWidth(true);
diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h
index ca1707af..af4d3653 100644
--- a/kimagemapeditor/mapslistview.h
+++ b/kimagemapeditor/mapslistview.h
@@ -33,7 +33,7 @@ class MapsListView : public TQVBox
 Q_OBJECT
   TQ_OBJECT
 public:
-  MapsListView(TQWidget *tqparent, const char *name);
+  MapsListView(TQWidget *parent, const char *name);
   ~MapsListView();
   
   /**
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index c3aad2a7..f1aac09e 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -105,16 +105,16 @@ KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
   This is needed for empty directory adding/handling. (Andras)
   Currently works only for local directories
 */
-KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask)
+KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask)
 {
   QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesInternal(path, tqmask);
+  return internalFileInfo.allFilesInternal(path, mask);
 }
 
-KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask)
+KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask)
 {
   QExtFileInfo internalFileInfo;
-  KURL::List r = internalFileInfo.allFilesInternal( path, tqmask);
+  KURL::List r = internalFileInfo.allFilesInternal( path, mask);
 
   KURL::List::Iterator it;
   for ( it = r.begin(); it != r.end(); ++it )
@@ -206,7 +206,7 @@ bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
 }
 
 /** No descriptions */
-KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask)
+KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask)
 {
   dirListItems.clear();
   if (internalExists(startURL))
@@ -214,7 +214,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', tqmask );
+    TQStringList list = TQStringList::split( ' ', mask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h
index 00643915..59cabb14 100644
--- a/kimagemapeditor/qextfileinfo.h
+++ b/kimagemapeditor/qextfileinfo.h
@@ -34,8 +34,8 @@ public:
   /** convert relative filename to absolute */
   static KURL toAbsolute(const KURL& urlToConvert,const KURL& baseURL);
   /** recurse function for all files in dir */
-  static KURL::List allFiles( const KURL& path, const TQString &tqmask);
-  static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask);
+  static KURL::List allFiles( const KURL& path, const TQString &mask);
+  static KURL::List allFilesRelative( const KURL& path, const TQString &mask);
   /** create dir if don't exists */
   static bool createDir(const KURL & path );
   static KURL cdUp(const KURL &dir);
@@ -60,7 +60,7 @@ private:
   TQPtrList<TQRegExp> lstFilters;
 
   /** No descriptions */
-  KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask);
+  KURL::List allFilesInternal(const KURL& startURL, const TQString& mask);
 
 //  friend class I_like_this_class;