1 files changed, 36 insertions, 36 deletions

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);
 }