Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


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

3 files changed, 64 insertions, 64 deletions

diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp
index dd54e99be..faca9d967 100644
--- a/kdecore/svgicons/ksvgiconengine.cpp
+++ b/kdecore/svgicons/ksvgiconengine.cpp
@@ -127,12 +127,12 @@ public:
 			TQColor qStopColor = m_engine->painter()->parseColor(parseColor);
 
 			// Convert in a libart suitable form
-			Q_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
+			TQ_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
 
 			int opacity = m_engine->painter()->parseOpacity(parseOpacity);
 
-			Q_UINT32 rgba = (stopColor << 8) | opacity;
-			Q_UINT32 r, g, b, a;
+			TQ_UINT32 rgba = (stopColor << 8) | opacity;
+			TQ_UINT32 r, g, b, a;
 
 			// Convert from separated to premultiplied alpha
 			a = rgba & 0xff;
@@ -174,8 +174,8 @@ public:
 			return TQPointArray();
 
 		points.replace(',', ' ');
-		points.replace('\r', TQString::null);
-		points.replace('\n', TQString::null);
+		points.replace('\r', TQString());
+		points.replace('\n', TQString());
 
 		points = points.simplifyWhiteSpace();
 
@@ -201,7 +201,7 @@ public:
 		// Combine new and old matrix
 		TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
 
-		TQWMatrix *current = m_engine->painter()->worldMatrix();
+		TQWMatrix *current = m_engine->painter()->tqworldMatrix();
 		*current = matrix * *current;
 	}
 
@@ -221,9 +221,9 @@ public:
 		TQPtrList<TQDomNamedNodeMap> applyList;
 		applyList.setAutoDelete(true);
 
-		TQDomNode shape = node.parentNode();
-		for(; !shape.isNull() ; shape = shape.parentNode())
-			applyList.prepend(new TQDomNamedNodeMap(shape.attributes()));
+		TQDomNode tqshape = node.tqparentNode();
+		for(; !tqshape.isNull() ; tqshape = tqshape.tqparentNode())
+			applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes()));
 
 		// Apply parent attributes
 		for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next())
@@ -425,7 +425,7 @@ public:
 			if(href.startsWith("data:"))
 			{
 				// Get input
-				TQCString input = href.remove(TQRegExp("^data:image/.*;base64,")).utf8();
+				TQCString input = TQString(href.remove(TQRegExp("^data:image/.*;base64,"))).utf8();
 
 				// Decode into 'output'
 				TQByteArray output;
@@ -441,7 +441,7 @@ public:
 			{
 				// Scale, if needed
 				if(image.width() != (int) w || image.height() != (int) h)
-					image = image.smoothScale((int) w, (int) h, TQImage_ScaleFree);
+					image = image.smoothScale((int) w, (int) h, TQ_ScaleFree);
 
 				m_engine->painter()->drawImage(x, y, image);
 			}
@@ -622,7 +622,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		d->width = w;
 		d->height = h;
 
-		d->painter->worldMatrix()->scale(vratiow, vratioh);
+		d->painter->tqworldMatrix()->scale(vratiow, vratioh);
 	}
 	else
 	{
@@ -631,10 +631,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		double ratiow = width / d->width;
 		double ratioh = height / d->height;
 
-		d->painter->worldMatrix()->scale(ratiow, ratioh);
+		d->painter->tqworldMatrix()->scale(ratiow, ratioh);
 	}
 
-	TQWMatrix initialMatrix = *d->painter->worldMatrix();
+	TQWMatrix initialMatrix = *d->painter->tqworldMatrix();
 	d->helper->m_initialMatrix = initialMatrix;
 
 	// Apply transform
diff --git a/kdecore/svgicons/ksvgiconpainter.cpp b/kdecore/svgicons/ksvgiconpainter.cpp
index 811dfe918..06d5804f8 100644
--- a/kdecore/svgicons/ksvgiconpainter.cpp
+++ b/kdecore/svgicons/ksvgiconpainter.cpp
@@ -65,7 +65,7 @@ public:
 		m_useFillGradient = false;
 		m_useStrokeGradient = false;
 
-		m_worldMatrix = new TQWMatrix();
+		m_tqworldMatrix = new TQWMatrix();
 
 		// Create new image with alpha support
 		m_image = new TQImage(width, height, 32);
@@ -102,7 +102,7 @@ public:
 		art_free(m_buffer);
 
 		delete m_image;
-		delete m_worldMatrix;
+		delete m_tqworldMatrix;
 
 		for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
 		{
@@ -185,7 +185,7 @@ public:
 		m_tempBuffer = 0;
 	}
 
