1 files changed, 10 insertions, 10 deletions

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