Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actiondimdiametric.h

diff --git a/src/actions/actiondimdiametric.h b/src/actions/actiondimdiametric.h
index 43859d17539bd866cf030d0e35d4f77e1ab8f81d..676509ff2847a06d1b5ebf6300e8069c9662165b 100644 (file)
--- a/src/actions/actiondimdiametric.h
+++ b/src/actions/actiondimdiametric.h
@@ -2,10 +2,10 @@
 #define __ACTIONDIMDIAMETRIC_H__
 
 #include "actiondimension.h"
-#include "rs_dimdiametric.h"
+#include "dimdiametric.h"
 #include "vector.h"
 
-class RS_Entity;
+class Entity;
 
 /**
  * This action class can handle user events to draw diametric dimensions.
@@ -23,7 +23,7 @@ class ActionDimDiametric: public ActionDimension
                };
 
        public:
-               ActionDimDiametric(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDimDiametric(EntityContainer & container, GraphicView & graphicView);
                ~ActionDimDiametric();
 
                virtual RS2::ActionType rtti();
@@ -33,7 +33,7 @@ class ActionDimDiametric: 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();
@@ -41,11 +41,11 @@ class ActionDimDiametric: public ActionDimension
 
        private:
                /** Chosen entity (arc / circle) */
-               RS_Entity * entity;
+               Entity * entity;
                /** Chosen position */
                Vector pos;
                /** Data of new dimension */
-               RS_DimDiametricData edata;
+               DimDiametricData edata;
                /** Last status before entering text. */
                Status lastStatus;
 };