Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit c71ade2e373d85acf1357494b42202293dd771d2.

1 files changed, 50 insertions, 50 deletions

diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp
index a042d2d..a8f74df 100644
--- a/kdirstat/kdirtreeview.cpp
+++ b/kdirstat/kdirtreeview.cpp
@@ -433,7 +433,7 @@ void
 KDirTreeView::slotFinished()
 {
     emit progressInfo( i18n( "Finished. Elapsed time: %1" )
-		       .arg( formatTime( _stopWatch.elapsed(), true ) ) );
+		       .tqarg( formatTime( _stopWatch.elapsed(), true ) ) );
 
     if ( _updateTimer )
     {
@@ -463,7 +463,7 @@ void
 KDirTreeView::slotAborted()
 {
     emit progressInfo( i18n( "Aborted. Elapsed time: %1" )
-		       .arg( formatTime( _stopWatch.elapsed(), true ) ) );
+		       .tqarg( formatTime( _stopWatch.elapsed(), true ) ) );
 
     if ( _updateTimer )
     {
@@ -499,11 +499,11 @@ KDirTreeView::sendProgressInfo( const TQString & newCurrentDir )
 
 #if VERBOSE_PROGRESS_INFO
     emit progressInfo( i18n( "Elapsed time: %1   reading directory %2" )
-		       .arg( formatTime( _stopWatch.elapsed() ) )
-		       .arg( _currentDir ) );
+		       .tqarg( formatTime( _stopWatch.elapsed() ) )
+		       .tqarg( _currentDir ) );
 #else
     emit progressInfo( i18n( "Elapsed time: %1" )
-		       .arg( formatTime( _stopWatch.elapsed() ) ) );
+		       .tqarg( formatTime( _stopWatch.elapsed() ) ) );
 #endif
 }
 
@@ -719,14 +719,14 @@ KDirTreeView::setTreeBackground( const TQColor &color )
 void
 KDirTreeView::ensureContrast()
 {
-    if ( colorGroup().base() == white ||
-	 colorGroup().base() == black   )
+    if ( tqcolorGroup().base() == white ||
+	 tqcolorGroup().base() == black   )
     {
-	setTreeBackground( colorGroup().midlight() );
+	setTreeBackground( tqcolorGroup().midlight() );
     }
     else
     {
-	setTreeBackground( colorGroup().base() );
+	setTreeBackground( tqcolorGroup().base() );
     }
 }
 
