X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawcirclecr.h;h=969d6663f9b8c98fe26308f0086cae1e662377d8;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=6e50f446a50251ad7600c917a03aa84d60ec37b7;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/actions/actiondrawcirclecr.h b/src/actions/actiondrawcirclecr.h
index 6e50f44..969d666 100644
--- a/src/actions/actiondrawcirclecr.h
+++ b/src/actions/actiondrawcirclecr.h
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLECR_H__
 #define __ACTIONDRAWCIRCLECR_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 
 /**
@@ -23,7 +23,7 @@ class ActionDrawCircleCR: public ActionInterface
 		};
 
 	public:
-		ActionDrawCircleCR(RS_EntityContainer & container, GraphicView & graphicView);
+		ActionDrawCircleCR(EntityContainer & container, GraphicView & graphicView);
 		~ActionDrawCircleCR();
 
 		virtual RS2::ActionType rtti();
@@ -33,7 +33,7 @@ class ActionDrawCircleCR: 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();
@@ -47,7 +47,7 @@ class ActionDrawCircleCR: public ActionInterface
 		/**
 		 * Circle data defined so far.
 		 */
-		RS_CircleData data;
+		CircleData data;
 };
 
 #endif	// __ACTIONDRAWCIRCLECR_H__