TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 8 insertions, 8 deletions

diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cc
index 060eeacb..d64900db 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.contains( composite.boundingBox() ) )
+		if( m_rect.tqcontains( composite.boundingBox() ) )
 		{
 			selected = true;
 		}
@@ -117,7 +117,7 @@ VSelectObjects::visitVPath( VPath& composite )
 		if( m_select )
 		{
 			composite.setState( VObject::selected );
-			if( ! m_selection.containsRef( &composite ) )
+			if( ! m_selection.tqcontainsRef( &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.containsRef( &object ) )
+					if( ! m_selection.tqcontainsRef( &object ) )
 						m_selection.append( &object );
 					setSuccess();
 				}
@@ -168,7 +168,7 @@ VSelectObjects::visitVObject( VObject& object )
 			if( m_select )
 			{
 				object.setState( VObject::selected );
-				if( ! m_selection.containsRef( &object ) )
+				if( ! m_selection.tqcontainsRef( &object ) )
 					m_selection.append( &object );
 				setSuccess();
 			}
@@ -183,12 +183,12 @@ VSelectObjects::visitVObject( VObject& object )
 	// selection by point
 	else
 	{
-		if( object.boundingBox().contains( m_point ) )
+		if( object.boundingBox().tqcontains( m_point ) )
 		{
 			if( m_select )
 			{
 				object.setState( VObject::selected );
-				if( ! m_selection.containsRef( &object ) )
+				if( ! m_selection.tqcontainsRef( &object ) )
 					m_selection.append( &object );
 			}
 			else
@@ -205,7 +205,7 @@ VSelectObjects::visitVObject( VObject& object )
 void
 VSelectObjects::visitVLayer( VLayer& layer )
 {
-	VDocument* doc = (VDocument*)layer.parent();
+	VDocument* doc = (VDocument*)layer.tqparent();
 	if ( ( layer.state() != VObject::deleted ) &&
 	     ( ( doc->selectionMode() == VDocument::AllLayers ) ||
 	       ( doc->selectionMode() == VDocument::VisibleLayers && ( layer.state() == VObject::normal || layer.state() == VObject::normal_locked ) ) ||
@@ -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.containsRef( &text ) )
+			if( ! m_selection.tqcontainsRef( &text ) )
 				m_selection.append( &text );
 			return;
 		}