rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 29 insertions, 29 deletions

diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp
index 3da92d0..a8f74df 100644
--- a/kdirstat/kdirtreeview.cpp
+++ b/kdirstat/kdirtreeview.cpp
@@ -33,8 +33,8 @@
 using namespace KDirStat;
 
 
-KDirTreeView::KDirTreeView( TQWidget * tqparent )
-    : KDirTreeViewParentClass( tqparent )
+KDirTreeView::KDirTreeView( TQWidget * parent )
+    : KDirTreeViewParentClass( parent )
 {
     _tree		= 0;
     _updateTimer	= 0;
@@ -135,7 +135,7 @@ KDirTreeView::~KDirTreeView()
 
     /*
      * Don't delete _updateTimer here, it's already automatically deleted by TQt!
-     * (Since it's derived from TQObject and has a TQObject tqparent).
+     * (Since it's derived from TQObject and has a TQObject parent).
      */
 }
 
@@ -337,9 +337,9 @@ KDirTreeView::clear()
 void
 KDirTreeView::addChild( KFileInfo *newChild )
 {
-    if ( newChild->tqparent() )
+    if ( newChild->parent() )
     {
-	KDirTreeViewItem *cloneParent = locate( newChild->tqparent(),
+	KDirTreeViewItem *cloneParent = locate( newChild->parent(),
 						_doLazyClone,		// lazy
 						true );			// doClone
 
@@ -355,12 +355,12 @@ KDirTreeView::addChild( KFileInfo *newChild )
 	{
 	    if ( ! _doLazyClone )
 	    {
-		kdError() << k_funcinfo << "Can't find tqparent view item for "
+		kdError() << k_funcinfo << "Can't find parent view item for "
 			  << newChild << endl;
 	    }
 	}
     }
-    else	// No tqparent - top level item
+    else	// No parent - top level item
     {
 	// kdDebug() << "Immediately top level cloning " << newChild << endl;
 	new KDirTreeViewItem( this, newChild );
@@ -383,7 +383,7 @@ KDirTreeView::deleteChild( KFileInfo *child )
 	    /**
 	     * The selected item is about to be deleted. Select some other item
 	     * so there is still something selected: Preferably the next item
-	     * or the tqparent if there is no next. This cannot be done from
+	     * or the parent if there is no next. This cannot be done from
 	     * outside because the order of items is not known to the outside;
 	     * it might appear very random if the next item in the KFileInfo
 	     * list would be selected. The order of that list is definitely
@@ -397,17 +397,17 @@ KDirTreeView::deleteChild( KFileInfo *child )
 	     * next item so he can clean up many items in a row.
 	     **/
 
-	    nextSelection = clone->next() ? clone->next() : clone->tqparent();
+	    nextSelection = clone->next() ? clone->next() : clone->parent();
 	    // kdDebug() << k_funcinfo << " Next selection: " << nextSelection << endl;
 	}
 
-	KDirTreeViewItem *tqparent = clone->tqparent();
+	KDirTreeViewItem *parent = clone->parent();
 	delete clone;
 
-	while ( tqparent )
+	while ( parent )
 	{
-	    tqparent->updateSummary();
-	    tqparent = tqparent->tqparent();
+	    parent->updateSummary();
+	    parent = parent->parent();
 	}
 
 	if ( nextSelection )
@@ -979,22 +979,22 @@ KDirTreeViewItem::KDirTreeViewItem( KDirTreeView *	view,
 
 
 KDirTreeViewItem::KDirTreeViewItem( KDirTreeView *	view,
-				    KDirTreeViewItem *	tqparent,
+				    KDirTreeViewItem *	parent,
 				    KFileInfo *		orig )
-    : TQListViewItem( tqparent )
+    : TQListViewItem( parent )
 {
-    CHECK_PTR( tqparent );
-    init( view, tqparent, orig );
+    CHECK_PTR( parent );
+    init( view, parent, orig );
 }
 
 
 void
 KDirTreeViewItem::init( KDirTreeView *		view,
-			KDirTreeViewItem *	tqparent,
+			KDirTreeViewItem *	parent,
 			KFileInfo *		orig )
 {
     _view 	= view;
-    _parent	= tqparent;
+    _parent	= parent;
     _orig	= orig;
     _percent	= 0.0;
     _pacMan	= 0;
@@ -1082,7 +1082,7 @@ KDirTreeViewItem::init( KDirTreeView *		view,
 	}
     }
 
-    if ( ! tqparent || tqparent->isOpen() )
+    if ( ! parent || parent->isOpen() )
     {
 	setIcon();
     }
@@ -1184,11 +1184,11 @@ KDirTreeViewItem::updateSummary()
 
     // Calculate and display percentage
 
-    if ( _orig->tqparent() &&				// only if there is a tqparent as calculation base
-	 _orig->tqparent()->pendingReadJobs() < 1	&&	// not before subtree is finished reading
-	 _orig->tqparent()->totalSize() > 0 )		// avoid division by zero
+    if ( _orig->parent() &&				// only if there is a parent as calculation base
+	 _orig->parent()->pendingReadJobs() < 1	&&	// not before subtree is finished reading
+	 _orig->parent()->totalSize() > 0 )		// avoid division by zero
     {
-	 _percent = ( 100.0 * _orig->totalSize() ) / (float) _orig->tqparent()->totalSize();
+	 _percent = ( 100.0 * _orig->totalSize() ) / (float) _orig->parent()->totalSize();
 	 setText( _view->percentNumCol(), formatPercent ( _percent ) );
     }
     else
@@ -1367,7 +1367,7 @@ KDirTreeViewItem::cleanupDotEntries()
 	return;
 
 
-    // Retqparent dot entry tqchildren if there are no subdirectories on this level
+    // Reparent dot entry tqchildren if there are no subdirectories on this level
 
     if ( ! _orig->firstChild() )
     {
@@ -1379,7 +1379,7 @@ KDirTreeViewItem::cleanupDotEntries()
 	    KDirTreeViewItem *nextChild = child->next();
 
 
-	    // Retqparent this child
+	    // Reparent this child
 
 	    // kdDebug() << "Reparenting clone " << child << endl;
 	    dotEntry->removeItem( child );
@@ -1473,8 +1473,8 @@ KDirTreeViewItem::openNotify( bool open )
 void
 KDirTreeViewItem::openSubtree()
 {
-    if ( tqparent() )
-	tqparent()->setOpen( true );
+    if ( parent() )
+	parent()->setOpen( true );
 
     setOpen( true );
 }
@@ -1649,7 +1649,7 @@ KDirTreeViewItem::paintCell( TQPainter *			painter,
     else
     {
 	/*
-	 * Call the tqparent's paintCell() method.  We don't want to do
+	 * Call the parent's paintCell() method.  We don't want to do
 	 * all the hassle of drawing strings and pixmaps, regarding
 	 * alignments etc.
 	 */