From 18a819f5b3a741f7bdbc4efc7bc0057a448de2d8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdirstat@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdirstat/kcleanup.cpp | 2 +- kdirstat/kdirtree.cpp | 10 +++++----- kdirstat/kdirtreeview.cpp | 4 ++-- kdirstat/ktreemaptile.cpp | 40 +++++++++++++++++++-------------------- kdirstat/ktreemaptile.h | 16 ++++++++-------- kdirstat/ktreemapview.cpp | 26 ++++++++++++------------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/kdirstat/kcleanup.cpp b/kdirstat/kcleanup.cpp index 6e20dd7..c32c48c 100644 --- a/kdirstat/kcleanup.cpp +++ b/kdirstat/kcleanup.cpp @@ -173,7 +173,7 @@ KCleanup::confirmation( KFileInfo * item ) msg = i18n( "%1\nfor file %2" ).tqarg( cleanTitle() ).tqarg( item->url() ); } - if ( KMessageBox::warningContinueCancel( 0, // tqparentWidget + if ( KMessageBox::warningContinueCancel( 0, // parentWidget msg, // message i18n( "Please Confirm" ), // caption i18n( "Confirm" ) // confirmButtonLabel diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp index d05a5a5..e496329 100644 --- a/kdirstat/kdirtree.cpp +++ b/kdirstat/kdirtree.cpp @@ -186,15 +186,15 @@ KFileInfo::url() const { if ( _parent ) { - TQString tqparentUrl = _parent->url(); + TQString parentUrl = _parent->url(); if ( isDotEntry() ) // don't append "/." for dot entries - return tqparentUrl; + return parentUrl; - if ( tqparentUrl == "/" ) // avoid duplicating slashes - return tqparentUrl + _name; + if ( parentUrl == "/" ) // avoid duplicating slashes + return parentUrl + _name; else - return tqparentUrl + "/" + _name; + return parentUrl + "/" + _name; } else return _name; diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp index 68b3d74..3da92d0 100644 --- a/kdirstat/kdirtreeview.cpp +++ b/kdirstat/kdirtreeview.cpp @@ -1381,7 +1381,7 @@ KDirTreeViewItem::cleanupDotEntries() // Retqparent this child - // kdDebug() << "Retqparenting clone " << child << endl; + // kdDebug() << "Reparenting clone " << child << endl; dotEntry->removeItem( child ); insertItem( child ); @@ -1651,7 +1651,7 @@ KDirTreeViewItem::paintCell( TQPainter * painter, /* * Call the tqparent's paintCell() method. We don't want to do * all the hassle of drawing strings and pixmaps, regarding - * tqalignments etc. + * alignments etc. */ TQListViewItem::paintCell( painter, tqcolorGroup, diff --git a/kdirstat/ktreemaptile.cpp b/kdirstat/ktreemaptile.cpp index 3c2d04a..c9af270 100644 --- a/kdirstat/ktreemaptile.cpp +++ b/kdirstat/ktreemaptile.cpp @@ -28,34 +28,34 @@ using std::max; using std::min; -KTreemapTile::KTreemapTile( KTreemapView * tqparentView, - KTreemapTile * tqparentTile, +KTreemapTile::KTreemapTile( KTreemapView * parentView, + KTreemapTile * parentTile, KFileInfo * orig, const TQRect & rect, KOrientation orientation ) - : TQCanvasRectangle( rect, tqparentView->canvas() ) - , _parentView( tqparentView ) - , _parentTile( tqparentTile ) + : TQCanvasRectangle( rect, parentView->canvas() ) + , _parentView( parentView ) + , _parentTile( parentTile ) , _orig( orig ) { init(); - if ( tqparentTile ) - _cushionSurface = tqparentTile->cushionSurface(); + if ( parentTile ) + _cushionSurface = parentTile->cushionSurface(); createChildren( rect, orientation ); } -KTreemapTile::KTreemapTile( KTreemapView * tqparentView, - KTreemapTile * tqparentTile, +KTreemapTile::KTreemapTile( KTreemapView * parentView, + KTreemapTile * parentTile, KFileInfo * orig, const TQRect & rect, const KCushionSurface & cushionSurface, KOrientation orientation ) - : TQCanvasRectangle( rect, tqparentView->canvas() ) - , _parentView( tqparentView ) - , _parentTile( tqparentTile ) + : TQCanvasRectangle( rect, parentView->canvas() ) + , _parentView( parentView ) + , _parentTile( parentTile ) , _orig( orig ) , _cushionSurface( cushionSurface ) { @@ -189,7 +189,7 @@ KTreemapTile::createSquarifiedChildren( const TQRect & rect ) while ( *it ) { KFileInfoList row = squarify( tqchildrenRect, scale, it ); - tqchildrenRect = tqlayoutRow( tqchildrenRect, scale, row ); + tqchildrenRect = layoutRow( tqchildrenRect, scale, row ); } } @@ -261,7 +261,7 @@ KTreemapTile::squarify( const TQRect & rect, TQRect -KTreemapTile::tqlayoutRow( const TQRect & rect, +KTreemapTile::layoutRow( const TQRect & rect, double scale, KFileInfoList & row ) { @@ -332,7 +332,7 @@ KTreemapTile::tqlayoutRow( const TQRect & rect, } - // Subtract the tqlayouted area from the rectangle. + // Subtract the layouted area from the rectangle. TQRect newRect; @@ -427,10 +427,10 @@ KTreemapTile::renderCushion() // Cache some values. They are used for each loop iteration, so let's try // to keep multiple indirect references down. - int ambientLight = tqparentView()->ambientLight(); - double lightX = tqparentView()->lightX(); - double lightY = tqparentView()->lightY(); - double lightZ = tqparentView()->lightZ(); + int ambientLight = parentView()->ambientLight(); + double lightX = parentView()->lightX(); + double lightY = parentView()->lightY(); + double lightZ = parentView()->lightZ(); double xx2 = cushionSurface().xx2(); double xx1 = cushionSurface().xx1(); @@ -440,7 +440,7 @@ KTreemapTile::renderCushion() int x0 = rect.x(); int y0 = rect.y(); - TQColor color = tqparentView()->tileColor( _orig ); + TQColor color = parentView()->tileColor( _orig ); int maxRed = max( 0, color.red() - ambientLight ); int maxGreen = max( 0, color.green() - ambientLight ); int maxBlue = max( 0, color.blue() - ambientLight ); diff --git a/kdirstat/ktreemaptile.h b/kdirstat/ktreemaptile.h index d97f805..dc62974 100644 --- a/kdirstat/ktreemaptile.h +++ b/kdirstat/ktreemaptile.h @@ -141,8 +141,8 @@ namespace KDirStat * 'orientation' is the direction for further subdivision. 'Auto' * selects the wider direction inside 'rect'. **/ - KTreemapTile( KTreemapView * tqparentView, - KTreemapTile * tqparentTile, + KTreemapTile( KTreemapView * parentView, + KTreemapTile * parentTile, KFileInfo * orig, const TQRect & rect, KOrientation orientation = KTreemapAuto ); @@ -153,8 +153,8 @@ namespace KDirStat * Alternate constructor: Like the above, but explicitly specify a * cushion surface rather than using the tqparent's. **/ - KTreemapTile( KTreemapView * tqparentView, - KTreemapTile * tqparentTile, + KTreemapTile( KTreemapView * parentView, + KTreemapTile * parentTile, KFileInfo * orig, const TQRect & rect, const KCushionSurface & cushionSurface, @@ -176,12 +176,12 @@ namespace KDirStat /** * Returns the tqparent @ref KTreemapView. **/ - KTreemapView * tqparentView() const { return _parentView; } + KTreemapView * parentView() const { return _parentView; } /** * Returns the tqparent @ref KTreemapTile or 0 if there is none. **/ - KTreemapTile * tqparentTile() const { return _parentTile; } + KTreemapTile * parentTile() const { return _parentTile; } /** * Returns this tile's cushion surface parameters. @@ -250,9 +250,9 @@ namespace KDirStat /** * Lay out all members of 'row' within 'rect' along its longer side. - * Returns the new rectangle with the tqlayouted area subtracted. + * Returns the new rectangle with the layouted area subtracted. **/ - TQRect tqlayoutRow( const TQRect & rect, + TQRect layoutRow( const TQRect & rect, double scale, KFileInfoList & row ); diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp index e719a60..07d8412 100644 --- a/kdirstat/ktreemapview.cpp +++ b/kdirstat/ktreemapview.cpp @@ -192,8 +192,8 @@ KTreemapView::contentsMousePressEvent( TQMouseEvent * event ) if ( _selectedTile && _selectedTile->rect().tqcontains( event->pos() ) ) { - if ( _selectedTile->tqparentTile() ) - tile = _selectedTile->tqparentTile(); + if ( _selectedTile->parentTile() ) + tile = _selectedTile->parentTile(); } // Intentionally handling the middle button like the left button if @@ -285,10 +285,10 @@ KTreemapView::zoomIn() KTreemapTile * newRootTile = _selectedTile; - while ( newRootTile->tqparentTile() != _rootTile && - newRootTile->tqparentTile() ) // This should never happen, but who knows? + while ( newRootTile->parentTile() != _rootTile && + newRootTile->parentTile() ) // This should never happen, but who knows? { - newRootTile = newRootTile->tqparentTile(); + newRootTile = newRootTile->parentTile(); } if ( newRootTile ) @@ -319,8 +319,8 @@ KTreemapView::zoomOut() void KTreemapView::selectParent() { - if ( _selectedTile && _selectedTile->tqparentTile() ) - selectTile( _selectedTile->tqparentTile() ); + if ( _selectedTile && _selectedTile->parentTile() ) + selectTile( _selectedTile->parentTile() ); } @@ -335,10 +335,10 @@ KTreemapView::canZoomIn() const KTreemapTile * newRootTile = _selectedTile; - while ( newRootTile->tqparentTile() != _rootTile && - newRootTile->tqparentTile() ) // This should never happen, but who knows? + while ( newRootTile->parentTile() != _rootTile && + newRootTile->parentTile() ) // This should never happen, but who knows? { - newRootTile = newRootTile->tqparentTile(); + newRootTile = newRootTile->parentTile(); } if ( newRootTile ) @@ -366,7 +366,7 @@ KTreemapView::canZoomOut() const bool KTreemapView::canSelectParent() const { - return _selectedTile && _selectedTile->tqparentTile(); + return _selectedTile && _selectedTile->parentTile(); } @@ -427,8 +427,8 @@ KTreemapView::rebuildTreemap( KFileInfo * newRoot, if ( newRoot ) { - _rootTile = new KTreemapTile( this, // tqparentView - 0, // tqparentTile + _rootTile = new KTreemapTile( this, // parentView + 0, // parentTile newRoot, // orig TQRect( TQPoint( 0, 0), newSize ), KTreemapAuto );