Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

32 files changed, 306 insertions, 306 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index d628d53f..c08e44e6 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -236,7 +236,7 @@ AlignWidgetsCommand::execute()
 
 	int gridX = m_form->gridSize();
 	int gridY = m_form->gridSize();
-	TQWidget *tqparentWidget = m_form->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = m_form->selectedWidgets()->first()->parentWidget();
 	int tmpx, tmpy;
 
 	WidgetList list;
@@ -265,7 +265,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToLeft:
 		{
-			tmpx = tqparentWidget->width();
+			tmpx = parentWidget->width();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->x() < tmpx)
@@ -293,7 +293,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToTop:
 		{
-			tmpy = tqparentWidget->height();
+			tmpy = parentWidget->height();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->y() < tmpy)
@@ -378,11 +378,11 @@ AdjustSizeCommand::AdjustSizeCommand(int type, WidgetList &list, Form *form)
 {
 	for(TQWidget *w = list.first(); w; w = list.next())
 	{
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		m_sizes.insert(w->name(), w->size());
@@ -446,8 +446,8 @@ AdjustSizeCommand::execute()
 						s.setWidth(30);
 					if(s.height() < 30)
 						s.setHeight(30);
-					// small hack for flow tqlayouts
-					int type = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
+					// small hack for flow layouts
+					int type = item->container() ? item->container()->layoutType() : Container::NoLayout;
 					if(type == Container::HFlow)
 						s.setWidth(s.width() + 5);
 					else if(type == Container::VFlow)
@@ -846,11 +846,11 @@ InsertWidgetCommand::debug()
 
 /// CreateLayoutCommand ///////////////
 
-CreateLayoutCommand::CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form)
- : m_form(form), m_type(tqlayoutType)
+CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form *form)
+ : m_form(form), m_type(layoutType)
 {
 	WidgetList *m_list=0;
-	switch(tqlayoutType)
+	switch(layoutType)
 	{
 		case Container::HBox:
 		case Container::Grid:
@@ -890,7 +890,7 @@ CreateLayoutCommand::execute()
 		case Container::HSplitter: case Container::VSplitter:
 			classname = TQSPLITTER_OBJECT_NAME_STRING; break;
 		default:
-			classname = Container::tqlayoutTypeToString(m_type).latin1();
+			classname = Container::layoutTypeToString(m_type).latin1();
 	}
 
 	if(m_name.isEmpty())// the name must be generated only once
@@ -1017,11 +1017,11 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_containername = container->toplevel()->widget()->name();
 	m_name = container->widget()->name();
 	m_form = container->form();
-	m_type = container->tqlayoutType();
+	m_type = container->layoutType();
 
 	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next())
 	{
-		TQRect r(container->widget()->mapTo(container->widget()->tqparentWidget(), tree->widget()->pos()), tree->widget()->size());
+		TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size());
 		m_pos.insert(tree->widget()->name(), r);
 	}
 }
@@ -1385,7 +1385,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	{
 		TQWidget *w = it.current();
 		// Don't delete tabwidget or widgetstack pages
-		if(w->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
 			list.remove(w);
 			continue;
@@ -1399,8 +1399,8 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 		if (!item)
 			return;
 
-		// We need to store both tqparentContainer and tqparentWidget as they may be different (eg for TabWidget page)
-		m_containers.insert(item->name().latin1(), m_form->tqparentContainer(item->widget())->widget()->name());
+		// We need to store both parentContainer and parentWidget as they may be different (eg for TabWidget page)
+		m_containers.insert(item->name().latin1(), m_form->parentContainer(item->widget())->widget()->name());
 		m_parents.insert(item->name().latin1(), item->tqparent()->name().latin1());
 		FormIO::saveWidget(item, tqparent, m_domDoc);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
@@ -1421,7 +1421,7 @@ DeleteWidgetCommand::execute()
 		if (!item || !item->widget())
 			continue;
 
-		Container *cont = m_form->tqparentContainer(item->widget());
+		Container *cont = m_form->parentContainer(item->widget());
 		if (!containerToSelect)
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
@@ -1476,7 +1476,7 @@ void
 DeleteWidgetCommand::debug()
 {
 	kdDebug() << "DeleteWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
 }
 
 // CutWidgetCommand
@@ -1510,7 +1510,7 @@ void
 CutWidgetCommand::debug()
 {
 	kdDebug() << "CutWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name()
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name()
 		<< " data=\"" << m_data.left(80) << "...\"" << endl;
 }
 
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index c38f9b86..d998ad36 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -209,7 +209,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
 {
 	public:
-		CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form);
+		CreateLayoutCommand(int layoutType, WidgetList &list, Form *form);
 		CreateLayoutCommand() {;} // for BreakLayoutCommand
 
 		virtual void execute();
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 03302d3a..fff9a47c 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -405,7 +405,7 @@ ConnectionDialog::removeItem()
 	if(m_table->currentRow() == -1 || m_table->currentRow()>=m_table->rows())
 		return;
 
-	int confirm = KMessageBox::warningContinueCancel(tqparentWidget(),
+	int confirm = KMessageBox::warningContinueCancel(parentWidget(),
 		TQString("<qt>")+i18n("Do you want to delete this connection ?")+"</qt>", TQString(), KGuiItem(i18n("&Delete Connection")),
 		"dontAskBeforeDeleteConnection"/*config entry*/);
 	if(confirm == KMessageBox::Cancel)
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index a68e34d2..a9942d1c 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			{
 				if(!m_toplevel && m_moving == m_container) // no effect for form
 					return false;
-				if((!m_moving) || (!m_moving->tqparentWidget()))// || (m_moving->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+				if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 						return true;
 
 				moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y());
@@ -915,7 +915,7 @@ Container::createGridLayout(bool testOnly)
 }
 
 TQString
-Container::tqlayoutTypeToString(int type)
+Container::layoutTypeToString(int type)
 {
 	switch(type)
 	{
@@ -1110,24 +1110,24 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx = w->x() + realdx;
 		int tmpy = w->y() + realdy;
 		if(tmpx < 0)
 			dx = TQMAX(0 - w->x(), dx); // because dx is <0
-		else if(tmpx > w->tqparentWidget()->width() - gridX)
-			dx = TQMIN(w->tqparentWidget()->width() - gridX - w->x(), dx);
+		else if(tmpx > w->parentWidget()->width() - gridX)
+			dx = TQMIN(w->parentWidget()->width() - gridX - w->x(), dx);
 
 		if(tmpy < 0)
 			dy = TQMAX(0 - w->y(), dy); // because dy is <0
-		else if(tmpy > w->tqparentWidget()->height() - gridY)
-			dy = TQMIN(w->tqparentWidget()->height() - gridY - w->y(), dy);
+		else if(tmpy > w->parentWidget()->height() - gridY)
+			dy = TQMIN(w->parentWidget()->height() - gridY - w->y(), dy);
 	}
 
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
@@ -1136,11 +1136,11 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx, tmpy;
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index a76c913a..f2ae1f14 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -107,13 +107,13 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		TQLayout* tqlayout() const { return m_layout; }
 
 		//! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
-		LayoutType tqlayoutType() const { return m_layType; }
+		LayoutType layoutType() const { return m_layType; }
 
 		//! \return the margin of this Container.
-		int tqlayoutMargin() { return m_margin; }
+		int layoutMargin() { return m_margin; }
 
 		//! \return the spacing of this Container.
-		int tqlayoutSpacing() { return m_spacing; }
+		int layoutSpacing() { return m_spacing; }
 
 		/*! Sets this Container to use \a type of tqlayout. The widget are inserted
 		 automatically in the tqlayout following their positions.
@@ -126,8 +126,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! Sets the margin of this Container.
 		void setLayoutMargin(int margin) { m_margin = margin;}
 
-		//! \return the string representing the tqlayoutType \a type.
-		static TQString tqlayoutTypeToString(int type);
+		//! \return the string representing the layoutType \a type.
+		static TQString layoutTypeToString(int type);
 
 		//! \return the LayoutType (an int) for a given tqlayout name.
 		static LayoutType stringToLayoutType(const TQString &name);
diff --git a/kexi/formeditor/events.cpp b/kexi/formeditor/events.cpp
index d7d62358..ff16bcd9 100644
--- a/kexi/formeditor/events.cpp
+++ b/kexi/formeditor/events.cpp
@@ -67,18 +67,18 @@ ConnectionBuffer::allConnectionsForWidget(const TQString &widget)
 }
 
 void
-ConnectionBuffer::save(TQDomNode &tqparentNode)
+ConnectionBuffer::save(TQDomNode &parentNode)
 {
 	if(isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement connections;
-	if(!tqparentNode.namedItem("connections").isNull())
-		connections = tqparentNode.namedItem("connections").toElement();
+	if(!parentNode.namedItem("connections").isNull())
+		connections = parentNode.namedItem("connections").toElement();
 	else
 		connections = domDoc.createElement("connections");
-	tqparentNode.appendChild(connections);
+	parentNode.appendChild(connections);
 
 	for(Connection *c = first(); c; c = next())
 	{
@@ -109,10 +109,10 @@ ConnectionBuffer::save(TQDomNode &tqparentNode)
 }
 
 void
-ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode)
+ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode)
 {
 	ConnectionBuffer *buff = allConnectionsForWidget(widget);
-	buff->save(tqparentNode);
+	buff->save(parentNode);
 	delete buff;
 }
 
diff --git a/kexi/formeditor/events.h b/kexi/formeditor/events.h
index 727b3a43..a0ee3bac 100644
--- a/kexi/formeditor/events.h
+++ b/kexi/formeditor/events.h
@@ -60,15 +60,15 @@ class KFORMEDITOR_EXPORT ConnectionBuffer : public ConnectionList
 		ConnectionBuffer();
 		~ConnectionBuffer() {;}
 
-		void save(TQDomNode &tqparentNode);
-		void load(TQDomNode tqparentNode);
+		void save(TQDomNode &parentNode);
+		void load(TQDomNode parentNode);
 
 		/*! This function is called when a widget is renamed from \a oldname
 		to \a newname. All the Connections for this widget are updated. */
 		void    fixName(const TQString &oldname, const TQString &newName);
 
 		ConnectionBuffer*     allConnectionsForWidget(const TQString &widget);
-		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode);
+		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode);
 		void     removeAllConnectionsForWidget(const TQString &widget);
 };
 
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ada3f994..15011e50 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -651,12 +651,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 	//m_widget = w;
 //	m_container = container;
 
-	if((classname == "KFDTabWidget") || (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		if(w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+		if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 		{
-			//m_widget = w->tqparentWidget()->tqparentWidget();
-			setWidget(w->tqparentWidget()->tqparentWidget(), m_container->toplevel());
+			//m_widget = w->parentWidget()->parentWidget();
+			setWidget(w->parentWidget()->parentWidget(), m_container->toplevel());
 //			m_container = m_container->toplevel();
 		}
 
@@ -668,12 +668,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 			menu->setItemEnabled(id, false);
 		return true;
 	}
-	else if(w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+	else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 	{
-		//m_widget = w->tqparentWidget();
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget(); //m_widget;
+		//m_widget = w->parentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
-			w->tqparentWidget(),
+			w->parentWidget(),
 			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
 		);
 //		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
@@ -720,17 +720,17 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 }
 
 bool
-ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
-	if((name == "title") && (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget()->tqparentWidget());
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
 	}
-	else if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "id", stack->id(w));
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -743,15 +743,15 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW
 	TQString name = node.attribute("name");
 	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget());
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
 		item->addModifiedProperty("title", node.firstChild().toElement().text());
 		return true;
 	}
 
-	if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
 		int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 		stack->addWidget(w, id);
 		stack->raiseWidget(w);
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b8623fad..c8bdc1a6 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -251,7 +251,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
 			KFormDesigner::Container *container);
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index b625c712..7460b480 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -667,7 +667,7 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
 }
 
 bool
-StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &domDoc)
 {
 	if(name == "list_items" && classname == "KComboBox")
 	{
@@ -676,7 +676,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -687,7 +687,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", listbox->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -703,14 +703,14 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "resizable", listview->header()->isResizeEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "clickable", listview->header()->isClickEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "fullwidth", listview->header()->isStretchEnabled(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 
 		// Then we save the list view items
 		TQListViewItem *item = listview->firstChild();
 		while(item)
 		{
-			saveListItem(item, tqparentNode, domDoc);
+			saveListItem(item, parentNode, domDoc);
 			item = item->nextSibling();
 		}
 		return true;
@@ -720,10 +720,10 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 }
 
 void
-StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc)
 {
 	TQDomElement element = domDoc.createElement("item");
-	tqparentNode.appendChild(element);
+	parentNode.appendChild(element);
 
 	// We save the text of each column
 	for(int i = 0; i < item->listView()->columns(); i++)
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index f5bd5528..5d9032f0 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -91,7 +91,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 			const TQCString &property, bool isTopLevel);
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
-		void saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc);
+		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
 		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
 
 	private:
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 41afdf37..6acf139c 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -173,11 +173,11 @@ Form::commonParentContainer(WidgetList *wlist)
 	ObjectTreeItem *item = 0;
 	WidgetList *list = new WidgetList();
 
-	// Creates a list of all widget tqparents
+	// Creates a list of all widget parents
 	for(TQWidget *w = wlist->first(); w; w = wlist->next())
 	{
-		if(list->tqfindRef(w->tqparentWidget()) == -1)
-			list->append(w->tqparentWidget());
+		if(list->tqfindRef(w->parentWidget()) == -1)
+			list->append(w->parentWidget());
 	}
 
 	removeChildrenFromList(*list);
@@ -193,7 +193,7 @@ Form::commonParentContainer(WidgetList *wlist)
 }
 
 Container*
-Form::tqparentContainer(TQWidget *w)
+Form::parentContainer(TQWidget *w)
 {
 	ObjectTreeItem *it;
 	if(!w)
@@ -245,14 +245,14 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 		return;
 	}
 
-	//raise selected widget and all possible tqparents
+	//raise selected widget and all possible parents
 	TQWidget *wtmp = w;
-	while(!dontRaise && wtmp && wtmp->tqparentWidget() && (wtmp != widget()))
+	while(!dontRaise && wtmp && wtmp->parentWidget() && (wtmp != widget()))
 	{
 		wtmp->raise();
 		if(d->resizeHandles[ wtmp->name() ])
 			d->resizeHandles[ wtmp->name() ]->raise();
-		wtmp = wtmp->tqparentWidget();
+		wtmp = wtmp->parentWidget();
 	}
 
 	if (wtmp)
@@ -268,11 +268,11 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 	emitActionSignals(false);
 
 	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their tqparent
-	if(!FormManager::self()->isTopLevel(w) && w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+	if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 	{
-		w = w->tqparentWidget();
-		if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
-			w = w->tqparentWidget();
+		w = w->parentWidget();
+		if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+			w = w->parentWidget();
 	}
 
 	if(w && w != widget())
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index dbe64b52..d41d7a29 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -181,7 +181,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		 It is the same as activeContainer() for a simple widget, but unlike this function
 		  it will also return the tqparent Container if the widget itself is a Container.
 		 */
-		Container* tqparentContainer(TQWidget *w=0);
+		Container* parentContainer(TQWidget *w=0);
 
 		/*! \return The \ref Container which is a tqparent of all widgets in \a wlist.
 		 Used by \ref activeContainer(), and to find where
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 4b46f8fe..dbfdc10a 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -183,11 +183,11 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc)
 	// Save the toplevel widgets, and so the whole Form
 	saveWidget(form->objectTree(), uiElement, domDoc);
 
-	// We then save the tqlayoutdefaults element
-	TQDomElement tqlayoutDefaults = domDoc.createElement("tqlayoutDefaults");
-	tqlayoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
-	tqlayoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
-	uiElement.appendChild(tqlayoutDefaults);
+	// We then save the layoutdefaults element
+	TQDomElement layoutDefaults = domDoc.createElement("layoutDefaults");
+	layoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
+	layoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
+	uiElement.appendChild(layoutDefaults);
 
 	/// Save tab Stops
 	if(form->autoTabStops())
@@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name, 
+FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, 
 	const TQVariant &value, TQWidget *w, WidgetLibrary *lib)
 {
 	// Widget specific properties and attributes ///////////////
@@ -416,7 +416,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 	{
 		kdDebug() << "FormIO::savePropertyValue()  The object doesn't have this property. Let's try the WidgetLibrary." << endl;
 		if(lib)
-			lib->saveSpecialProperty(w->className(), name, value, w, tqparentNode, tqparent);
+			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent);
 		return;
 	}
 
@@ -449,7 +449,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			type.appendChild(valueE);
 		}
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
@@ -464,17 +464,17 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			valueE = tqparent.createTextNode(m_currentItem->pixmapName(property));
 		type.appendChild(valueE);
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
 	// Saving a "normal" property
 	writeVariant(tqparent, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 void
-FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value)
+FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value)
 {
 	TQDomElement type;
 	TQDomText valueE;
@@ -721,16 +721,16 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVari
 			break;
 	}
 
-	tqparentNode.appendChild(type);
+	parentNode.appendChild(type);
 }
 
 void
-FormIO::savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
+FormIO::savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
 {
 	TQDomElement propertyE = domDoc.createElement(tagName);
 	propertyE.setAttribute("name", property);
 	writeVariant(domDoc, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 TQVariant
@@ -1019,22 +1019,22 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	}
 	// Saving container 's tqlayout if there is one
 	TQDomElement tqlayout;
-	if(item->container() && item->container()->tqlayoutType() != Container::NoLayout)
+	if(item->container() && item->container()->layoutType() != Container::NoLayout)
 	{
 		if(item->container()->tqlayout()) // there is a tqlayout
 		{
 			tqlayout = domDoc.createElement("temp");
 			savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
-			if(item->modifiedProperties()->tqcontains("tqlayoutMargin"))
-				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->tqlayoutMargin());
-			if(item->modifiedProperties()->tqcontains("tqlayoutSpacing"))
-				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->tqlayoutSpacing());
+			if(item->modifiedProperties()->tqcontains("layoutMargin"))
+				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+			if(item->modifiedProperties()->tqcontains("layoutSpacing"))
+				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
 			tclass.appendChild(tqlayout);
 		}
 	}
 
-	int tqlayoutType = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
-	switch(tqlayoutType) {
+	int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
+	switch(layoutType) {
 		case Container::Grid: // grid tqlayout
 		{
 			tqlayout.setTagName("grid");
@@ -1075,7 +1075,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 			WidgetList *list = (WidgetList*)flow->widgetList();
 
 			// save some special properties
-			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::tqlayoutTypeToString(item->container()->tqlayoutType()) );
+			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
 			savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
 
 			// fill the widget's grid info, ie just simulate grid tqlayout
@@ -1231,7 +1231,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 
 	m_currentItem = item;
 	// if we are inside a Grid, we need to insert the widget in the good cell
-	if(container->tqlayoutType() == Container::Grid)  {
+	if(container->layoutType() == Container::Grid)  {
 		TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
 		if(el.hasAttribute("rowspan")) { // widget spans multiple cells
 			if(tqlayout)
@@ -1420,21 +1420,21 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 		}
 		else if(tag == "grid") {
 			// first, see if it is flow tqlayout
-			TQString tqlayoutName;
+			TQString layoutName;
 			for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling())  {
 				if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout"))  {
-					tqlayoutName = child.toElement().text();
+					layoutName = child.toElement().text();
 					break;
 				}
 			}
 
-			 if(tqlayoutName == "HFlow") {
+			 if(layoutName == "HFlow") {
 				item->container()->m_layType = Container::HFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Horizontal);
 				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
-			else if(tqlayoutName == "VFlow") {
+			else if(layoutName == "VFlow") {
 				item->container()->m_layType = Container::VFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Vertical);
diff --git a/kexi/formeditor/formIO.h b/kexi/formeditor/formIO.h
index f2308433..5556b240 100644
--- a/kexi/formeditor/formIO.h
+++ b/kexi/formeditor/formIO.h
@@ -149,12 +149,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static void loadWidget(Container *container,
 			const TQDomElement &el, TQWidget *tqparent=0);
 
-		/*! Save an element in the \a domDoc as child of \a tqparentNode.
+		/*! Save an element in the \a domDoc as child of \a parentNode.
 		  The element will be saved like this :
 		  \code  <$(tagName) name = "$(property)">< value_as_XML ><$(tagName)/>
 		  \endcode
 		*/
-		static void savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName,
+		static void savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName,
 			const TQString &property, const TQVariant &value);
 
 		/*! Read an object property in the DOM doc.
@@ -165,7 +165,7 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static TQVariant readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name);
 
 		/*! Write an object property in the DOM doc.
-		   \param tqparentNode the DOM document to write to
+		   \param parentNode the DOM document to write to
 		   \param name   the name of the property being saved
 		   \param value  the value of this property
 		   \param w      the widget whose property is being saved
@@ -174,12 +174,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 			 Properties of subwidget are saved with subwidget="true" arribute added 
 			 to 'property' XML element.
 		*/
