Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

1 files changed, 14 insertions, 14 deletions

diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index b17d2e7b7..83a4ea377 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())
-//		sizeHint();
+//		tqsizeHint();
 
 //	kdDebug() << this << " hintedSize " << hintedSize << endl;
 
@@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
 			if ((*it)->isExplicitlyHidden())
 				continue;
 
-			TQRect temp = childrenRect, itemRect;
+			TQRect temp = childrenRect, tqitemRect;
 			if (box.isVertical) {
 				temp.setHeight( 0 );
-				itemRect = (*it)->placementHint( temp );
-				temp.setHeight( itemRect.height() );
-				childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
+				tqitemRect = (*it)->placementHint( temp );
+				temp.setHeight( tqitemRect.height() );
+				childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing );
 			} else {
 				temp.setWidth( 0 );
-				itemRect = (*it)->placementHint( temp );
-				kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
-				temp.setWidth( itemRect.width() );
-				childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
+				tqitemRect = (*it)->placementHint( temp );
+				kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl;
+				temp.setWidth( tqitemRect.width() );
+				childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing );
 				kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
 			}
-			itemRect = (*it)->placementHint( temp );
-			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
-			(*it)->setGeometry( itemRect, force );
+			tqitemRect = (*it)->placementHint( temp );
+			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl;
+			(*it)->setGeometry( tqitemRect, force );
 		}
 	}
 }
 
 //FIXME truly experimental (is so close to greeter_geometry.c)
-QSize
-KdmLayoutBox::sizeHint()
+TQSize
+KdmLayoutBox::tqsizeHint()
 {
 	// Sum up area taken by children
 	int w = 0, h = 0;