diff options
Diffstat (limited to 'src/item.cpp')
-rw-r--r-- | src/item.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/item.cpp b/src/item.cpp index e2cd3b0..2e7d578 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -359,7 +359,7 @@ void Item::setParentItem( Item *newParentItem ) if (newParentItem) { - if ( newParentItem->tqcontains(this) ); + if ( newParentItem->contains(this) ); // kdError() << k_funcinfo << "Already a child of " << newParentItem << endl; else { @@ -405,13 +405,13 @@ void Item::addChild( Item *child ) if ( !child ) return; - if ( child->tqcontains(this) ) + if ( child->contains(this) ) { // kdError() << k_funcinfo << "Attempting to add a child to this item that is already a tqparent of this item. Incest results in stack overflow." << endl; return; } - if ( tqcontains( child, true ) ) + if ( contains( child, true ) ) { // kdError() << k_funcinfo << "Already have child " << child << endl; return; @@ -428,7 +428,7 @@ void Item::addChild( Item *child ) void Item::removeChild( Item *child ) { - if ( !child || !m_tqchildren.tqcontains(child) ) + if ( !child || !m_tqchildren.contains(child) ) return; m_tqchildren.remove(child); @@ -439,12 +439,12 @@ void Item::removeChild( Item *child ) } -bool Item::tqcontains( Item *item, bool direct ) const +bool Item::contains( Item *item, bool direct ) const { const ItemList::const_iterator end = m_tqchildren.end(); for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it ) { - if ( (Item*)*it == item || ( !direct && (*it)->tqcontains( item, false ) ) ) + if ( (Item*)*it == item || ( !direct && (*it)->contains( item, false ) ) ) return true; } return false; @@ -559,7 +559,7 @@ TQColor Item::dataColor( const TQString & id ) const Variant * Item::createProperty( const TQString & id, Variant::Type::Value type ) { - if ( !m_variantData.tqcontains(id) ) + if ( !m_variantData.contains(id) ) { m_variantData[id] = new Variant(type); if (m_bDoneCreation) @@ -572,7 +572,7 @@ Variant * Item::createProperty( const TQString & id, Variant::Type::Value type ) Variant * Item::property( const TQString & id ) const { - if ( m_variantData.tqcontains(id) ) + if ( m_variantData.contains(id) ) return m_variantData[id]; kdError() << k_funcinfo << " No such property with id " << id << endl; @@ -582,7 +582,7 @@ Variant * Item::property( const TQString & id ) const bool Item::hasProperty( const TQString & id ) const { - return m_variantData.tqcontains(id); + return m_variantData.contains(id); } |