-		static void savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name,
+		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name,
 			const TQVariant &value, TQWidget *w, WidgetLibrary *lib=0);
 
 	protected:
-		/*! Saves the TQVariant \a value as text to be included in an xml file, with \a tqparentNode.*/
-		static void writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value);
+		/*! Saves the TQVariant \a value as text to be included in an xml file, with \a parentNode.*/
+		static void writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value);
 
 		/*! Creates a toplevel widget from the TQDomElement \a element in the Form \a form,
 		 with \a tqparent as tqparent widget.
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 85001f5e..4004fcd4 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -890,7 +890,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	PLUG_ACTION("edit_paste", true);
 	PLUG_ACTION("edit_delete", !toplevelWidgetSelected);
 	separatorNeeded = true;
-	PLUG_ACTION("tqlayout_menu", enableLayout);
+	PLUG_ACTION("layout_menu", enableLayout);
 	PLUG_ACTION("break_layout", enableLayout);
 	separatorNeeded = true;
 	PLUG_ACTION("align_menu", !toplevelWidgetSelected);
@@ -1050,49 +1050,49 @@ FormManager::slotConnectionCreated(Form *form, Connection &connection)
 }
 
 void
-FormManager::tqlayoutHBox()
+FormManager::layoutHBox()
 {
 	createLayout(Container::HBox);
 }
 
 void
-FormManager::tqlayoutVBox()
+FormManager::layoutVBox()
 {
 	createLayout(Container::VBox);
 }
 
 void
-FormManager::tqlayoutGrid()
+FormManager::layoutGrid()
 {
 	createLayout(Container::Grid);
 }
 
 void
-FormManager::tqlayoutHSplitter()
+FormManager::layoutHSplitter()
 {
 	createLayout(Container::HSplitter);
 }
 
 void
-FormManager::tqlayoutVSplitter()
+FormManager::layoutVSplitter()
 {
 	createLayout(Container::VSplitter);
 }
 
 void
-FormManager::tqlayoutHFlow()
+FormManager::layoutHFlow()
 {
 	createLayout(Container::HFlow);
 }
 
 void
-FormManager::tqlayoutVFlow()
+FormManager::layoutVFlow()
 {
 	createLayout(Container::VFlow);
 }
 
 void
-FormManager::createLayout(int tqlayoutType)
+FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
 	// if only one widget is selected (a container), we modify its tqlayout
@@ -1105,15 +1105,15 @@ FormManager::createLayout(int tqlayoutType)
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
 		if(!item || !item->container() || !m_propSet->tqcontains("tqlayout"))
 			return;
-		(*m_propSet)["tqlayout"] = Container::tqlayoutTypeToString(tqlayoutType);
+		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
-	TQWidget *tqparent = list->first()->tqparentWidget();
+	TQWidget *tqparent = list->first()->parentWidget();
 	for(TQWidget *w = list->first(); w; w = list->next())
 	{
-		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->tqparentWidget()->name() << " insteaed of " << tqparent->name() << endl;
-		if(w->tqparentWidget() != tqparent)
+		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->parentWidget()->name() << " insteaed of " << tqparent->name() << endl;
+		if(w->parentWidget() != tqparent)
 		{
 			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
 		   "All selected widgets must have the same tqparent."));
@@ -1122,7 +1122,7 @@ FormManager::createLayout(int tqlayoutType)
 		}
 	}
 
-	KCommand *com = new CreateLayoutCommand(tqlayoutType, *list, m_active);
+	KCommand *com = new CreateLayoutCommand(layoutType, *list, m_active);
 	m_active->addCommand(com, true);
 }
 
@@ -1244,11 +1244,11 @@ FormManager::alignWidgets(int type)
 	if(!activeForm() || !activeForm()->objectTree() || (activeForm()->selectedWidgets()->count() < 2))
 		return;
 
-	TQWidget *tqparentWidget = activeForm()->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = activeForm()->selectedWidgets()->first()->parentWidget();
 
 	for(TQWidget *w = activeForm()->selectedWidgets()->first(); w; w = activeForm()->selectedWidgets()->next())
 	{
-		if(w->tqparentWidget() != tqparentWidget)
+		if(w->parentWidget() != parentWidget)
 		{
 			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same tqparent widget" << endl;
 			return;
@@ -1512,16 +1512,16 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	enableAction("tqlayout_menu", multiple || containerSelected);
-	enableAction("tqlayout_hbox", multiple || containerSelected);
-	enableAction("tqlayout_vbox", multiple || containerSelected);
-	enableAction("tqlayout_grid", multiple || containerSelected);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
+	enableAction("layout_menu", multiple || containerSelected);
+	enableAction("layout_hbox", multiple || containerSelected);
+	enableAction("layout_vbox", multiple || containerSelected);
+	enableAction("layout_grid", multiple || containerSelected);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = activeForm() ? activeForm()->activeContainer() : 0;
 	if (container)
-		enableAction("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+		enableAction("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit widgetSelected(form, true);
 }
@@ -1553,13 +1553,13 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	enableAction("tqlayout_menu", hasChildren);
-	enableAction("tqlayout_hbox", hasChildren);
-	enableAction("tqlayout_vbox", hasChildren);
-	enableAction("tqlayout_grid", hasChildren);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
-	enableAction("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	enableAction("layout_menu", hasChildren);
+	enableAction("layout_hbox", hasChildren);
+	enableAction("layout_vbox", hasChildren);
+	enableAction("layout_grid", hasChildren);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
+	enableAction("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit formWidgetSelected( form );
 }
@@ -1631,12 +1631,12 @@ FormManager::disableWidgetActions()
 	enableAction("format_raise", false);
 	enableAction("format_lower", false);
 
-	enableAction("tqlayout_menu", false);
-	enableAction("tqlayout_hbox", false);
-	enableAction("tqlayout_vbox", false);
-	enableAction("tqlayout_grid", false);
-	enableAction("tqlayout_hsplitter", false);
-	enableAction("tqlayout_vsplitter", false);
+	enableAction("layout_menu", false);
+	enableAction("layout_hbox", false);
+	enableAction("layout_vbox", false);
+	enableAction("layout_grid", false);
+	enableAction("layout_hsplitter", false);
+	enableAction("layout_vsplitter", false);
 	enableAction("break_layout", false);
 }
 
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index a4622d1b..e7934cc2 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -259,19 +259,19 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		void editConnections();
 
 		//! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
-		void tqlayoutHBox();
+		void layoutHBox();
 		//! Lay out selected widgets using VBox tqlayout.
-		void tqlayoutVBox();
+		void layoutVBox();
 		//! Lay out selected widgets using Grid tqlayout.
-		void tqlayoutGrid();
+		void layoutGrid();
 		//! Lay out selected widgets in an horizontal splitter
-		void  tqlayoutHSplitter();
+		void  layoutHSplitter();
 		//! Lay out selected widgets in a verticak splitter
-		void  tqlayoutVSplitter();
+		void  layoutVSplitter();
 		//! Lay out selected widgets using HFlow tqlayout
-		void tqlayoutHFlow();
+		void layoutHFlow();
 		//! Lay out selected widgets using VFlow tqlayout.
-		void tqlayoutVFlow();
+		void layoutVFlow();
 
 		//! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
 		void breakLayout();
@@ -421,7 +421,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
 		  currently selected widgets (that must have the same tqparent).
 		  Calls \ref CreateLayoutCommand. */
