Phase two of adding polyline functionality...

[architektonas] / src / actions / actiondrawcircle.h

diff --git a/src/actions/actiondrawcircle.h b/src/actions/actiondrawcircle.h
index 763d184c0f8f13b65510f2eae63aab13235c252b..3d02f3d617e81924a023def1cac6d2995c4389b8 100644 (file)
--- a/src/actions/actiondrawcircle.h
+++ b/src/actions/actiondrawcircle.h
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLE_H__
 #define __ACTIONDRAWCIRCLE_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 
 /**
@@ -23,7 +23,7 @@ class ActionDrawCircle: public ActionInterface
                };
 
        public:
-               ActionDrawCircle(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDrawCircle(EntityContainer & container, GraphicView & graphicView);
                ~ActionDrawCircle();
 
                virtual RS2::ActionType rtti();
@@ -33,7 +33,7 @@ class ActionDrawCircle: 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 hideOptions();
                virtual void showOptions();
@@ -45,7 +45,7 @@ class ActionDrawCircle: public ActionInterface
                /**
                 * Circle data defined so far.
                 */
-               RS_CircleData data;
+               CircleData data;
 };
 
 #endif // __ACTIONDRAWCIRCLE_H__