From bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:48 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/mechanics/mechanicsgroup.cpp | 6 +++--- src/mechanics/mechanicsgroup.h | 2 +- src/mechanics/mechanicsitem.cpp | 4 ++-- src/mechanics/mechanicsitem.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/mechanics') diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp index 900eb92..2c577c8 100644 --- a/src/mechanics/mechanicsgroup.cpp +++ b/src/mechanics/mechanicsgroup.cpp @@ -71,9 +71,9 @@ void MechanicsGroup::removeChildren( Item *item ) if (!item) return; - const ItemList tqchildren = item->tqchildren(); - const ItemList::const_iterator end = tqchildren.end(); - for ( ItemList::const_iterator it = tqchildren.begin(); it != end; ++it ) + const ItemList children = item->children(); + const ItemList::const_iterator end = children.end(); + for ( ItemList::const_iterator it = children.begin(); it != end; ++it ) { removeChildren(*it); removeItem(*it); diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h index 0908d66..1ea2dc5 100644 --- a/src/mechanics/mechanicsgroup.h +++ b/src/mechanics/mechanicsgroup.h @@ -42,7 +42,7 @@ public: */ void setRaised( bool isRaised ); /** - * Removes all the tqchildren of the given item from the group + * Removes all the children of the given item from the group */ void removeChildren( Item *item ); bool addItem( Item *item ); diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp index 96c4adf..81340b4 100644 --- a/src/mechanics/mechanicsitem.cpp +++ b/src/mechanics/mechanicsitem.cpp @@ -206,8 +206,8 @@ void MechanicsItem::updateMechanicsInfoCombined() double mass_x = 0.; double mass_y = 0.; - const ItemList::const_iterator end = m_tqchildren.end(); - for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it ) + const ItemList::const_iterator end = m_children.end(); + for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it ) { MechanicsItem *child = dynamic_cast((Item*)*it); if (child) diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 3c8f7a1..712ff3c 100644 --- a/src/mechanics/mechanicsitem.h +++ b/src/mechanics/mechanicsitem.h @@ -158,12 +158,12 @@ public: PositionInfo relativePosition() const { return m_relativePosition; } /** * Returns the mechanics info for this item (so not taking into account that - * of attached tqchildren) + * of attached children) */ MechanicsInfo *mechanicsInfo() { return &m_mechanicsInfo; } /** * Returns the combined mechanics info for this item (which takes into - * account that of attached tqchildren). + * account that of attached children). */ CombinedMechanicsInfo *mechanicsInfoCombined() { return &m_mechanicsInfoCombined; } /** -- cgit v1.2.1