-		void createLayout(int tqlayoutType);
+		void createLayout(int layoutType);
 
 		/*! Function called by all other AlignWidgets*() function. Calls \ref AlignWidgetsCommand. */
 		void alignWidgets(int type);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index a79374cd..8ab3ae0d 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -69,11 +69,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -215,9 +215,9 @@ KFormDesignerKDevPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -405,12 +405,12 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 			multiple = true;
 	}
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", multiple);
-	ENABLE_ACTION("tqlayout_vbox", multiple);
-	ENABLE_ACTION("tqlayout_grid", multiple);
+	ENABLE_ACTION("layout_hbox", multiple);
+	ENABLE_ACTION("layout_vbox", multiple);
+	ENABLE_ACTION("layout_grid", multiple);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -420,10 +420,10 @@ KFormDesignerKDevPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", true);
-	ENABLE_ACTION("tqlayout_vbox", true);
-	ENABLE_ACTION("tqlayout_grid", true);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_hbox", true);
+	ENABLE_ACTION("layout_vbox", true);
+	ENABLE_ACTION("layout_grid", true);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -486,9 +486,9 @@ KFormDesignerKDevPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
 	ENABLE_ACTION("break_layout", false);
 }
 
@@ -616,10 +616,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 548b4a35..72f2ef82 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
@@ -45,7 +45,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index 5f17d849..f9dad43a 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -37,14 +37,14 @@ using namespace KFormDesigner;
 
 
 ObjectTreeItem::ObjectTreeItem(const TQString &classn, const TQString &name, TQWidget *widget,
- Container *tqparentContainer, Container *container)
+ Container *parentContainer, Container *container)
  : m_enabled(true), m_row(-1), m_col(-1), m_rowspan(-1), m_colspan(-1), m_span(false)
 {
 	m_className = classn;
 	m_name = name;
 	m_widget = widget;
 	m_container = container;
-	m_eater = new EventEater(widget, tqparentContainer);
+	m_eater = new EventEater(widget, parentContainer);
 	m_parent = 0;
 	m_subprops = 0;
 }
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ca301f4d..ae9b1e26 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -64,7 +64,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 class KFORMEDITOR_EXPORT ObjectTreeItem
 {
 	public:
-		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *tqparentContainer, Container *container=0);
+		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *parentContainer, Container *container=0);
 		virtual ~ObjectTreeItem();
 
 		TQString name() const { return m_name; }
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index ac1cb4cb..c2448c6e 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -36,7 +36,7 @@
 using namespace KFormDesigner;
 
 ResizeHandle::ResizeHandle(ResizeHandleSet *set, HandlePos pos, bool editing)
