Rename old tq methods that no longer need a unique name

1 files changed, 12 insertions, 12 deletions

diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 2759fe98..24347c40 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 	WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = w;
 	bool addSubwidgetFlag = false;
-	int propertyId = w->tqmetaObject()->findProperty(name, true);
+	int propertyId = w->metaObject()->findProperty(name, true);
 	if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget
 		subwidget = subpropIface->subwidget();
-		propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true);
+		propertyId = subpropIface->subwidget()->metaObject()->findProperty(name, true);
 		addSubwidgetFlag = true;
 	}
 	if(propertyId == -1)
@@ -420,7 +420,7 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const
 		return;
 	}
 
-	const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true);
+	const TQMetaProperty *meta = subwidget->metaObject()->property(propertyId, true);
 	if (!meta->stored( subwidget )) //not storable
 		return;
 	TQDomElement propertyE = parent.createElement("property");
@@ -880,8 +880,8 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 	{
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj);
 		TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj;
-		const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true);
-		const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0;
+		const int count = subobject->metaObject()->findProperty(name.latin1(), true);
+		const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0;
 
 		if (meta) {
 			if (meta->isSetType()) {
@@ -968,7 +968,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 	// - 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()->tqmetaObject()->findProperty("dataSource"))
+//	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)
@@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 		= dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w);
 	TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w;
 	for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) {
-		if(subwidget->tqmetaObject()->findProperty(*it, true) != -1)
+		if(subwidget->metaObject()->findProperty(*it, true) != -1)
 			item->addModifiedProperty(*it, subwidget->property(*it));
 	}
 
@@ -1376,9 +1376,9 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 				}
 			}
 			// If the object doesn't have this property, we let the Factory handle it (maybe a special property)
-			else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1)
+			else if(subwidget->metaObject()->findProperty(name.latin1(), true) == -1)
 			{
-				if(w->className() == TQString::tqfromLatin1("CustomWidget"))
+				if(w->className() == TQString::fromLatin1("CustomWidget"))
 					item->storeUnknownProperty(node);
 				else {
 					bool read = container->form()->library()->readSpecialProperty(
@@ -1400,8 +1400,8 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 					val = r;
 				}
 				subwidget->setProperty(name.latin1(), val);
-//				int count = w->tqmetaObject()->findProperty(name, true);
-//				const TQMetaProperty *meta = w->tqmetaObject()->property(count, true);
+//				int count = w->metaObject()->findProperty(name, true);
+//				const TQMetaProperty *meta = w->metaObject()->property(count, true);
 //				if(meta && meta->isEnumType()) {
 //					val = w->property(name.latin1()); //update: we want a numeric value of enum
 //				}
@@ -1460,7 +1460,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			readChildNodes(item, container, node, w);
 		}
 		else {// unknown tag, we let the Factory handle it
-			if(w->className() == TQString::tqfromLatin1("CustomWidget"))
+			if(w->className() == TQString::fromLatin1("CustomWidget"))
 				item->storeUnknownProperty(node);
 			else {
 				bool read = container->form()->library()->readSpecialProperty(