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

24 files changed, 67 insertions, 67 deletions

diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc
index da08d94f..a793115d 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cc
@@ -82,7 +82,7 @@ VCommandHistory::addCommand( VCommand* command, bool execute )
 	}
 
 	m_commands.append( command );
-	kdDebug(38000) << "History: new command: " << m_commands.tqfindRef( command ) << endl;
+	kdDebug(38000) << "History: new command: " << m_commands.findRef( command ) << endl;
 
 	if( execute )
 	{
@@ -176,7 +176,7 @@ VCommandHistory::redo()
 void
 VCommandHistory::undo( VCommand* command )
 {
-	if( ( m_commands.tqfindRef( command ) == -1 ) || ( !command->success() ) )
+	if( ( m_commands.findRef( command ) == -1 ) || ( !command->success() ) )
 		return;
 
 	command->unexecute();
@@ -192,7 +192,7 @@ VCommandHistory::undo( VCommand* command )
 void
 VCommandHistory::redo( VCommand* command )
 {
-	if( ( m_commands.tqfindRef( command ) == -1 ) || ( command->success() ) )
+	if( ( m_commands.findRef( command ) == -1 ) || ( command->success() ) )
 		return;
 
 	command->execute();
@@ -210,7 +210,7 @@ VCommandHistory::undoAllTo( VCommand* command )
 {
 	int to;
 
-	if( ( to = m_commands.tqfindRef( command ) ) == -1 )
+	if( ( to = m_commands.findRef( command ) ) == -1 )
 		return;
 
 	int i = m_commands.count() - 1;
@@ -239,7 +239,7 @@ VCommandHistory::redoAllTo( VCommand* command )
 {
 	int to;
 
-	if( ( to = m_commands.tqfindRef( command ) ) == -1 )
+	if( ( to = m_commands.findRef( command ) ) == -1 )
 		return;
 
 	int i = 0;
diff --git a/karbon/commands/vreplacingcmd.h b/karbon/commands/vreplacingcmd.h
index a4f478e3..727dc806 100644
--- a/karbon/commands/vreplacingcmd.h
+++ b/karbon/commands/vreplacingcmd.h
@@ -29,7 +29,7 @@ class VSelection;
 
 /**
  * VReplacingCmd is a generic command. Derive from it if you plan to do complex
- * transformations upon selected objects which make it necessary to tqreplace
+ * transformations upon selected objects which make it necessary to replace
  * each object as a whole with a new object.
  */
 
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc
index d8eaf027..7872df5f 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cc
@@ -264,7 +264,7 @@ bool
 VPath::pointIsInside( const KoPoint& p ) const
 {
 	// Check if point is inside boundingbox.
-	if( !boundingBox().tqcontains( p ) )
+	if( !boundingBox().contains( p ) )
 		return false;
 
 
@@ -422,7 +422,7 @@ VPath::transformByViewbox( const TQDomElement &element, TQString viewbox )
 	if( ! viewbox.isEmpty() )
 	{
 		// allow for viewbox def with ',' or whitespace
-		TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ' ).simplifyWhiteSpace() );
+		TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ' ).simplifyWhiteSpace() );
 
 		double w = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() ) );
 		double h = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) );
diff --git a/karbon/core/vdocument.cc b/karbon/core/vdocument.cc
index 0384141b..2de51bf1 100644
--- a/karbon/core/vdocument.cc
+++ b/karbon/core/vdocument.cc
@@ -151,20 +151,20 @@ VDocument::removeLayer( VLayer* layer )
 
 bool VDocument::canRaiseLayer( VLayer* layer )
 {
-    int pos = m_layers.tqfind( layer );
+    int pos = m_layers.find( layer );
     return (pos != int( m_layers.count() ) - 1 && pos >= 0 );
 }
 
 bool VDocument::canLowerLayer( VLayer* layer )
 {
-    int pos = m_layers.tqfind( layer );
+    int pos = m_layers.find( layer );
     return (pos>0);
 }
 
 void
 VDocument::raiseLayer( VLayer* layer )
 {
-	int pos = m_layers.tqfind( layer );
+	int pos = m_layers.find( layer );
 	if( pos != int( m_layers.count() ) - 1 && pos >= 0 )
 	{
 		VLayer* layer = m_layers.take( pos );
@@ -175,7 +175,7 @@ VDocument::raiseLayer( VLayer* layer )
 void
 VDocument::lowerLayer( VLayer* layer )
 {
-	int pos = m_layers.tqfind( layer );
+	int pos = m_layers.find( layer );
 	if ( pos > 0 )
 	{
 		VLayer* layer = m_layers.take( pos );
@@ -186,13 +186,13 @@ VDocument::lowerLayer( VLayer* layer )
 int
 VDocument::layerPos( VLayer* layer )
 {
-	return m_layers.tqfind( layer );
+	return m_layers.find( layer );
 } // VDocument::layerPos
 
 void
 VDocument::setActiveLayer( VLayer* layer )
 {
-	if ( m_layers.tqfind( layer ) != -1 )
+	if ( m_layers.find( layer ) != -1 )
 		m_activeLayer = layer;
 } // VDocument::setActiveLayer
 
@@ -318,6 +318,6 @@ VDocument::accept( VVisitor& visitor )
 TQString
 VDocument::objectName( const VObject *obj ) const
 {
-	TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.tqfind( obj );
+	TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.find( obj );
 	return it == m_objectNames.end() ? 0L : it.data();
 }
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index ab2ec328..35f3991e 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -383,7 +383,7 @@ VGroup::insertInfrontOf( VObject* newObject, VObject* oldObject )
 {
 	newObject->setParent( this );
 
-	m_objects.insert( m_objects.tqfind( oldObject ), newObject );
+	m_objects.insert( m_objects.find( oldObject ), newObject );
 
 	invalidateBoundingBox();
 }
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index 49c3bc11..dddfe6ce 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -111,7 +111,7 @@ VLayer::downwards( const VObject& object )
 {
 	if( m_objects.getFirst() == &object ) return;
 
-	int index = m_objects.tqfind( &object );
+	int index = m_objects.find( &object );
 	bool bLast = m_objects.getLast() == &object;
 	m_objects.remove( index );
 
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 4f279cd7..1442d90c 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -416,7 +416,7 @@ bool
 VSubpath::pointIsInside( const KoPoint& p ) const
 {
 	// If the point is not inside the boundingbox, it cannot be inside the path either.
-	if( !boundingBox().tqcontains( p ) )
+	if( !boundingBox().contains( p ) )
 		return false;
 
 	// First check if the point is inside the knot polygon (beziers are treated
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index b7cc2167..77809ac5 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -135,7 +135,7 @@ VSelection::append( VObject* object )
 	// only append if item is not deleted or not already in list
 	if( object->state() != deleted )
 	{
-		if( ! m_objects.tqcontainsRef( object ) )
+		if( ! m_objects.containsRef( object ) )
 			m_objects.append( object );
 		object->setState( selected );
 		invalidateBoundingBox();
@@ -295,7 +295,7 @@ VSelection::handleNode( const KoPoint &point ) const
 {
 	for( uint i = node_lt; i <= node_rb; ++i )
 	{
-		if( m_handleRect[i].tqcontains( point ) )
+		if( m_handleRect[i].contains( point ) )
 			return static_cast<VHandleNode>( i );
 	}
 
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index 9f215b59..e73445ee 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -660,7 +660,7 @@ VText::buildRequest( TQString family, int weight, int slant, double size, int &i
 {
 	// Strip those stupid [Xft or whatever]...
 	int pos;
-	if( ( pos = family.tqfind( '[' ) ) )
+	if( ( pos = family.find( '[' ) ) )
 		family = family.left( pos );
 
 	// Use FontConfig to locate & select fonts and use  FreeType2 to open them
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index a0cba13b..23e4243c 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -110,7 +110,7 @@ VDocumentPreview::eventFilter( TQObject* object, TQEvent* event )
 		m_lastPoint = m_firstPoint;
 		KoPoint p3( m_firstPoint.x() / scaleFactor - xoffset,
 					( height() - m_firstPoint.y() ) / scaleFactor - yoffset );
-		m_dragging = rect.tqcontains( p3 );
+		m_dragging = rect.contains( p3 );
 	}
 	else if( event->type() == TQEvent::MouseButtonRelease )
 	{
@@ -144,7 +144,7 @@ VDocumentPreview::eventFilter( TQObject* object, TQEvent* event )
 		{
 			KoPoint p3( mouseEvent->pos().x() / scaleFactor - xoffset,
 						( height() - mouseEvent->pos().y() ) / scaleFactor - yoffset );
-			setCursor( rect.tqcontains( p3 ) ? TQCursor::SizeAllCursor : TQCursor( TQt::arrowCursor ) );
+			setCursor( rect.contains( p3 ) ? TQCursor::SizeAllCursor : TQCursor( TQt::arrowCursor ) );
 		}
 	}
 
@@ -1014,7 +1014,7 @@ VLayersTab::removeDeletedObjectsFromList()
 		{
 			VGroup *group = dynamic_cast<VGroup*>( layerItem->layer() );
 			// check if object of item is still child of object of tqparent item
-			if( group && ! group->objects().tqcontains( it.current()->object() ) )
+			if( group && ! group->objects().contains( it.current()->object() ) )
 			{
 				layerItem->takeItem( it.current() );
 				delete it.current();
@@ -1028,7 +1028,7 @@ VLayersTab::removeDeletedObjectsFromList()
 			{
 				VGroup *group = dynamic_cast<VGroup*>( objectItem->object() );
 				// check if object of item is still child of object of tqparent item
-				if( group && ! group->objects().tqcontains( it.current()->object() ) )
+				if( group && ! group->objects().contains( it.current()->object() ) )
 				{
 					objectItem->takeItem( it.current() );
 					delete it.current();
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 39739e68..7003e510 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -102,7 +102,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path )
 		return;
 
 	// Note: we modiy segments from path. that doesn't hurt, since we
-	// tqreplace "path" with the temporary path "newPath" afterwards.
+	// replace "path" with the temporary path "newPath" afterwards.
 
 	VSubpath newPath( 0L );
 
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc
index 98ae826e..0ac9fd0c 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cc
@@ -293,25 +293,25 @@ VKoPainter::fillPath()
 	if( m_index == 0 ) return;
 
 	// find begin of last subpath
-	int tqfind = -1;
+	int find = -1;
 	for( int i = m_index - 1; i >= 0; i-- )
 	{
 		if( m_path[i].code == ART_MOVETO_OPEN || m_path[i].code == ART_MOVETO )
 		{
-			tqfind = i;
+			find = i;
 			break;
 		}
 	}
 
 	// for now, always close
-	if( tqfind != -1 && ( m_path[ tqfind ].x3 != m_path[ m_index - 1 ].x3 ||
-						m_path[ tqfind ].y3 != m_path[ m_index - 1 ].y3 ) )
+	if( find != -1 && ( m_path[ find ].x3 != m_path[ m_index - 1 ].x3 ||
+						m_path[ find ].y3 != m_path[ m_index - 1 ].y3 ) )
 	{
 		ensureSpace( m_index + 1 );
 
 		m_path[ m_index ].code = ART_LINETO;
-		m_path[ m_index ].x3	= m_path[ tqfind ].x3;
-		m_path[ m_index ].y3	= m_path[ tqfind ].y3;
+		m_path[ m_index ].x3	= m_path[ find ].x3;
+		m_path[ m_index ].y3	= m_path[ find ].y3;
 
 		m_index++;
 		m_path[ m_index ].code = ART_END;
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 724b228f..47f07a68 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -48,7 +48,7 @@ VPolygon::init()
 	bool bFirst = true;
 
 	TQString points = m_points.simplifyWhiteSpace();
-	points.tqreplace( ',', ' ' );
+	points.replace( ',', ' ' );
 	points.remove( '\r' );
 	points.remove( '\n' );
 	TQStringList pointList = TQStringList::split( ' ', points );
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index de5d15f4..85faa0f7 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -52,7 +52,7 @@ VPolyline::init()
 	bool bFirst = true;
 
 	TQString points = m_points.simplifyWhiteSpace();
-	points.tqreplace( ',', ' ' );
+	points.replace( ',', ' ' );
 	points.remove( '\r' );
 	points.remove( '\n' );
 	TQStringList pointList = TQStringList::split( ' ', points );
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") );
diff --git a/karbon/visitors/vselectnodes.cc b/karbon/visitors/vselectnodes.cc
index 28789956..6d297c96 100644
--- a/karbon/visitors/vselectnodes.cc
+++ b/karbon/visitors/vselectnodes.cc
@@ -54,7 +54,7 @@ VSelectNodes::visitVSubpath( VSubpath& path )
 				// select all control points inside the selection rect
 				for( int i = 0; i < curr->degree()-1; ++i )
 				{
-					if( m_rect.tqcontains( curr->point( i ) ) )
+					if( m_rect.contains( curr->point( i ) ) )
 					{
 						curr->selectPoint( i, m_select );
 						setSuccess();
@@ -81,7 +81,7 @@ VSelectNodes::visitVSubpath( VSubpath& path )
 				}
 			}	
 
-			if( m_rect.tqcontains( curr->knot() ) )
+			if( m_rect.contains( curr->knot() ) )
 			{
 				curr->selectKnot( m_select );
 				// select the last control point before the knot, if segment is curve
@@ -122,7 +122,7 @@ VTestNodes::visitVSubpath( VSubpath& path )
 	while( path.current() )
 	{
 		for( int i = 0; i < path.current()->degree(); i++ )
-			if( m_rect.tqcontains( path.current()->point( i ) ) ) //&&
+			if( m_rect.contains( path.current()->point( i ) ) ) //&&
               //path.current()->pointIsSelected( i ) )
 			{
 				m_segments.append( path.current() );
diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cc
index d64900db..0a428c43 100644
--- a/karbon/visitors/vselectobjects.cc
+++ b/karbon/visitors/vselectobjects.cc
@@ -44,7 +44,7 @@ VSelectObjects::visitVPath( VPath& composite )
 	{
 		// Check if composite is completely inside the selection rectangle.
 		// This test should be the first test since it's the less expensive one.
-		if( m_rect.tqcontains( composite.boundingBox() ) )
+		if( m_rect.contains( composite.boundingBox() ) )
 		{
 			selected = true;
 		}
@@ -117,7 +117,7 @@ VSelectObjects::visitVPath( VPath& composite )
 		if( m_select )
 		{
 			composite.setState( VObject::selected );
-			if( ! m_selection.tqcontainsRef( &composite ) )
+			if( ! m_selection.containsRef( &composite ) )
 				m_selection.append( &composite );
 		}
 		else
@@ -148,7 +148,7 @@ VSelectObjects::visitVObject( VObject& object )
 				if( m_rect.intersects( object.boundingBox() ) )
 				{
 					object.setState( VObject::selected );
-					if( ! m_selection.tqcontainsRef( &object ) )
+					if( ! m_selection.containsRef( &object ) )
 						m_selection.append( &object );
 					setSuccess();
 				}
@@ -168,7 +168,7 @@ VSelectObjects::visitVObject( VObject& object )
 			if( m_select )
 			{
 				object.setState( VObject::selected );
-				if( ! m_selection.tqcontainsRef( &object ) )
+				if( ! m_selection.containsRef( &object ) )
 					m_selection.append( &object );
 				setSuccess();
 			}
@@ -183,12 +183,12 @@ VSelectObjects::visitVObject( VObject& object )
 	// selection by point
 	else
 	{
-		if( object.boundingBox().tqcontains( m_point ) )
+		if( object.boundingBox().contains( m_point ) )
 		{
 			if( m_select )
 			{
 				object.setState( VObject::selected );
-				if( ! m_selection.tqcontainsRef( &object ) )
+				if( ! m_selection.containsRef( &object ) )
 					m_selection.append( &object );
 			}
 			else
@@ -239,7 +239,7 @@ VSelectObjects::visitVText( VText& text )
 			kdDebug(38000) << "selected: " << itr.current() << endl;
 			m_selection.remove( &c );
 			text.setState( VObject::selected );
-			if( ! m_selection.tqcontainsRef( &text ) )
+			if( ! m_selection.containsRef( &text ) )
 				m_selection.append( &text );
 			return;
 		}
diff --git a/karbon/vtoolcontroller.cc b/karbon/vtoolcontroller.cc
index 902deb78..03cc9ee8 100644
--- a/karbon/vtoolcontroller.cc
+++ b/karbon/vtoolcontroller.cc
@@ -65,7 +65,7 @@ VToolController::setCurrentTool( VTool *tool )
 void
 VToolController::registerTool( VTool *tool )
 {
-	if( !m_tools.tqfind( tool->name() ) )
+	if( !m_tools.find( tool->name() ) )
 		m_tools.insert( tool->name(), tool );
 	//kdDebug(38000) << "active tool : " << m_currentTool->name() << endl;
 }
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 49410a35..49d7f053 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -174,7 +174,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 
 void VGradientWidget::mousePressEvent( TQMouseEvent* e )
 {
-	if( ! m_pntArea.tqcontains( e->x(), e->y() ) )
+	if( ! m_pntArea.contains( e->x(), e->y() ) )
 		return;
 
 	TQPtrList<VColorStop>& colorStops = m_gradient->m_colorStops;
@@ -217,7 +217,7 @@ void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e )
 {
 	if( e->button() == Qt::RightButton && currentPoint )
 	{
-		if( m_pntArea.tqcontains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) )
+		if( m_pntArea.contains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) )
 		{
 			int x = e->x() - m_pntArea.left();
 			// check if we are still above the actual ramp point
@@ -235,7 +235,7 @@ void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e )
 
 void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 {
-	if( ! m_pntArea.tqcontains( e->x(), e->y() ) )
+	if( ! m_pntArea.contains( e->x(), e->y() ) )
 		return;
 
 	if( e->button() != Qt::LeftButton )