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

39 files changed, 171 insertions, 171 deletions

diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc
index e5621010..6d142b1d 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cc
@@ -289,7 +289,7 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 			Helper::self()->doc()->appendChild(*newElement);
 
 		// Special logics:
-		if(qName == "switch" || qName == "pattern" || qName == "tqmask")
+		if(qName == "switch" || qName == "pattern" || qName == "mask")
 			m_noRendering = true;
 	}
 
@@ -320,10 +320,10 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 
 		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(parentNode.handle());
+			SVGElementImpl *parent = Helper::self()->doc()->getElementFromHandle(parentNode.handle());
 
-			if(tqparent)
-				locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
+			if(parent)
+				locatableParent = dynamic_cast<SVGLocatableImpl *>(parent);
 		}
 
 		SVGMatrixImpl *parentMatrix = 0;
@@ -392,7 +392,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString
 	}
 
 	// Special logics:
-	if(qName == "switch" || qName == "pattern" || qName == "tqmask")
+	if(qName == "switch" || qName == "pattern" || qName == "mask")
 	{
 		m_noRendering = false;
 		bool ok = tests ? tests->ok() : true;
diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h
index 5e4f6520..77c6407c 100644
--- a/ksvg/data/SVGStylableImpl.lut.h
+++ b/ksvg/data/SVGStylableImpl.lut.h
@@ -47,7 +47,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = {
     "stroke\0"
     "clip\0"
     "fill\0"
-    "tqmask\0"
+    "mask\0"
 };
 
 
diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h
index fafe5204..f078b778 100644
--- a/ksvg/dom/SVGLocatable.h
+++ b/ksvg/dom/SVGLocatable.h
@@ -84,7 +84,7 @@ public:
 
 	/**
 	 * Returns the transformation matrix from current user units (i.e., after application of
-	 * the <code>transform</code> attribute, if any) to the tqparent user agent's notice of a "pixel".
+	 * the <code>transform</code> attribute, if any) to the parent user agent's notice of a "pixel".
 	 * For display devices, ideally this represents a physical screen pixel. For other devices or
 	 * environments where physical pixel sizes are not known, then an algorithm similar to the
 	 * CSS2 definition of a "pixel" can be used instead.
diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h
index 62196710..cdb0ef74 100644
--- a/ksvg/dom/SVGSVGElement.h
+++ b/ksvg/dom/SVGSVGElement.h
@@ -185,13 +185,13 @@ public:
 	 * corresponds to this 'svg' element. When the user agent is actually
 	 * rendering the content,  then the position and size values represent the
 	 * actual values when rendering.  The position and size values are unitless
-	 * values in the coordinate system of  the tqparent element. If no tqparent element
+	 * values in the coordinate system of  the parent element. If no parent element
 	 * exists (i.e., 'svg' element represents  the root of the document tree), if
 	 * this SVG document is embedded as part of  another document (e.g., via the
 	 * HTML 'object' element), then the position and  size are unitless values in
-	 * the coordinate system of the tqparent document. (If  the tqparent uses CSS or
+	 * the coordinate system of the parent document. (If  the parent uses CSS or
 	 * XSL tqlayout, then unitless values represent pixel units  for the current CSS
-	 * or XSL viewport, as described in the CSS2 specification.)  If the tqparent
+	 * or XSL viewport, as described in the CSS2 specification.)  If the parent
 	 * element does not have a coordinate system, then the user agent  should
 	 * provide reasonable default values for this attribute.
 	 *
diff --git a/ksvg/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h
index 1382d693..e4fb8a9f 100644
--- a/ksvg/dom/SVGTextElement.h
+++ b/ksvg/dom/SVGTextElement.h
@@ -61,7 +61,7 @@ class SVGTextElementImpl;
  * features that apply to tqshapes such as paths and rectangles also
  * apply to <code>text</code> elements.
  *
- * It is possible to apply a gradient, pattern, clipping path, tqmask or
+ * It is possible to apply a gradient, pattern, clipping path, mask or
  * filter to text.When one of these facilities is applied to text and
  * keyword objectBoundingBox is used to specify a graphical effect
  * relative to the "object bounding box", then the object bounding box
diff --git a/ksvg/ecma/ksvg_lookup.h b/ksvg/ecma/ksvg_lookup.h
index ef22000a..11c41462 100644
--- a/ksvg/ecma/ksvg_lookup.h
+++ b/ksvg/ecma/ksvg_lookup.h
@@ -37,7 +37,7 @@ public: \
     /* get() method, called by KSVGBridge::get */ \
     KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
     \
-    /* Called by lookupGet(). Auto-generated. Forwards to the tqparent which has the given property. */ \
+    /* Called by lookupGet(). Auto-generated. Forwards to the parent which has the given property. */ \
     KJS::Value getInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
     \
     KJS::Object prototype(KJS::ExecState *exec) const;\
@@ -59,7 +59,7 @@ public: \
     KSVG_GET_COMMON \
     virtual KJS::Value cache(KJS::ExecState *exec) const;
 
-// For classes without properties, but with a tqparent class to forward to
+// For classes without properties, but with a parent class to forward to
 #define KSVG_FORWARDGET \
 public: \
     \
@@ -127,7 +127,7 @@ namespace KSVG
 	 *
 	 * This method does it all (looking in the hashtable, checking for function
 	 * overrides, creating the function or retrieving from cache, calling
-	 * getValueProperty in case of a non-function property, forwarding to tqparent[s] if
+	 * getValueProperty in case of a non-function property, forwarding to parent[s] if
 	 * unknown property).
 	 *
 	 * Template arguments:
@@ -256,14 +256,14 @@ namespace KSVG
     } \
     const KJS::ClassInfo ClassProto::info = { ClassName, 0, &s_hashTable, 0 }; \
 
-// same as KSVG_IMPLEMENT_PROTOTYPE but with a tqparent class to forward calls to
+// same as KSVG_IMPLEMENT_PROTOTYPE but with a parent class to forward calls to
 // Not used within KSVG up to now - each class does a self proto lookup in generateddata.cpp
 #define KSVG_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName,ClassProto,ClassFunc,ParentProto) \
     KJS::Value KSVG::ClassProto::get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
     { \
       KJS::Value val = lookupGetFunction<ClassFunc,KJS::ObjectImp>(exec, propertyName, &s_hashTable, this ); \
       if ( val.type() != UndefinedType ) return val; \
-      /* Not found -> forward request to "tqparent" prototype */ \
+      /* Not found -> forward request to "parent" prototype */ \
       return ParentProto::self(exec).get( exec, propertyName ); \
     } \
     bool KSVG::ClassProto::hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
@@ -310,7 +310,7 @@ namespace KSVG
 
 // To be used in all call() implementations!
 // Can't use if (!thisObj.inherits(&ClassName::s_classInfo) since we don't
-// use the (single-tqparent) inheritance of ClassInfo...
+// use the (single-parent) inheritance of ClassInfo...
 #define KSVG_CHECK_THIS(ClassName) KSVG_CHECK(ClassName, thisObj)
 
 #endif
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index ae6024b3..90194781 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -490,7 +490,7 @@ void ScheduledAction::execute(Window *window)
 
 ////////////////////// WindowQObject ////////////////////////
 
-WindowQObject::WindowQObject(Window *w) : tqparent(w)
+WindowQObject::WindowQObject(Window *w) : parent(w)
 {
 }
 
@@ -560,8 +560,8 @@ void WindowQObject::timerEvent(TQTimerEvent *e)
 			scheduledActions.remove(it);
 		}
 		
-		if(tqparent->doc())
-			action->execute(tqparent);
+		if(parent->doc())
+			action->execute(parent);
 		
 		// It is important to test singleShot and not action->singleShot here - the
 		// action could have been deleted already if not single shot and if the
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 091448a8..ea07856c 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -114,7 +114,7 @@ protected slots:
 protected:
 	void timerEvent(TQTimerEvent *e);
 private:
-	Window *tqparent;
+	Window *parent;
 	//KHTMLPart *part;        // not guarded, may be dangling
 	TQMap<int, ScheduledAction*> scheduledActions;
 };
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);
diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h
index 92ba5b69..d075d688 100644
--- a/ksvg/plugin/backends/agg/AggCanvasFactory.h
+++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h
@@ -35,7 +35,7 @@ public:
 	AggCanvasFactory();
 	virtual ~AggCanvasFactory();
 
-	virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+	virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 };
 
 };
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp
index 8688c28d..1d2ee30c 100644
--- a/ksvg/plugin/backends/libart/LibartCanvas.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp
@@ -214,12 +214,12 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat
 
 			TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-			TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
+			TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
 
 			double affine[6];
 			KSVGHelper::matrixToAffine(matrix, affine);
 
-			ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)tqmask.data());
+			ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)mask.data());
 		}
 
 		art_svp_free(imageBorder);
@@ -334,11 +334,11 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 
 		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNode.handle());
+			SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNode.handle());
 
-			if(tqparent)
+			if(parent)
 			{
-				SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(tqparent);
+				SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(parent);
 
 				if(parentShape)
 				{
@@ -354,7 +354,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 	return clippedSvp;
 }
 
-void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox)
+void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox)
 {
 	int x0 = screenBBox.left();
 	int y0 = screenBBox.top();
@@ -363,13 +363,13 @@ void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRec
 
 	if(m_nrChannels == 3)
 	{
-		if(tqmask.data())
-			art_ksvg_rgb_svp_alpha_tqmask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)tqmask.data());
+		if(mask.data())
+			art_ksvg_rgb_svp_alpha_mask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)mask.data());
 		else
 			art_rgb_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0);
 	}
 	else
-		art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)tqmask.data());
+		art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)mask.data());
 }
 
 ArtSVP *LibartCanvas::copy_svp(const ArtSVP *svp)
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.h b/ksvg/plugin/backends/libart/LibartCanvas.h
index ff3829bd..9232789a 100644
--- a/ksvg/plugin/backends/libart/LibartCanvas.h
+++ b/ksvg/plugin/backends/libart/LibartCanvas.h
@@ -50,7 +50,7 @@ class LibartCanvas : public KSVGCanvas
 public:
 	LibartCanvas(unsigned int width, unsigned int height);
 
-	void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox);
+	void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox);
 	void drawImage(TQImage image, SVGStylableImpl *style, const SVGMatrixImpl *matrix, const KSVGPolygon& clippingPolygon);
 
 	virtual T2P::BezierPath *toBezierPath(CanvasItem *item) const;
diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h
index 0e5e3bed..c26aa833 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h
+++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h
@@ -35,7 +35,7 @@ public:
 	LibartCanvasFactory();
 	virtual ~LibartCanvasFactory();
 
-	virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+	virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 };
 
 }
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
index c9042b56..1434931b 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
@@ -252,7 +252,7 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st
 
 		TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-		TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
+		TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
 
 		if(paintType(style) == SVG_PAINTTYPE_URI)
 		{
@@ -263,11 +263,11 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st
 				pserver->setBBoxTarget(tqshape);
 				if(!pserver->finalized())
 					pserver->finalizePaintServer();
-				pserver->render(canvas, clippedSvp, opacity(style), tqmask, screenBBox);
+				pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox);
 			}
 		}
 		else
-			canvas->drawSVP(clippedSvp, m_color, tqmask, screenBBox);
+			canvas->drawSVP(clippedSvp, m_color, mask, screenBBox);
 	}
 
 	art_svp_free(clippedSvp);
@@ -1899,7 +1899,7 @@ void LibartGradient::reference(const TQString &)
 {
 }
 
-void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox)
+void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox)
 {
 	if(!m_stops.isEmpty())
 	{
@@ -2022,9 +2022,9 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB
 		art_render_svp(render, svp);
 		art_ksvg_render_gradient_linear(render, linear, ART_FILTER_HYPER);
 
-		if(tqmask.data())
+		if(mask.data())
 			art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1,
-				(const art_u8 *)tqmask.data(), screenBBox.width());
+				(const art_u8 *)mask.data(), screenBBox.width());
 
 		art_render_invoke(render);
 
@@ -2032,7 +2032,7 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB
 	}
 }
 
