diff options
Diffstat (limited to 'kword/KWCanvas.cpp')
-rw-r--r-- | kword/KWCanvas.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 2e147e6c..1551026c 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -183,24 +183,24 @@ KWCanvas::~KWCanvas() m_frameViewManager = 0; } -void KWCanvas::tqrepaintChanged( KWFrameSet * fs, bool resetChanged ) +void KWCanvas::repaintChanged( KWFrameSet * fs, bool resetChanged ) { assert(fs); // the new code can't support fs being 0L here. Mail me if it happens (DF) - //kdDebug(32002) << "KWCanvas::tqrepaintChanged this=" << this << " fs=" << fs << endl; + //kdDebug(32002) << "KWCanvas::repaintChanged this=" << this << " fs=" << fs << endl; TQPainter p( viewport() ); p.translate( -contentsX(), -contentsY() ); p.setBrushOrigin( -contentsX(), -contentsY() ); TQRect crect( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); drawFrameSet( fs, &p, crect, true, resetChanged, m_viewMode ); - // ###### This tqrepaints the whole grid every time. Ouch. + // ###### This repaints the whole grid every time. Ouch. // We should return a TQRegion from drawFrameSet.... Tricky. if ( m_doc->showGrid() ) drawGrid( p, crect ); } -void KWCanvas::tqrepaintAll( bool erase /* = false */ ) +void KWCanvas::repaintAll( bool erase /* = false */ ) { - //kdDebug(32002) << "KWCanvas::tqrepaintAll erase=" << erase << endl; + //kdDebug(32002) << "KWCanvas::repaintAll erase=" << erase << endl; viewport()->tqrepaint( erase ); } @@ -403,7 +403,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid ) } emit docStructChanged(Pictures); if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - tqrepaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( FALSE ); //draw the grid over the whole canvas } } @@ -812,7 +812,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e ) m_currentTable->resizeColumn( m_rowColResized, docPoint.x() ); // Repaint only the changed rects (oldRect U newRect) TQRect newRect( m_viewMode->normalToView( m_doc->zoomRect( m_currentTable->boundingRect() ) ) ); - tqrepaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE ); + repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE ); } else if (m_interactionPolicy) { m_interactionPolicy->handleMouseMove(e->state(), @@ -893,7 +893,7 @@ void KWCanvas::mrEditFrame() { delete(m_interactionPolicy); m_interactionPolicy = 0; if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - tqrepaintContents(); + repaintContents(); } m_mousePressed = false; } @@ -932,7 +932,7 @@ void KWCanvas::mrCreateText() emit currentFrameSetEditChanged(); } setMouseMode( MM_EDIT ); - m_doc->tqrepaintAllViews(); + m_doc->repaintAllViews(); emit docStructChanged(TextFrames); emit currentFrameSetEditChanged(); } @@ -1033,7 +1033,7 @@ void KWCanvas::mrCreateTable() } m_doc->updateAllFrames(); m_doc->tqlayout(); - tqrepaintAll(); + repaintAll(); } setMouseMode( MM_EDIT ); @@ -1127,7 +1127,7 @@ void KWCanvas::contentsMouseReleaseEvent( TQMouseEvent * e ) } if ( old_mouseMove != MM_EDIT && !m_doc->showGrid() && m_doc->snapToGrid() ) - tqrepaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( FALSE ); //draw the grid over the whole canvas m_mousePressed = false; } } @@ -1192,7 +1192,7 @@ void KWCanvas::setFrameBackgroundColor( const TQBrush &_backColor ) { KWFrameBackGroundColorCommand *cmd=new KWFrameBackGroundColorCommand(i18n("Change Frame Background Color"),frameindexList,oldColor,_backColor); m_doc->addCommand(cmd); - m_doc->tqrepaintAllViews(); + m_doc->repaintAllViews(); } else { @@ -1370,7 +1370,7 @@ void KWCanvas::terminateCurrentEdit() delete m_currentFrameSetEdit; m_currentFrameSetEdit = 0L; emit currentFrameSetEditChanged(); - tqrepaintAll(); + repaintAll(); } void KWCanvas::terminateEditing( KWFrameSet *fs ) @@ -1404,7 +1404,7 @@ void KWCanvas::setMouseMode( MouseMode newMouseMode ) m_mouseMode = newMouseMode; if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - tqrepaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( FALSE ); //draw the grid over the whole canvas } else m_mouseMode = newMouseMode; @@ -1837,7 +1837,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) KoPoint docPoint = m_doc->unzoomPoint( normalPoint ); viewport()->setCursor( m_frameViewManager->mouseCursor( docPoint, keyev->stateAfter() ) ); if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - tqrepaintContents(); + repaintContents(); } } else if ( keyev->key() == Key_Insert && keyev->state() == 0 ) { @@ -2254,11 +2254,11 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint TQRect newRect( frame->outerRect(m_viewMode) ); TQRect frameRect( m_viewMode->normalToView( newRect ) ); // Repaint only the changed rects (oldRect U newRect) - m_tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); + m_repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); } - TQRegion tqrepaintRegion() { - return m_tqrepaintRegion; + TQRegion repaintRegion() { + return m_repaintRegion; } private: @@ -2271,7 +2271,7 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint private: // vars KoPoint m_from, m_to; KWViewMode *m_viewMode; - TQRegion m_tqrepaintRegion; + TQRegion m_repaintRegion; double m_diffX, m_diffY; }; @@ -2280,9 +2280,9 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint converter.update(m_frames[i], m_frameResize[i].oldRect); if ( !m_parent->kWordDocument()->showGrid() && m_parent->kWordDocument()->snapToGrid() ) - m_parent->tqrepaintContents( false ); //draw the grid over the whole canvas + m_parent->repaintContents( false ); //draw the grid over the whole canvas else - m_parent->tqrepaintContents( converter.tqrepaintRegion().boundingRect(), false ); + m_parent->repaintContents( converter.repaintRegion().boundingRect(), false ); m_parent->gui()->getView()->updateFrameStatusBarItem(); } @@ -2373,7 +2373,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & TQPtrList<KWTableFrameSet> tablesMoved; tablesMoved.setAutoDelete( FALSE ); - TQRegion tqrepaintRegion; + TQRegion repaintRegion; KoPoint _move=m_boundingRect.topLeft() - oldBoundingRect.topLeft(); TQValueListIterator<KWFrame*> framesIterator = m_frames.begin(); @@ -2394,7 +2394,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & TQRect frameRect( m_parent->viewMode()->normalToView( newRect ) ); // Repaint only the changed rects (oldRect U newRect) - tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); + repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); } } @@ -2410,15 +2410,15 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & TQRect newRect( frame->outerRect(m_parent->viewMode()) ); TQRect frameRect( m_parent->viewMode()->normalToView( newRect ) ); // Repaing only the changed rects (oldRect U newRect) - tqrepaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); + repaintRegion += TQRegion(oldRect).unite(frameRect).boundingRect(); } } } if ( !m_parent->kWordDocument()->showGrid() && m_parent->kWordDocument()->snapToGrid() ) - m_parent->tqrepaintContents( false ); //draw the grid over the whole canvas + m_parent->repaintContents( false ); //draw the grid over the whole canvas else - m_parent->tqrepaintContents( tqrepaintRegion.boundingRect(), false ); + m_parent->repaintContents( repaintRegion.boundingRect(), false ); m_parent->gui()->getView()->updateFrameStatusBarItem(); } |