1 files changed, 14 insertions, 14 deletions

diff --git a/src/qeffects.cpp b/src/qeffects.cpp
index 45ff01d..28fdb83 100644
--- a/src/qeffects.cpp
+++ b/src/qeffects.cpp
@@ -108,7 +108,7 @@ void TQAlphaWidget::run( int time )
 
 	widget->setWState( WState_Visible );
 
-	move( widget->tqgeometry().x(),widget->tqgeometry().y() );
+	move( widget->geometry().x(),widget->geometry().y() );
 	resize( widget->size().width(), widget->size().height() );
 
 	front = TQImage( widget->size(), 32 );
@@ -116,8 +116,8 @@ void TQAlphaWidget::run( int time )
 
 	back = TQImage( widget->size(), 32 );
 	back = TQPixmap::grabWindow( TQApplication::desktop()->winId(),
-								widget->tqgeometry().x(), widget->tqgeometry().y(),
-								widget->tqgeometry().width(), widget->tqgeometry().height() );
+								widget->geometry().x(), widget->geometry().y(),
+								widget->geometry().width(), widget->geometry().height() );
 
 	if ( !back.isNull() && checkTime.elapsed() < duration / 2 ) {
 		mixed = back.copy();
@@ -142,7 +142,7 @@ bool TQAlphaWidget::eventFilter( TQObject* o, TQEvent* e )
 		case TQEvent::Move:
 			if ( o != widget )
 				break;
-			move( widget->tqgeometry().x(),widget->tqgeometry().y() );
+			move( widget->geometry().x(),widget->geometry().y() );
 			update();
 			break;
 		case TQEvent::Hide:
@@ -251,7 +251,7 @@ void TQAlphaWidget::render()
 			widget->clearWState( WState_ForceHide );
 		alphaBlend();
 		pm = mixed;
-		tqrepaint( FALSE );
+		repaint( FALSE );
 	}
 }
 
@@ -311,8 +311,8 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
 		totalWidth = widget->width();
 		totalHeight = widget->height();
 	} else {
-		totalWidth = widget->tqsizeHint().width();
-		totalHeight = widget->tqsizeHint().height();
+		totalWidth = widget->sizeHint().width();
+		totalHeight = widget->sizeHint().height();
 	}
 
 	currentHeight = totalHeight;
@@ -348,7 +348,7 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e )
 		case TQEvent::Move:
 			if ( o != widget )
 				break;
-			move( widget->tqgeometry().x(),widget->tqgeometry().y() );
+			move( widget->geometry().x(),widget->geometry().y() );
 			update();
 			break;
 		case TQEvent::Hide:
@@ -438,7 +438,7 @@ void TQRollEffect::run( int time )
 
 	widget->setWState( WState_Visible );
 
-	move( widget->tqgeometry().x(),widget->tqgeometry().y() );
+	move( widget->geometry().x(),widget->geometry().y() );
 	resize( TQMIN( currentWidth, totalWidth ), TQMIN( currentHeight, totalHeight ) );
 
 	show();
@@ -484,8 +484,8 @@ void TQRollEffect::scroll()
 
 		int w = totalWidth;
 		int h = totalHeight;
-		int x = widget->tqgeometry().x();
-		int y = widget->tqgeometry().y();
+		int x = widget->geometry().x();
+		int y = widget->geometry().y();
 
 		if ( orientation & RightScroll || orientation & LeftScroll )
 			w = TQMIN( currentWidth, totalWidth );
@@ -494,15 +494,15 @@ void TQRollEffect::scroll()
 
 		setUpdatesEnabled( FALSE );
 		if ( orientation & UpScroll )
-			y = widget->tqgeometry().y() + TQMAX( 0, totalHeight - currentHeight );
+			y = widget->geometry().y() + TQMAX( 0, totalHeight - currentHeight );
 		if ( orientation & LeftScroll )
-			x = widget->tqgeometry().x() + TQMAX( 0, totalWidth - currentWidth );
+			x = widget->geometry().x() + TQMAX( 0, totalWidth - currentWidth );
 		if ( orientation & UpScroll || orientation & LeftScroll )
 			move( x, y );
 
 		resize( w, h );
 		setUpdatesEnabled( TRUE );
-		tqrepaint( FALSE );
+		repaint( FALSE );
 	}
 	if ( done ) {
 		anim.stop();