-	Q_UINT32 toArtColor(const TQColor &color)
+	TQ_UINT32 toArtColor(const TQColor &color)
 	{
 		// Convert in a libart suitable form
 		TQString tempName = color.name();
@@ -211,7 +211,7 @@ public:
 		return result;
 	}
 
-	void drawSVP(ArtSVP *svp, Q_UINT32 rgb, int opacity)
+	void drawSVP(ArtSVP *svp, TQ_UINT32 rgb, int opacity)
 	{
 		if(!svp)
 			return;
@@ -233,12 +233,12 @@ public:
 	void drawBPath(ArtBpath *bpath)
 	{
 		double affine[6];
-		affine[0] = m_worldMatrix->m11();
-		affine[1] = m_worldMatrix->m12();
-		affine[2] = m_worldMatrix->m21();
-		affine[3] = m_worldMatrix->m22();
-		affine[4] = m_worldMatrix->dx();
-		affine[5] = m_worldMatrix->dy();
+		affine[0] = m_tqworldMatrix->m11();
+		affine[1] = m_tqworldMatrix->m12();
+		affine[2] = m_tqworldMatrix->m21();
+		affine[3] = m_tqworldMatrix->m22();
+		affine[4] = m_tqworldMatrix->dx();
+		affine[5] = m_tqworldMatrix->dy();
 
 		ArtBpath *temp = art_bpath_affine_transform(bpath, affine);
 		ArtVpath *vec = art_bez_path_to_vec(temp, 0.25);
@@ -249,12 +249,12 @@ public:
 	void drawVPath(ArtVpath *vec)
 	{
 		double affine[6];
-		affine[0] = m_worldMatrix->m11();
-		affine[1] = m_worldMatrix->m12();
-		affine[2] = m_worldMatrix->m21();
-		affine[3] = m_worldMatrix->m22();
-		affine[4] = m_worldMatrix->dx();
-		affine[5] = m_worldMatrix->dy();
+		affine[0] = m_tqworldMatrix->m11();
+		affine[1] = m_tqworldMatrix->m12();
+		affine[2] = m_tqworldMatrix->m21();
+		affine[3] = m_tqworldMatrix->m22();
+		affine[4] = m_tqworldMatrix->dx();
+		affine[5] = m_tqworldMatrix->dy();
 
 		ArtVpath *temp = art_vpath_affine_transform(vec, affine);
 		art_free(vec);
@@ -267,7 +267,7 @@ public:
 		ArtSVP *svp;
 		ArtSVP *fillSVP = 0, *strokeSVP = 0;
 
-		Q_UINT32 fillColor = 0, strokeColor = 0;
+		TQ_UINT32 fillColor = 0, strokeColor = 0;
 
 		// Filling
 		{
@@ -461,10 +461,10 @@ public:
 			m.map(x1, y1, &x1, &y1);
 			m.map(x2, y2, &x2, &y2);
 
-			double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx();
-			double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy();
-			double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx();
-			double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy();
+			double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
+			double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
+			double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
+			double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
 
 			double dx = x2n - x1n;
 			double dy = y2n - y1n;
@@ -515,12 +515,12 @@ public:
 			else
 				fy = cy;
 
-			radial->affine[0] = m_worldMatrix->m11();
-			radial->affine[1] = m_worldMatrix->m12();
-			radial->affine[2] = m_worldMatrix->m21();
-			radial->affine[3] = m_worldMatrix->m22();
-			radial->affine[4] = m_worldMatrix->dx();
-			radial->affine[5] = m_worldMatrix->dy();
+			radial->affine[0] = m_tqworldMatrix->m11();
+			radial->affine[1] = m_tqworldMatrix->m12();
+			radial->affine[2] = m_tqworldMatrix->m21();
+			radial->affine[3] = m_tqworldMatrix->m22();
+			radial->affine[4] = m_tqworldMatrix->dx();
+			radial->affine[5] = m_tqworldMatrix->dy();
 
 			radial->fx = (fx - cx) / r;
 			radial->fy = (fy - cy) / r;
@@ -674,7 +674,7 @@ public:
 		  {
 			  QRgb *sl = reinterpret_cast<QRgb *>(m_image->scanLine(y));
 			  for(int x = 0; x < m_width; x++)
-				  sl[x] = qRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
+				  sl[x] = tqRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
 
 			  line += m_rowstride;
 		  }
@@ -1123,7 +1123,7 @@ private:
 	ArtSVP *m_clipSVP;
 
 	TQImage *m_image;
-	TQWMatrix *m_worldMatrix;
+	TQWMatrix *m_tqworldMatrix;
 
 	TQString m_fillRule;
 	TQString m_joinStyle;
@@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image()
 	return new TQImage(*d->helper->m_image);
 }
 
-TQWMatrix *KSVGIconPainter::worldMatrix()
+TQWMatrix *KSVGIconPainter::tqworldMatrix()
 {
-	return d->helper->m_worldMatrix;
+	return d->helper->m_tqworldMatrix;
 }
 
 void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix)
 {
-	if(d->helper->m_worldMatrix)
-		delete d->helper->m_worldMatrix;
+	if(d->helper->m_tqworldMatrix)
+		delete d->helper->m_tqworldMatrix;
 
-	d->helper->m_worldMatrix = matrix;
+	d->helper->m_tqworldMatrix = matrix;
 }
 
 void KSVGIconPainter::setStrokeWidth(double width)
@@ -1263,8 +1263,8 @@ void KSVGIconPainter::setStrokeColor(const TQString &stroke)
 
 		TQString url = stroke;
 
-		unsigned int start = url.find("#") + 1;
-		unsigned int end = url.findRev(")");
+		unsigned int start = url.tqfind("#") + 1;
+		unsigned int end = url.tqfindRev(")");
 
 		d->helper->m_strokeGradientReference = url.mid(start, end - start);
 	}
@@ -1291,8 +1291,8 @@ void KSVGIconPainter::setFillColor(const TQString &fill)
 
 		TQString url = fill;
 
-		unsigned int start = url.find("#") + 1;
-		unsigned int end = url.findRev(")");
+		unsigned int start = url.tqfind("#") + 1;
+		unsigned int end = url.tqfindRev(")");
 
 		d->helper->m_fillGradientReference = url.mid(start, end - start);
 	}
