rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index c23190691..e7a5ad8ec 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -869,8 +869,8 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
 	for(TQWidget *w = m_list->first(); w; w = m_list->next())
 		m_pos.insert(w->name(), w->tqgeometry());
 	ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name());
-	if(item && item->tqparent()->container())
-		m_containername = item->tqparent()->name();
+	if(item && item->parent()->container())
+		m_containername = item->parent()->name();
 	delete m_list;
 }
 
@@ -948,9 +948,9 @@ CreateLayoutCommand::execute()
 void
 CreateLayoutCommand::unexecute()
 {
-	ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_containername);
-	if(!tqparent)
-		tqparent = m_form->objectTree();
+	ObjectTreeItem *parent = m_form->objectTree()->lookup(m_containername);
+	if(!parent)
+		parent = m_form->objectTree();
 
 	// We reparent every widget to the Container and take them out of the tqlayout
 	TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
@@ -959,21 +959,21 @@ CreateLayoutCommand::unexecute()
 		ObjectTreeItem *item = m_form->objectTree()->lookup(it.key());
 		if(item && item->widget())
 		{
-			item->widget()->reparent(tqparent->widget(), TQPoint(0,0), true);
-			item->eventEater()->setContainer(tqparent->container());
+			item->widget()->reparent(parent->widget(), TQPoint(0,0), true);
+			item->eventEater()->setContainer(parent->container());
 			if(m_pos[it.key()].isValid())
 				item->widget()->setGeometry(m_pos[it.key()]);
 			m_form->objectTree()->reparent(item->name(), m_containername);
 		}
 	}
 
-	if(!tqparent->container())
+	if(!parent->container())
 		return;
 	ObjectTreeItem* titem = m_form->objectTree()->lookup(m_name);
 	if (!titem)
 		return; //better this than a crash
 	TQWidget *w = titem->widget();
-	tqparent->container()->deleteWidget(w); // delete the tqlayout widget
+	parent->container()->deleteWidget(w); // delete the tqlayout widget
 	FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
 }
 
@@ -1378,7 +1378,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	m_domDoc = TQDomDocument("UI");
 	m_domDoc.appendChild(m_domDoc.createElement("UI"));
 
-	TQDomElement tqparent = m_domDoc.namedItem("UI").toElement();
+	TQDomElement parent = m_domDoc.namedItem("UI").toElement();
 
 	//for(TQWidget *w = list.first(); w; w = list.next())
 	/*for(WidgetListIterator it(list); it.current() != 0; ++it)
@@ -1401,12 +1401,12 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 
 		// We need to store both parentContainer and parentWidget as they may be different (eg for TabWidget page)
 		m_containers.insert(item->name().latin1(), m_form->parentContainer(item->widget())->widget()->name());
-		m_parents.insert(item->name().latin1(), item->tqparent()->name().latin1());
-		FormIO::saveWidget(item, tqparent, m_domDoc);
+		m_parents.insert(item->name().latin1(), item->parent()->name().latin1());
+		FormIO::saveWidget(item, parent, m_domDoc);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
 	}
 
-	FormIO::cleanClipboard(tqparent);
+	FormIO::cleanClipboard(parent);
 }
 
 void
@@ -1426,7 +1426,7 @@ DeleteWidgetCommand::execute()
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
 	}
-	//now we've nothing selecte: select tqparent container
+	//now we've nothing selecte: select parent container
 	if (containerToSelect)
 		m_form->setSelectedWidget( containerToSelect->widget() );
 }
@@ -1456,10 +1456,10 @@ DeleteWidgetCommand::unexecute()
 		if (!titem)
 			return; //better this than a crash
 		Container *cont = titem->container();
-		ObjectTreeItem *tqparent = m_form->objectTree()->lookup(m_parents[wname]);
+		ObjectTreeItem *parent = m_form->objectTree()->lookup(m_parents[wname]);
 		TQDomElement widg = n.toElement();
-		if(tqparent)
-			FormIO::loadWidget(cont, widg, tqparent->widget());
+		if(parent)
+			FormIO::loadWidget(cont, widg, parent->widget());
 		else
 			FormIO::loadWidget(cont, widg);
 	}