rename the following methods:

tqparent parent
tqmask mask


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

3 files changed, 16 insertions, 16 deletions

diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp
index 40b0c8a..900eb92 100644
--- a/src/mechanics/mechanicsgroup.cpp
+++ b/src/mechanics/mechanicsgroup.cpp
@@ -30,13 +30,13 @@ bool MechanicsGroup::addItem( Item *item )
 		return false;
 	}
 	
-	// Check that the item's tqparent isn't already selected
-	Item *tqparent = item->parentItem();
-	while (tqparent)
+	// Check that the item's parent isn't already selected
+	Item *parent = item->parentItem();
+	while (parent)
 	{
-		if ( m_itemList.contains(tqparent) )
+		if ( m_itemList.contains(parent) )
 			return false;
-		tqparent = tqparent->parentItem();
+		parent = parent->parentItem();
 	}
 	removeChildren(item);
 	
@@ -131,13 +131,13 @@ MechanicsItemList MechanicsGroup::toplevelMechItemList() const
 	const MechanicsItemList::const_iterator end = mechItemList.end();
 	for ( MechanicsItemList::const_iterator it = mechItemList.begin(); it != end; ++it )
 	{
-		MechanicsItem* tqparent = *it;
-		while (tqparent)
+		MechanicsItem* parent = *it;
+		while (parent)
 		{
-			if ( !tqparent->parentItem() && !toplevel.contains(tqparent) )
-				toplevel.append(tqparent);
+			if ( !parent->parentItem() && !toplevel.contains(parent) )
+				toplevel.append(parent);
 			
-			tqparent = dynamic_cast<MechanicsItem*>(tqparent->parentItem());
+			parent = dynamic_cast<MechanicsItem*>(parent->parentItem());
 		}
 	}
 	
diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h
index 054e04a..3c8f7a1 100644
--- a/src/mechanics/mechanicsitem.h
+++ b/src/mechanics/mechanicsitem.h
@@ -152,8 +152,8 @@ public:
 	 */
 	PositionInfo absolutePosition() const;
 	/**
-	 * Returns the position relative to the tqparent item (or the absolute
-	 * position if there is no tqparent item)
+	 * Returns the position relative to the parent item (or the absolute
+	 * position if there is no parent item)
 	 */
 	PositionInfo relativePosition() const { return m_relativePosition; }
 	/**
@@ -227,7 +227,7 @@ protected:
 	void updateCanvasPoints();
 	
 	MechanicsDocument *p_mechanicsDocument;
-	PositionInfo m_relativePosition; // Absolution position if not attached to a tqparent item, or otherwise relative to tqparent item
+	PositionInfo m_relativePosition; // Absolution position if not attached to a parent item, or otherwise relative to parent item
 	MechanicsInfo m_mechanicsInfo;
 	CombinedMechanicsInfo m_mechanicsInfoCombined;
 	
diff --git a/src/mechanics/mechanicssimulation.h b/src/mechanics/mechanicssimulation.h
index 9a82d91..f91a159 100644
--- a/src/mechanics/mechanicssimulation.h
+++ b/src/mechanics/mechanicssimulation.h
@@ -76,8 +76,8 @@ protected:
 
 /**
 Rigid body with mass, inertia, etc. Collection of mechanics items with
-functionality for moving them about, rotating, etc. Only one mother-tqparent
-(has no tqparent itself, all other items are descendents) allowed.
+functionality for moving them about, rotating, etc. Only one mother-parent
+(has no parent itself, all other items are descendents) allowed.
 @short Rigid body, handles MechanicsItems
 @author David Saxton
 */
@@ -107,7 +107,7 @@ public:
 	
 protected:
 	/**
-	 * Attempt to find the overall tqparent.
+	 * Attempt to find the overall parent.
 	 * @returns false iff unsucessful (including if there are no MechanicsItems present)
 	 */
 	bool findOverallParent();