TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 23 insertions, 23 deletions

diff --git a/src/cnitemgroup.cpp b/src/cnitemgroup.cpp
index 21a9878..9d8030f 100644
--- a/src/cnitemgroup.cpp
+++ b/src/cnitemgroup.cpp
@@ -38,7 +38,7 @@ bool CNItemGroup::addItem( Item *item )
 	// of the list as the most recently added item if some
 	// the previous activeCNItem is removed
 	
-	if ( !item || !item->canvas() || m_itemList.contains(item) || !item->isMovable() )
+	if ( !item || !item->canvas() || m_itemList.tqcontains(item) || !item->isMovable() )
 		return false;
 	
 	if ( m_currentLevel != -1 && item->level() > m_currentLevel )
@@ -59,7 +59,7 @@ bool CNItemGroup::addItem( Item *item )
 
 bool CNItemGroup::addNode( Node *node )
 {
-	if ( !node || m_nodeList.contains(node) || node->isChildNode() )
+	if ( !node || m_nodeList.tqcontains(node) || node->isChildNode() )
 		return false;
 	m_nodeList.prepend(node);
 	node->setSelected(true);
@@ -71,7 +71,7 @@ bool CNItemGroup::addNode( Node *node )
 
 bool CNItemGroup::addConnector( Connector *con )
 {
-	if ( !con || m_connectorList.contains(con) )
+	if ( !con || m_connectorList.tqcontains(con) )
 		return false;
 	m_connectorList.prepend(con);
 	con->setSelected(true);
@@ -81,7 +81,7 @@ bool CNItemGroup::addConnector( Connector *con )
 }
 
 
-bool CNItemGroup::addQCanvasItem( QCanvasItem *qcanvasItem )
+bool CNItemGroup::addTQCanvasItem( TQCanvasItem *qcanvasItem )
 {
 	if (!qcanvasItem) return false;
 	
@@ -98,7 +98,7 @@ bool CNItemGroup::addQCanvasItem( QCanvasItem *qcanvasItem )
 	{
 		ConnectorLine *connectorLine = dynamic_cast<ConnectorLine*>(qcanvasItem);
 		if (connectorLine)
-			connector = connectorLine->parent();
+			connector = connectorLine->tqparent();
 	}
 	if (connector)
 		return addConnector(connector);
@@ -106,14 +106,14 @@ bool CNItemGroup::addQCanvasItem( QCanvasItem *qcanvasItem )
 	return false;
 }
 
-void CNItemGroup::setItems( QCanvasItemList list )
+void CNItemGroup::setItems( TQCanvasItemList list )
 {
 	ItemList itemRemoveList = m_itemList;
 	ConnectorList connectorRemoveList = m_connectorList;
 	NodeList nodeRemoveList = m_nodeList;
 	
-	const QCanvasItemList::const_iterator end = list.end();
-	for ( QCanvasItemList::const_iterator it = list.begin(); it != end; ++it )
+	const TQCanvasItemList::const_iterator end = list.end();
+	for ( TQCanvasItemList::const_iterator it = list.begin(); it != end; ++it )
 	{
 		switch ( *it ? (*it)->rtti() : 0 )
 		{
@@ -135,7 +135,7 @@ void CNItemGroup::setItems( QCanvasItemList list )
 			}
 			case ItemDocument::RTTI::ConnectorLine:
 			{
-				connectorRemoveList.remove( (dynamic_cast<ConnectorLine*>(*it))->parent() );
+				connectorRemoveList.remove( (dynamic_cast<ConnectorLine*>(*it))->tqparent() );
 				break;
 			}
 			default:
@@ -171,12 +171,12 @@ void CNItemGroup::setItems( QCanvasItemList list )
 	}
 	
 	{
-		const QCanvasItemList::const_iterator end = list.end();
-		for ( QCanvasItemList::const_iterator it = list.begin(); it != end; ++it )
+		const TQCanvasItemList::const_iterator end = list.end();
+		for ( TQCanvasItemList::const_iterator it = list.begin(); it != end; ++it )
 		{
 			// We don't need to check that we've already got the item as it will
 			// be checked in the function call
-			addQCanvasItem(*it);
+			addTQCanvasItem(*it);
 		}
 	}
 }
@@ -184,7 +184,7 @@ void CNItemGroup::setItems( QCanvasItemList list )
 
 void CNItemGroup::removeItem( Item *item )
 {
-	if ( !item || !m_itemList.contains(item) )
+	if ( !item || !m_itemList.tqcontains(item) )
 		return;
 	unregisterItem(item);
 	if ( m_activeItem == item )
@@ -198,7 +198,7 @@ void CNItemGroup::removeItem( Item *item )
 
 void CNItemGroup::removeNode( Node *node )
 {
-	if ( !node || !m_nodeList.contains(node) )
+	if ( !node || !m_nodeList.tqcontains(node) )
 		return;
 	m_nodeList.remove(node);
 	node->setSelected(false);
@@ -209,7 +209,7 @@ void CNItemGroup::removeNode( Node *node )
 
 void CNItemGroup::removeConnector( Connector *con )
 {
-	if ( !con || !m_connectorList.contains(con) ) return;
+	if ( !con || !m_connectorList.tqcontains(con) ) return;
 	m_connectorList.remove(con);
 	con->setSelected(false);
 	updateInfo();
@@ -217,7 +217,7 @@ void CNItemGroup::removeConnector( Connector *con )
 }
 
 
-void CNItemGroup::removeQCanvasItem( QCanvasItem *qcanvasItem )
+void CNItemGroup::removeTQCanvasItem( TQCanvasItem *qcanvasItem )
 {
 	if (!qcanvasItem) return;
 	
@@ -234,7 +234,7 @@ void CNItemGroup::removeQCanvasItem( QCanvasItem *qcanvasItem )
 	{
 		ConnectorLine *connectorLine = dynamic_cast<ConnectorLine*>(qcanvasItem);
 		if (connectorLine)
-			connector = connectorLine->parent();
+			connector = connectorLine->tqparent();
 	}
 	if (connector)
 		return removeConnector(connector);
@@ -257,7 +257,7 @@ NodeList CNItemGroup::nodes( bool excludeParented ) const
 		NodeList::const_iterator internalEnd = internal.end();
 		for ( NodeList::const_iterator intIt = internal.begin(); intIt != internalEnd; ++intIt )
 		{
-			if ( *intIt && !nodeList.contains(*intIt) )
+			if ( *intIt && !nodeList.tqcontains(*intIt) )
 				nodeList << *intIt;
 		}
 	}
@@ -279,7 +279,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
 	ConnectorList::iterator tcEnd = translatableConnectors.end();
 	for ( ConnectorList::iterator it = translatableConnectors.begin(); it != tcEnd; ++it )
 	{
-		if ( *it && !connectorList.contains(*it) )
+		if ( *it && !connectorList.tqcontains(*it) )
 			connectorList << *it;
 	}
 	
@@ -294,7 +294,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
 			ConnectorList::const_iterator connectedEnd = connected.end();
 			for ( ConnectorList::const_iterator conIt = connected.begin(); conIt != connectedEnd; ++conIt )
 			{
-				if ( *conIt && !connectorList.contains(*conIt) )
+				if ( *conIt && !connectorList.tqcontains(*conIt) )
 					connectorList << *conIt;
 			}
 		}
@@ -304,7 +304,7 @@ ConnectorList CNItemGroup::connectors( bool excludeParented ) const
 }
 
 
-bool CNItemGroup::contains( QCanvasItem *qcanvasItem ) const
+bool CNItemGroup::tqcontains( TQCanvasItem *qcanvasItem ) const
 {
 	if (!qcanvasItem)
 		return false;
@@ -582,9 +582,9 @@ void CNItemGroup::setActiveItem( Item *item )
 }
 
 
-QStringList CNItemGroup::itemIDs()
+TQStringList CNItemGroup::itemIDs()
 {
-	QStringList list;
+	TQStringList list;
 	ItemList::iterator end = m_itemList.end();
 	for ( ItemList::iterator it = m_itemList.begin(); it != end; ++it )
 	{