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, 6 insertions, 6 deletions

diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ae9b1e26..b37d7caa 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -58,7 +58,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 
 /*! 
  @short An item representing a widget
- Holds the properties of a widget (classname, name, tqparent, tqchildren ..).
+ Holds the properties of a widget (classname, name, parent, tqchildren ..).
  @author Lucijan Busch <lucijan@kde.org>
  */
 class KFORMEDITOR_EXPORT ObjectTreeItem
@@ -71,7 +71,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQString className() const { return m_className; }
 		TQWidget* widget() const { return m_widget; }
 		EventEater* eventEater() const { return m_eater; }
-		ObjectTreeItem* tqparent() const { return m_parent; }
+		ObjectTreeItem* parent() const { return m_parent; }
 		ObjectTreeList* tqchildren() { return &m_tqchildren; }
 
 		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
@@ -82,7 +82,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		Container* container() const { return m_container;}
 
 		void setWidget(TQWidget *w) { m_widget = w; }
-		void setParent(ObjectTreeItem *tqparent)  { m_parent = tqparent;}
+		void setParent(ObjectTreeItem *parent)  { m_parent = parent;}
 
 		void debug(int ident);
 		void rename(const TQString &name);
@@ -152,8 +152,8 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		/*! Renames the item named \a oldname to \a newname. \return false if widget named \a newname
 		 already exists and renaming failed. */
 		bool rename(const TQString &oldname, const TQString &newname );
-		/*! Sets \a newtqparent as new tqparent for the item whose name is \a name. */
-		bool reparent(const TQString &name, const TQString &newtqparent);
+		/*! Sets \a newparent as new parent for the item whose name is \a name. */
+		bool reparent(const TQString &name, const TQString &newparent);
 
 		/*! \return the ObjectTreeItem named \a name, or 0 if doesn't exist. */
 		ObjectTreeItem* lookup(const TQString &name);
@@ -162,7 +162,7 @@ class KFORMEDITOR_EXPORT ObjectTree : public ObjectTreeItem
 		this dict, use ObjectTreeDictIterator. */
 		ObjectTreeDict* dict() { return &m_treeDict; }
 
-		void addItem(ObjectTreeItem *tqparent, ObjectTreeItem *c);
+		void addItem(ObjectTreeItem *parent, ObjectTreeItem *c);
 		void removeItem(const TQString &name);
 		void removeItem(ObjectTreeItem *c);