Rename obsolete tq methods to standard names

1 files changed, 10 insertions, 10 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index a2cddd89..1d782a20 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -437,7 +437,7 @@ AdjustSizeCommand::execute()
 				ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
 				if(item && !item->children()->isEmpty()) { // container
 					TQSize s;
-					if(item->container() && item->container()->tqlayout())
+					if(item->container() && item->container()->layout())
 						s = w->sizeHint();
 					else
 						s = getSizeFromChildren(item);
@@ -614,7 +614,7 @@ AdjustSizeCommand::debug()
 
 LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, 
 	const TQVariant &oldValue, const TQVariant &value)
- : PropertyCommand(buf, wname, oldValue, value, "tqlayout")
+ : PropertyCommand(buf, wname, oldValue, value, "layout")
 {
 	m_form = FormManager::self()->activeForm();
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(wname);
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
 TQString
 LayoutPropertyCommand::name() const
 {
-	return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
+	return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
 }
 
 void
@@ -775,7 +775,7 @@ InsertWidgetCommand::execute()
 	}
 	w->move(m_insertRect.x(), m_insertRect.y());
 	w->resize(m_insertRect.width()-1, m_insertRect.height()-1); // -1 is not to hide dots
-	w->setStyle(&(m_container->widget()->tqstyle()));
+	w->setStyle(&(m_container->widget()->style()));
 	w->setBackgroundOrigin(TQWidget::ParentOrigin);
 	w->show();
 
@@ -802,7 +802,7 @@ InsertWidgetCommand::execute()
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it)
 		item->addModifiedProperty(*it, w->property(*it));
 
-	m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account
+	m_container->reloadLayout(); // reload the layout to take the new wigdet into account
 
 	m_container->setSelectedWidget(w, false);
 	if (m_container->form()->library()->internalProperty(w->className(), 
@@ -864,7 +864,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	}
 	for(TQWidget *w = list.first(); w; w = list.next())
 		m_list->append(w);
-	m_list->sort(); // we sort them now, before creating the tqlayout
+	m_list->sort(); // we sort them now, before creating the layout
 
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
 		m_pos.insert(w->name(), w->geometry());
@@ -911,7 +911,7 @@ CreateLayoutCommand::execute()
 		return;
 
 	container->setSelectedWidget(0, false);
-	w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
+	w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget
 	// sizeHint of these widgets depends on geometry, so give them appropriate geometry
 	if(m_type == Container::HFlow)
 		w->resize( TQSize(700, 20) );
@@ -938,7 +938,7 @@ CreateLayoutCommand::execute()
 		((TQSplitter*)w)->setOrientation(Qt::Vertical);
 	else if(tree->container()) {
 		tree->container()->setLayout((Container::LayoutType)m_type);
-		w->resize(tree->container()->tqlayout()->sizeHint()); // the tqlayout doesn't have its own size
+		w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size
 	}
 
 	container->setSelectedWidget(w, false);
@@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute()
 	if(!parent)
 		parent = m_form->objectTree();
 
-	// We reparent every widget to the Container and take them out of the tqlayout
+	// We reparent every widget to the Container and take them out of the layout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
 	for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it)
 	{
@@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute()
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	parent->container()->deleteWidget(w); // delete the tqlayout widget
+	parent->container()->deleteWidget(w); // delete the layout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }