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
v3.5.13-sru
tpearson 13 years ago
parent e8d62395de
commit 18a819f5b3

@ -173,7 +173,7 @@ KCleanup::confirmation( KFileInfo * item )
msg = i18n( "%1\nfor file %2" ).tqarg( cleanTitle() ).tqarg( item->url() ); msg = i18n( "%1\nfor file %2" ).tqarg( cleanTitle() ).tqarg( item->url() );
} }
if ( KMessageBox::warningContinueCancel( 0, // tqparentWidget if ( KMessageBox::warningContinueCancel( 0, // parentWidget
msg, // message msg, // message
i18n( "Please Confirm" ), // caption i18n( "Please Confirm" ), // caption
i18n( "Confirm" ) // confirmButtonLabel i18n( "Confirm" ) // confirmButtonLabel

@ -186,15 +186,15 @@ KFileInfo::url() const
{ {
if ( _parent ) if ( _parent )
{ {
TQString tqparentUrl = _parent->url(); TQString parentUrl = _parent->url();
if ( isDotEntry() ) // don't append "/." for dot entries if ( isDotEntry() ) // don't append "/." for dot entries
return tqparentUrl; return parentUrl;
if ( tqparentUrl == "/" ) // avoid duplicating slashes if ( parentUrl == "/" ) // avoid duplicating slashes
return tqparentUrl + _name; return parentUrl + _name;
else else
return tqparentUrl + "/" + _name; return parentUrl + "/" + _name;
} }
else else
return _name; return _name;

@ -1381,7 +1381,7 @@ KDirTreeViewItem::cleanupDotEntries()
// Retqparent this child // Retqparent this child
// kdDebug() << "Retqparenting clone " << child << endl; // kdDebug() << "Reparenting clone " << child << endl;
dotEntry->removeItem( child ); dotEntry->removeItem( child );
insertItem( child ); insertItem( child );
@ -1651,7 +1651,7 @@ KDirTreeViewItem::paintCell( TQPainter * painter,
/* /*
* Call the tqparent's paintCell() method. We don't want to do * Call the tqparent's paintCell() method. We don't want to do
* all the hassle of drawing strings and pixmaps, regarding * all the hassle of drawing strings and pixmaps, regarding
* tqalignments etc. * alignments etc.
*/ */
TQListViewItem::paintCell( painter, TQListViewItem::paintCell( painter,
tqcolorGroup, tqcolorGroup,

@ -28,34 +28,34 @@ using std::max;
using std::min; using std::min;
KTreemapTile::KTreemapTile( KTreemapView * tqparentView, KTreemapTile::KTreemapTile( KTreemapView * parentView,
KTreemapTile * tqparentTile, KTreemapTile * parentTile,
KFileInfo * orig, KFileInfo * orig,
const TQRect & rect, const TQRect & rect,
KOrientation orientation ) KOrientation orientation )
: TQCanvasRectangle( rect, tqparentView->canvas() ) : TQCanvasRectangle( rect, parentView->canvas() )
, _parentView( tqparentView ) , _parentView( parentView )
, _parentTile( tqparentTile ) , _parentTile( parentTile )
, _orig( orig ) , _orig( orig )
{ {
init(); init();
if ( tqparentTile ) if ( parentTile )
_cushionSurface = tqparentTile->cushionSurface(); _cushionSurface = parentTile->cushionSurface();
createChildren( rect, orientation ); createChildren( rect, orientation );
} }
KTreemapTile::KTreemapTile( KTreemapView * tqparentView, KTreemapTile::KTreemapTile( KTreemapView * parentView,
KTreemapTile * tqparentTile, KTreemapTile * parentTile,
KFileInfo * orig, KFileInfo * orig,
const TQRect & rect, const TQRect & rect,
const KCushionSurface & cushionSurface, const KCushionSurface & cushionSurface,
KOrientation orientation ) KOrientation orientation )
: TQCanvasRectangle( rect, tqparentView->canvas() ) : TQCanvasRectangle( rect, parentView->canvas() )
, _parentView( tqparentView ) , _parentView( parentView )
, _parentTile( tqparentTile ) , _parentTile( parentTile )
, _orig( orig ) , _orig( orig )
, _cushionSurface( cushionSurface ) , _cushionSurface( cushionSurface )
{ {
@ -189,7 +189,7 @@ KTreemapTile::createSquarifiedChildren( const TQRect & rect )
while ( *it ) while ( *it )
{ {
KFileInfoList row = squarify( tqchildrenRect, scale, 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 TQRect
KTreemapTile::tqlayoutRow( const TQRect & rect, KTreemapTile::layoutRow( const TQRect & rect,
double scale, double scale,
KFileInfoList & row ) 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; TQRect newRect;
@ -427,10 +427,10 @@ KTreemapTile::renderCushion()
// Cache some values. They are used for each loop iteration, so let's try // Cache some values. They are used for each loop iteration, so let's try
// to keep multiple indirect references down. // to keep multiple indirect references down.
int ambientLight = tqparentView()->ambientLight(); int ambientLight = parentView()->ambientLight();
double lightX = tqparentView()->lightX(); double lightX = parentView()->lightX();
double lightY = tqparentView()->lightY(); double lightY = parentView()->lightY();
double lightZ = tqparentView()->lightZ(); double lightZ = parentView()->lightZ();
double xx2 = cushionSurface().xx2(); double xx2 = cushionSurface().xx2();
double xx1 = cushionSurface().xx1(); double xx1 = cushionSurface().xx1();
@ -440,7 +440,7 @@ KTreemapTile::renderCushion()
int x0 = rect.x(); int x0 = rect.x();
int y0 = rect.y(); int y0 = rect.y();
TQColor color = tqparentView()->tileColor( _orig ); TQColor color = parentView()->tileColor( _orig );
int maxRed = max( 0, color.red() - ambientLight ); int maxRed = max( 0, color.red() - ambientLight );
int maxGreen = max( 0, color.green() - ambientLight ); int maxGreen = max( 0, color.green() - ambientLight );
int maxBlue = max( 0, color.blue() - ambientLight ); int maxBlue = max( 0, color.blue() - ambientLight );

@ -141,8 +141,8 @@ namespace KDirStat
* 'orientation' is the direction for further subdivision. 'Auto' * 'orientation' is the direction for further subdivision. 'Auto'
* selects the wider direction inside 'rect'. * selects the wider direction inside 'rect'.
**/ **/
KTreemapTile( KTreemapView * tqparentView, KTreemapTile( KTreemapView * parentView,
KTreemapTile * tqparentTile, KTreemapTile * parentTile,
KFileInfo * orig, KFileInfo * orig,
const TQRect & rect, const TQRect & rect,
KOrientation orientation = KTreemapAuto ); KOrientation orientation = KTreemapAuto );
@ -153,8 +153,8 @@ namespace KDirStat
* Alternate constructor: Like the above, but explicitly specify a * Alternate constructor: Like the above, but explicitly specify a
* cushion surface rather than using the tqparent's. * cushion surface rather than using the tqparent's.
**/ **/
KTreemapTile( KTreemapView * tqparentView, KTreemapTile( KTreemapView * parentView,
KTreemapTile * tqparentTile, KTreemapTile * parentTile,
KFileInfo * orig, KFileInfo * orig,
const TQRect & rect, const TQRect & rect,
const KCushionSurface & cushionSurface, const KCushionSurface & cushionSurface,
@ -176,12 +176,12 @@ namespace KDirStat
/** /**
* Returns the tqparent @ref KTreemapView. * 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. * 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. * 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. * 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, double scale,
KFileInfoList & row ); KFileInfoList & row );

@ -192,8 +192,8 @@ KTreemapView::contentsMousePressEvent( TQMouseEvent * event )
if ( _selectedTile && if ( _selectedTile &&
_selectedTile->rect().tqcontains( event->pos() ) ) _selectedTile->rect().tqcontains( event->pos() ) )
{ {
if ( _selectedTile->tqparentTile() ) if ( _selectedTile->parentTile() )
tile = _selectedTile->tqparentTile(); tile = _selectedTile->parentTile();
} }
// Intentionally handling the middle button like the left button if // Intentionally handling the middle button like the left button if
@ -285,10 +285,10 @@ KTreemapView::zoomIn()
KTreemapTile * newRootTile = _selectedTile; KTreemapTile * newRootTile = _selectedTile;
while ( newRootTile->tqparentTile() != _rootTile && while ( newRootTile->parentTile() != _rootTile &&
newRootTile->tqparentTile() ) // This should never happen, but who knows? newRootTile->parentTile() ) // This should never happen, but who knows?
{ {
newRootTile = newRootTile->tqparentTile(); newRootTile = newRootTile->parentTile();
} }
if ( newRootTile ) if ( newRootTile )
@ -319,8 +319,8 @@ KTreemapView::zoomOut()
void void
KTreemapView::selectParent() KTreemapView::selectParent()
{ {
if ( _selectedTile && _selectedTile->tqparentTile() ) if ( _selectedTile && _selectedTile->parentTile() )
selectTile( _selectedTile->tqparentTile() ); selectTile( _selectedTile->parentTile() );
} }
@ -335,10 +335,10 @@ KTreemapView::canZoomIn() const
KTreemapTile * newRootTile = _selectedTile; KTreemapTile * newRootTile = _selectedTile;
while ( newRootTile->tqparentTile() != _rootTile && while ( newRootTile->parentTile() != _rootTile &&
newRootTile->tqparentTile() ) // This should never happen, but who knows? newRootTile->parentTile() ) // This should never happen, but who knows?
{ {
newRootTile = newRootTile->tqparentTile(); newRootTile = newRootTile->parentTile();
} }
if ( newRootTile ) if ( newRootTile )
@ -366,7 +366,7 @@ KTreemapView::canZoomOut() const
bool bool
KTreemapView::canSelectParent() const KTreemapView::canSelectParent() const
{ {
return _selectedTile && _selectedTile->tqparentTile(); return _selectedTile && _selectedTile->parentTile();
} }
@ -427,8 +427,8 @@ KTreemapView::rebuildTreemap( KFileInfo * newRoot,
if ( newRoot ) if ( newRoot )
{ {
_rootTile = new KTreemapTile( this, // tqparentView _rootTile = new KTreemapTile( this, // parentView
0, // tqparentTile 0, // parentTile
newRoot, // orig newRoot, // orig
TQRect( TQPoint( 0, 0), newSize ), TQRect( TQPoint( 0, 0), newSize ),
KTreemapAuto ); KTreemapAuto );

Loading…
Cancel
Save