- : TQWidget(set->m_widget->tqparentWidget()), m_set(set)
+ : TQWidget(set->m_widget->parentWidget()), m_set(set)
 {
 //	setBackgroundMode(TQt::NoBackground);
 	m_dragging = false;
@@ -226,16 +226,16 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev)
 		tmpw += tmpx;
 		tmpx = 0;
 	}
-	else if(tmpx + tmpw > m_set->m_widget->tqparentWidget()->width())
-		tmpw = m_set->m_widget->tqparentWidget()->width() - tmpx;
+	else if(tmpx + tmpw > m_set->m_widget->parentWidget()->width())
+		tmpw = m_set->m_widget->parentWidget()->width() - tmpx;
 
 	if(tmpy < 0)
 	{
 		tmph += tmpy;
 		tmpy = 0;
 	}
-	else if(tmpy + tmph > m_set->m_widget->tqparentWidget()->height())
-		tmph = m_set->m_widget->tqparentWidget()->height() - tmpy;
+	else if(tmpy + tmph > m_set->m_widget->parentWidget()->height())
+		tmph = m_set->m_widget->parentWidget()->height() - tmpy;
 
 	const bool shouldBeMoved = (tmpx != m_set->m_widget->x()) || (tmpy != m_set->m_widget->y());
 	const bool shouldBeResized = (tmpw != m_set->m_widget->width()) || (tmph != m_set->m_widget->height());
@@ -272,16 +272,16 @@ void ResizeHandle::paintEvent( TQPaintEvent * )
 	/*TQPainter p(this);
 	p.setRasterOp(XorROP);
 	p.fillRect(TQRect(0, 0, 6, 6),white);
-	bitBlt( this, TQPoint(0,0), tqparentWidget(), rect(), XorROP);*/
+	bitBlt( this, TQPoint(0,0), parentWidget(), rect(), XorROP);*/
 }
 
 /////////////// ResizeHandleSet //////////////////
 
 ResizeHandleSet::ResizeHandleSet(TQWidget *modify, Form *form, bool editing)
-: TQObject(modify->tqparentWidget()), /*m_widget(modify),*/ m_form(form)
+: TQObject(modify->parentWidget()), /*m_widget(modify),*/ m_form(form)
 {
 	m_widget = 0;
-	/*TQWidget *tqparent = modify->tqparentWidget();
+	/*TQWidget *tqparent = modify->parentWidget();
 
 	handles[0] = new ResizeHandle( modify, ResizeHandle::TopLeft, editing);
 	handles[1] = new ResizeHandle( modify, ResizeHandle::TopCenter, editing);
diff --git a/kexi/formeditor/scripting/scriptIO.cpp b/kexi/formeditor/scripting/scriptIO.cpp
index ee0b1f59..b124a99a 100644
--- a/kexi/formeditor/scripting/scriptIO.cpp
+++ b/kexi/formeditor/scripting/scriptIO.cpp
@@ -27,30 +27,30 @@
 #include "main/scriptcontainer.h"
 
 bool
-ScriptIO::saveFormEvents(TQDomNode &tqparentNode, FormScript *formScript)
+ScriptIO::saveFormEvents(TQDomNode &parentNode, FormScript *formScript)
 {
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 
 	// Save the form's code
 	if(!formScript->getCode().isEmpty()) {
 		TQDomElement  script = domDoc.createElement("script");
 		script.setAttribute("language", formScript->scriptContainer()->getInterpreterName());
-		tqparentNode.appendChild(script);
+		parentNode.appendChild(script);
 		TQDomText scriptCode = domDoc.createTextNode(formScript->getCode());
 		script.appendChild(scriptCode);
 	}
 
 	// Save all form events
 	if(!formScript->eventList()->isEmpty())
-		saveEventList(formScript->eventList(), tqparentNode);
+		saveEventList(formScript->eventList(), parentNode);
 	return true;
 }
 
 bool
-ScriptIO::loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager)
+ScriptIO::loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager)
 {
-	TQDomElement script = tqparentNode.namedItem("script").toElement();
-	TQDomElement events = tqparentNode.namedItem("events").toElement();
+	TQDomElement script = parentNode.namedItem("script").toElement();
+	TQDomElement events = parentNode.namedItem("events").toElement();
 
 	// Load script code
 	FormScript *formScript = new FormScript(form, manager);
@@ -76,15 +76,15 @@ ScriptIO::saveAllEventsForWidget(TQObject *widget, FormScript *formScript, TQDom
 }
 
 void
-ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
+ScriptIO::saveEvent(Event *event, TQDomNode &parentNode)
 {
 	if(!event)
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement eventNode = domDoc.createElement("event");
 	eventNode.setAttribute("type", event->type());
-	tqparentNode.appendChild(eventNode);
+	parentNode.appendChild(eventNode);
 
 	switch(event->type()) {
 		case Event::Slot: {
@@ -138,14 +138,14 @@ ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
 }
 
 void
-ScriptIO::saveEventList(EventList *list, TQDomNode &tqparentNode)
+ScriptIO::saveEventList(EventList *list, TQDomNode &parentNode)
 {
 	if(!list || list->isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement events = domDoc.createElement("events");
-	tqparentNode.appendChild(events);
+	parentNode.appendChild(events);
 
 	TQValueListConstIterator<Event*> endIt = list->constEnd();
 	for(TQValueListConstIterator<Event*> it =  list->constBegin(); it != endIt; ++it)
diff --git a/kexi/formeditor/scripting/scriptIO.h b/kexi/formeditor/scripting/scriptIO.h
index 319de0fd..9261d75c 100644
--- a/kexi/formeditor/scripting/scriptIO.h
+++ b/kexi/formeditor/scripting/scriptIO.h
@@ -42,17 +42,17 @@ class ScriptIO
 		/*! Save the evnts of a form.
 		 Creates an \<events\> tag, and then one \<event\> tag for each event.
 		 Each event tqcontains \<sender\> and \<receiver\> tags, with attributes depending on event type. */
-		static bool  saveFormEvents(TQDomNode &tqparentNode, FormScript *script);
-		/*! Reads the \<events\> tag (\a tqparentNode), then creates and fills a FormScript object linked to this \a form.
+		static bool  saveFormEvents(TQDomNode &parentNode, FormScript *script);
+		/*! Reads the \<events\> tag (\a parentNode), then creates and fills a FormScript object linked to this \a form.
 		 The new FormScript object is then added  to ScriptManager list.*/
-		static bool  loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager);
+		static bool  loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager);
 
 		/*! Save only the events related to widget \a name in the FormScript \a fscript.
 		 Used eg when copying/pasting widgets to keep also events related to it.*/
 		static bool  saveAllEventsForWidget(TQObject *widget, FormScript *fscript, TQDomNode &node);
 
