diff options
Diffstat (limited to 'kpresenter/KPrCanvas.cpp')
| -rw-r--r-- | kpresenter/KPrCanvas.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index c43faed3..e5e97785 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) m_moveSnapDiff = KoPoint( 0, 0 ); - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; - m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; + m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); move += m_moveSnapDiff; } @@ -4672,7 +4672,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) move -= m_moveSnapDiff; m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { @@ -4680,12 +4680,12 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) - movedRect.topLeft().x() ); m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY() - movedRect.topLeft().y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); } move += m_moveSnapDiff; @@ -4745,7 +4745,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) ); KoRect objRect = kpobject->getRealRect(); - KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE ); + KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE ); bool left = false; bool right = false; @@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -4931,7 +4931,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { sp.setY( rect.bottom() ); } - m_gl.repaintSnapping( sp, snaptqStatus ); + m_gl.repaintSnapping( sp, snapStatus ); } _tqrepaint( oldBoundingRect ); @@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping; KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() ); snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff ); + m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff ); } sp += snapDiff; |