From afbfdc507bfaafc8824a9808311d57a9ece87510 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 7 Jul 2011 21:14:06 +0000 Subject: Rename incorrect instances of tqrepaint[...] to repaint[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpresenter/KPrCanvas.cpp | 24 ++--- kpresenter/KPrCanvas.h | 8 +- kpresenter/KPrConfig.cpp | 8 +- kpresenter/KPrEffectHandler.cpp | 224 ++++++++++++++++++++-------------------- kpresenter/KPrEffectHandler.h | 2 +- kpresenter/KPrObject.h | 2 +- kpresenter/KPrPage.cpp | 2 +- kpresenter/KPrPage.h | 2 +- kpresenter/KPrPageEffects.cpp | 152 +++++++++++++-------------- kpresenter/KPrTextObject.cpp | 12 +-- kpresenter/KPrTextObject.h | 2 +- 11 files changed, 219 insertions(+), 219 deletions(-) (limited to 'kpresenter') diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 134e0851..9e8d1815 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -295,7 +295,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) bufPainter.translate( -diffx(), -diffy() ); bufPainter.setBrushOrigin( -diffx(), -diffy() ); - TQRect crect( paintEvent->rect() ); // the rectangle that needs to be tqrepainted, in widget coordinates + TQRect crect( paintEvent->rect() ); // the rectangle that needs to be repainted, in widget coordinates bufPainter.setClipRect( crect ); //kdDebug(33001) << "KPrCanvas::paintEvent " << DEBUGRECT( crect ) << ", " << size() << endl; @@ -846,7 +846,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) recalcAutoGuides(); if ( m_view->kPresenterDoc()->showGuideLines() && !m_disableSnapping ) { - m_gl.tqrepaintSnapping( objectRect( false ) ); + m_gl.repaintSnapping( objectRect( false ) ); } } else @@ -1042,7 +1042,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) endDrawCubicBezierCurve(); - m_gl.tqrepaintAfterSnapping(); + m_gl.repaintAfterSnapping(); return; } @@ -1215,7 +1215,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) m_view->kPresenterDoc()->addCommand( cmd ); } else { - m_activePage->tqrepaintObj(); + m_activePage->repaintObj(); } m_isMoving = false; } @@ -1374,7 +1374,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) default: break; } - m_gl.tqrepaintAfterSnapping(); + m_gl.repaintAfterSnapping(); emit objectSelectedChanged(); @@ -2110,7 +2110,7 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e ) m_disableSnapping = e->key() == TQt::Key_Shift; if ( !oldChangeSnap && m_disableSnapping ) { - m_gl.tqrepaintAfterSnapping(); + m_gl.repaintAfterSnapping(); } // undo snapping for move by mouse if ( e->state() & Qt::LeftButton && m_isMoving ) @@ -4638,7 +4638,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) // redraw guidelines (intentionally always) KoRect movedRect( rect ); movedRect.moveBy( move.x(), move.y() ); - m_gl.tqrepaintSnapping( movedRect ); + m_gl.repaintSnapping( movedRect ); } if ( move != KoPoint( 0, 0 ) ) @@ -4727,7 +4727,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) if ( snapToGuideLines ) { // redraw guidelines (intentionally always) - m_gl.tqrepaintSnapping( movedRect ); + m_gl.repaintSnapping( movedRect ); } if ( move != KoPoint( 0, 0 ) ) @@ -4931,7 +4931,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { sp.setY( rect.bottom() ); } - m_gl.tqrepaintSnapping( sp, snaptqStatus ); + m_gl.repaintSnapping( sp, snaptqStatus ); } _tqrepaint( oldBoundingRect ); @@ -5544,7 +5544,7 @@ void KPrCanvas::tqlayout() } } -KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool tqrepaintSnapping ) +KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) { KoPoint sp( pos ); KPrDocument * doc( m_view->kPresenterDoc() ); @@ -5582,9 +5582,9 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool tqrepaintSnapping ) sp.setY( pageRect.bottom() ); // redraw guidelines (intentionally always) - if ( tqrepaintSnapping && snapToGuideLines ) + if ( repaintSnapping && snapToGuideLines ) { - m_gl.tqrepaintSnapping( sp, KoGuides::SNAP_BOTH ); + m_gl.repaintSnapping( sp, KoGuides::SNAP_BOTH ); } return sp; diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index 9ab7de16..c7c67c02 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -438,7 +438,7 @@ protected: // functions for displaying /** - * This method is used for tqrepainting the canvas. + * This method is used for repainting the canvas. */ virtual void paintEvent( TQPaintEvent* ); @@ -690,13 +690,13 @@ private: * If so it returns the position it has snapped to. * * @param pos the point which should be snapped - * @param tqrepaintSnapping true if the guides should be tqrepainted. - * @param tqrepaintSnapping false when the guides should not be tqrepainted. + * @param repaintSnapping true if the guides should be repainted. + * @param repaintSnapping false when the guides should not be repainted. * You have to call tqrepaint by yourself. * * @return the position of the snapped point */ - KoPoint snapPoint( KoPoint &pos, bool tqrepaintSnapping = true ); + KoPoint snapPoint( KoPoint &pos, bool repaintSnapping = true ); /** * @brief Find the next grid in distance diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index e6498bc3..a5cf24fe 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -351,7 +351,7 @@ KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidg void KPrConfigureColorBackground::apply() { KPrDocument * doc = m_pView->kPresenterDoc(); - bool tqrepaintNeeded = false; + bool repaintNeeded = false; TQColor _col = bgColor->color(); if( oldBgColor != _col ) { config->setGroup( "KPresenter Color" ); @@ -359,7 +359,7 @@ void KPrConfigureColorBackground::apply() doc->setTxtBackCol( _col ); doc->replaceObjs(); oldBgColor=_col; - tqrepaintNeeded = true; + repaintNeeded = true; } _col = gridColor->color(); if( oldGridColor != _col ) { @@ -368,9 +368,9 @@ void KPrConfigureColorBackground::apply() doc->tqrepaint( false ); doc->setGridColor( _col ); oldGridColor=_col; - tqrepaintNeeded = true; + repaintNeeded = true; } - if (tqrepaintNeeded) + if (repaintNeeded) doc->tqrepaint( false ); } 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 it_debug(m_tqrepaintRects); + TQPtrListIterator it_debug(m_repaintRects); while( ( r = it_debug.current() ) != 0 ) { ++it_debug; @@ -194,7 +194,7 @@ bool KPrEffectHandler::doEffect() sleep( 1 ); #endif - TQPtrListIterator it_r(m_tqrepaintRects); + TQPtrListIterator 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 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 ) { diff --git a/kpresenter/KPrEffectHandler.h b/kpresenter/KPrEffectHandler.h index 877ed2f0..0b383e06 100644 --- a/kpresenter/KPrEffectHandler.h +++ b/kpresenter/KPrEffectHandler.h @@ -322,7 +322,7 @@ protected: /** * The rects which have to be bitblt */ - TQPtrList m_tqrepaintRects; + TQPtrList m_repaintRects; /** * The rects which have to be bitblt as the objects diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index ce5b37c5..598373ea 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -188,7 +188,7 @@ public: virtual KoPoint getRealOrig() const; KoRect getRealRect() const; /** - * @brief Get the rect which has to be tqrepainted + * @brief Get the rect which has to be repainted * * This also contains the shadow. */ diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 2fbbbaa2..b357ded9 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -2202,7 +2202,7 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) return moveByCmd; } -void KPrPage::tqrepaintObj() +void KPrPage::repaintObj() { TQPtrListIterator it( m_objectList ); for ( ; it.current() ; ++it ) diff --git a/kpresenter/KPrPage.h b/kpresenter/KPrPage.h index 03953df9..431a3662 100644 --- a/kpresenter/KPrPage.h +++ b/kpresenter/KPrPage.h @@ -503,7 +503,7 @@ public: TQPtrList allTextObjects() const; void addTextObjects(TQPtrList& lst) const; - void tqrepaintObj(); + void repaintObj(); KPrObject * getCursor(const TQPoint &pos ); KPrObject * getCursor(const KoPoint &pos ); diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp index a8192edb..a7c3093b 100644 --- a/kpresenter/KPrPageEffects.cpp +++ b/kpresenter/KPrPageEffects.cpp @@ -436,15 +436,15 @@ bool KPrPageEffects::effectSurround1() const int h = m_height / 10; int w = m_width / 10; - int tqrepaint_h = h; - int tqrepaint_w = w; + int repaint_h = h; + int repaint_w = w; bool finished = false; bool tqrepaint= false; int rh = 0; int rw = 0; - int tqrepaint_rh = 0; - int tqrepaint_rw = 0; + int repaint_rh = 0; + int repaint_rw = 0; // 1 if ( step < m_height ) @@ -456,9 +456,9 @@ bool KPrPageEffects::effectSurround1() const { tqrepaint = true; - tqrepaint_rh = m_height - tqrepaint_h; - tqrepaint_rw = step - m_height + tqrepaint_w; - tqrepaint_w = stepSize; + repaint_rh = m_height - repaint_h; + repaint_rw = step - m_height + repaint_w; + repaint_w = stepSize; } } // 2 @@ -467,13 +467,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - h; rw = step - m_height + w; w = stepSize; - if ( step + stepSize >= m_height + m_width - tqrepaint_w ) + if ( step + stepSize >= m_height + m_width - repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - ( step - m_height + tqrepaint_h - m_width + tqrepaint_w + stepSize ); - tqrepaint_rw = m_width - tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize ); + repaint_rw = m_width - repaint_w; + repaint_h = stepSize; } } // 3 @@ -482,13 +482,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - m_height + h - m_width + w + stepSize ); rw = m_width - w; h = stepSize; - if ( step + stepSize >= 2 * m_height - tqrepaint_h + m_width - tqrepaint_w ) + if ( step + stepSize >= 2 * m_height - repaint_h + m_width - repaint_w ) { tqrepaint = true; - tqrepaint_rh = 0; - tqrepaint_rw = m_width - ( step - 2 * m_height + tqrepaint_h - m_width + 2 * tqrepaint_w + stepSize ); - tqrepaint_w = stepSize; + repaint_rh = 0; + repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize ); + repaint_w = stepSize; } } // 4 @@ -497,13 +497,13 @@ bool KPrPageEffects::effectSurround1() const rh = 0; rw = m_width - ( step - 2 * m_height + h - m_width + 2 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 2 * m_height - tqrepaint_h + 2 * m_width - 3 * tqrepaint_w ) + if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = step - 2 * m_height + 2 * tqrepaint_h - 2 * m_width + 3 * tqrepaint_w; - tqrepaint_rw = tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w; + repaint_rw = repaint_w; + repaint_h = stepSize; } } // 5 @@ -512,13 +512,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 2 * m_height + 2 * h - 2 * m_width + 3 * w; rw = w; h = stepSize; - if ( step + stepSize >= 3 * m_height - 3 * tqrepaint_h + 2 * m_width - 3 * tqrepaint_w ) + if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - 2 * tqrepaint_h; - tqrepaint_rw = step - 3 * m_height + 3 * tqrepaint_h - 2 * m_width + 5 * tqrepaint_w; - tqrepaint_w = stepSize; + repaint_rh = m_height - 2 * repaint_h; + repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w; + repaint_w = stepSize; } } // 6 @@ -527,13 +527,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 2 * h; rw = step - 3 * m_height + 3 * h - 2 * m_width + 5 * w; w = stepSize; - if ( step + stepSize >= 3 * m_height - 3 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w ) + if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - ( step - 3 * m_height + 5 * tqrepaint_h - 3 * m_width + 6 * tqrepaint_w + stepSize ); - tqrepaint_rw = m_width - 2 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize ); + repaint_rw = m_width - 2 * repaint_w; + repaint_h = stepSize; } } // 7 @@ -542,13 +542,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 3 * m_height + 5 * h - 3 * m_width + 6 * w + stepSize ); rw = m_width - 2 * w; h = stepSize; - if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w ) + if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = tqrepaint_h; - tqrepaint_rw = m_width - ( step - 4 * m_height + 6 * tqrepaint_h - 3 * m_width + 8 * tqrepaint_w + stepSize ); - tqrepaint_w = stepSize; + repaint_rh = repaint_h; + repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize ); + repaint_w = stepSize; } } // 8 @@ -557,13 +557,13 @@ bool KPrPageEffects::effectSurround1() const rh = h; rw = m_width - ( step - 4 * m_height + 6 * h - 3 * m_width + 8 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w ) + if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = step - 4 * m_height + 8 * tqrepaint_h - 4 * m_width + 10 * tqrepaint_w; - tqrepaint_rw = 2 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w; + repaint_rw = 2 * repaint_w; + repaint_h = stepSize; } } // 9 @@ -572,13 +572,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 4 * m_height + 8 * h - 4 * m_width + 10 * w; rw = 2 * w; h = stepSize; - if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w ) + if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - 3 * tqrepaint_h; - tqrepaint_rw = step - 5 * m_height + 10 * tqrepaint_h - 4 * m_width + 13 * tqrepaint_w; - tqrepaint_w = stepSize; + repaint_rh = m_height - 3 * repaint_h; + repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w; + repaint_w = stepSize; } } // 10 @@ -587,13 +587,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 3 * h; rw = step - 5 * m_height + 10 * h - 4 * m_width + 13 * w; w = stepSize; - if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w ) + if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - ( step - 5 * m_height + 13 * tqrepaint_h - 5 * m_width + 15 * tqrepaint_w + stepSize ); - tqrepaint_rw = m_width - 3 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize ); + repaint_rw = m_width - 3 * repaint_w; + repaint_h = stepSize; } } // 11 @@ -602,13 +602,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 5 * m_height + 13 * h - 5 * m_width + 15 * w + stepSize ); rw = m_width - 3 * w; h = stepSize; - if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w ) + if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = 2 * tqrepaint_h; - tqrepaint_rw = m_width - ( step - 6 * m_height + 15 * tqrepaint_h - 5 * m_width + 18 * tqrepaint_w + stepSize ); - tqrepaint_w = stepSize; + repaint_rh = 2 * repaint_h; + repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize ); + repaint_w = stepSize; } } // 12 @@ -617,13 +617,13 @@ bool KPrPageEffects::effectSurround1() const rh = 2 * h; rw = m_width - ( step - 6 * m_height + 15 * h - 5 * m_width + 18 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w ) + if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = step - 6 * m_height + 18 * tqrepaint_h - 6 * m_width + 21 * tqrepaint_w; - tqrepaint_rw = 3 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w; + repaint_rw = 3 * repaint_w; + repaint_h = stepSize; } } // 13 @@ -632,13 +632,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 6 * m_height + 18 * h - 6 * m_width + 21 * w; rw = 3 * w; h = stepSize; - if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w ) + if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - 4 * tqrepaint_h; - tqrepaint_rw = step - 7 * m_height + 21 * tqrepaint_h - 6 * m_width + 25 * tqrepaint_w; - tqrepaint_w = stepSize; + repaint_rh = m_height - 4 * repaint_h; + repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w; + repaint_w = stepSize; } } // 14 @@ -647,13 +647,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 4 * h; rw = step - 7 * m_height + 21 * h - 6 * m_width + 25 * w; w = stepSize; - if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w ) + if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - ( step - 7 * m_height + 25 * tqrepaint_h - 7 * m_width + 28 * tqrepaint_w + stepSize ); - tqrepaint_rw = m_width - 4 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize ); + repaint_rw = m_width - 4 * repaint_w; + repaint_h = stepSize; } } // 15 @@ -662,13 +662,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 7 * m_height + 25 * h - 7 * m_width + 28 * w + stepSize ); rw = m_width - 4 * w; h = stepSize; - if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w ) + if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = 3 * tqrepaint_h; - tqrepaint_rw = m_width - ( step - 8 * m_height + 28 * tqrepaint_h - 7 * m_width + 32 * tqrepaint_w + stepSize ); - tqrepaint_w = stepSize; + repaint_rh = 3 * repaint_h; + repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize ); + repaint_w = stepSize; } } // 16 @@ -677,13 +677,13 @@ bool KPrPageEffects::effectSurround1() const rh = 3 * h; rw = m_width - ( step - 8 * m_height + 28 * h - 7 * m_width + 32 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w ) + if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = step - 8 * m_height + 32 * tqrepaint_h - 8 * m_width + 36 * tqrepaint_w; - tqrepaint_rw = 4 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w; + repaint_rw = 4 * repaint_w; + repaint_h = stepSize; } } // 17 @@ -692,13 +692,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 8 * m_height + 32 * h - 8 * m_width + 36 * w; rw = 4 * w; h = stepSize; - if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w ) + if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - 5 * tqrepaint_h; - tqrepaint_rw = step - 9 * m_height + 36 * tqrepaint_h - 8 * m_width + 41 * tqrepaint_w; - tqrepaint_w = stepSize; + repaint_rh = m_height - 5 * repaint_h; + repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w; + repaint_w = stepSize; } } // 18 @@ -707,13 +707,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 5 * h; rw = step - 9 * m_height + 36 * h - 8 * m_width + 41 * w; w = stepSize; - if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 9 * m_width - 45 * tqrepaint_w ) + if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w ) { tqrepaint = true; - tqrepaint_rh = m_height - ( step - 9 * m_height + 41 * tqrepaint_h - 9 * m_width + 45 * tqrepaint_w + stepSize ); - tqrepaint_rw = m_width - 5 * tqrepaint_w; - tqrepaint_h = stepSize; + repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize ); + repaint_rw = m_width - 5 * repaint_w; + repaint_h = stepSize; } } // 19 @@ -739,7 +739,7 @@ bool KPrPageEffects::effectSurround1() const if ( tqrepaint ) { - bitBlt( m_dst, tqrepaint_rw, tqrepaint_rh, &m_pageTo, tqrepaint_rw, tqrepaint_rh, tqrepaint_w, tqrepaint_h ); + bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h ); } return finished; diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 90b3c66f..4d1a94c4 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -136,11 +136,11 @@ KPrTextObject::KPrTextObject( KPrDocument *doc ) TQT_SLOT( slotNewCommand( KCommand * ) ) ); connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), TQT_SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, TQT_SIGNAL( tqrepaintChanged( KoTextObject* ) ), + connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ), TQT_SLOT( slotRepaintChanged() ) ); - // Send our "tqrepaintChanged" signals to the document. - connect( this, TQT_SIGNAL( tqrepaintChanged( KPrTextObject * ) ), + // Send our "repaintChanged" signals to the document. + connect( this, TQT_SIGNAL( repaintChanged( KPrTextObject * ) ), m_doc, TQT_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); connect(m_textobj, TQT_SIGNAL( showFormatObject(const KoTextFormat &) ), TQT_SLOT( slotFormatChanged(const KoTextFormat &)) ); @@ -1296,7 +1296,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) void KPrTextObject::tqlayout() { tqinvalidate(); - // Get the thing going though, tqrepainting doesn't call formatMore + // Get the thing going though, repainting doesn't call formatMore m_textobj->formatMore( 2 ); } @@ -1441,7 +1441,7 @@ void KPrTextObject::slotAvailableHeightNeeded() void KPrTextObject::slotRepaintChanged() { - emit tqrepaintChanged( this ); + emit repaintChanged( this ); } KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp ) @@ -1518,7 +1518,7 @@ KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const TQByteArray & *cursor = *( cmd->execute( cursor ) ); m_textobj->formatMore( 2 ); - emit tqrepaintChanged( this ); + emit repaintChanged( this ); m_textobj->emitEnsureCursorVisible(); m_textobj->emitUpdateUI( true ); m_textobj->emitShowCursor(); diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index a85b2e8a..141062d1 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -176,7 +176,7 @@ public: TQPoint viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const; signals: - void tqrepaintChanged( KPrTextObject* ); + void repaintChanged( KPrTextObject* ); protected slots: void slotFormatChanged(const KoTextFormat &); -- cgit v1.2.1