rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

6 files changed, 19 insertions, 19 deletions

diff --git a/karbon/tools/vcurvefit.cc b/karbon/tools/vcurvefit.cc
index fee361c2..40d7b7e3 100644
--- a/karbon/tools/vcurvefit.cc
+++ b/karbon/tools/vcurvefit.cc
@@ -425,7 +425,7 @@ static double NewtonRaphsonRootFind(KoPoint *Q,KoPoint P,double u)
 
 /*
  *  Reparameterize:
- *	Given set of points and their parameterization, try to tqfind
+ *	Given set of points and their parameterization, try to find
  *   a better parameterization.
  *
  */
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc
index 7254e835..95752f52 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cc
@@ -289,16 +289,16 @@ VGradientTool::mouseButtonPress()
 	m_current = first();
 
 	// set the apropriate editing state
-	if( m_center.tqcontains( m_current ) && shiftPressed())
+	if( m_center.contains( m_current ) && shiftPressed())
 	{
 		m_state = moveCenter;
 	}
-	else if( m_origin.tqcontains( m_current ) )
+	else if( m_origin.contains( m_current ) )
 	{
 		m_state = moveOrigin;
 		m_fixed = m_vector.center();
 	}
-	else if( m_vector.tqcontains( m_current ) )
+	else if( m_vector.contains( m_current ) )
 	{
 		m_state = moveVector;
 		m_fixed = m_origin.center();
@@ -489,7 +489,7 @@ VGradientTool::setCursor() const
 	if( !view() ) return;
 
 	// set a different cursor if mouse is inside the handle rects
-	if( m_origin.tqcontains( last() ) || m_vector.tqcontains( last() ) || m_center.tqcontains( last() ) )
+	if( m_origin.contains( last() ) || m_vector.contains( last() ) || m_center.contains( last() ) )
 		view()->setCursor( TQCursor( TQt::SizeAllCursor ) );
 	else
 		view()->setCursor( TQCursor( TQt::arrowCursor ) );
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 1856672f..d522652c 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -300,12 +300,12 @@ VPatternTool::mouseButtonPress()
 	m_current = first();
 
 	// set the apropriate editing state
-	if( m_origin.tqcontains( m_current ) )
+	if( m_origin.contains( m_current ) )
 	{
 		m_state = moveOrigin;
 		m_fixed = m_vector.center();
 	}
-	else if( m_vector.tqcontains( m_current ) )
+	else if( m_vector.contains( m_current ) )
 	{
 		m_state = moveVector;
 		m_fixed = m_origin.center();
@@ -472,7 +472,7 @@ VPatternTool::setCursor() const
 	if( !view() ) return;
 
 	// set a different cursor if mouse is inside the handle rects
-	if( m_origin.tqcontains( last() ) || m_vector.tqcontains( last() ) )
+	if( m_origin.contains( last() ) || m_vector.contains( last() ) )
 		view()->setCursor( TQCursor( TQt::SizeAllCursor ) );
 	else
 		view()->setCursor( TQCursor( TQt::arrowCursor ) );
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc
index 747357de..7ef25c5e 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cc
@@ -120,7 +120,7 @@ VSelectNodesTool::setCursor() const
 	{
 		VSegment* seg = segments.at( 0 );
 		for( int i = 0; i < seg->degree(); ++i )
-			if( seg->pointIsSelected( i ) && selrect.tqcontains( seg->point( i ) ) )
+			if( seg->pointIsSelected( i ) && selrect.contains( seg->point( i ) ) )
 			{
 				view()->setCursor( VCursor::needleMoveArrow() );
 				break;
@@ -158,16 +158,16 @@ VSelectNodesTool::mouseButtonPress()
 
 		// allow moving bezier points only if one of the bezier points is within the selection rect
 		// and no neighboring knot is selected
-		if( segments.count() == 1 && ! selrect.tqcontains( seg->knot() ) && ! seg->knotIsSelected() 
+		if( segments.count() == 1 && ! selrect.contains( seg->knot() ) && ! seg->knotIsSelected() 
 		&& ( prev && ! prev->knotIsSelected() ) )
 		{
-			if( selrect.tqcontains( seg->point( 1 ) ) )
+			if( selrect.contains( seg->point( 1 ) ) )
 			{
 				m_state = movingbezier1;
 				if( next )
 					next->selectPoint( 0, false );
 			}
-			else if( selrect.tqcontains( seg->point( 0 ) ) )
+			else if( selrect.contains( seg->point( 0 ) ) )
 			{
 				m_state = movingbezier2;
 				if( prev ) 
@@ -180,7 +180,7 @@ VSelectNodesTool::mouseButtonPress()
 			{
 				for( int i = 0; i < seg->degree(); ++i )
 				{
-					if( seg->pointIsSelected( i ) && selrect.tqcontains( seg->point( i ) ) )
+					if( seg->pointIsSelected( i ) && selrect.contains( seg->point( i ) ) )
 					{
 						m_state = moving;
 						break;
@@ -197,7 +197,7 @@ VSelectNodesTool::mouseButtonPress()
 		{
 			for( int i = 0; i < seg->degree(); ++i )
 			{
-				if( selrect.tqcontains( seg->point( i ) ) )
+				if( selrect.contains( seg->point( i ) ) )
 				{
 					KoPoint vDist = seg->point( i ) - m_current;
 					double dist = vDist.x()*vDist.x() + vDist.y()*vDist.y();
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc
index 751c0ebe..e29e1afb 100644
--- a/karbon/tools/vselecttool.cc
+++ b/karbon/tools/vselecttool.cc
@@ -183,7 +183,7 @@ VSelectTool::mouseButtonPress()
 
 	if( m_activeNode != node_none )
 		m_state = scaling;
-	else if( rect.tqcontains( m_current ) && m_state == normal )
+	else if( rect.contains( m_current ) && m_state == normal )
 		m_state = moving;
 
 	recalc();
@@ -274,7 +274,7 @@ VSelectTool::mouseButtonRelease()
 			VObjectListIterator it( newSelection );
 			for( ; it.current(); ++it )
 			{
-				if( oldSelection.tqcontains( it.current() ) )
+				if( oldSelection.contains( it.current() ) )
 					lastMatched = it.current();
 			}
 			
@@ -282,7 +282,7 @@ VSelectTool::mouseButtonRelease()
 			// - none is selected
 			// - the stack's bottom object was the last selected object
 			if( lastMatched && lastMatched != newSelection.first() )
-				view()->part()->document().selection()->append( newSelection.at( newSelection.tqfind( lastMatched )-1 ) );
+				view()->part()->document().selection()->append( newSelection.at( newSelection.find( lastMatched )-1 ) );
 			else
 				view()->part()->document().selection()->append( newSelection.last() );
 		}
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index fda8e9fe..67776ac3 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -678,7 +678,7 @@ VTextTool::mouseButtonRelease()
 	VObject* selObj = selection->objects().getFirst();
 
 	// initialize dialog with single selected object
-	if( selection->objects().count() == 1 && selObj->boundingBox().tqcontains( last() ) )
+	if( selection->objects().count() == 1 && selObj->boundingBox().contains( last() ) )
 		m_optionsWidget->initialize( *selObj );
 	else 
 	{
@@ -691,7 +691,7 @@ VTextTool::mouseButtonRelease()
 			return;
 	}
 
-	if( dynamic_cast<VText*>( selObj ) && selObj->boundingBox().tqcontains( last() ) )
+	if( dynamic_cast<VText*>( selObj ) && selObj->boundingBox().contains( last() ) )
 		m_optionsWidget->setCaption( i18n( "Change Text") );
 	else 
 		m_optionsWidget->setCaption( i18n( "Insert Text") );