diff options
Diffstat (limited to 'kpresenter/KPrEffectHandler.cpp')
-rw-r--r-- | kpresenter/KPrEffectHandler.cpp | 224 |
1 files changed, 112 insertions, 112 deletions
diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp index ddc96d91..a63ad1d2 100644 --- a/kpresenter/KPrEffectHandler.cpp +++ b/kpresenter/KPrEffectHandler.cpp @@ -129,7 +129,7 @@ bool KPrEffectHandler::doEffect() if ( doAppearEffectStep( object ) ) { - m_removeRects.append( m_tqrepaintRects.getLast() ); + m_removeRects.append( m_repaintRects.getLast() ); if ( appearObject != m_appearEffectObjects.getLast() ) { next = false; @@ -172,7 +172,7 @@ bool KPrEffectHandler::doEffect() ++m_effectStep; TQRect *r; #if 0 // used for debugging effects - TQPtrListIterator<TQRect> it_debug(m_tqrepaintRects); + TQPtrListIterator<TQRect> it_debug(m_repaintRects); while( ( r = it_debug.current() ) != 0 ) { ++it_debug; @@ -194,7 +194,7 @@ bool KPrEffectHandler::doEffect() sleep( 1 ); #endif - TQPtrListIterator<TQRect> it_r(m_tqrepaintRects); + TQPtrListIterator<TQRect> it_r(m_repaintRects); #if 1 while( ( r = it_r.current() ) != 0 ) { @@ -213,7 +213,7 @@ bool KPrEffectHandler::doEffect() bitBlt( m_dst, 0, 0, &m_paint); #endif - m_lastRepaintRects = m_tqrepaintRects; + m_lastRepaintRects = m_repaintRects; TQPtrListIterator<TQRect> it3(m_removeRects); while( ( r = it3.current() ) != 0 ) { @@ -221,7 +221,7 @@ bool KPrEffectHandler::doEffect() m_lastRepaintRects.remove( r ); } - m_tqrepaintRects.clear(); + m_repaintRects.clear(); m_paint = *m_src; @@ -251,7 +251,7 @@ void KPrEffectHandler::finish() bool next = true; TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - m_tqrepaintRects.append( new TQRect( objectRect ) ); + m_repaintRects.append( new TQRect( objectRect ) ); if ( appearObject != m_appearEffectObjects.getLast() ) { @@ -397,7 +397,7 @@ bool KPrEffectHandler::doDisappearEffectStep( KPrObject *object ) bool KPrEffectHandler::appearNone( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - m_tqrepaintRects.append( new TQRect( objectRect ) ); + m_repaintRects.append( new TQRect( objectRect ) ); drawObject( object, 0, 0, &m_paint ); return true; } @@ -406,9 +406,9 @@ bool KPrEffectHandler::appearNone( KPrObject *object ) bool KPrEffectHandler::appearComeLeft( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); - int xdiff = tqrepaintRect.x() - ox; + int xdiff = repaintRect.x() - ox; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -417,8 +417,8 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object ) x = ox; positionReached = true; } - tqrepaintRect.moveLeft( x + xdiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeft x = " << x << " " << positionReached << endl; drawObject( object, x - ox, 0, &m_paint ); @@ -430,9 +430,9 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object ) bool KPrEffectHandler::appearComeTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); - int ydiff = tqrepaintRect.y() - oy; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int y = m_effectStep * m_stepHeight - objectRect.height(); @@ -441,8 +441,8 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object ) y = oy; positionReached = true; } - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeTop y = " << y << " " << positionReached << endl; drawObject( object, 0, y - oy, &m_paint ); @@ -454,9 +454,9 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object ) bool KPrEffectHandler::appearComeRight( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); - int xdiff = tqrepaintRect.x() - ox; + int xdiff = repaintRect.x() - ox; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -465,8 +465,8 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object ) x = ox; positionReached = true; } - tqrepaintRect.moveLeft( x + xdiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRight x = " << x << " " << positionReached << endl; drawObject( object, x - ox, 0, &m_paint ); @@ -478,9 +478,9 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object ) bool KPrEffectHandler::appearComeBottom( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); - int ydiff = tqrepaintRect.y() - oy; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int y = m_src->height() - m_effectStep * m_stepHeight; @@ -489,8 +489,8 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object ) y = oy; positionReached = true; } - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeBottom y = " << y << " " << positionReached << endl; drawObject( object, 0, y - oy, &m_paint ); @@ -502,11 +502,11 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object ) bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = tqrepaintRect.x() - ox; - int ydiff = tqrepaintRect.y() - oy; + int xdiff = repaintRect.x() - ox; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -521,9 +521,9 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - tqrepaintRect.moveLeft( x + xdiff ); - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeftTop x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -535,11 +535,11 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = tqrepaintRect.x() - ox; - int ydiff = tqrepaintRect.y() - oy; + int xdiff = repaintRect.x() - ox; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -554,9 +554,9 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - tqrepaintRect.moveLeft( x + xdiff ); - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeftBottom x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -568,11 +568,11 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = tqrepaintRect.x() - ox; - int ydiff = tqrepaintRect.y() - oy; + int xdiff = repaintRect.x() - ox; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -587,9 +587,9 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - tqrepaintRect.moveLeft( x + xdiff ); - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRightTop x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -601,11 +601,11 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = tqrepaintRect.x() - ox; - int ydiff = tqrepaintRect.y() - oy; + int xdiff = repaintRect.x() - ox; + int ydiff = repaintRect.y() - oy; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -620,9 +620,9 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - tqrepaintRect.moveLeft( x + xdiff ); - tqrepaintRect.moveTop( y + ydiff ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveLeft( x + xdiff ); + repaintRect.moveTop( y + ydiff ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRightBottom x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -633,8 +633,8 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) bool KPrEffectHandler::appearWipeLeft( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = tqrepaintRect.width(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = repaintRect.width(); bool positionReached = false; int w = m_effectStep * m_stepWidth; @@ -644,17 +644,17 @@ bool KPrEffectHandler::appearWipeLeft( KPrObject *object ) positionReached = true; } - tqrepaintRect.setWidth( w ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setWidth( w ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; return positionReached; } bool KPrEffectHandler::appearWipeRight( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = tqrepaintRect.width(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = repaintRect.width(); bool positionReached = false; int w = m_effectStep * m_stepWidth; @@ -664,9 +664,9 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object ) positionReached = true; } - tqrepaintRect.setLeft( tqrepaintRect.right() - w ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setLeft( repaintRect.right() - w ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; return positionReached; } @@ -674,8 +674,8 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object ) bool KPrEffectHandler::appearWipeTop( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = tqrepaintRect.height(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = repaintRect.height(); bool positionReached = false; int h = m_effectStep * m_stepHeight; @@ -685,9 +685,9 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object ) positionReached = true; } - tqrepaintRect.setHeight( h ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setHeight( h ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; return positionReached; } @@ -695,8 +695,8 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object ) bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = tqrepaintRect.height(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = repaintRect.height(); bool positionReached = false; int h = m_effectStep * m_stepHeight; @@ -706,9 +706,9 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) positionReached = true; } - tqrepaintRect.setTop( tqrepaintRect.bottom() - h ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setTop( repaintRect.bottom() - h ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; return positionReached; } @@ -717,7 +717,7 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); bool positionReached = false; @@ -728,8 +728,8 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) } else { - tqrepaintRect.moveBy( -x, 0 ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( -x, 0 ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeft x = " << -x + ox << " " << positionReached << endl; drawObject( object, -x, 0, &m_paint ); } @@ -741,7 +741,7 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) bool KPrEffectHandler::disappearGoTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); bool positionReached = false; @@ -752,8 +752,8 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object ) } else { - tqrepaintRect.moveBy( 0, -y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( 0, -y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoTop y = " << -y + oy << " " << positionReached << endl; drawObject( object, 0, -y, &m_paint ); } @@ -765,7 +765,7 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object ) bool KPrEffectHandler::disappearGoRight( KPrObject *object ) { int ox = m_view->zoomHandler()->zoomItX( object->getRealRect().x() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); bool positionReached = false; int x = m_effectStep * m_stepWidth; @@ -775,8 +775,8 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object ) } else { - tqrepaintRect.moveBy( x, 0 ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( x, 0 ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoRight x = " << x + ox << " " << positionReached << endl; drawObject( object, x, 0, &m_paint ); } @@ -788,7 +788,7 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object ) bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) { int oy = m_view->zoomHandler()->zoomItY( object->getRealRect().y() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); bool positionReached = false; int y = m_effectStep * m_stepHeight; @@ -798,8 +798,8 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) } else { - tqrepaintRect.moveBy( 0, y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( 0, y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoBottom y = " << y + oy << " " << positionReached << endl; drawObject( object, 0, y, &m_paint ); } @@ -811,7 +811,7 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -824,8 +824,8 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) } else { - tqrepaintRect.moveBy( -x, -y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( -x, -y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << -y + oy << positionReached << endl; drawObject( object, -x, -y, &m_paint ); } @@ -837,7 +837,7 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -850,8 +850,8 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) } else { - tqrepaintRect.moveBy( -x, y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( -x, y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << y + oy << positionReached << endl; drawObject( object, -x, y, &m_paint ); } @@ -863,7 +863,7 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -876,8 +876,8 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) } else { - tqrepaintRect.moveBy( x, -y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( x, -y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << -y + oy << positionReached << endl; drawObject( object, x, -y, &m_paint ); } @@ -889,7 +889,7 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) { TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -902,8 +902,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) } else { - tqrepaintRect.moveBy( x, y ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + repaintRect.moveBy( x, y ); + m_repaintRects.append( new TQRect( repaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << y + oy << positionReached << endl; drawObject( object, x, y, &m_paint ); } @@ -914,8 +914,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = tqrepaintRect.width(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = repaintRect.width(); bool positionReached = false; int w = ow - m_effectStep * m_stepWidth; @@ -925,9 +925,9 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) } else { - tqrepaintRect.setWidth( w ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setWidth( w ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; } return positionReached; @@ -936,8 +936,8 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = tqrepaintRect.width(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = repaintRect.width(); bool positionReached = false; int w = ow - m_effectStep * m_stepWidth; @@ -947,9 +947,9 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) } else { - tqrepaintRect.setLeft( tqrepaintRect.right() - w ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setLeft( repaintRect.right() - w ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; } return positionReached; @@ -958,8 +958,8 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = tqrepaintRect.height(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = repaintRect.height(); bool positionReached = false; int h = oh - m_effectStep * m_stepHeight; @@ -969,9 +969,9 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) } else { - tqrepaintRect.setHeight( h ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setHeight( h ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; } return positionReached; @@ -980,8 +980,8 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) bool KPrEffectHandler::disappearWipeBottom( KPrObject *object ) { - TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = tqrepaintRect.height(); + TQRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = repaintRect.height(); bool positionReached = false; int h = oh - m_effectStep * m_stepHeight; @@ -991,9 +991,9 @@ bool KPrEffectHandler::disappearWipeBottom( KPrObject *object ) } else { - tqrepaintRect.setTop( tqrepaintRect.bottom() - h ); - m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); - drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); + repaintRect.setTop( repaintRect.bottom() - h ); + m_repaintRects.append( new TQRect( repaintRect ) ); + drawObject( object, 0, 0, &m_paint, &repaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; } return positionReached; @@ -1035,7 +1035,7 @@ void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, TQPixmap *sc if ( ( obj->getAppearStep() < m_step.m_step || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.tqcontainsRef( obj ) ) && ( ( obj->getDisappear() && obj->getDisappearStep() > m_step.m_step ) || ! obj->getDisappear() ) - && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_tqrepaintRects.getLast()) ) + && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_repaintRects.getLast()) ) { if ( obj->getAppearStep() == m_step.m_step && ! m_back ) { |