-void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox)
+void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox)
 {
 	if(!m_stops.isEmpty())
 	{
@@ -2158,9 +2158,9 @@ void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB
 		art_render_svp(render, svp);
 		art_ksvg_render_gradient_radial(render, radial, ART_FILTER_HYPER);
 
-		if(tqmask.data())
+		if(mask.data())
 			art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1,
-				(const art_u8 *)tqmask.data(), screenBBox.width());
+				(const art_u8 *)mask.data(), screenBBox.width());
 
 		art_render_invoke(render);
 
@@ -2184,7 +2184,7 @@ void LibartPattern::reference(const TQString &href)
 	m_pattern->reference(href);
 }
 
-void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox)
+void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox)
 {
 	SVGPatternElementImpl::Tile tile = m_pattern->createTile(getBBoxTarget());
 
@@ -2202,7 +2202,7 @@ void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArra
 
 		int alpha = int(opacity * 255 + 0.5);
 
-		ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)tqmask.data());
+		ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)mask.data());
 	}
 }
 
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h
index bf18dbd0..b5b9984b 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.h
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.h
@@ -73,7 +73,7 @@ namespace KSVG
 		LibartPaintServer() : CanvasPaintServer() {}
 		virtual ~LibartPaintServer() {}
 
-		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) = 0;
+		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) = 0;
 
 		_ArtRender *createRenderer(TQRect rect, KSVGCanvas *c);
 	};
@@ -99,7 +99,7 @@ namespace KSVG
 	public:
 		LibartLinearGradient(SVGLinearGradientElementImpl *linear) : LibartGradient(linear), m_linear(linear) {}
 
-		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox);
+		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox);
 
 	protected:
 		SVGLinearGradientElementImpl *m_linear;
@@ -110,7 +110,7 @@ namespace KSVG
 	public:
 		LibartRadialGradient(SVGRadialGradientElementImpl *radial) : LibartGradient(radial), m_radial(radial) {}
 
-		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox);
+		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox);
 
 	protected:
 		SVGRadialGradientElementImpl *m_radial;
@@ -125,7 +125,7 @@ namespace KSVG
 		virtual void finalizePaintServer();
 		virtual void reference(const TQString &href);
 
-		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox);
+		virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox);
 
 	protected:
 		SVGPatternElementImpl *m_pattern;
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index 0f55be71..d5e5e1dc 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -43,7 +43,7 @@ extern "C"
 KInstance *KSVGPluginFactory::s_instance = 0;
 KAboutData *KSVGPluginFactory::s_about = 0;
 
-KSVGPluginFactory::KSVGPluginFactory(TQObject *tqparent, const char *name) : KParts::Factory(tqparent, name)
+KSVGPluginFactory::KSVGPluginFactory(TQObject *parent, const char *name) : KParts::Factory(parent, name)
 {
 }
 
@@ -56,7 +56,7 @@ KSVGPluginFactory::~KSVGPluginFactory()
 	s_about = 0;
 }
 
-KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args)
+KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, const char *, const TQStringList &args)
 {
 	// Get the width and height of the <embed>
 	// TODO : <object>
@@ -72,7 +72,7 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const
 			height = r2.cap(3).toUInt(&dummy);
 	}
 	
-	return new KSVGPlugin(parentWidget, wname, tqparent, name, width, height);
+	return new KSVGPlugin(parentWidget, wname, parent, name, width, height);
 }
 
 KInstance *KSVGPluginFactory::instance()
@@ -90,8 +90,8 @@ KInstance *KSVGPluginFactory::instance()
 	return s_instance;
 }
 
-KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *tqparent)
-: KParts::BrowserExtension(tqparent, "KSVGPlugin BrowserExtension")
+KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *parent)
+: KParts::BrowserExtension(parent, "KSVGPlugin BrowserExtension")
 {
 }
 
diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h
index c94de0a1..846bf15f 100644
--- a/ksvg/plugin/ksvg_factory.h
+++ b/ksvg/plugin/ksvg_factory.h
@@ -32,10 +32,10 @@ class KSVGPluginFactory : public KParts::Factory
 Q_OBJECT
   TQ_OBJECT
 public:
