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

17 files changed, 105 insertions, 105 deletions

diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index 0ab19f3a..111b2887 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -150,13 +150,13 @@ void SVGDOMNodeBridge::putValueProperty(ExecState *exec, int token, const Value
 // triggered by one of the child nodes
 void updateTextItem(ExecState *exec, const DOM::Node node)
 {
-	DOM::Node tqparent;
-	while(!(tqparent = node.parentNode()).isNull())
+	DOM::Node parent;
+	while(!(parent = node.parentNode()).isNull())
 	{
-		DOM::DOMString name = tqparent.nodeName();
+		DOM::DOMString name = parent.nodeName();
 		if(name == "text" || name == "tspan" || name == "tref")
 		{
-			SVGHelperImpl::updateItem(exec, tqparent);
+			SVGHelperImpl::updateItem(exec, parent);
 			break;
 		}
 	}
@@ -304,7 +304,7 @@ Value appendHelper(ExecState *exec, DOM::Node node, DOM::Node newNode)
 
 		// Get some SVGElementImpl's
 		SVGElementImpl *nodeElement = doc->getElementFromHandle(newNode.handle());
-		// TODO : extra check needed to see if the new elements tqparent is already appended
+		// TODO : extra check needed to see if the new elements parent is already appended
 		// in the doc. Not really nice, should be some other way? (Rob)
 		if(nodeElement && !nodeElement->parentNode().parentNode().isNull())
 		{
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index 13fc9e46..deab7476 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -134,7 +134,7 @@ bool SVGElementImpl::hasEventListener(int id, bool local)
 	if(local)
 		return false;
 
-	// Check every tqparent element
+	// Check every parent element
 	for(DOM::Node node = parentNode(); !node.isNull(); node = node.parentNode())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
@@ -518,7 +518,7 @@ bool SVGElementImpl::dispatchEvent(SVGEventImpl *evt, bool tempEvent)
 {
 	evt->setTarget(this);
 
-	// Find out, where to send to -> collect tqparent nodes
+	// Find out, where to send to -> collect parent nodes
 	TQPtrList<SVGElementImpl> nodeChain;
 
 	for(DOM::Element e = *this; !e.isNull(); e = e.parentNode())
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index afbc1e74..51c97be9 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -274,7 +274,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 
 	SVGMatrixImpl *baseMatrix = SVGSVGElementImpl::createSVGMatrix();
 
-	// Set the scale to map the tqmask onto the image
+	// Set the scale to map the mask onto the image
 	double xScale = static_cast<double>(imageWidth) / width()->baseVal()->value();
 	double yScale = static_cast<double>(imageHeight) / height()->baseVal()->value();
 
@@ -338,13 +338,13 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 		// Note: r and b reversed
 		//TQImage maskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
 		//maskImage.setAlphaBuffer(true);
-		//maskImage.save("tqmask.png", "PNG");
+		//maskImage.save("mask.png", "PNG");
 	}
 
 	TQByteArray maskData(imageWidth * imageHeight);
     const double epsilon = DBL_EPSILON;
 
-	// Convert the rgba image into an 8-bit tqmask, according to the specs.
+	// Convert the rgba image into an 8-bit mask, according to the specs.
 	for(int i = 0; i < imageWidth * imageHeight; i++)
 	{
 		TQ_UINT32 rgba = imageBits[i];
@@ -388,7 +388,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	baseMatrix->deref();
 	bbox->deref();
 
-	// The screenToMask matrix is calculated each time the tqmask is used so we don't
+	// The screenToMask matrix is calculated each time the mask is used so we don't
 	// need to set it here.
 	TQWMatrix tempMatrix;
 
@@ -414,19 +414,19 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	int imageWidth = static_cast<int>(width()->baseVal()->value() * xScale + 0.5);
 	int imageHeight = static_cast<int>(height()->baseVal()->value() * yScale + 0.5);
 
-	Mask tqmask;
+	Mask mask;
 
 	if(imageWidth > 0 && imageHeight > 0)
 	{
 		CacheKey key(referencingElement, imageWidth, imageHeight);
 
-		if(!m_maskCache.find(key, tqmask))
+		if(!m_maskCache.find(key, mask))
 		{
-			tqmask = createMask(referencingElement, imageWidth, imageHeight);
-			m_maskCache.insert(key, tqmask, imageWidth * imageHeight);
+			mask = createMask(referencingElement, imageWidth, imageHeight);
+			m_maskCache.insert(key, mask, imageWidth * imageHeight);
 		}
 
-		// Generate a tqmask-coordinates to screen-coordinates matrix
+		// Generate a mask-coordinates to screen-coordinates matrix
 		SVGMatrixImpl *matrix = 0;
 		if(locatableRef)
 			matrix = locatableRef->getScreenCTM();
@@ -447,10 +447,10 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 		TQWMatrix screenToMask = matrix->qmatrix().invert();
 		matrix->deref();
 
-		tqmask.setScreenToMask(screenToMask);
+		mask.setScreenToMask(screenToMask);
 	}
 	
-	return tqmask;
+	return mask;
 }
 
 TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
@@ -471,11 +471,11 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 
 				if(maskElement)
 				{
-					SVGMaskElementImpl::Mask tqmask = maskElement->createMask(tqshape);
+					SVGMaskElementImpl::Mask mask = maskElement->createMask(tqshape);
 					
-					if(!tqmask.isEmpty())
+					if(!mask.isEmpty())
 					{
-						TQByteArray maskData = tqmask.rectangle(screenRectangle);
+						TQByteArray maskData = mask.rectangle(screenRectangle);
 
 						if(cumulativeMask.size() == 0)
 							cumulativeMask = maskData;
@@ -483,7 +483,7 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 						{
 							int size = cumulativeMask.size();
 
-							// Multiply into the cumulative tqmask (using fast divide by 255)
+							// Multiply into the cumulative mask (using fast divide by 255)
 							for(int i = 0; i < size; i++)
 							{
 								int tmp = maskData[i] * cumulativeMask[i] + 0x80;
@@ -499,10 +499,10 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 
 		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle());
+			SVGElementImpl *parent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle());
 
-			if(tqparent)
-				tqshape = dynamic_cast<SVGShapeImpl *>(tqparent);
+			if(parent)
+				tqshape = dynamic_cast<SVGShapeImpl *>(parent);
 			else
 				tqshape = 0;
 		}
@@ -514,8 +514,8 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 	return cumulativeMask;
 }
 
-SVGMaskElementImpl::Mask::Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height)
-	:	m_width(width), m_height(height), m_tqmask(tqmask), m_screenToMask(screenToMask)
+SVGMaskElementImpl::Mask::Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height)
+	:	m_width(width), m_height(height), m_mask(mask), m_screenToMask(screenToMask)
 {
 }
 
diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h
index 0e4f0f89..5b61d713 100644
--- a/ksvg/impl/SVGMaskElementImpl.h
+++ b/ksvg/impl/SVGMaskElementImpl.h
@@ -56,7 +56,7 @@ public:
 	{
 	public:
 		Mask() : m_width(0), m_height(0) {}
-		Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height);
+		Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height);
 		~Mask() {}
 	
 		bool isEmpty() const { return m_width == 0; }
@@ -68,7 +68,7 @@ public:
 	private:
 		int m_width;
 		int m_height;
-		TQByteArray m_tqmask;
+		TQByteArray m_mask;
 		TQWMatrix m_screenToMask;
 	};
 
@@ -89,9 +89,9 @@ public:
 
 	Mask createMask(SVGShapeImpl *referencingElement);
 	
-	// Compute the tqmask on a given tqshape, taking into account all masks defined
+	// Compute the mask on a given tqshape, taking into account all masks defined
 	// on the tqshape's ancestors. This is a workaround for us not having a buffer
-	// for container elements, so we can't tqmask containers directly.
+	// for container elements, so we can't mask containers directly.
 	static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
 
 private:
@@ -137,7 +137,7 @@ public:
 	void putValueProperty(KJS::ExecState *exec, int token, const KJS::Value &value, int attr);
 };
 
-KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "tqmask")
+KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "mask")
 
 inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) const
 {
@@ -146,7 +146,7 @@ inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) c
 	m_screenToMask.map(screenX, screenY, &x, &y);
 
 	if(x >= 0 && x < m_width && y >= 0 && y < m_height)
-		return m_tqmask[x + y * m_width];
+		return m_mask[x + y * m_width];
 	else
 		return 0;
 }
diff --git a/ksvg/impl/SVGSVGElementImpl.h b/ksvg/impl/SVGSVGElementImpl.h
index b5d6212d..d2667a35 100644
--- a/ksvg/impl/SVGSVGElementImpl.h
+++ b/ksvg/impl/SVGSVGElementImpl.h
@@ -158,7 +158,7 @@ private:
 
 	TQMap<TQString, SVGElementImpl *> m_map;
 
