summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrCanvas.cpp38
-rw-r--r--kpresenter/KPrClosedLineObject.cpp2
-rw-r--r--kpresenter/KPrCommand.cpp4
-rw-r--r--kpresenter/KPrDocument.cpp6
-rw-r--r--kpresenter/KPrGroupObject.cpp2
-rw-r--r--kpresenter/KPrObjectProperties.cpp4
-rw-r--r--kpresenter/KPrPage.cpp2
-rw-r--r--kpresenter/KPrQuadricBezierCurveObjectIface.h4
-rw-r--r--kpresenter/KPrSVGPathParser.cpp6
-rw-r--r--kpresenter/KPrSVGPathParser.h4
-rw-r--r--kpresenter/KPrSideBar.cpp2
-rw-r--r--kpresenter/KPrView.cpp4
-rw-r--r--kpresenter/global.h6
13 files changed, 42 insertions, 42 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;
diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp
index 208335f5..12e95919 100644
--- a/kpresenter/KPrClosedLineObject.cpp
+++ b/kpresenter/KPrClosedLineObject.cpp
@@ -73,7 +73,7 @@ KPrClosedLineObject::KPrClosedLineObject( const KPrPointObject &object )
case OT_CUBICBEZIERCURVE:
typeString = i18n( "Closed Cubic Bezier Curve" );
break;
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
typeString = i18n( "Closed Quadric Bezier Curve" );
break;
default:
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index 5f88381d..50c31cf0 100644
--- a/kpresenter/KPrCommand.cpp
+++ b/kpresenter/KPrCommand.cpp
@@ -981,7 +981,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
} break;
case OT_FREEHAND:
case OT_POLYLINE:
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
case OT_CUBICBEZIERCURVE:
{
KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object );
@@ -1067,7 +1067,7 @@ void KoPenCmd::addObjects( const TQPtrList<KPrObject> &_objects )
} break;
case OT_FREEHAND:
case OT_POLYLINE:
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
case OT_CUBICBEZIERCURVE:
{
KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object );
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 1aa505eb..535ee46e 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -1958,7 +1958,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
else
newpage->appendObject( kpCurveObject );
} break;
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
{
kdDebug(33001) << "Quadricbeziercurve" << endl;
KPrQuadricBezierCurveObject *kpQuadricObject = new KPrQuadricBezierCurveObject();
@@ -2022,7 +2022,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
else
newpage->appendObject( kpCurveObject );
} break;
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
{
kdDebug(33001) << "Quadricbeziercurve" << endl;
KPrQuadricBezierCurveObject *kpQuadricObject = new KPrQuadricBezierCurveObject();
@@ -2963,7 +2963,7 @@ KCommand *KPrDocument::loadObjects( const TQDomElement &element, bool paste )
else
insertObjectInPage(offset, kppolylineobject);
} break;
- case OT_TQUADRICBEZIERCURVE: {
+ case OT_QUADRICBEZIERCURVE: {
KPrQuadricBezierCurveObject *kpQuadricBezierCurveObject = new KPrQuadricBezierCurveObject();
offset=kpQuadricBezierCurveObject->load(obj);
if ( sticky && !ignoreSticky)
diff --git a/kpresenter/KPrGroupObject.cpp b/kpresenter/KPrGroupObject.cpp
index 867155fe..6ad0557d 100644
--- a/kpresenter/KPrGroupObject.cpp
+++ b/kpresenter/KPrGroupObject.cpp
@@ -248,7 +248,7 @@ double KPrGroupObject::load( const TQDomElement &element, KPrDocument *doc)
kppolylineobject->setOrig(kppolylineobject->getOrig().x(),objOffset - offset);
objects.append( kppolylineobject );
} break;
- case OT_TQUADRICBEZIERCURVE: {
+ case OT_QUADRICBEZIERCURVE: {
KPrQuadricBezierCurveObject *kpQuadricBezierCurveObject = new KPrQuadricBezierCurveObject();
objOffset = kpQuadricBezierCurveObject->load( current );
kpQuadricBezierCurveObject->setOrig(kpQuadricBezierCurveObject->getOrig().x(),objOffset - offset);
diff --git a/kpresenter/KPrObjectProperties.cpp b/kpresenter/KPrObjectProperties.cpp
index c0c8d581..bbc1053e 100644
--- a/kpresenter/KPrObjectProperties.cpp
+++ b/kpresenter/KPrObjectProperties.cpp
@@ -56,7 +56,7 @@ void KPrObjectProperties::getProperties( const TQPtrList<KPrObject> &objects )
case OT_LINE:
case OT_FREEHAND:
case OT_POLYLINE:
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
case OT_CUBICBEZIERCURVE:
getPenProperties( it.current() );
getLineEndsProperties( it.current() );
@@ -145,7 +145,7 @@ void KPrObjectProperties::getLineEndsProperties( KPrObject *object )
}
case OT_FREEHAND:
case OT_POLYLINE:
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
case OT_CUBICBEZIERCURVE:
{
KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object );
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 656b48e2..81c5a412 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -1427,7 +1427,7 @@ void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, con
_type = i18n( "Closed Polyline" );
_name = i18n( "Insert Closed Polyline" );
}
- else if ( _mode == INS_CLOSED_TQUADRICBEZIERCURVE ) {
+ else if ( _mode == INS_CLOSED_QUADRICBEZIERCURVE ) {
_type = i18n( "Closed Quadric Bezier Curve" );
_name = i18n( "Insert Closed Quadric Bezier Curve" );
}
diff --git a/kpresenter/KPrQuadricBezierCurveObjectIface.h b/kpresenter/KPrQuadricBezierCurveObjectIface.h
index 3b1d383f..d49a836a 100644
--- a/kpresenter/KPrQuadricBezierCurveObjectIface.h
+++ b/kpresenter/KPrQuadricBezierCurveObjectIface.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KPTQUADRI_OBJECT_IFACE_H
-#define KPTQUADRI_OBJECT_IFACE_H
+#ifndef KPQUADRI_OBJECT_IFACE_H
+#define KPQUADRI_OBJECT_IFACE_H
#include <dcopobject.h>
#include <dcopref.h>
diff --git a/kpresenter/KPrSVGPathParser.cpp b/kpresenter/KPrSVGPathParser.cpp
index e452cdfa..97e8ac8b 100644
--- a/kpresenter/KPrSVGPathParser.cpp
+++ b/kpresenter/KPrSVGPathParser.cpp
@@ -38,9 +38,9 @@ ObjType KPrSVGPathParser::getType( TQString &d )
{
objType = OT_FREEHAND;
}
- else if ( ( m_pathType & SEEN_TQUADRIC ) && ! ( m_pathType & SEEN_CUBIC ) )
+ else if ( ( m_pathType & SEEN_QUADRIC ) && ! ( m_pathType & SEEN_CUBIC ) )
{
- objType = OT_TQUADRICBEZIERCURVE;
+ objType = OT_QUADRICBEZIERCURVE;
}
else if ( m_pathType & SEEN_CUBIC )
{
@@ -119,7 +119,7 @@ void KPrSVGPathParser::svgCurveToCubic( double x1, double y1, double x2, double
if ( x1 == x2 && y1 == y2 )
{
- m_pathType |= SEEN_TQUADRIC;
+ m_pathType |= SEEN_QUADRIC;
}
else
{
diff --git a/kpresenter/KPrSVGPathParser.h b/kpresenter/KPrSVGPathParser.h
index 523e4695..bd7180f9 100644
--- a/kpresenter/KPrSVGPathParser.h
+++ b/kpresenter/KPrSVGPathParser.h
@@ -40,7 +40,7 @@ public:
* @return The object type. This can be:
* OT_FREEHAND
* OT_CLOSED_LINE
- * OT_TQUADRICBEZIERCURVE
+ * OT_QUADRICBEZIERCURVE
* OT_CUBICBEZIERCURVE
* or
* OT_UNDEFINED if path is not supported
@@ -71,7 +71,7 @@ private:
SEEN_MOVE = 1,
SEEN_LINE = 2,
SEEN_CUBIC = 4,
- SEEN_TQUADRIC = 8,
+ SEEN_QUADRIC = 8,
SEEN_CLOSE = 16,
NO_BEZIER = 32,
UNSUPPORTED = 64
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index be2e4079..715bdf02 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -727,7 +727,7 @@ void OutlineObjectItem::setObject( KPrObject* object )
case OT_POLYLINE:
setPixmap( 0, KPBarIcon( "polyline" ) );
break;
- case OT_TQUADRICBEZIERCURVE:
+ case OT_QUADRICBEZIERCURVE:
setPixmap( 0, KPBarIcon( "quadricbeziercurve" ) );
break;
case OT_CUBICBEZIERCURVE:
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index af3905ba..d21928ba 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -1128,7 +1128,7 @@ void KPrView::toolsPolyline()
void KPrView::toolsQuadricBezierCurve()
{
if ( actionToolsQuadricBezierCurve->isChecked() ) {
- m_canvas->setToolEditMode( INS_TQUADRICBEZIERCURVE, false );
+ m_canvas->setToolEditMode( INS_QUADRICBEZIERCURVE, false );
deSelectAllObjects();
m_currentLineTool = LtQuadricBezier;
actionToolsLinePopup->setIcon("quadricbeziercurve");
@@ -1207,7 +1207,7 @@ void KPrView::toolsClosedPolyline()
void KPrView::toolsClosedQuadricBezierCurve()
{
if ( actionToolsClosedQuadricBezierCurve->isChecked() ) {
- m_canvas->setToolEditMode( INS_CLOSED_TQUADRICBEZIERCURVE, false );
+ m_canvas->setToolEditMode( INS_CLOSED_QUADRICBEZIERCURVE, false );
deSelectAllObjects();
m_currentClosedLineTool = CltQuadricBezier;
actionToolsClosedLinePopup->setIcon("closed_quadricbeziercurve");
diff --git a/kpresenter/global.h b/kpresenter/global.h
index 656f6735..01f80728 100644
--- a/kpresenter/global.h
+++ b/kpresenter/global.h
@@ -66,7 +66,7 @@ enum ObjType {
OT_GROUP = 10,
OT_FREEHAND = 11,
OT_POLYLINE = 12,
- OT_TQUADRICBEZIERCURVE = 13,
+ OT_QUADRICBEZIERCURVE = 13,
OT_CUBICBEZIERCURVE = 14,
OT_POLYGON = 15,
OT_CLOSED_LINE = 16
@@ -258,7 +258,7 @@ enum ToolEditMode {
INS_AUTOFORM = 10,
INS_FREEHAND = 11,
INS_POLYLINE = 12,
- INS_TQUADRICBEZIERCURVE = 13,
+ INS_QUADRICBEZIERCURVE = 13,
INS_CUBICBEZIERCURVE = 14,
INS_POLYGON = 15,
INS_PICTURE = 16,
@@ -267,7 +267,7 @@ enum ToolEditMode {
TEM_ZOOM = 19,
INS_CLOSED_FREEHAND = 20,
INS_CLOSED_POLYLINE = 21,
- INS_CLOSED_TQUADRICBEZIERCURVE = 22,
+ INS_CLOSED_QUADRICBEZIERCURVE = 22,
INS_CLOSED_CUBICBEZIERCURVE = 23
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 08:33:44 +0000