summaryrefslogtreecommitdiffstats
path: root/kexi/formeditor/factories
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/formeditor/factories')
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp36
-rw-r--r--kexi/formeditor/factories/containerfactory.h2
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp14
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.h4
4 files changed, 28 insertions, 28 deletions
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ada3f994..15011e50 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -651,12 +651,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
//m_widget = w;
// m_container = container;
- if((classname == "KFDTabWidget") || (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+ if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
{
- if(w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
{
- //m_widget = w->tqparentWidget()->tqparentWidget();
- setWidget(w->tqparentWidget()->tqparentWidget(), m_container->toplevel());
+ //m_widget = w->parentWidget()->parentWidget();
+ setWidget(w->parentWidget()->parentWidget(), m_container->toplevel());
// m_container = m_container->toplevel();
}
@@ -668,12 +668,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
menu->setItemEnabled(id, false);
return true;
}
- else if(w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+ else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
{
- //m_widget = w->tqparentWidget();
- TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget(); //m_widget;
+ //m_widget = w->parentWidget();
+ TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
setWidget(
- w->tqparentWidget(),
+ w->parentWidget(),
container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
);
// m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
@@ -720,17 +720,17 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
}
bool
-ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
{
- if((name == "title") && (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+ if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
{
- TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget()->tqparentWidget());
- KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+ TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
+ KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
}
- else if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+ else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
{
- TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
- KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "id", stack->id(w));
+ TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
+ KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
}
else
return false;
@@ -743,15 +743,15 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW
TQString name = node.attribute("name");
if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
{
- TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget());
+ TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
tab->addTab(w, node.firstChild().toElement().text());
item->addModifiedProperty("title", node.firstChild().toElement().text());
return true;
}
- if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+ if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
{
- TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
+ TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
stack->addWidget(w, id);
stack->raiseWidget(w);
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b8623fad..c8bdc1a6 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -251,7 +251,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
KFormDesigner::Container *container);
virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
- const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent);
+ const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
KFormDesigner::ObjectTreeItem *item);
virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index b625c712..7460b480 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -667,7 +667,7 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
}
bool
-StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &domDoc)
{
if(name == "list_items" && classname == "KComboBox")
{
@@ -676,7 +676,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
{
TQDomElement item = domDoc.createElement("item");
KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->text(i));
- tqparentNode.appendChild(item);
+ parentNode.appendChild(item);
}
return true;
}
@@ -687,7 +687,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
{
TQDomElement item = domDoc.createElement("item");
KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", listbox->text(i));
- tqparentNode.appendChild(item);
+ parentNode.appendChild(item);
}
return true;
}
@@ -703,14 +703,14 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "resizable", listview->header()->isResizeEnabled(i));
KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "clickable", listview->header()->isClickEnabled(i));
KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "fullwidth", listview->header()->isStretchEnabled(i));
- tqparentNode.appendChild(item);
+ parentNode.appendChild(item);
}
// Then we save the list view items
TQListViewItem *item = listview->firstChild();
while(item)
{
- saveListItem(item, tqparentNode, domDoc);
+ saveListItem(item, parentNode, domDoc);
item = item->nextSibling();
}
return true;
@@ -720,10 +720,10 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
}
void
-StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc)
{
TQDomElement element = domDoc.createElement("item");
- tqparentNode.appendChild(element);
+ parentNode.appendChild(element);
// We save the text of each column
for(int i = 0; i < item->listView()->columns(); i++)
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index f5bd5528..5d9032f0 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
virtual bool saveSpecialProperty(const TQCString &classname,
const TQString &name, const TQVariant &value, TQWidget *w,
- TQDomElement &tqparentNode, TQDomDocument &tqparent);
+ TQDomElement &parentNode, TQDomDocument &tqparent);
virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
TQWidget *w, KFormDesigner::ObjectTreeItem *item);
virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -91,7 +91,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
const TQCString &property, bool isTopLevel);
virtual bool changeText(const TQString &newText);
virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
- void saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc);
+ void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
private: