Phase two of adding polyline functionality...

[architektonas] / src / actions / actiondimaligned.h

diff --git a/src/actions/actiondimaligned.h b/src/actions/actiondimaligned.h
index 731aab1d61c3b4f5acdb122a8d5085625a66884e..89044baa65fd0727139a9a643c3bd5bf0b8febaa 100644 (file)
--- a/src/actions/actiondimaligned.h
+++ b/src/actions/actiondimaligned.h
@@ -2,7 +2,7 @@
 #define __ACTIONDIMALIGNED_H__
 
 #include "actiondimension.h"
-#include "rs_dimaligned.h"
+#include "dimaligned.h"
 
 /**
  * This action class can handle user events to draw
@@ -25,7 +25,7 @@ class ActionDimAligned: public ActionDimension
                };
 
        public:
-               ActionDimAligned(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDimAligned(EntityContainer & container, GraphicView & graphicView);
                ~ActionDimAligned();
 
                virtual RS2::ActionType rtti();
@@ -35,7 +35,7 @@ class ActionDimAligned: 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();
@@ -45,7 +45,7 @@ class ActionDimAligned: public ActionDimension
                /**
                 * Aligned dimension data.
                 */
-               RS_DimAlignedData edata;
+               DimAlignedData edata;
 
                /** Last status before entering text. */
                Status lastStatus;