Remove additional unneeded tq method conversions

1 files changed, 10 insertions, 10 deletions

diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 24347c40..9161049d 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -621,7 +621,7 @@ FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant
 		case TQVariant::Cursor:
 		{
 			type = parent.createElement("cursor");
-			valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape()));
+			valueE = parent.createTextNode(TQString::number(value.toCursor().shape()));
 			type.appendChild(valueE);
 			break;
 		}
@@ -964,14 +964,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 
 	savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	// Important: save dataSource property FIRST before properties like "tqalignment"
+	// Important: save dataSource property FIRST before properties like "alignment"
 	// - needed when subproperties are defined after subwidget creation, and subwidget is created after setting "dataSource"
 	//   (this is the case for KexiDBAutoField)
 //! @todo more properties like "dataSource" may needed here...
 //	if (-1 != item->widget()->metaObject()->findProperty("dataSource"))
 	//	savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
 
-	// We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+	// We don't want to save the geometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
 	if(item && !item->parent()) {
 		// save form widget size, but not its position
 		savePropertyValue(tclass, domDoc, "geometry",
@@ -992,10 +992,10 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 	for(TQMap<TQString,TQVariant>::ConstIterator it = map->constBegin(); it != endIt; ++it)
 	{
 		const TQCString name( it.key().latin1() );
-		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "tqalignment") {
+		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "alignment") {
 			if(!savedAlignment) // not to save it twice
 			{
-				savePropertyValue(tclass, domDoc, "tqalignment", item->widget()->property("tqalignment"), item->widget());
+				savePropertyValue(tclass, domDoc, "alignment", item->widget()->property("alignment"), item->widget());
 				savedAlignment = true;
 			}
 		}
@@ -1038,13 +1038,13 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		case Container::Grid: // grid tqlayout
 		{
 			tqlayout.setTagName("grid");
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
 				saveWidget(objIt, tqlayout, domDoc, true);
 			break;
 		}
 		case Container::HBox: case Container::VBox:
 		{
-			// as we don't save tqgeometry, we need to sort widgets in the right order, not creation order
+			// as we don't save geometry, we need to sort widgets in the right order, not creation order
 			WidgetList *list;
 			if(tqlayout.tagName() == "hbox") {
 				list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
@@ -1055,7 +1055,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 				tqlayout.setTagName("vbox");
 			}
 
-			for(ObjectTreeItem *objTree = item->tqchildren()->first(); objTree; objTree = item->tqchildren()->next())
+			for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
 				list->append(objTree->widget());
 			list->sort();
 
@@ -1090,7 +1090,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		}
 		default:
 		{
-			for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next())
+			for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
 				saveWidget(objIt, tclass, domDoc);
 		}
 	}
@@ -1391,7 +1391,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			{
 				TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) );
 				if(name == "geometry" && dynamic_cast<FormWidget*>(w)) {
-					//fix tqgeometry if needed - this is top level form widget
+					//fix geometry if needed - this is top level form widget
 					TQRect r( val.toRect() );
 					if (r.left()<0) //negative X!
 						r.moveLeft(0);