@@ -778,19 +778,19 @@ KDirTreeView::popupContextMenu( TQListViewItem *	listViewItem,
 	    if ( orig->isSparseFile() )
 	    {
 		text = i18n( "Sparse file: %1 (%2 Bytes) -- allocated: %3 (%4 Bytes)" )
-		    .arg( formatSize( orig->byteSize() ) )
-		    .arg( formatSizeLong( orig->byteSize()  ) )
-		    .arg( formatSize( orig->allocatedSize() ) )
-		    .arg( formatSizeLong( orig->allocatedSize() ) );
+		    .tqarg( formatSize( orig->byteSize() ) )
+		    .tqarg( formatSizeLong( orig->byteSize()  ) )
+		    .tqarg( formatSize( orig->allocatedSize() ) )
+		    .tqarg( formatSizeLong( orig->allocatedSize() ) );
 	    }
 	    else
 	    {
 		text = i18n( "%1 (%2 Bytes) with %3 hard links => effective size: %4 (%5 Bytes)" )
-		    .arg( formatSize( orig->byteSize() ) )
-		    .arg( formatSizeLong( orig->byteSize() ) )
-		    .arg( orig->links() )
-		    .arg( formatSize( orig->size() ) )
-		    .arg( formatSizeLong( orig->size() ) );
+		    .tqarg( formatSize( orig->byteSize() ) )
+		    .tqarg( formatSizeLong( orig->byteSize() ) )
+		    .tqarg( orig->links() )
+		    .tqarg( formatSize( orig->size() ) )
+		    .tqarg( formatSizeLong( orig->size() ) );
 	    }
 
 	    popupContextInfo( pos, text );
@@ -832,8 +832,8 @@ KDirTreeView::popupContextSizeInfo( const TQPoint &	pos,
     else
     {
 	info = i18n( "%1 (%2 Bytes)" )
-	    .arg( formatSize( size ) )
-	    .arg( formatSizeLong( size ) );
+	    .tqarg( formatSize( size ) )
+	    .tqarg( formatSizeLong( size ) );
     }
 
     popupContextInfo( pos, info );
@@ -1021,15 +1021,15 @@ KDirTreeViewItem::init( KDirTreeView *		view,
 		if ( _orig->isSparseFile() )
 		{
 		    text = i18n( "%1 / %2 Links (allocated: %3)" )
-			.arg( formatSize( _orig->byteSize() ) )
-			.arg( formatSize( _orig->links() ) )
-			.arg( formatSize( _orig->allocatedSize() ) );
+			.tqarg( formatSize( _orig->byteSize() ) )
+			.tqarg( formatSize( _orig->links() ) )
+			.tqarg( formatSize( _orig->allocatedSize() ) );
 		}
 		else
 		{
 		    text = i18n( "%1 / %2 Links" )
-			.arg( formatSize( _orig->byteSize() ) )
-			.arg( _orig->links() );
+			.tqarg( formatSize( _orig->byteSize() ) )
+			.tqarg( _orig->links() );
 		}
 	    }
 	    else // No multiple links or no regular file
@@ -1037,8 +1037,8 @@ KDirTreeViewItem::init( KDirTreeView *		view,
 		if ( _orig->isSparseFile() )
 		{
 		    text = i18n( "%1 (allocated: %2)" )
-			.arg( formatSize( _orig->byteSize() ) )
-			.arg( formatSize( _orig->allocatedSize() ) );
+			.tqarg( formatSize( _orig->byteSize() ) )
+			.tqarg( formatSize( _orig->allocatedSize() ) );
 		}
 		else
 		{
@@ -1065,9 +1065,9 @@ KDirTreeViewItem::init( KDirTreeView *		view,
 	 * Determine whether or not this item can be opened.
 	 *
 	 * Normally, TQt handles this very well, but when lazy cloning is in
-	 * effect, TQt cannot know whether or not there are children - they may
+	 * effect, TQt cannot know whether or not there are tqchildren - they may
 	 * only be in the original tree until the user tries to open this
-	 * item. So let's assume there may be children as long as the directory
+	 * item. So let's assume there may be tqchildren as long as the directory
 	 * is still being read.
 	 */
 
@@ -1170,7 +1170,7 @@ KDirTreeViewItem::updateSummary()
 	    TQString text	= "";
 
 	    if ( jobs > 0 )
-		text = i18n( "[%1 Read Jobs]" ).arg( formatCount( _orig->pendingReadJobs(), true ) );
+		text = i18n( "[%1 Read Jobs]" ).tqarg( formatCount( _orig->pendingReadJobs(), true ) );
 	    setText( _view->readJobsCol(), text );
 #endif
 	}
@@ -1202,15 +1202,15 @@ KDirTreeViewItem::updateSummary()
 	if ( ! _pacMan )
 	    _pacMan = new KPacManAnimation( _view, height()-4, true );
 
-	repaint();
+	tqrepaint();
     }
 
 
-    if ( ! isOpen() )	// Lazy update: Nobody can see the children
+    if ( ! isOpen() )	// Lazy update: Nobody can see the tqchildren
 	return;		// -> don't update them.
 
 
-    // Update all children
+    // Update all tqchildren
 
     KDirTreeViewItem *child = firstChild();
 
@@ -1231,7 +1231,7 @@ KDirTreeViewItem::locate( KFileInfo *	wanted,
     if ( lazy && ! isOpen() )
     {
 	/*
-	 * In "lazy" mode, we don't bother searching all the children of this
+	 * In "lazy" mode, we don't bother searching all the tqchildren of this
 	 * item if they are not visible (i.e. the branch is open) anyway. In
 	 * this case, cloning that branch is deferred until the branch is
 	 * actually opened - which in most cases will never happen anyway (most
@@ -1243,7 +1243,7 @@ KDirTreeViewItem::locate( KFileInfo *	wanted,
 	 *
 	 * Note that this mode is _independent_ of lazy cloning in general: The
 	 * caller explicitly specifies if he wants to locate an item at all
-	 * cost, even if that means deferred cloning children whose creation
+	 * cost, even if that means deferred cloning tqchildren whose creation
 	 * has been delayed until now.
 	 */
 
@@ -1261,13 +1261,13 @@ KDirTreeViewItem::locate( KFileInfo *	wanted,
 
     if ( wanted->urlPart( level ) == _orig->name() )
     {
-	// Search all children
+	// Search all tqchildren
 
 	KDirTreeViewItem *child = firstChild();
 
 	if ( ! child && _orig->hasChildren() && doClone )
 	{
-	    // kdDebug() << "Deferred cloning " << this << " for children search of " << wanted << endl;
+	    // kdDebug() << "Deferred cloning " << this << " for tqchildren search of " << wanted << endl;
 	    deferredClone();
 	    child = firstChild();
 	}
@@ -1294,14 +1294,14 @@ KDirTreeViewItem::deferredClone()
 
     if ( ! _orig->hasChildren() )
     {
-	// kdDebug() << k_funcinfo << "Oops, no children - sorry for bothering you!" << endl;
+	// kdDebug() << k_funcinfo << "Oops, no tqchildren - sorry for bothering you!" << endl;
 	setExpandable( false );
 
 	return;
     }
 
 
-    // Clone all normal children
+    // Clone all normal tqchildren
 
     int level		 = _orig->treeLevel();
     bool startingClean	 = ! firstChild();
@@ -1367,7 +1367,7 @@ KDirTreeViewItem::cleanupDotEntries()
 	return;
 
 
-    // Reparent dot entry children if there are no subdirectories on this level
+    // Reparent dot entry tqchildren if there are no subdirectories on this level
 
     if ( ! _orig->firstChild() )
     {
@@ -1391,9 +1391,9 @@ KDirTreeViewItem::cleanupDotEntries()
 	/*
 	 * Immediately delete the (now emptied) dot entry. The algorithm for
 	 * the original tree doesn't quite fit here - there, the dot entry is
-	 * actually deleted in the step below. But the 'no children' check for
+	 * actually deleted in the step below. But the 'no tqchildren' check for
 	 * this fails here since the original dot entry still _has_ its
-	 * children - they will be deleted only after all clones have been
+	 * tqchildren - they will be deleted only after all clones have been
 	 * processed.
 	 *
 	 * This had been the cause for a core that took me quite some time to
@@ -1404,7 +1404,7 @@ KDirTreeViewItem::cleanupDotEntries()
     }
 
 
-    // Delete dot entries without any children
+    // Delete dot entries without any tqchildren
 
     if ( ! _orig->dotEntry()->firstChild() && dotEntry )
     {
@@ -1593,16 +1593,16 @@ KDirTreeViewItem::compare( TQListViewItem *	otherListViewItem,
 
 void
 KDirTreeViewItem::paintCell( TQPainter *			painter,
-			     const TQColorGroup &	colorGroup,
+			     const TQColorGroup &	tqcolorGroup,
 			     int			column,
 			     int			width,
-			     int			alignment )
+			     int			tqalignment )
 {
     // _view->incDebugCount(5);
 
     if ( column == _view->percentBarCol() )
     {
-	painter->setBackgroundColor( colorGroup.base() );
+	painter->setBackgroundColor( tqcolorGroup.base() );
 
 	if ( _percent > 0.0 )
 	{
@@ -1634,10 +1634,10 @@ KDirTreeViewItem::paintCell( TQPainter *			painter,
 		     && ! _pacMan )
 		{
 		    TQListViewItem::paintCell( painter,
-					      colorGroup,
+					      tqcolorGroup,
 					      column,
 					      width,
-					      alignment );
+					      tqalignment );
 		}
 		else
 		{
@@ -1654,10 +1654,10 @@ KDirTreeViewItem::paintCell( TQPainter *			painter,
 	 * alignments etc.
 	 */
 	TQListViewItem::paintCell( painter,
-				  colorGroup,
+				  tqcolorGroup,
 				  column,
 				  width,
-				  alignment );
+				  tqalignment );
     }
 }