-	// Transformation provided by the 'tqparent' of the outermost svg element
+	// Transformation provided by the 'parent' of the outermost svg element
 	SVGMatrixImpl *m_rootParentScreenCTM;
 
 	SVGMatrixImpl *m_localMatrix;
diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cc
index 255ab286..755bbd13 100644
--- a/ksvg/impl/SVGShapeImpl.cc
+++ b/ksvg/impl/SVGShapeImpl.cc
@@ -59,9 +59,9 @@ SVGShapeImpl::~SVGShapeImpl()
 
 bool SVGShapeImpl::directRender()
 {
-	SVGShapeImpl *tqparent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle()));
-	if(tqparent)
-		return tqparent->directRender();
+	SVGShapeImpl *parent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle()));
+	if(parent)
+		return parent->directRender();
 	else
 		return true;
 }
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 32db8575..d1019ff8 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -270,7 +270,7 @@ void SVGStylableImpl::processStyle()
 			m_strokeOpacity = 1;
 	}
 
-	// Fake group opacity by multiplying by our tqparent's group opacity
+	// Fake group opacity by multiplying by our parent's group opacity
 	if(~m_flags & SVG_STYLE_FLAG_OPACITY)
 	{
 		if(parentStyle)
@@ -286,7 +286,7 @@ void SVGStylableImpl::processStyle()
 		m_clipPath = "";
 
 	if(~m_flags & SVG_STYLE_FLAG_MASK)
-		m_tqmask = "";
+		m_mask = "";
 
 	// Spec: default "nonzero"
 	if(~m_flags & SVG_STYLE_FLAG_FILL_RULE)
@@ -737,7 +737,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value)
  glyph-orientation-vertical	SVGStylableImpl::GlyphOrientationVertical	DontDelete|ReadOnly
  glyph-orientation-horizontal	SVGStylableImpl::GlyphOrientationHorizontal	DontDelete|ReadOnly
  color-interpolation	SVGStylableImpl::ColorInterpolation	DontDelete|ReadOnly
- tqmask				SVGStylableImpl::Mask	DontDelete|ReadOnly
+ mask				SVGStylableImpl::Mask	DontDelete|ReadOnly
 @end
 @namespace KSVG
 @begin SVGStylableImplProto::s_hashTable 2
@@ -1076,7 +1076,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
 		case Mask:
 			m_flags |= SVG_STYLE_FLAG_MASK;
 			if(!inherit)
-				m_tqmask = extractUrlId(param);
+				m_mask = extractUrlId(param);
 			break;
 		case MarkerStart:
 			m_flags |= SVG_STYLE_FLAG_MARKER_START;
