diff options
Diffstat (limited to 'kpresenter/KPrCanvas.cpp')
| -rw-r--r-- | kpresenter/KPrCanvas.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 56a75516..bff7caac 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -428,9 +428,9 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) topPainter.drawLine( m_view->zoomHandler()->zoomPoint( m_startPoint ), m_view->zoomHandler()->zoomPoint( m_endPoint ) ); } break; - case INS_TQUADRICBEZIERCURVE: + case INS_QUADRICBEZIERCURVE: case INS_CUBICBEZIERCURVE: - case INS_CLOSED_TQUADRICBEZIERCURVE: + case INS_CLOSED_QUADRICBEZIERCURVE: case INS_CLOSED_CUBICBEZIERCURVE: if ( m_drawCubicBezierCurve ) { @@ -736,9 +736,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } if ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE - || toolEditMode == INS_TQUADRICBEZIERCURVE + || toolEditMode == INS_QUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE - || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) ) { + || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) ) { if ( m_drawLineWithCubicBezierCurve ) { TQPainter p( this ); p.setPen( TQPen( TQt::black, 1, TQt::SolidLine ) ); @@ -950,8 +950,8 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) m_pointArray.putPoints( m_indexPointArray, 1, m_startPoint.x(), m_startPoint.y() ); ++m_indexPointArray; } break; - case INS_CUBICBEZIERCURVE: case INS_TQUADRICBEZIERCURVE: - case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_TQUADRICBEZIERCURVE: { + case INS_CUBICBEZIERCURVE: case INS_QUADRICBEZIERCURVE: + case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_QUADRICBEZIERCURVE: { deSelectAllObj(); recalcAutoGuides(); mousePressed = true; @@ -1026,8 +1026,8 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) return; } - if ( e->button() == Qt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) + if ( e->button() == Qt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) && !m_pointArray.isNull() && m_drawCubicBezierCurve ) { if ( m_drawLineWithCubicBezierCurve ) { KoPoint point = snapPoint( docPoint ); @@ -1164,8 +1164,8 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) _objects.setAutoDelete( false ); if ( ( m_drawPolyline && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) ) - || ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) ) ) { + || ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) ) ) { return; } @@ -1712,8 +1712,8 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) mouseSelectedObject = true; } break; - case INS_CUBICBEZIERCURVE: case INS_TQUADRICBEZIERCURVE: - case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_TQUADRICBEZIERCURVE:{ + case INS_CUBICBEZIERCURVE: case INS_QUADRICBEZIERCURVE: + case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_QUADRICBEZIERCURVE:{ TQPainter p( this ); p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); @@ -1766,7 +1766,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) double _thirdY = m_symmetricEndPoint.y() - _diffY; m_CubicBezierThirdPoint = KoPoint( _thirdX, _thirdY ); - if ( toolEditMode == INS_TQUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) { + if ( toolEditMode == INS_QUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) { _secondX = _thirdX; _secondY = _thirdY; m_CubicBezierSecondPoint = KoPoint( _secondX, _secondY ); @@ -3762,13 +3762,13 @@ void KPrCanvas::insertCubicBezierCurve( const KoPointArray &_pointArray ) m_activePage->insertCubicBezierCurve( points, bezierPoints, rect, m_view->getPen(), m_view->getLineBegin(), m_view->getLineEnd() ); } - else if ( toolEditMode == INS_TQUADRICBEZIERCURVE ) + else if ( toolEditMode == INS_QUADRICBEZIERCURVE ) { m_activePage->insertQuadricBezierCurve( points, bezierPoints, rect, m_view->getPen(), m_view->getLineBegin(), m_view->getLineEnd() ); } else if ( toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || - toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) + toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) { m_activePage->insertClosedLine( bezierPoints, rect, m_view->getPen(), m_view->getBrush(), m_view->getFillType(), m_view->getGColor1(), m_view->getGColor2(), @@ -3832,8 +3832,8 @@ void KPrCanvas::setToolEditMode( ToolEditMode _m, bool updateView ) if ( ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) && !m_pointArray.isNull()) endDrawPolyline(); - if ( ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) && !m_pointArray.isNull() ) + if ( ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) && !m_pointArray.isNull() ) endDrawCubicBezierCurve(); exitEditMode(); @@ -5523,7 +5523,7 @@ void KPrCanvas::closeObject(bool /*close*/) for ( ; it.current(); ++it ) { if ( it.current()->isSelected() && (it.current()->getType() == OT_POLYLINE || it.current()->getType() == OT_FREEHAND - || it.current()->getType() == OT_TQUADRICBEZIERCURVE + || it.current()->getType() == OT_QUADRICBEZIERCURVE || it.current()->getType() == OT_CUBICBEZIERCURVE )) lst.append( it.current() ); } @@ -5644,7 +5644,7 @@ void KPrCanvas::objectPopup( KPrObject *object, const TQPoint &point ) break; case OT_POLYLINE: case OT_CUBICBEZIERCURVE: - case OT_TQUADRICBEZIERCURVE: + case OT_QUADRICBEZIERCURVE: case OT_FREEHAND: m_view->openPopupMenuObject( "closed_popup", point ); break; |