-	KSVGPluginFactory(TQObject *tqparent = 0, const char *name = 0);
+	KSVGPluginFactory(TQObject *parent = 0, const char *name = 0);
 	virtual ~KSVGPluginFactory();
 	
-	virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
+	virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
 	
 	static KInstance *instance();
 
@@ -51,7 +51,7 @@ Q_OBJECT
 friend class KSVGPlugin;
 
 public:
-	KSVGPluginBrowserExtension(KSVGPlugin *tqparent);
+	KSVGPluginBrowserExtension(KSVGPlugin *parent);
 	virtual ~KSVGPluginBrowserExtension();
 };
 
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 87cd7398..1a2e3f8d 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -81,7 +81,7 @@ struct KSVGPlugin::Private
 	unsigned int height;
 };
 
-KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(tqparent, name)
+KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(parent, name)
 {
 	kdDebug(26003) << "KSVGPlugin::KSVGPlugin" << endl;
 	setInstance(KSVGPluginFactory::instance());
@@ -95,7 +95,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, co
 
 	ksvgd->doc = 0;
 
-	ksvgd->window = new KSVGWidget(this, wtqparent, "Rendering Widget");
+	ksvgd->window = new KSVGWidget(this, wparent, "Rendering Widget");
 	connect(ksvgd->window, TQT_SIGNAL(browseURL(const TQString &)), this, TQT_SLOT(browseURL(const TQString &)));
 	ksvgd->window->show();
 
@@ -144,7 +144,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, co
 	ksvgd->renderingBackendAction->setItems(items);
 	ksvgd->renderingBackendAction->setCurrentItem(KSVG::CanvasFactory::self()->itemInList(ksvgd->canvas));
 
-	ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wtqparent);
+	ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wparent);
 
 	setXMLFile("ksvgplugin.rc");
 }
diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h
index 919b0290..675f469d 100644
--- a/ksvg/plugin/ksvg_plugin.h
+++ b/ksvg/plugin/ksvg_plugin.h
@@ -37,7 +37,7 @@ class KSVGPlugin : public KParts::ReadOnlyPart
 Q_OBJECT
   TQ_OBJECT
 public:
-	KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0);
+	KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, unsigned int width = 0, unsigned int height = 0);
 	virtual ~KSVGPlugin();
 
 	virtual bool openFile() { return false; }
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index 8cfb4baa..015d7bad 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -27,8 +27,8 @@
 #include "SVGDocumentImpl.h"
 #include "SVGSVGElementImpl.h"
 
-KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name), m_part(part)
+KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name)
+: TQWidget(parent, name), m_part(part)
 {
 	setMouseTracking(true);	
 	setFocusPolicy(TQ_WheelFocus);
diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h
index 33fc82e3..d84701c9 100644
--- a/ksvg/plugin/ksvg_widget.h
+++ b/ksvg/plugin/ksvg_widget.h
@@ -33,7 +33,7 @@ class KSVGWidget : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-	KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name);
+	KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name);
 	virtual ~KSVGWidget();
 
 	KSVGPlugin *part() const;
diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1
index a695c8d4..226c04c3 100644
--- a/ksvg/test/W3C_TESTSUITE_1.1
+++ b/ksvg/test/W3C_TESTSUITE_1.1
@@ -103,7 +103,7 @@ linking-uri-02-b	-
 linking-uri-03-t	x
 
 [MASKING]
-masking-tqmask-01-b	-
+masking-mask-01-b	-
 masking-opacity-01-b	o
 masking-path-01-b	x
 masking-path-02-b	x
diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED
index 476b0afc..c83c567e 100644
--- a/ksvg/test/ZVON-TEST-PASSED
+++ b/ksvg/test/ZVON-TEST-PASSED
@@ -86,8 +86,8 @@ masking-clipPath-BE-02.svg:		x
 masking-clipPath-BE-08.svg:		x
 masking-clipRule-BE-03.svg:		x
 masking-groupOpac-BE-04.svg:	x
-masking-tqmask-BE-05.svg:			x
-masking-tqmask-BE-06.svg:			x
+masking-mask-BE-05.svg:			x
+masking-mask-BE-06.svg:			x
 masking-property-BE-07.svg:		x
 masking-vportClip-BE-09.svg:	x