-		static void  saveEvent(Event *event, TQDomNode &tqparentNode);
-		static void  saveEventList(EventList *list, TQDomNode &tqparentNode);
+		static void  saveEvent(Event *event, TQDomNode &parentNode);
+		static void  saveEventList(EventList *list, TQDomNode &parentNode);
 		static void  loadEvent(TQDomNode &node, EventList *list, Form *form);
 
 	protected:
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 4bea0294..be8cfb4a 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -123,10 +123,10 @@ Spring::isPropertyVisible(const TQCString &name)
 
 
 void
-Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNode, TQDomDocument &domDoc, bool insideGridLayout)
+Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode, TQDomDocument &domDoc, bool insideGridLayout)
 {
 	TQDomElement tclass = domDoc.createElement("spacer");
-	tqparentNode.appendChild(tclass);
+	parentNode.appendChild(tclass);
 
 	if(insideGridLayout)
 	{
@@ -141,7 +141,7 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNo
 
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	if(tqparentNode.tagName() == "widget")
+	if(parentNode.tagName() == "widget")
 		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
 	if(!item->widget()->tqsizeHint().isValid())
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 0e1745dc..d95e96ae 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -98,11 +98,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerPart *part = new KFormDesignerPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerPart *part = new KFormDesignerPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -219,22 +219,22 @@ KFormDesignerPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	KActionMenu *tqlayoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "tqlayout_menu");
-	tqlayoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox"));
-	tqlayoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox"));
-	tqlayoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHFlow()), actionCollection(), "tqlayout_hflow"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVFlow()), actionCollection(), "tqlayout_vflow"));
-	tqlayoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter"));
-	tqlayoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter"));
+	KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
+	layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
 	new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 /*
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
-	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter");
-	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 */
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -433,15 +433,15 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_vbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_grid", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
+	ENABLE_ACTION("layout_menu", multiple || containerSelected);
+	ENABLE_ACTION("layout_hbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_vbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_grid", multiple || containerSelected);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -454,13 +454,13 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", hasChildren);
-	ENABLE_ACTION("tqlayout_hbox", hasChildren);
-	ENABLE_ACTION("tqlayout_vbox", hasChildren);
-	ENABLE_ACTION("tqlayout_grid", hasChildren);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_menu", hasChildren);
+	ENABLE_ACTION("layout_hbox", hasChildren);
+	ENABLE_ACTION("layout_vbox", hasChildren);
+	ENABLE_ACTION("layout_grid", hasChildren);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -523,12 +523,12 @@ KFormDesignerPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_menu", false);
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
-	ENABLE_ACTION("tqlayout_hsplitter", false);
-	ENABLE_ACTION("tqlayout_vsplitter", false);
+	ENABLE_ACTION("layout_menu", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
+	ENABLE_ACTION("layout_hsplitter", false);
+	ENABLE_ACTION("layout_vsplitter", false);
 	ENABLE_ACTION("break_layout", false);
 }
 #endif
@@ -640,10 +640,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -663,7 +663,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 7ffb8705..5b264b03 100644
--- a/kexi/formeditor/test/kfd_part.h
+++ b/kexi/formeditor/test/kfd_part.h
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 12585b6c..f26661ab 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -64,9 +64,9 @@ WidgetInfo::WidgetInfo(WidgetFactory *f)
 {
 }
 
-WidgetInfo::WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName,
+WidgetInfo::WidgetInfo(WidgetFactory *f, const char* parentFactoryName,
 	const char* inheritedClassName)
- : m_parentFactoryName( TQCString("kformdesigner_")+tqparentFactoryName )
+ : m_parentFactoryName( TQCString("kformdesigner_")+parentFactoryName )
  , m_inheritedClassName(inheritedClassName)
  , m_inheritedClass(0)
  , m_overriddenAlternateNames(0)
@@ -188,7 +188,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
-		KTextEdit *textedit = new KTextEdit(text, TQString(), w->tqparentWidget());
+		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
 		textedit->tqsetAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
