Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

2 files changed, 17 insertions, 17 deletions

diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp
index b5b5681f..2e43a97f 100644
--- a/ksvg/core/CanvasItems.cpp
+++ b/ksvg/core/CanvasItems.cpp
@@ -107,7 +107,7 @@ void CanvasText::handleTSpan(KSVGCanvas *canvas, const SVGMatrixImpl *screenCTM,
 			TQString text = tspan->text();
 			if(!text.isEmpty())
 			{
-				T2P::GlyphLayoutParams *params = tspan->tqlayoutParams();
+				T2P::GlyphLayoutParams *params = tspan->layoutParams();
 
 				if(bMultipleX || bMultipleY)
 				{
@@ -265,7 +265,7 @@ KSVGTextChunk *CanvasText::createTextChunk(KSVGCanvas *canvas, const SVGMatrixIm
 						curx = usex;
 						cury = usey;
 
-						T2P::GlyphLayoutParams *params = tpath->tqlayoutParams();
+						T2P::GlyphLayoutParams *params = tpath->layoutParams();
 
 						if(!params->tb())
 							curx += endx;
@@ -290,7 +290,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 	TQMemArray<double> _cury(1);
 	_cury[0] = double(cury);
 
-	T2P::GlyphLayoutParams *params = m_text->tqlayoutParams();
+	T2P::GlyphLayoutParams *params = m_text->layoutParams();
 	SVGTextPositioningElementImpl *tp = textChunk->getTextElement(0);
 	SVGTextContentElementImpl *tc = textChunk->getTextContentElement(0);
 	SVGTextContentElementImpl *tc0 = tc;
@@ -373,7 +373,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		}
 
 		{
-			T2P::GlyphLayoutParams *params = tc->tqlayoutParams();
+			T2P::GlyphLayoutParams *params = tc->layoutParams();
 			params->setLetterSpacing(params->letterSpacing() + addLetterSpacing);
 			if(bpath)
 			{
@@ -429,7 +429,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		return;
 
 	// Draw 'text-decoration'
-	// TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
+	// TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
 	// Underline and overline have to be drawn before the glyphs are rendered
 	if(tc0->getTextDecoration() & UNDERLINE && !params->tb())
 		addTextDecoration(tc0, (curx - anchor), (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
@@ -444,7 +444,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		SVGTextContentElementImpl *style = textChunk->getTextContentElement(j);
 
 		// Draw 'text-decoration'
-		// TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
+		// TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
 		// Underline and overline have to be drawn before the glyphs are rendered
 		if(style->getAttribute("text-decoration") == "underline" && !params->tb())
 			addTextDecoration(style, glyph->bboxX() - anchor, (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc
index 690069ba..e5621010 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cc
@@ -300,13 +300,13 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 
 	if(svg && svg->ownerSVGElement() == 0)
 	{
-		SVGImageElementImpl *tqparentImage = Helper::self()->doc()->tqparentImage();
+		SVGImageElementImpl *parentImage = Helper::self()->doc()->parentImage();
 
-		if(tqparentImage)
+		if(parentImage)
 		{
 			// We're being displayed in a document via an 'image' element. Set
 			// us up to fit into it's rectangle.
-			tqparentImage->setupSVGElement(svg);
+			parentImage->setupSVGElement(svg);
 		}
 	}
 
@@ -316,25 +316,25 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 	{
 		// Set up the cached screenCTM
 		SVGLocatableImpl *locatableParent = 0;
-		DOM::Node tqparentNode = newElement->parentNode();
+		DOM::Node parentNode = newElement->parentNode();
 
-		if(!tqparentNode.isNull())
+		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(tqparentNode.handle());
+			SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(parentNode.handle());
 
 			if(tqparent)
 				locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
 		}
 
-		SVGMatrixImpl *tqparentMatrix = 0;
+		SVGMatrixImpl *parentMatrix = 0;
 
 		if(locatableParent)
-			tqparentMatrix = locatableParent->getScreenCTM();
+			parentMatrix = locatableParent->getScreenCTM();
 		else
-			tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
+			parentMatrix = SVGSVGElementImpl::createSVGMatrix();
 
-		locatable->updateCachedScreenCTM(tqparentMatrix);
-		tqparentMatrix->deref();
+		locatable->updateCachedScreenCTM(parentMatrix);
+		parentMatrix->deref();
 	}
 
 	m_currentNode = newElement;