Phase two of adding polyline functionality...

[architektonas] / src / actions / actiondrawcircle2p.h

diff --git a/src/actions/actiondrawcircle2p.h b/src/actions/actiondrawcircle2p.h
index 8f47cb734e0d4febf02841651be647f2e91fbb79..887400a64fb91078cd096511fa96bc506fcb1aed 100644 (file)
--- a/src/actions/actiondrawcircle2p.h
+++ b/src/actions/actiondrawcircle2p.h
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLE2P_H__
 #define __ACTIONDRAWCIRCLE2P_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 #include "vector.h"
 
@@ -24,7 +24,7 @@ class ActionDrawCircle2P: public ActionInterface
                };
 
        public:
-               ActionDrawCircle2P(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDrawCircle2P(EntityContainer & container, GraphicView & graphicView);
                ~ActionDrawCircle2P();
 
                void reset();
@@ -34,7 +34,7 @@ class ActionDrawCircle2P: 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 updateMouseButtonHints();
                virtual void updateMouseCursor();
@@ -44,7 +44,7 @@ class ActionDrawCircle2P: public ActionInterface
                /**
                 * Circle data defined so far.
                 */
-               RS_CircleData data;
+               CircleData data;
                /**
                 * 1st point.
                 */