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, 12 insertions, 12 deletions

diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp
index d5ec98d..c641074 100644
--- a/src/mechanics/mechanicssimulation.cpp
+++ b/src/mechanics/mechanicssimulation.cpp
@@ -13,14 +13,14 @@
 #include "mechanicssimulation.h"
 
 #include <cmath>
-#include <qtimer.h>
+#include <tqtimer.h>
 
 MechanicsSimulation::MechanicsSimulation( MechanicsDocument *mechanicsDocument )
-	: QObject(mechanicsDocument)
+	: TQObject(mechanicsDocument)
 {
 	p_mechanicsDocument = mechanicsDocument;
-	m_advanceTmr = new QTimer(this);
-	connect( m_advanceTmr, SIGNAL(timeout()), this, SLOT(slotAdvance()) );
+	m_advanceTmr = new TQTimer(this);
+	connect( m_advanceTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAdvance()) );
 	m_advanceTmr->start(1);
 }
 
@@ -51,7 +51,7 @@ RigidBody::~RigidBody()
 
 bool RigidBody::addMechanicsItem( MechanicsItem *item )
 {
-	if ( !item || m_mechanicsItemList.contains(item) )
+	if ( !item || m_mechanicsItemList.tqcontains(item) )
 		return false;
 	
 	m_mechanicsItemList.append(item);
@@ -85,20 +85,20 @@ bool RigidBody::findOverallParent()
 	const MechanicsItemList::iterator end = m_mechanicsItemList.end();
 	for ( MechanicsItemList::iterator it = m_mechanicsItemList.begin(); it != end; ++it )
 	{
-		MechanicsItem *parentItem = *it;
-		MechanicsItem *parentCandidate = dynamic_cast<MechanicsItem*>((*it)->parentItem());
+		MechanicsItem *tqparentItem = *it;
+		MechanicsItem *tqparentCandidate = dynamic_cast<MechanicsItem*>((*it)->tqparentItem());
 		
-		while (parentCandidate)
+		while (tqparentCandidate)
 		{
-			parentItem = parentCandidate;
-			parentCandidate = dynamic_cast<MechanicsItem*>(parentItem->parentItem());
+			tqparentItem = tqparentCandidate;
+			tqparentCandidate = dynamic_cast<MechanicsItem*>(tqparentItem->tqparentItem());
 		}
 		
 		if ( !p_overallParent )
 			// Must be the first item to test
-			p_overallParent = parentItem;
+			p_overallParent = tqparentItem;
 		
-		if ( p_overallParent != parentItem )
+		if ( p_overallParent != tqparentItem )
 		{
 			p_overallParent = 0l;
 			return false;