TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 5 insertions, 5 deletions

diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp
index 1522e495..f7ed9d09 100644
--- a/kalzium/src/kalziumutils.cpp
+++ b/kalzium/src/kalziumutils.cpp
@@ -35,10 +35,10 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo
 	{
 		font.setPointSize( size );
 		p->setFont( font );
-		r = p->boundingRect( TQRect(), Qt::AlignAuto, string );
+		r = p->boundingRect( TQRect(), TQt::AlignAuto, string );
 		r.moveBy( rect.left(), rect.top() );
 		
-		if ( rect.contains( r ) )
+		if ( rect.tqcontains( r ) )
 			goodSizeFound = true;
 		else
 			size--;
@@ -50,12 +50,12 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo
 
 int KalziumUtils::StringHeight( const TQString& string, const TQFont& font, TQPainter* p )
 {
-	return p->boundingRect( TQRect(), Qt::AlignAuto, string ).height();
+	return p->boundingRect( TQRect(), TQt::AlignAuto, string ).height();
 }
 
 int KalziumUtils::StringWidth( const TQString& string, const TQFont& font, TQPainter* p )
 {
-	return p->boundingRect( TQRect(), Qt::AlignAuto, string ).width();
+	return p->boundingRect( TQRect(), TQt::AlignAuto, string ).width();
 }
 
 double KalziumUtils::strippedValue( double num )
@@ -69,7 +69,7 @@ double KalziumUtils::strippedValue( double num )
 		power *= 10;
 
 	num = num / power * 10000;
-	num = qRound( num );
+	num = tqRound( num );
 
 	return num * power / 10000;
 }