1 files changed, 17 insertions, 17 deletions

diff --git a/src/item.cpp b/src/item.cpp
index 884ee17..48f2c91 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -17,7 +17,7 @@
 #include <kdialogbase.h>
 #include <ktextedit.h>
 #include <tqbitarray.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 const int minPrefixExp = -24;
@@ -313,11 +313,11 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
 
 	KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() );
 	TQFrame *frame = dlg->makeMainWidget();
-	TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
+	TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
 	KTextEdit *textEdit = new KTextEdit( frame );
 	textEdit->setTextFormat( PlainText );
 	textEdit->setText( v->value().toString() );
-	tqlayout->addWidget( textEdit, 10 );
+	layout->addWidget( textEdit, 10 );
 	textEdit->setFocus();
 	connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
 	dlg->setMinimumWidth( 600 );
@@ -381,22 +381,22 @@ int Item::level() const
 }
 
 
-ItemList Item::tqchildren( bool includeGrandChildren ) const
+ItemList Item::children( bool includeGrandChildren ) const
 {
 	if (!includeGrandChildren)
-		return m_tqchildren;
+		return m_children;
 	
-	ItemList tqchildren = m_tqchildren;
-	ItemList::const_iterator end = m_tqchildren.end();
-	for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
+	ItemList children = m_children;
+	ItemList::const_iterator end = m_children.end();
+	for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
 	{
 		if (!*it)
 			continue;
 		
-		tqchildren += (*it)->tqchildren(true);
+		children += (*it)->children(true);
 	}
 	
-	return tqchildren;
+	return children;
 }
 
 
@@ -417,7 +417,7 @@ void Item::addChild( Item *child )
 		return;
 	}
 	
-	m_tqchildren.append(child);
+	m_children.append(child);
 	connect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
 	
 	child->setParentItem(this);
@@ -428,10 +428,10 @@ void Item::addChild( Item *child )
 
 void Item::removeChild( Item *child )
 {
-	if ( !child || !m_tqchildren.contains(child) )
+	if ( !child || !m_children.contains(child) )
 		return;
 	
-	m_tqchildren.remove(child);
+	m_children.remove(child);
 	disconnect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
 	
 	childRemoved(child);
@@ -441,8 +441,8 @@ void Item::removeChild( Item *child )
 
 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 )
+	const ItemList::const_iterator end = m_children.end();
+	for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
 	{
 		if ( (Item*)*it == item || ( !direct && (*it)->contains( item, false ) ) )
 			return true;
@@ -468,8 +468,8 @@ void Item::updateZ( int baseZ )
 	
 	setZ(z);
 	
-	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 )
 	{
 		if (*it)
 			(*it)->updateZ(baseZ+1);