Remove additional unneeded tq method conversions

2 files changed, 9 insertions, 9 deletions

diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 2e30d5f4..e41e5613 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -256,7 +256,7 @@ InsertPageCommand::execute()
 	if(classname == "KFDTabWidget")
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
-		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
+		TQString n = i18n("Page %1").arg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
 
@@ -455,7 +455,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
 	wSplitter->setName(i18n("Splitter"));
 	wSplitter->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter"));
-	wSplitter->setDescription(i18n("A container that enables user to resize its tqchildren"));
+	wSplitter->setDescription(i18n("A container that enables user to resize its children"));
 	addClass(wSplitter);
 
 	KFormDesigner::WidgetInfo *wHFlow = new KFormDesigner::WidgetInfo(this);
@@ -682,7 +682,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
 		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) );
-//		if( ((TQWidgetStack*)m_widget)->tqchildren()->count() == 4) // == the stack has only one page
+//		if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
@@ -872,8 +872,8 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos)
 	if(!tab)
 		return;
 
-	KFormDesigner::ObjectTreeItem *item = tab->tqchildren()->take(oldpos);
-	tab->tqchildren()->insert(newpos, item);
+	KFormDesigner::ObjectTreeItem *item = tab->children()->take(oldpos);
+	tab->children()->insert(newpos, item);
 }
 
 void ContainerFactory::addStackPage()
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index afc37086..2607fcca 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -492,7 +492,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	if(classname == "KLineEdit")
 	{
 		KLineEdit *lineedit = static_cast<KLineEdit*>(w);
-		createEditor(classname, lineedit->text(), lineedit, container, lineedit->tqgeometry(), lineedit->tqalignment(), true);
+		createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true);
 		return true;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)
@@ -505,7 +505,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 			editText();
 		}
 		else
-			createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(classname, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	else if(classname == "KPushButton")
@@ -531,7 +531,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 	else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
 	{
 		TQCheckBox *check = static_cast<TQCheckBox*>(w);
-		//TQRect r(check->tqgeometry());
+		//TQRect r(check->geometry());
 		//r.setX(r.x() + 20);
 		TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w);
 		TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
@@ -860,7 +860,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname,
 	}
 	else if(classname == "KexiPictureLabel")
 	{
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 	else if(classname == TQLABEL_OBJECT_NAME_STRING)