@@ -228,7 +228,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 //#else
 	}
 	else {
-		KLineEdit *editor = new KLineEdit(text, w->tqparentWidget());
+		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
 		editor->tqsetAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
@@ -643,7 +643,7 @@ WidgetFactory::saveSpecialProperty(const TQCString &, const TQString &, const TQ
 bool WidgetFactory::inheritsFactories()
 {
 	for (TQAsciiDictIterator<WidgetInfo> it(m_classesByName); it.current(); ++it) {
-		if (!it.current()->tqparentFactoryName().isEmpty())
+		if (!it.current()->parentFactoryName().isEmpty())
 			return true;
 	}
 	return false;
@@ -667,11 +667,11 @@ void WidgetFactory::setEditor(TQWidget *widget, TQWidget *editor)
 	if (!widget)
 		return;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		m_editor = editor;
 	}
 	else {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setEditor(widget, editor);
 		m_editor = editor; //keep a copy
@@ -683,7 +683,7 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 	if (!widget)
 		return 0;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		return m_editor;
 	}
 	else {
@@ -697,8 +697,8 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 void WidgetFactory::setWidget(TQWidget *widget, Container* container)
 {
 	WidgetInfo *winfo = widget ? m_classesByName[widget->className()] : 0;
-	if (winfo && !winfo->tqparentFactoryName().isEmpty()) {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+	if (winfo && !winfo->parentFactoryName().isEmpty()) {
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setWidget(widget, container);
 	}
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 2cb74fc8..eab422ce 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -70,7 +70,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 
 		WidgetInfo(WidgetFactory *f);
 
-		WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName, const char* inheritedClassName = 0);
+		WidgetInfo(WidgetFactory *f, const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~WidgetInfo();
 
@@ -146,7 +146,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 		 If cancelled value is returned, there is no overriding (the default). */
 		tristate autoSyncForProperty(const char *propertyName) const;
 
-		TQCString tqparentFactoryName() const { return m_parentFactoryName; }
+		TQCString parentFactoryName() const { return m_parentFactoryName; }
 
 		WidgetInfo* inheritedClass() const { return m_inheritedClass; }
 
@@ -327,7 +327,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 */
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
 			const TQVariant &value, TQWidget *w,
-			TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 
 		/*! This function is called when FormIO finds a property or an unknown
 		element in a .ui file. You can this way load a special property, for
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 265153e7..ac663f8b 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -135,13 +135,13 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f)
 			continue; //this class is hidden
 		// check if we want to inherit a widget from a different factory
 		if (!w->m_parentFactoryName.isEmpty() && !w->m_inheritedClassName.isEmpty()) {
-			WidgetFactory *tqparentFactory = d->factories[w->m_parentFactoryName];
-			if (!tqparentFactory) {
+			WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName];
+			if (!parentFactory) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className()
 					<< "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl;
 				continue;
 			}
-			WidgetInfo* inheritedClass = tqparentFactory->m_classesByName[ w->m_inheritedClassName ];
+			WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ];
 			if (!inheritedClass) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->m_inheritedClassName
 					<< "' - no such class to inherit in factory '" << w->m_parentFactoryName << "'" << endl;
@@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname)
 }
 
 bool
-WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent)
+WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
 	loadFactories();
 	WidgetInfo *wi = d->widgets.tqfind(classname);
 	if (!wi)
 		return false;
 
-	if (wi->factory()->saveSpecialProperty(classname, name, value, w, tqparentNode, tqparent))
+	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent))
 		return true;
 	//try from inherited class
 	if (wi->inheritedClass())
-		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, tqparentNode, tqparent);
+		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent);
 	return false;
 }
 
@@ -649,11 +649,11 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForName(propertyName);
+	return parentFactory->propertyDescForName(propertyName);
 }
 
 TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& name)
@@ -667,11 +667,11 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForValue(name);
+	return parentFactory->propertyDescForValue(name);
 }
 
 void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo& winfo, TQWidget* w )
@@ -681,10 +681,10 @@ void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo
 	winfo.factory()->setPropertyOptions(buf, winfo, w);
 	if (winfo.m_parentFactoryName.isEmpty())
 		return;
-	WidgetFactory *tqparentFactory = d->factories[winfo.m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo.m_parentFactoryName];
+	if (!parentFactory)
 		return;
-	tqparentFactory->setPropertyOptions(buf, winfo, w);
+	parentFactory->setPropertyOptions(buf, winfo, w);
 }
 
 WidgetFactory* WidgetLibrary::factory(const char* factoryName) const
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index d8a6529a..22d4c05f 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		bool clearWidgetContent(const TQCString &classname, TQWidget *w);
 
 		bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
 		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index e1c3a1e9..55bd4c60 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "tqlayoutMargin") || (property == "tqlayoutSpacing")) {
+	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -901,7 +901,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 		return;
 
 	TQStringList list;
-	TQString value = Container::tqlayoutTypeToString(container->tqlayoutType());
+	TQString value = Container::layoutTypeToString(container->layoutType());
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
@@ -912,17 +912,17 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	updatePropertyValue(item, "tqlayout");
 
-	p = new KoProperty::Property("tqlayoutMargin", container->tqlayoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
+	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutMargin");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutMargin");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
-	p = new KoProperty::Property("tqlayoutSpacing", container->tqlayoutSpacing(), 
+	p = new KoProperty::Property("layoutSpacing", container->layoutSpacing(), 
 		i18n("Layout Spacing"), i18n("Layout Spacing"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutSpacing");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutSpacing");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
 }
@@ -951,19 +951,19 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 
 		container->setLayout(type);
 		bool show = (type != Container::NoLayout);
-		if(show != d->set["tqlayoutMargin"].isVisible())  {
-			d->set["tqlayoutMargin"].setVisible(show);
-			d->set["tqlayoutSpacing"].setVisible(show);
+		if(show != d->set["layoutMargin"].isVisible())  {
+			d->set["layoutMargin"].setVisible(show);
+			d->set["layoutSpacing"].setVisible(show);
 			KFormDesigner::FormManager::self()->showPropertySet(this, true/*force*/);
 		}
 		return;
 	}
 
-	if(prop == "tqlayoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->tqlayout()) {
 		container->setLayoutMargin(value.toInt());
 		container->tqlayout()->setMargin(value.toInt());
 	}
-	else if(prop == "tqlayoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->tqlayout())  {
 		container->setLayoutSpacing(value.toInt());
 		container->tqlayout()->setSpacing(value.toInt());
 	}