Rename a number of old tq methods that are no longer tq specific

1 files changed, 12 insertions, 12 deletions

diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 178e2b74..9bec64ba 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -183,14 +183,14 @@ void WidgetFactory::hideClass(const char *classname)
 
 void
 WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
-	TQWidget *w, Container *container, TQRect tqgeometry,
+	TQWidget *w, Container *container, TQRect geometry,
 	int align, bool useFrame, bool multiLine, BackgroundMode background)
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
 		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
-		textedit->tqsetAlignment(align);
+		textedit->setAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
 			textedit->setWordWrap(dynamic_cast<TQTextEdit*>(w)->wordWrap());
 			textedit->setWrapPolicy(dynamic_cast<TQTextEdit*>(w)->wrapPolicy());
@@ -198,12 +198,12 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->setPalette(w->palette());
 		textedit->setFont(w->font());
 		textedit->setResizePolicy(TQScrollView::Manual);
-		textedit->setGeometry(tqgeometry);
+		textedit->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			textedit->setBackgroundMode(w->backgroundMode());
 		else
 			textedit->setBackgroundMode(background);
-//		textedit->setPaletteBackgroundColor(textedit->tqcolorGroup().color( TQColorGroup::Base ));
+//		textedit->setPaletteBackgroundColor(textedit->colorGroup().color( TQColorGroup::Base ));
 		textedit->setPaletteBackgroundColor(w->paletteBackgroundColor());
 		for(int i =0; i <= textedit->paragraphs(); i++)
 			textedit->setParagraphBackgroundColor(i, w->paletteBackgroundColor());
@@ -229,10 +229,10 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	}
 	else {
 		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
-		editor->tqsetAlignment(align);
+		editor->setAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
-		editor->setGeometry(tqgeometry);
+		editor->setGeometry(geometry);
 		if(background == TQt::NoBackground)
 			editor->setBackgroundMode(w->backgroundMode());
 		else
@@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 	//copy properties if available
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
-	if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true))
+	if (-1!=m_editor->metaObject()->findProperty("margin", true) && -1!=subwidget->metaObject()->findProperty("margin", true))
 		m_editor->setProperty("margin", subwidget->property("margin"));
 //#endif
 //js	m_handles = new ResizeHandleSet(w, container->form(), true);
@@ -314,10 +314,10 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container)
 bool
 WidgetFactory::editList(TQWidget *w, TQStringList &list)
 {
-	KDialogBase dialog(w->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
+	KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(w->name()), &dialog, "editlist");
 	dialog.setMainWidget(edit);
 	edit->insertStringList(list);
 //	edit->show();
@@ -345,7 +345,7 @@ WidgetFactory::editRichText(TQWidget *w, TQString &text)
 void
 WidgetFactory::editListView(TQListView *listview)
 {
-	EditListViewDialog dlg(((TQWidget*)listview)->tqtopLevelWidget());
+	EditListViewDialog dlg(((TQWidget*)listview)->topLevelWidget());
 	//dlg.exec(listview);
 }
 
@@ -376,7 +376,7 @@ WidgetFactory::eventFilter(TQObject *obj, TQEvent *ev)
 		if(obj != (TQObject *)w)
 			return false;
 
-		TQWidget *focus = w->tqtopLevelWidget()->tqfocusWidget();
+		TQWidget *focus = w->topLevelWidget()->focusWidget();
 		if(focus && w != focus && !w->child(focus->name(), focus->className()))
 			resetEditor();
 	}
@@ -456,7 +456,7 @@ WidgetFactory::resetEditor()
 	if(m_widget)
 	{
 		disconnect(m_widget, 0, this, 0);
-		m_widget->tqrepaint();
+		m_widget->repaint();
 	}
 
 //js	delete m_handles;