diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:14 -0600 |
| commit | c1ef065782051db96cdfd32cf55be6408c2a9d22 (patch) | |
| tree | 0bc3705b597f8c98b2b9992d22ab9620df50b877 /src/mechanics | |
| parent | bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f (diff) | |
| download | ktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.tar.gz ktechlab-c1ef065782051db96cdfd32cf55be6408c2a9d22.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.
Diffstat (limited to 'src/mechanics')
| -rw-r--r-- | src/mechanics/mechanicsgroup.cpp | 6 | ||||
| -rw-r--r-- | src/mechanics/mechanicsgroup.h | 2 | ||||
| -rw-r--r-- | src/mechanics/mechanicsitem.cpp | 4 | ||||
| -rw-r--r-- | src/mechanics/mechanicsitem.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp index 2c577c8..900eb92 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 children = item->children(); - const ItemList::const_iterator end = children.end(); - for ( ItemList::const_iterator it = children.begin(); it != end; ++it ) + const ItemList tqchildren = item->tqchildren(); + const ItemList::const_iterator end = tqchildren.end(); + for ( ItemList::const_iterator it = tqchildren.begin(); it != end; ++it ) { removeChildren(*it); removeItem(*it); diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h index 1ea2dc5..0908d66 100644 --- a/src/mechanics/mechanicsgroup.h +++ b/src/mechanics/mechanicsgroup.h @@ -42,7 +42,7 @@ public: */ void setRaised( bool isRaised ); /** - * Removes all the children of the given item from the group + * Removes all the tqchildren 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 81340b4..96c4adf 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_children.end(); - for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it ) + const ItemList::const_iterator end = m_tqchildren.end(); + for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it ) { MechanicsItem *child = dynamic_cast<MechanicsItem*>((Item*)*it); if (child) diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 712ff3c..3c8f7a1 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 children) + * of attached tqchildren) */ MechanicsInfo *mechanicsInfo() { return &m_mechanicsInfo; } /** * Returns the combined mechanics info for this item (which takes into - * account that of attached children). + * account that of attached tqchildren). */ CombinedMechanicsInfo *mechanicsInfoCombined() { return &m_mechanicsInfoCombined; } /** |