diff --git a/ksvg/impl/SVGStylableImpl.h b/ksvg/impl/SVGStylableImpl.h
index e2493317..34ce2f4e 100644
--- a/ksvg/impl/SVGStylableImpl.h
+++ b/ksvg/impl/SVGStylableImpl.h
@@ -225,7 +225,7 @@ public:
 	STYLE_GET(TQString, WordSpacing, m_wordSpacing)
 	STYLE_GET(TQString, FontWeight, m_fontWeight)
 	STYLE_GET(TQString, ClipPath, m_clipPath)
-	STYLE_GET(TQString, Mask, m_tqmask)
+	STYLE_GET(TQString, Mask, m_mask)
 	STYLE_GET(TQString, StartMarker, m_startMarker)
 	STYLE_GET(TQString, MidMarker, m_midMarker)
 	STYLE_GET(TQString, EndMarker, m_endMarker)
@@ -255,7 +255,7 @@ public:
 	STYLE_GET_OPTIM(EColorInterpolation, ColorInterpolation, m_colorInterpolation, 1)
 	
 	STYLE_HAS(ClipPath, m_clipPath)
-	STYLE_HAS(Mask, m_tqmask)
+	STYLE_HAS(Mask, m_mask)
 	STYLE_HAS(StartMarker, m_startMarker)
 	STYLE_HAS(MidMarker, m_midMarker)
 	STYLE_HAS(EndMarker, m_endMarker)
diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cc
index 4776c679..59dd904b 100644
--- a/ksvg/impl/SVGTransformableImpl.cc
+++ b/ksvg/impl/SVGTransformableImpl.cc
@@ -87,8 +87,8 @@ SVGMatrixImpl *SVGTransformableImpl::getCTM()
 
 	if(!parentNde.isNull() && parentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
 	{
-		SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNde.handle());
-		SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
+		SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNde.handle());
+		SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(parent);
 
 		if(locatableParent)
 		{
diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cc
index b7bc40f2..872bb0bc 100644
--- a/ksvg/impl/SVGUseElementImpl.cc
+++ b/ksvg/impl/SVGUseElementImpl.cc
@@ -243,10 +243,10 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
 
 		setReferencedElement(orig);
 
-		// Create a tqparent, a <g>
-		SVGElementImpl *tqparent = 0;
+		// Create a parent, a <g>
+		SVGElementImpl *parent = 0;
 		DOM::Element impl = static_cast<DOM::Document *>(ownerDoc())->createElement("g");
-		tqparent = SVGDocumentImpl::createElement("g", impl, ownerDoc());
+		parent = SVGDocumentImpl::createElement("g", impl, ownerDoc());
 		SVGElementImpl *clone = orig->cloneNode(true);
 
 		// Apply the use-correction
@@ -258,8 +258,8 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
 		trans += ")";
 
 		// Apply the transform attribute and render the element
-		tqparent->setAttributeInternal("transform", trans);
-		tqparent->setAttribute("transform", trans);
+		parent->setAttributeInternal("transform", trans);
+		parent->setAttribute("transform", trans);
 
 		// Apply width/height if symbol
 		if(dynamic_cast<SVGSymbolElementImpl *>(clone))
@@ -294,14 +294,14 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
 			}
 		}
 
-		appendChild(*tqparent);
-		tqparent->appendChild(*clone);
+		appendChild(*parent);
+		parent->appendChild(*clone);
 
-		setupSubtree(tqparent, ownerSVGElement(), viewportElement());
+		setupSubtree(parent, ownerSVGElement(), viewportElement());
 
 		m_instanceRoot->setCorrespondingElement(clone);
 
-		dynamic_cast<SVGLocatableImpl *>(tqparent)->updateCachedScreenCTM(screenCTM());
+		dynamic_cast<SVGLocatableImpl *>(parent)->updateCachedScreenCTM(screenCTM());
 
 		// Redirect local ecma event handlers to the correspondingElement
 		TQPtrListIterator<SVGRegisteredEventListener> it(eventListeners());
diff --git a/ksvg/impl/generateddata.cpp b/ksvg/impl/generateddata.cpp
index 16ac3456..5a4b3d7b 100644
--- a/ksvg/impl/generateddata.cpp
+++ b/ksvg/impl/generateddata.cpp
@@ -283,7 +283,7 @@ const ClassInfo SVGMPathElementImpl::s_classInfo = {"KSVG::SVGMPathElementImpl",
 const DOM::DOMString SVGMarkerElementImpl::s_tagName = "marker";
 const ClassInfo SVGMarkerElementImpl::s_classInfo = {"KSVG::SVGMarkerElementImpl",0,&SVGMarkerElementImpl::s_hashTable,0};
 const ClassInfo SVGMarkerElementImplConstructor::s_classInfo = {"KSVG::SVGMarkerElementImplConstructor",0,&SVGMarkerElementImplConstructor::s_hashTable,0};
-const DOM::DOMString SVGMaskElementImpl::s_tagName = "tqmask";
+const DOM::DOMString SVGMaskElementImpl::s_tagName = "mask";
 const ClassInfo SVGMaskElementImpl::s_classInfo = {"KSVG::SVGMaskElementImpl",0,&SVGMaskElementImpl::s_hashTable,0};
 const ClassInfo SVGMatrixImpl::s_classInfo = {"KSVG::SVGMatrixImpl",0,&SVGMatrixImpl::s_hashTable,0};
 const ClassInfo SVGMetadataElementImpl::s_classInfo = {"KSVG::SVGMetadataElementImpl",0,0,0};
diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c
index bcf9ec46..69b45306 100644
--- a/ksvg/impl/libs/art_support/art_misc.c
+++ b/ksvg/impl/libs/art_support/art_misc.c
@@ -464,7 +464,7 @@ struct _ksvgArtRgbAffineClipAlphaData
 	int src_width;
 	int src_height;
 	int src_rowstride;
-	const art_u8 *tqmask;
+	const art_u8 *mask;
 	int y0;
 };
 
@@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -626,7 +626,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int
 			srcAlpha = alpha * src_p[3] + 0x80;
 			srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
 
-			srcAlpha = (srcAlpha * *tqmask++) + 0x80;
+			srcAlpha = (srcAlpha * *mask++) + 0x80;
 			srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
 
 			d = *dst_p;
@@ -656,7 +656,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int
 		else
 		{
 			dst_p += 3;
-			tqmask++;
+			mask++;
 		}
 	}
 }
@@ -680,7 +680,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
 	x1 = data->x1;
 
 	alphatab = data->alphatab;
-	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->mask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -887,7 +887,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int
 			srcAlpha = alpha * src_p[3] + 0x80;
 			srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
 
-			srcAlpha = (srcAlpha * *tqmask++) + 0x80;
+			srcAlpha = (srcAlpha * *mask++) + 0x80;
 			srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
 
 			d = *dst_p;
@@ -924,7 +924,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int
 		else
 		{
 			dst_p += 4;
-			tqmask++;
+			mask++;
 		}
 	}
 }
@@ -948,7 +948,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
 	x1 = data->x1;
 
 	alphatab = data->alphatab;
-	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->mask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -1030,7 +1030,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
 		const art_u8 *src,
 		int src_width, int src_height, int src_rowstride,
 		const double affine[6],
-		int alpha, const art_u8 *tqmask)
+		int alpha, const art_u8 *mask)
 {
 	ksvgArtRgbAffineClipAlphaData data;
 	int i;
@@ -1052,7 +1052,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
 	data.x0 = x0;
 	data.x1 = x1;
 	data.y0 = y0;
-	data.tqmask = tqmask;
+	data.mask = mask;
 
 	art_affine_invert(data.inv, affine);
 
@@ -1063,14 +1063,14 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
 
 	if(dst_channels == 3)
 	{
-		if(tqmask)
+		if(mask)
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data);
 		else
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data);
 	}
 	else
 	{
-		if(tqmask)
+		if(mask)
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data);
 		else
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data);
@@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -1277,11 +1277,11 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0,
 		/* Pattern source is in RGBA format, premultiplied.
 		 * alpha represents fill/stroke/group opacity.
 		 *
-		 * Multiply source alpha by 'alpha' and tqmask value then composite over.
-		 * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d).
+		 * Multiply source alpha by 'alpha' and mask value then composite over.
+		 * For each channel, d = d + alpha * mask * (s - srcAlpha * d).
 		 */
 		
-		am = (alpha * *tqmask++) + 0x80;
+		am = (alpha * *mask++) + 0x80;
 		am = (am + (am >> 8)) >> 8;
 
 		srcAlpha = src_p[3];
@@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
 
 	alphatab = data->alphatab;
 
-	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->mask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -1594,11 +1594,11 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0,
 		/* Pattern source is in RGBA format, premultiplied.
 		 * alpha represents fill/stroke/group opacity.
 		 *
-		 * Multiply source alpha by 'alpha' and tqmask value then composite over.
-		 * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d).
+		 * Multiply source alpha by 'alpha' and mask value then composite over.
+		 * For each channel, d = d + alpha * mask * (s - srcAlpha * d).
 		 */
 		
-		am = (alpha * *tqmask++) + 0x80;
+		am = (alpha * *mask++) + 0x80;
 		am = (am + (am >> 8)) >> 8;
 
 		srcAlpha = src_p[3];
@@ -1636,7 +1636,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0,
 
 		*dst_p++ = d + tmp2;
 
-		/* dstAlpha = dstAlpha + srcAlpha * alpha * tqmask * (1 - dstAlpha) */
+		/* dstAlpha = dstAlpha + srcAlpha * alpha * mask * (1 - dstAlpha) */
 		d = *dst_p;
 
 		tmp = srcAlpha * am + 0x80;
@@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
 
 	alphatab = data->alphatab;
 
-	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->mask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -1756,7 +1756,7 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
 		ArtFilterLevel level,
 		ArtAlphaGamma *alphaGamma,
 		int alpha,
-		const art_u8 *tqmask)
+		const art_u8 *mask)
 {
 	ksvgArtRgbAffineClipAlphaData data;
 	int i;
@@ -1790,10 +1790,10 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
 	data.src_height = src_height;
 	data.src_rowstride = src_rowstride;
 
-	data.tqmask = tqmask;
+	data.mask = mask;
 	data.y0 = y0;
 
-	if(tqmask)
+	if(mask)
 	{
 		if(dst_channels == 3)
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data);
diff --git a/ksvg/impl/libs/art_support/art_misc.h b/ksvg/impl/libs/art_support/art_misc.h
index 7311d4b7..52f09a63 100644
--- a/ksvg/impl/libs/art_support/art_misc.h
+++ b/ksvg/impl/libs/art_support/art_misc.h
@@ -58,7 +58,7 @@ extern "C" {
 			const art_u8 *src,
 			int src_width, int src_height, int src_rowstride,
 			const double affine[6],
-			int alpha, const art_u8 *tqmask);
+			int alpha, const art_u8 *mask);
 
 	void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride,
 		int dst_channels,
@@ -68,7 +68,7 @@ extern "C" {
 		ArtFilterLevel level,
 		ArtAlphaGamma *alphaGamma,
 		int alpha,
-		const art_u8 *tqmask);
+		const art_u8 *mask);
 
 	void ksvg_art_svp_move(ArtSVP *svp, int dx, int dy);
 
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c
index 0c552c42..04ea81fc 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.c
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.c
@@ -37,7 +37,7 @@ struct _ArtKSVGRgbaSVPAlphaData {
   art_u8 r, g, b, alpha;
   art_u32 rgba;
   art_u8 *buf;
-	art_u8 *tqmask;
+	art_u8 *mask;
   int rowstride;
   int x0, x1;
 	int y0;
@@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i
 }
 
 static void
