diff options
Diffstat (limited to 'karbon/visitors')
| -rw-r--r-- | karbon/visitors/vselectnodes.cc | 6 | ||||
| -rw-r--r-- | karbon/visitors/vselectobjects.cc | 14 |
2 files changed, 10 insertions, 10 deletions
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; } |