diff options
Diffstat (limited to 'kexi/formeditor/formIO.cpp')
| -rw-r--r-- | kexi/formeditor/formIO.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 4b46f8fe6..dbfdc10a9 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -183,11 +183,11 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc) // Save the toplevel widgets, and so the whole Form saveWidget(form->objectTree(), uiElement, domDoc); - // We then save the tqlayoutdefaults element - TQDomElement tqlayoutDefaults = domDoc.createElement("tqlayoutDefaults"); - tqlayoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing())); - tqlayoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin())); - uiElement.appendChild(tqlayoutDefaults); + // We then save the layoutdefaults element + TQDomElement layoutDefaults = domDoc.createElement("layoutDefaults"); + layoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing())); + layoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin())); + uiElement.appendChild(layoutDefaults); /// Save tab Stops if(form->autoTabStops()) @@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf) ///////////////////////////////////////////////////////////////////////////// void -FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name, +FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, const TQVariant &value, TQWidget *w, WidgetLibrary *lib) { // Widget specific properties and attributes /////////////// @@ -416,7 +416,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c { kdDebug() << "FormIO::savePropertyValue() The object doesn't have this property. Let's try the WidgetLibrary." << endl; if(lib) - lib->saveSpecialProperty(w->className(), name, value, w, tqparentNode, tqparent); + lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent); return; } @@ -449,7 +449,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c type.appendChild(valueE); } propertyE.appendChild(type); - tqparentNode.appendChild(propertyE); + parentNode.appendChild(propertyE); return; } @@ -464,17 +464,17 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c valueE = tqparent.createTextNode(m_currentItem->pixmapName(property)); type.appendChild(valueE); propertyE.appendChild(type); - tqparentNode.appendChild(propertyE); + parentNode.appendChild(propertyE); return; } // Saving a "normal" property writeVariant(tqparent, propertyE, value); - tqparentNode.appendChild(propertyE); + parentNode.appendChild(propertyE); } void -FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value) +FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value) { TQDomElement type; TQDomText valueE; @@ -721,16 +721,16 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVari break; } - tqparentNode.appendChild(type); + parentNode.appendChild(type); } void -FormIO::savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value) +FormIO::savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value) { TQDomElement propertyE = domDoc.createElement(tagName); propertyE.setAttribute("name", property); writeVariant(domDoc, propertyE, value); - tqparentNode.appendChild(propertyE); + parentNode.appendChild(propertyE); } TQVariant @@ -1019,22 +1019,22 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument & } // Saving container 's tqlayout if there is one TQDomElement tqlayout; - if(item->container() && item->container()->tqlayoutType() != Container::NoLayout) + if(item->container() && item->container()->layoutType() != Container::NoLayout) { if(item->container()->tqlayout()) // there is a tqlayout { tqlayout = domDoc.createElement("temp"); savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget()); - if(item->modifiedProperties()->tqcontains("tqlayoutMargin")) - savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->tqlayoutMargin()); - if(item->modifiedProperties()->tqcontains("tqlayoutSpacing")) - savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->tqlayoutSpacing()); + if(item->modifiedProperties()->tqcontains("layoutMargin")) + savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin()); + if(item->modifiedProperties()->tqcontains("layoutSpacing")) + savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing()); tclass.appendChild(tqlayout); } } - int tqlayoutType = item->container() ? item->container()->tqlayoutType() : Container::NoLayout; - switch(tqlayoutType) { + int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout; + switch(layoutType) { case Container::Grid: // grid tqlayout { tqlayout.setTagName("grid"); @@ -1075,7 +1075,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument & WidgetList *list = (WidgetList*)flow->widgetList(); // save some special properties - savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::tqlayoutTypeToString(item->container()->tqlayoutType()) ); + savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) ); // fill the widget's grid info, ie just simulate grid tqlayout @@ -1231,7 +1231,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar m_currentItem = item; // if we are inside a Grid, we need to insert the widget in the good cell - if(container->tqlayoutType() == Container::Grid) { + if(container->layoutType() == Container::Grid) { TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout(); if(el.hasAttribute("rowspan")) { // widget spans multiple cells if(tqlayout) @@ -1420,21 +1420,21 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl } else if(tag == "grid") { // first, see if it is flow tqlayout - TQString tqlayoutName; + TQString layoutName; for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) { if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) { - tqlayoutName = child.toElement().text(); + layoutName = child.toElement().text(); break; } } - if(tqlayoutName == "HFlow") { + if(layoutName == "HFlow") { item->container()->m_layType = Container::HFlow; KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); tqlayout->setOrientation(Qt::Horizontal); item->container()->m_layout = (TQLayout*)tqlayout; } - else if(tqlayoutName == "VFlow") { + else if(layoutName == "VFlow") { item->container()->m_layType = Container::VFlow; KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); tqlayout->setOrientation(Qt::Vertical); |