-art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
 {
 	int i;
 	int v;
@@ -136,7 +136,7 @@ art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, a
 
 	for(i = 0; i < n; i++)
 	{
-		am = (alpha * *tqmask++) + 0x80;
+		am = (alpha * *mask++) + 0x80;
 		am = (am + (am >> 8)) >> 8;
 
 		v = *buf;
@@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
 	b = data->b;
 	alphatab = data->alphatab;
 
-	maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+	maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0);
 
 	if(n_steps > 0)
 	{
@@ -436,7 +436,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
 		   art_u32 rgba,
 		   art_u8 *buf, int rowstride,
 		   ArtAlphaGamma *alphagamma,
-			 art_u8 *tqmask)
+			 art_u8 *mask)
 {
   ArtKSVGRgbaSVPAlphaData data;
   int r, g, b;
@@ -454,7 +454,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
   data.b = b;
   data.alpha = alpha;
   data.rgba = rgba;
-	data.tqmask = tqmask;
+	data.mask = mask;
 
   a = 0x8000;
   da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */
@@ -471,7 +471,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
   data.x1 = x1;
 	data.y0 = y0;
 
-	if(tqmask)
+	if(mask)
 		art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data);
 	else
 	{
@@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
 /* RGB renderers */
 
 static void
-art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
 {
 	int i;
 	int v;
@@ -497,7 +497,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art
 
 	for(i = 0; i < n; i++)
 	{
-		am = (alpha * *tqmask++) + 0x80;
+		am = (alpha * *mask++) + 0x80;
 		am = (am + (am >> 8)) >> 8;
 
 		v = *buf;
@@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
 	b = data->b;
 	alphatab = data->alphatab;
 
-	maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+	maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0);
 
 	if(n_steps > 0)
 	{
@@ -616,12 +616,12 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
  * @alphagamma is NULL.
  **/
 void
-art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
+art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
 												int x0, int y0, int x1, int y1,
 												art_u32 rgba,
 												art_u8 *buf, int rowstride,
 												ArtAlphaGamma *alphagamma,
-												art_u8 *tqmask)
+												art_u8 *mask)
 {
 	ArtKSVGRgbaSVPAlphaData data;
 	int r, g, b, alpha;
@@ -637,7 +637,7 @@ art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
 	data.g = g;
 	data.b = b;
 	data.alpha = alpha;
-	data.tqmask = tqmask;
+	data.mask = mask;
 
 	a = 0x8000;
 	da = (alpha * 66051 + 0x80) >> 8;	/* 66051 equals 2 ^ 32 / (255 * 255) */
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.h b/ksvg/impl/libs/art_support/art_rgba_svp.h
index 860eabcc..b59096d4 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.h
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.h
@@ -40,15 +40,15 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
 		   art_u32 rgba,
 		   art_u8 *buf, int rowstride,
 		   ArtAlphaGamma *alphagamma,
-			 art_u8 *tqmask);
+			 art_u8 *mask);
 
 void
-art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
+art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
 		   int x0, int y0, int x1, int y1,
 		   art_u32 rgba,
 		   art_u8 *buf, int rowstride,
 		   ArtAlphaGamma *alphagamma,
-			 art_u8 *tqmask);
+			 art_u8 *mask);
 
 #ifdef __cplusplus
 }
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 522480f1..70c00262 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window tqparent, root, *tqchildren;
+		Window parent, root, *tqchildren;
 		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
@@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &tqparent, &tqchildren, &ntqchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
 		if (ntqchildren > 0)
 			XFree (tqchildren);
 
-		if (tqparent == root)
+		if (parent == root)
 			return 1;
 
-		w = tqparent;
+		w = parent;
 	}
 
 	return 0;
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
index 7d359b61..aa94c7c6 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
@@ -61,7 +61,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 					       XlibRgbDither dither,
 					       int x_dither, int y_dither);
 
-void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
 					     Pixmap *mask_return,
 					     int alpha_threshold);