1 files changed, 12 insertions, 12 deletions

diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 8d7d7daf..73c79c30 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 			));
 	}*/
 
-	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property
+	if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property
 		createLayoutProperty(tree);
 }
 
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
+	else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 	if (!container || !KFormDesigner::FormManager::self()->activeForm() ||
 		!KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget())
 		return;
-	// special containers have no 'tqlayout' property, as it should not be changed
+	// special containers have no 'layout' property, as it should not be changed
 	TQCString className = container->widget()->className();
 	if((className == "HBox") || (className == "VBox") || (className == "Grid"))
 		return;
@@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
-	KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value,
+	KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value,
 		i18n("Container's Layout"), i18n("Container's Layout"));
 	p->setVisible( container->form()->library()->advancedPropertiesVisible() );
 	d->set.addProperty(p);
 
-	updatePropertyValue(item, "tqlayout");
+	updatePropertyValue(item, "layout");
 
 	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
@@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	container = item->container();
 
-	if(prop == "tqlayout") {
+	if(prop == "layout") {
 		Container::LayoutType type = Container::stringToLayoutType(value.toString());
 
-		if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing)
+		if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing)
 			d->lastCommand->setValue(value);
 		else if(!d->isUndoing)  {
 			d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(),
-				d->set["tqlayout"].oldValue(), value);
+				d->set["layout"].oldValue(), value);
 			KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
 		}
 
@@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 		return;
 	}
 
-	if(prop == "layoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->layout()) {
 		container->setLayoutMargin(value.toInt());
-		container->tqlayout()->setMargin(value.toInt());
+		container->layout()->setMargin(value.toInt());
 	}
-	else if(prop == "layoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->layout())  {
 		container->setLayoutSpacing(value.toInt());
-		container->tqlayout()->setSpacing(value.toInt());
+		container->layout()->setSpacing(value.toInt());
 	}
 
 	ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name());