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

1 files changed, 26 insertions, 26 deletions

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