Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3aab8aa05b954b80e336517f93463a9b5f50f3d6)

1 files changed, 7 insertions, 7 deletions

diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 62402bfa..188238fd 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -879,7 +879,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name)
 	else if(type == "set")
 	{
 		WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj);
-		TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj;
+		TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : obj;
 		const int count = subobject->metaObject()->findProperty(name.latin1(), true);
 		const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0;
 
@@ -1343,7 +1343,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			if (node.attribute("subwidget")=="true") {
 				//this is property for subwidget: remember it for delayed setting
 				//because now the subwidget could be not created yet (true e.g. for KexiDBAutoField)
-				const TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) );
+				const TQVariant val( readPropertyValue(node.firstChild(), w, name) );
 				kdDebug() << val.toStringList() << endl;
 				item->addSubproperty( name.latin1(), val );
 				//subwidget->setProperty(name.latin1(), val);
@@ -1353,23 +1353,23 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 
 			// We cannot assign the buddy now as the buddy widget may not be created yet
 			if(name == "buddy")
-				m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w);
+				m_buddies->insert(readPropertyValue(node.firstChild(), w, name).toString(), (TQLabel*)w);
 			else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
 			  item->container() && item->container()->layout()) {
 			  // We load the margin of a Layout
 				if(name == "margin")  {
-					int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
+					int margin = readPropertyValue(node.firstChild(), w, name).toInt();
 					item->container()->setLayoutMargin(margin);
 					item->container()->layout()->setMargin(margin);
 				}
 				// We load the spacing of a Layout
 				else if(name == "spacing")  {
-					int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
+					int spacing = readPropertyValue(node.firstChild(), w, name).toInt();
 					item->container()->setLayoutSpacing(spacing);
 					item->container()->layout()->setSpacing(spacing);
 				}
 				else if((name == "justify")){
-					bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool();
+					bool justify = readPropertyValue(node.firstChild(), w, name).toBool();
 					KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
 					if(flow)
 						flow->setJustified(justify);
@@ -1389,7 +1389,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 			}
 			else // we have a normal property, let's load it
 			{
-				TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) );
+				TQVariant val( readPropertyValue(node.firstChild(), w, name) );
 				if(name == "geometry" && dynamic_cast<FormWidget*>(w)) {
 					//fix geometry if needed - this is top level form widget
 					TQRect r( val.toRect() );