From 6a1f2b1b6b19b0dd47b1e58afff29a12ae158226 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:29:23 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit 628043be55ddd2f534411d028e4f68c8fe4eaabb) --- kdm/kfrontend/themer/kdmlayout.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kdm/kfrontend/themer/kdmlayout.cpp') diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index 83a4ea377..093d450fc 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -74,7 +74,7 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) // Check if box size was computed. If not compute it // TODO check if this prevents updating changing items // if (!hintedSize.isValid()) -// tqsizeHint(); +// sizeHint(); // kdDebug() << this << " hintedSize " << hintedSize << endl; @@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) if ((*it)->isExplicitlyHidden()) continue; - TQRect temp = childrenRect, tqitemRect; + TQRect temp = childrenRect, itemRect; if (box.isVertical) { temp.setHeight( 0 ); - tqitemRect = (*it)->placementHint( temp ); - temp.setHeight( tqitemRect.height() ); - childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + temp.setHeight( itemRect.height() ); + childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing ); } else { temp.setWidth( 0 ); - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl; - temp.setWidth( tqitemRect.width() ); - childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl; + temp.setWidth( itemRect.width() ); + childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing ); kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl; } - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl; - (*it)->setGeometry( tqitemRect, force ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl; + (*it)->setGeometry( itemRect, force ); } } } //FIXME truly experimental (is so close to greeter_geometry.c) TQSize -KdmLayoutBox::tqsizeHint() +KdmLayoutBox::sizeHint() { // Sum up area taken by children int w = 0, h = 0; -- cgit v1.2.3