Rename old tq methods that no longer need a unique name

4 files changed, 8 insertions, 8 deletions

diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h
index 75ac0bd1..eac4c204 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 tqworldMatrix() { return m_matrix; }
+	virtual const TQWMatrix worldMatrix() { 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 84ad9d13..b61d854a 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 tqworldMatrix() = 0;
+	virtual const TQWMatrix worldMatrix() = 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 7f380287..51819ae3 100644
--- a/karbon/render/vqpainter.cc
+++ b/karbon/render/vqpainter.cc
@@ -81,9 +81,9 @@ VTQPainter::end()
 }
 
 const TQWMatrix
-VTQPainter::tqworldMatrix()
+VTQPainter::worldMatrix()
 {
-	return m_painter->tqworldMatrix();
+	return m_painter->worldMatrix();
 }
 
 void
@@ -153,13 +153,13 @@ VTQPainter::fillPath()
 {
 	// we probably dont need filling for qpainter
 	//m_index = 0;
-	m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index );
+	m_painter->drawPolygon( m_pa, FALSE, 0, m_index );
 }
 
 void
 VTQPainter::strokePath()
 {
-	m_painter->tqdrawPolyline( m_pa, 0, m_index );
+	m_painter->drawPolyline( 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->tqworldMatrix();
+	TQWMatrix matrix = m_painter->worldMatrix();
 	
 	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 d1a556db..5cf3ecd1 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 tqworldMatrix();
+	virtual const TQWMatrix worldMatrix();
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }