rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 40 insertions, 40 deletions

diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index 2a31a19..516fb92 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -49,7 +49,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText) :
 	doTree(true),
 	doText(true),
 	child(0),
-	tqparent(0),
+	parent(0),
 	sibling(0),
 	deleteChildren(false)
 {
@@ -67,7 +67,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText,
 	doTree(true),
 	doText(true),
 	child(0),
-	tqparent(0),
+	parent(0),
 	sibling(0),
 	deleteChildren(false)
 {
@@ -92,7 +92,7 @@ KTreeViewItem::~KTreeViewItem()
 // appends a direct child
 void KTreeViewItem::appendChild(KTreeViewItem* newChild)
 {
-    newChild->tqparent = this;
+    newChild->parent = this;
     newChild->owner = owner;
     if (!getChild()) {
 	child = newChild;
@@ -169,10 +169,10 @@ KTreeViewItem* KTreeViewItem::getChild() const
     return child;
 }
 
-// returns the tqparent of this item
+// returns the parent of this item
 KTreeViewItem* KTreeViewItem::getParent() const
 {
-    return tqparent;
+    return parent;
 }
 
 // returns reference to the item pixmap
@@ -199,10 +199,10 @@ bool KTreeViewItem::hasChild() const
     return child != 0;
 }
 
-// indicates whether this item has a tqparent
+// indicates whether this item has a parent
 bool KTreeViewItem::hasParent() const
 {
-    return tqparent != 0;
+    return parent != 0;
 }
 
 // indicates whether this item has a sibling below it
@@ -234,7 +234,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild)
 	appendChild(newChild);
 	return;
     }
-    newChild->tqparent = this;
+    newChild->parent = this;
     newChild->owner = owner;
     if (index == 0) {
 	newChild->sibling = getChild();
@@ -393,9 +393,9 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
 
     /*
      * If this is not the first item in the tree draw the line up
-     * towards tqparent or sibling.
+     * towards parent or sibling.
      */
-    if (tqparent->tqparent != 0 || tqparent->getChild() != this)
+    if (parent->parent != 0 || parent->getChild() != this)
 	p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY);
 
     // draw the line down towards sibling
@@ -408,12 +408,12 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
      * item out to the left.
      */
     if (sibling || (doExpandButton && (child || delayedExpanding)) ||
-	tqparent->tqparent != 0 ||
+	parent->parent != 0 ||
 	/*
 	 * The following handles the case of an item at the end of the
 	 * topmost level which doesn't have tqchildren.
 	 */
-	tqparent->getChild() != this)
+	parent->getChild() != this)
     {
 	p->drawLine(parentLeaderX, cellCenterY, itemLeaderX, cellCenterY);
     }
@@ -422,7 +422,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const
      * If there are siblings of ancestors below, draw our portion of the
      * branches that extend through this cell.
      */
-    KTreeViewItem* prevRoot = tqparent;
+    KTreeViewItem* prevRoot = parent;
     while (prevRoot->getParent() != 0) {  /* while not root item */
 	if (prevRoot->hasSibling()) {
 	    int sibLeaderX = owner->indentation(prevRoot) - (22 / 2);
@@ -573,10 +573,10 @@ int KTreeViewItem::width(int indent, const TQFontMetrics& fm) const
  */
 
 // constructor
-KTreeView::KTreeView(TQWidget *tqparent,
+KTreeView::KTreeView(TQWidget *parent,
 		     const char *name,
 		     WFlags f) :
-	TQGridView(tqparent, name, f),
+	TQGridView(parent, name, f),
 	clearing(false),
 	current(-1),
 	drawExpandButton(true),
@@ -649,7 +649,7 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix
 // appends the given item to the tqchildren of the item at the given index
 void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
 {
-    /* find tqparent item and append new item to tqparent's sub tree */
+    /* find parent item and append new item to parent's sub tree */
     KTreeViewItem* parentItem = itemAt(index);
     if (!parentItem)
 	return;
@@ -660,7 +660,7 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index)
 // given path
 void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath)
 {
-    /* find tqparent item and append new item to tqparent's sub tree */
+    /* find parent item and append new item to parent's sub tree */
     KTreeViewItem* parentItem = itemAt(thePath);
     if (!parentItem)
 	return;
@@ -994,7 +994,7 @@ int KTreeView::itemRow(KTreeViewItem* item)
 
 /*
  * move the subtree at the specified index up one branch level (make root
- * item a sibling of its current tqparent)
+ * item a sibling of its current parent)
  */
 void KTreeView::join(int index)
 {
@@ -1005,7 +1005,7 @@ void KTreeView::join(int index)
 
 /*
  * move the subtree at the specified index up one branch level (make root
- * item a sibling of it's current tqparent)
+ * item a sibling of it's current parent)
  */
 void KTreeView::join(const KPath& path)
 {
@@ -1014,7 +1014,7 @@ void KTreeView::join(const KPath& path)
 	join(item);
 }
 
-/* move item at specified index one slot down in its tqparent's sub tree */
+/* move item at specified index one slot down in its parent's sub tree */
 void KTreeView::lowerItem(int index)
 {
   KTreeViewItem *item = itemAt(index);
@@ -1022,7 +1022,7 @@ void KTreeView::lowerItem(int index)
     lowerItem(item);
 }
 
-/* move item at specified path one slot down in its tqparent's sub tree */
+/* move item at specified path one slot down in its parent's sub tree */
 void KTreeView::lowerItem(const KPath& path)
 {
     KTreeViewItem* item = itemAt(path);
@@ -1030,7 +1030,7 @@ void KTreeView::lowerItem(const KPath& path)
 	lowerItem(item);
 }
 
-/* move item at specified index one slot up in its tqparent's sub tree */
+/* move item at specified index one slot up in its parent's sub tree */
 void KTreeView::raiseItem(int index)
 {
   KTreeViewItem* item = itemAt(index);
@@ -1038,7 +1038,7 @@ void KTreeView::raiseItem(int index)
 	raiseItem(item);
 }
 
-/* move item at specified path one slot up in its tqparent's sub tree */
+/* move item at specified path one slot up in its parent's sub tree */
 void KTreeView::raiseItem(const KPath& path)
 {
     KTreeViewItem* item = itemAt(path);
@@ -1237,7 +1237,7 @@ bool KTreeView::treeDrawing() const
 }
 
 
-// appends a child to the specified tqparent item (note: a child, not a sibling, is added!)
+// appends a child to the specified parent item (note: a child, not a sibling, is added!)
 void KTreeView::appendChildItem(KTreeViewItem* theParent,
 				KTreeViewItem* newItem)
 {
@@ -1317,17 +1317,17 @@ bool KTreeView::countItem(KTreeViewItem*, void* total)
 }
 
 // if item is expanded, collapses it or vice-versa
-void KTreeView::expandOrCollapse(KTreeViewItem* tqparent)
+void KTreeView::expandOrCollapse(KTreeViewItem* parent)
 {
     bool autoU = autoUpdate();
     setAutoUpdate(false);
-    int parentIndex = itemRow(tqparent);
-    if (tqparent->isExpanded()) {
-	collapseSubTree(tqparent);
+    int parentIndex = itemRow(parent);
+    if (parent->isExpanded()) {
+	collapseSubTree(parent);
     emit collapsed(parentIndex);
     }
     else {
-	expandSubTree(tqparent);
+	expandSubTree(parent);
 	emit expanded(parentIndex);
     }
     if (autoU && isVisible())
@@ -1534,7 +1534,7 @@ void KTreeView::itemPath(KTreeViewItem* item, KPath& path) const
 
 /*
  * joins the item's branch into the tree, making the item a sibling of its
- * tqparent
+ * parent
  */
 void KTreeView::join(KTreeViewItem *item)
 {
@@ -1632,15 +1632,15 @@ int KTreeView::level(KTreeViewItem* item) const
     assert(item->owner == this);
     assert(item != treeRoot);
     int l = 0;
-    item = item->tqparent->tqparent;	/* since item != treeRoot, there is a tqparent */
+    item = item->parent->parent;	/* since item != treeRoot, there is a parent */
     while (item != 0) {
-	item = item->tqparent;
+	item = item->parent;
 	l++;
     }
     return l;
 }
 
-/* move specified item down one slot in tqparent's subtree */
+/* move specified item down one slot in parent's subtree */
 void KTreeView::lowerItem(KTreeViewItem *item)
 {
   KTreeViewItem *itemParent = item->getParent();
@@ -1866,7 +1866,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int)
     p->setClipping(false);
 }
 
-/* raise the specified item up one slot in tqparent's subtree */
+/* raise the specified item up one slot in parent's subtree */
 void KTreeView::raiseItem(KTreeViewItem *item)
 {
   KTreeViewItem *itemParent = item->getParent();
@@ -1891,15 +1891,15 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path)
     // get the next key
     TQString* searchString = path.pop();
 
-    // find the tqparent item
-    KTreeViewItem* tqparent = recursiveFind(path);
-    if (tqparent == 0)
+    // find the parent item
+    KTreeViewItem* parent = recursiveFind(path);
+    if (parent == 0)
 	return 0;
 
     /*
-     * Iterate through the tqparent's tqchildren searching for searchString.
+     * Iterate through the parent's tqchildren searching for searchString.
      */
-    KTreeViewItem* sibling = tqparent->getChild();
+    KTreeViewItem* sibling = parent->getChild();
     while (sibling != 0) {
 	if (*searchString == sibling->getText()) {
 	    break;			/* found it! */
@@ -1988,7 +1988,7 @@ void KTreeView::takeItem(KTreeViewItem* item)
 	    c = c->getParent();
 	}
 	if (c != 0) {
-	    // move current item to tqparent
+	    // move current item to parent
 	    cur = item->getParent();
 	    if (cur == treeRoot)
 		cur = 0;