@@ -1315,7 +1315,7 @@ void KSVGIconPainter::setFillRule(const TQString &fillRule)
 	d->helper->m_fillRule = fillRule;
 }
 
-Q_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
+TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
 {
 	int opacity = 255;
 
@@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image)
 		image = image.convertDepth(32);
 
 	double affine[6];
-	affine[0] = d->helper->m_worldMatrix->m11();
-	affine[1] = d->helper->m_worldMatrix->m12();
-	affine[2] = d->helper->m_worldMatrix->m21();
-	affine[3] = d->helper->m_worldMatrix->m22();
+	affine[0] = d->helper->m_tqworldMatrix->m11();
+	affine[1] = d->helper->m_tqworldMatrix->m12();
+	affine[2] = d->helper->m_tqworldMatrix->m21();
+	affine[3] = d->helper->m_tqworldMatrix->m22();
 	// use the world matrix to convert the coordinates
-	d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]);
+	d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]);
 
 	d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height,
 									d->helper->m_rowstride, image.bits(), image.width(), image.height(),
@@ -2560,7 +2560,7 @@ TQColor KSVGIconPainter::parseColor(const TQString &param)
 			return TQColor(245, 255, 250);
 		else if(rgbColor == "mistyrose")
 			return TQColor(255, 228, 225);
-		else if(rgbColor == "moccasin")
+		else if(rgbColor == "tqmoccasin")
 			return TQColor(255, 228, 181);
 		else if(rgbColor == "navajowhite")
 			return TQColor(255, 222, 173);
@@ -2753,7 +2753,7 @@ void KSVGIconPainter::addRadialGradientElement(ArtGradientRadial *gradient, TQDo
 	d->helper->m_radialGradientElementMap.insert(gradient, element);
 }
 
-Q_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
+TQ_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
 {
 	return d->helper->toArtColor(color);
 }
diff --git a/kdecore/svgicons/ksvgiconpainter.h b/kdecore/svgicons/ksvgiconpainter.h
index 9ba44d2cf..6b00d9d7c 100644
--- a/kdecore/svgicons/ksvgiconpainter.h
+++ b/kdecore/svgicons/ksvgiconpainter.h
@@ -41,7 +41,7 @@ public:
 
 	TQImage *image();
 
-	TQWMatrix *worldMatrix();
+	TQWMatrix *tqworldMatrix();
 
 	void finish();
 
@@ -61,7 +61,7 @@ public:
 	void setStrokeDashOffset(const TQString &dashOffset);
 	void setStrokeDashArray(const TQString &dashes);
 
-	void setWorldMatrix(TQWMatrix *worldMatrix);
+	void setWorldMatrix(TQWMatrix *tqworldMatrix);
 	void setClippingRect(int x, int y, int w, int h);
 
 	void drawRectangle(double x, double y, double w, double h, double rx, double ry);
@@ -73,8 +73,8 @@ public:
 	void drawImage(double x, double y, TQImage &image);
 
 	TQColor parseColor(const TQString &param);
-	Q_UINT32 toArtColor(const TQColor &color);
-	Q_UINT32 parseOpacity(const TQString &data);
+	TQ_UINT32 toArtColor(const TQColor &color);
+	TQ_UINT32 parseOpacity(const TQString &data);
 
 	double toPixel(const TQString &s, bool hmode);
 	double dpi();