1 files changed, 13 insertions, 13 deletions

diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp
index 6ce4bcae..53a9a15b 100644
--- a/kexi/formeditor/utils.cpp
+++ b/kexi/formeditor/utils.cpp
@@ -88,7 +88,7 @@ void
 KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form)
 {
 	ObjectTreeItem *tree = form->objectTree()->lookup(w->name());
-	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->isEmpty())
+	if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty())
 		&& !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)
 		) //fix weird behaviour
 		return; // if the user has set a cursor for this widget or this is a container, don't change it
@@ -108,7 +108,7 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 	int tmpw = 0, tmph = 0;
 	TQObjectList *list = w->queryList(inheritClass, 0, false, false);
 	for(TQObject *o = list->first(); o; o = list->next()) {
-		TQRect  r = ((TQWidget*)o)->tqgeometry();
+		TQRect  r = ((TQWidget*)o)->geometry();
 		tmpw = TQMAX(tmpw, r.right());
 		tmph = TQMAX(tmph, r.bottom());
 	}
@@ -119,9 +119,9 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass)
 
 // -----------------
 
-HorWidgetList::HorWidgetList(TQWidget *tqtopLevelWidget)
+HorWidgetList::HorWidgetList(TQWidget *topLevelWidget)
 	: WidgetList()
-	, m_tqtopLevelWidget(tqtopLevelWidget)
+	, m_topLevelWidget(topLevelWidget)
 {
 }
 
@@ -133,14 +133,14 @@ int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 {
 	TQWidget *w1 = TQT_TQWIDGET(item1);
 	TQWidget *w2 = TQT_TQWIDGET(item2);
-	return w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x();
+	return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x();
 }
 
 // -----------------
 
-VerWidgetList::VerWidgetList(TQWidget *tqtopLevelWidget)
+VerWidgetList::VerWidgetList(TQWidget *topLevelWidget)
 	: WidgetList()
-	, m_tqtopLevelWidget(tqtopLevelWidget)
+	, m_topLevelWidget(topLevelWidget)
 {
 }
 
@@ -157,9 +157,9 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	TQObject *page1 = 0;
 	TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1);
 	if (tw1) // special case
-		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
+		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2;
 	else
-		y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
+		y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
 
 	TQObject *page2 = 0;
 	TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2);
@@ -169,16 +169,16 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It
 	}
 
 	if (tw2) // special case
-		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
+		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2;
 	else
-		y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y();
+		y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y();
 	
 	kdDebug() << w1->name() << ": " << y1 << " " 
 		<< " | " << w2->name() << ": " << y2 << endl;
 
 
-	//kdDebug() << w1->name() << ": " << w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)) << " " << w1->y()
-		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_tqtopLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
+	//kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, TQPoint(0,0)) << " " << w1->y()
+		//<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl;
 	return y1 - y2;
 }