Initial phase of adding polyline functionality. DOES NOT COMPILE.

[architektonas] / src / actions / actiondrawspline.h

diff --git a/src/actions/actiondrawspline.h b/src/actions/actiondrawspline.h
index 02722d7c7fad1a84ab928b6c4b5f5177541bf910..a0140893633f66008bd7cf4d2526c414eb6ab8f0 100644 (file)
--- a/src/actions/actiondrawspline.h
+++ b/src/actions/actiondrawspline.h
@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include "actioninterface.h"
-#include "rs_spline.h"
+#include "spline.h"
 
 /**
  * This action class can handle user events to draw splines.
@@ -23,7 +23,7 @@ class ActionDrawSpline: public ActionInterface
                };
 
        public:
-               ActionDrawSpline(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDrawSpline(EntityContainer & container, GraphicView & graphicView);
                virtual ~ActionDrawSpline();
 
                virtual RS2::ActionType rtti();
@@ -33,7 +33,7 @@ class ActionDrawSpline: public ActionInterface
                virtual void mouseMoveEvent(QMouseEvent * e);
                virtual void mouseReleaseEvent(QMouseEvent * e);
                virtual void coordinateEvent(Vector * e);
-               virtual void commandEvent(RS_CommandEvent * e);
+               virtual void commandEvent(CommandEvent * e);
                virtual QStringList getAvailableCommands();
                virtual void showOptions();
                virtual void hideOptions();
@@ -51,12 +51,12 @@ class ActionDrawSpline: public ActionInterface
                /**
                 * Spline data defined so far.
                 */
-               RS_SplineData data;
+               SplineData data;
 
                /**
                 * Polyline entity we're working on.
                 */
-               RS_Spline * spline;
+               Spline * spline;
 
                /**
                 * Point history (for undo)