Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actionmodifyround.h

diff --git a/src/actions/actionmodifyround.h b/src/actions/actionmodifyround.h
index fab4beda749d84d417b99b95f66773e73ea0f9fd..b7603ab89b8accb9ccb133a03045a7adf814a28e 100644 (file)
--- a/src/actions/actionmodifyround.h
+++ b/src/actions/actionmodifyround.h
@@ -1,11 +1,11 @@
 #ifndef __ACTIONMODIFYROUND_H__
 #define __ACTIONMODIFYROUND_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
-class RS_Entity;
+class Entity;
 
 /**
  * This action class can handle user events to round corners.
@@ -27,7 +27,7 @@ class ActionModifyRound: public ActionInterface
                };
 
        public:
-               ActionModifyRound(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionModifyRound(EntityContainer & container, GraphicView & graphicView);
                ~ActionModifyRound();
 
                virtual RS2::ActionType rtti();
@@ -35,7 +35,7 @@ class ActionModifyRound: public ActionInterface
                virtual void trigger();
                virtual void mouseMoveEvent(QMouseEvent * e);
                virtual void mouseReleaseEvent(QMouseEvent * e);
-               virtual void commandEvent(RS_CommandEvent * e);
+               virtual void commandEvent(CommandEvent * e);
                virtual QStringList getAvailableCommands();
                virtual void hideOptions();
                virtual void showOptions();
@@ -49,10 +49,10 @@ class ActionModifyRound: public ActionInterface
 
        private:
                Vector coord1;
-               RS_Entity * entity1;
+               Entity * entity1;
                Vector coord2;
-               RS_Entity * entity2;
-               RS_RoundData data;
+               Entity * entity2;
+               RoundData data;
                /** Last status before entering angle. */
                Status lastStatus;
 };