diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 6c86748feda6b6fb15ec2ce73b18838aa6a9a7f9 (patch) | |
tree | 31d759580e3bf977fd7fea7a451b535f3c0741a6 /src/mechanics | |
parent | 87a016680e3677da3993f333561e79eb0cead7d5 (diff) | |
download | ktechlab-6c86748feda6b6fb15ec2ce73b18838aa6a9a7f9.tar.gz ktechlab-6c86748feda6b6fb15ec2ce73b18838aa6a9a7f9.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mechanics')
-rw-r--r-- | src/mechanics/mechanicsgroup.cpp | 8 | ||||
-rw-r--r-- | src/mechanics/mechanicsitem.cpp | 12 | ||||
-rw-r--r-- | src/mechanics/mechanicsitem.h | 2 | ||||
-rw-r--r-- | src/mechanics/mechanicssimulation.cpp | 14 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp index 8d27579..32f1748 100644 --- a/src/mechanics/mechanicsgroup.cpp +++ b/src/mechanics/mechanicsgroup.cpp @@ -31,12 +31,12 @@ bool MechanicsGroup::addItem( Item *item ) } // Check that the item's tqparent isn't already selected - Item *tqparent = item->tqparentItem(); + Item *tqparent = item->parentItem(); while (tqparent) { if ( m_itemList.tqcontains(tqparent) ) return false; - tqparent = tqparent->tqparentItem(); + tqparent = tqparent->parentItem(); } removeChildren(item); @@ -134,10 +134,10 @@ MechanicsItemList MechanicsGroup::toplevelMechItemList() const MechanicsItem* tqparent = *it; while (tqparent) { - if ( !tqparent->tqparentItem() && !toplevel.tqcontains(tqparent) ) + if ( !tqparent->parentItem() && !toplevel.tqcontains(tqparent) ) toplevel.append(tqparent); - tqparent = dynamic_cast<MechanicsItem*>(tqparent->tqparentItem()); + tqparent = dynamic_cast<MechanicsItem*>(tqparent->parentItem()); } } diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp index 379face..96c4adf 100644 --- a/src/mechanics/mechanicsitem.cpp +++ b/src/mechanics/mechanicsitem.cpp @@ -102,9 +102,9 @@ void MechanicsItem::dataChanged() PositionInfo MechanicsItem::absolutePosition() const { - MechanicsItem *tqparentMechItem = dynamic_cast<MechanicsItem*>((Item*)(p_parentItem)); - if (tqparentMechItem) - return tqparentMechItem->absolutePosition() + m_relativePosition; + MechanicsItem *parentMechItem = dynamic_cast<MechanicsItem*>((Item*)(p_parentItem)); + if (parentMechItem) + return parentMechItem->absolutePosition() + m_relativePosition; return m_relativePosition; } @@ -118,13 +118,13 @@ void MechanicsItem::reparented( Item *oldItem, Item *newItem ) if (oldMechItem) { m_relativePosition = oldMechItem->absolutePosition() + m_relativePosition; - disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(tqparentMoved()) ); + disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); } if (newMechItem) { m_relativePosition = m_relativePosition - newMechItem->absolutePosition(); - connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(tqparentMoved()) ); + connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); } updateCanvasPoints(); @@ -153,7 +153,7 @@ void MechanicsItem::childRemoved( Item *child ) } -void MechanicsItem::tqparentMoved() +void MechanicsItem::parentMoved() { PositionInfo absPos = absolutePosition(); Item::moveBy( absPos.x() - x(), absPos.y() - y() ); diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 8c73d9d..054e04a 100644 --- a/src/mechanics/mechanicsitem.h +++ b/src/mechanics/mechanicsitem.h @@ -188,7 +188,7 @@ public slots: * Rotate the item by the given amount (in radians) */ void rotateBy( double dtheta ); - void tqparentMoved(); + void parentMoved(); signals: /** diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp index c641074..15900d3 100644 --- a/src/mechanics/mechanicssimulation.cpp +++ b/src/mechanics/mechanicssimulation.cpp @@ -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 *tqparentItem = *it; - MechanicsItem *tqparentCandidate = dynamic_cast<MechanicsItem*>((*it)->tqparentItem()); + MechanicsItem *parentItem = *it; + MechanicsItem *parentCandidate = dynamic_cast<MechanicsItem*>((*it)->parentItem()); - while (tqparentCandidate) + while (parentCandidate) { - tqparentItem = tqparentCandidate; - tqparentCandidate = dynamic_cast<MechanicsItem*>(tqparentItem->tqparentItem()); + parentItem = parentCandidate; + parentCandidate = dynamic_cast<MechanicsItem*>(parentItem->parentItem()); } if ( !p_overallParent ) // Must be the first item to test - p_overallParent = tqparentItem; + p_overallParent = parentItem; - if ( p_overallParent != tqparentItem ) + if ( p_overallParent != parentItem ) { p_overallParent = 0l; return false; |