X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondimangular.h;h=c790bb4962d0e8183d259c39890395a665836160;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=fa3643f87bc1466442e1ff1f2837a49049aa2d81;hpb=d774c2655ba2c3657a565f325411144452392277;p=architektonas

diff --git a/src/actions/actiondimangular.h b/src/actions/actiondimangular.h
index fa3643f..c790bb4 100644
--- a/src/actions/actiondimangular.h
+++ b/src/actions/actiondimangular.h
@@ -2,10 +2,10 @@
 #define __ACTIONDIMANGULAR_H__
 
 #include "actiondimension.h"
-#include "rs_dimangular.h"
+#include "dimangular.h"
 #include "vector.h"
 
-class RS_Line;
+class Line;
 
 /**
  * This action class can handle user events to draw angular dimensions.
@@ -23,7 +23,7 @@ class ActionDimAngular: public ActionDimension
 		};
 
 	public:
-		ActionDimAngular(RS_EntityContainer & container, GraphicView & graphicView);
+		ActionDimAngular(EntityContainer & container, GraphicView & graphicView);
 		~ActionDimAngular();
 
 		virtual RS2::ActionType rtti();
@@ -32,7 +32,7 @@ class ActionDimAngular: public ActionDimension
 		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();
@@ -40,13 +40,13 @@ class ActionDimAngular: public ActionDimension
 
 	private:
 		/** 1st chosen line */
-		RS_Line * line1;
+		Line * line1;
 		/** 2nd chosen line */
-		RS_Line * line2;
+		Line * line2;
 		/** Center of arc */
 		Vector center;
 		/** Data of new dimension */
-		RS_DimAngularData edata;
+		DimAngularData edata;
 		/** Last status before entering text. */
 		Status lastStatus;
 };