1 files changed, 13 insertions, 13 deletions

diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index e1c3a1e9..55bd4c60 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "tqlayoutMargin") || (property == "tqlayoutSpacing")) {
+	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -901,7 +901,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 		return;
 
 	TQStringList list;
-	TQString value = Container::tqlayoutTypeToString(container->tqlayoutType());
+	TQString value = Container::layoutTypeToString(container->layoutType());
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
@@ -912,17 +912,17 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	updatePropertyValue(item, "tqlayout");
 
-	p = new KoProperty::Property("tqlayoutMargin", container->tqlayoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
+	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutMargin");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutMargin");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
-	p = new KoProperty::Property("tqlayoutSpacing", container->tqlayoutSpacing(), 
+	p = new KoProperty::Property("layoutSpacing", container->layoutSpacing(), 
 		i18n("Layout Spacing"), i18n("Layout Spacing"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutSpacing");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutSpacing");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
 }
@@ -951,19 +951,19 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 
 		container->setLayout(type);
 		bool show = (type != Container::NoLayout);
-		if(show != d->set["tqlayoutMargin"].isVisible())  {
-			d->set["tqlayoutMargin"].setVisible(show);
-			d->set["tqlayoutSpacing"].setVisible(show);
+		if(show != d->set["layoutMargin"].isVisible())  {
+			d->set["layoutMargin"].setVisible(show);
+			d->set["layoutSpacing"].setVisible(show);
 			KFormDesigner::FormManager::self()->showPropertySet(this, true/*force*/);
 		}
 		return;
 	}
 
-	if(prop == "tqlayoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->tqlayout()) {
 		container->setLayoutMargin(value.toInt());
 		container->tqlayout()->setMargin(value.toInt());
 	}
-	else if(prop == "tqlayoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->tqlayout())  {
 		container->setLayoutSpacing(value.toInt());
 		container->tqlayout()->setSpacing(value.toInt());
 	}