Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

7 files changed, 18 insertions, 18 deletions

diff --git a/karbon/render/art_rgb.c b/karbon/render/art_rgb.c
index 4d30fad4..6dd84bde 100644
--- a/karbon/render/art_rgb.c
+++ b/karbon/render/art_rgb.c
@@ -30,10 +30,10 @@
 /* This is really slow. Is there any way we might speed it up?
    Two ideas:
 
-   First, maybe we should be working at 32-bit alignment. Then,
+   First, maybe we should be working at 32-bit tqalignment. Then,
    this can be a simple loop over word stores.
 
-   Second, we can keep working at 24-bit alignment, but have some
+   Second, we can keep working at 24-bit tqalignment, but have some
    intelligence about storing. For example, we can iterate over
    4-pixel chunks (aligned at 4 pixels), with an inner loop
    something like:
@@ -100,7 +100,7 @@ art_rgb_fill_run_ (art_u8 *buf, art_u32 rgb, int n)
 	      *buf++ = b;
 	    }
 	} else {
-	  /* handle prefix up to byte alignment */
+	  /* handle prefix up to byte tqalignment */
 	  /* I'm worried about this cast on sizeof(long) != sizeof(uchar *)
 	     architectures, but it _should_ work. */
 	  for (i = 0; ((unsigned long)buf) & 3; i++)
diff --git a/karbon/render/art_rgb_svp.c b/karbon/render/art_rgb_svp.c
index 617f1abe..2052d2ff 100644
--- a/karbon/render/art_rgb_svp.c
+++ b/karbon/render/art_rgb_svp.c
@@ -120,7 +120,7 @@ art_rgb_svp_callback_ (void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the rendering.
  *
- * Renders the shape specified with @svp into the @buf RGB buffer.
+ * Renders the tqshape specified with @svp into the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
@@ -400,7 +400,7 @@ art_rgb_svp_alpha_opaque_callback_ (void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
  *
- * Renders the shape specified with @svp over the @buf RGB buffer.
+ * Renders the tqshape specified with @svp over the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h
index eac4c204..75ac0bd1 100644
--- a/karbon/render/vkopainter.h
+++ b/karbon/render/vkopainter.h
@@ -52,7 +52,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix worldMatrix() { return m_matrix; }
+	virtual const TQWMatrix tqworldMatrix() { return m_matrix; }
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h
index b61d854a..84ad9d13 100644
--- a/karbon/render/vpainter.h
+++ b/karbon/render/vpainter.h
@@ -57,7 +57,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & ) = 0;
-	virtual const TQWMatrix worldMatrix() = 0;
+	virtual const TQWMatrix tqworldMatrix() = 0;
 	virtual void setZoomFactor( double ) = 0;
 	virtual double zoomFactor() { return 1.0; }
 
diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cc
index 51819ae3..7f380287 100644
--- a/karbon/render/vqpainter.cc
+++ b/karbon/render/vqpainter.cc
@@ -81,9 +81,9 @@ VTQPainter::end()
 }
 
 const TQWMatrix
-VTQPainter::worldMatrix()
+VTQPainter::tqworldMatrix()
 {
-	return m_painter->worldMatrix();
+	return m_painter->tqworldMatrix();
 }
 
 void
@@ -153,13 +153,13 @@ VTQPainter::fillPath()
 {
 	// we probably dont need filling for qpainter
 	//m_index = 0;
-	m_painter->drawPolygon( m_pa, FALSE, 0, m_index );
+	m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index );
 }
 
 void
 VTQPainter::strokePath()
 {
-	m_painter->drawPolyline( m_pa, 0, m_index );
+	m_painter->tqdrawPolyline( m_pa, 0, m_index );
 	m_index = 0;
 }
 
@@ -265,7 +265,7 @@ VTQPainter::drawRect( const KoRect &rect )
 void
 VTQPainter::drawImage( const TQImage &image, const TQWMatrix &affine )
 {
-	TQWMatrix matrix = m_painter->worldMatrix();
+	TQWMatrix matrix = m_painter->tqworldMatrix();
 	
 	double m11 = affine.m11() * matrix.m11() * m_zoomFactor + affine.m12() * matrix.m21();
 	double m12 = (affine.m11() * matrix.m12() + affine.m12() * matrix.m22() ) * m_zoomFactor;
diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h
index 5cf3ecd1..d1a556db 100644
--- a/karbon/render/vqpainter.h
+++ b/karbon/render/vqpainter.h
@@ -44,7 +44,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix worldMatrix();
+	virtual const TQWMatrix tqworldMatrix();
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 7e955610..b9cf9376 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window parent, root, *children;
-		int nchildren;
+		Window parent, root, *tqchildren;
+		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &parent, &children, &nchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
-		if (nchildren > 0)
-			XFree (children);
+		if (ntqchildren > 0)
+			XFree (tqchildren);
 
 		if (parent == root)
 			return 1;