Phase two of adding polyline functionality...

[architektonas] / src / actions / actiondimlinear.h

diff --git a/src/actions/actiondimlinear.h b/src/actions/actiondimlinear.h
index 60113664c4defd1f917b714933ef95c98263fbb7..755b0e6b8f261af6c842a85daac2093652311879 100644 (file)
--- a/src/actions/actiondimlinear.h
+++ b/src/actions/actiondimlinear.h
@@ -2,7 +2,7 @@
 #define __ACTIONDIMLINEAR_H__
 
 #include "actiondimension.h"
-#include "rs_dimlinear.h"
+#include "dimlinear.h"
 
 /**
  * This action class can handle user events to draw aligned dimensions.
@@ -34,7 +34,8 @@ class ActionDimLinear: public ActionDimension
                };
 
        public:
-               ActionDimLinear(RS_EntityContainer & container, GraphicView & graphicView, double angle = 0.0, bool fixedAngle = false);
+               ActionDimLinear(EntityContainer & container, GraphicView & graphicView,
+                       double angle = 0.0, bool fixedAngle = false);
                ~ActionDimLinear();
 
                virtual RS2::ActionType rtti();
@@ -44,7 +45,7 @@ class ActionDimLinear: 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();
@@ -57,12 +58,11 @@ class ActionDimLinear: public ActionDimension
                /**
                 * Aligned dimension data.
                 */
-               RS_DimLinearData edata;
+               DimLinearData edata;
                /**
                 * Is the angle fixed?
                 */
                bool fixedAngle;
-
                /** Last status before entering text or angle. */
                Status lastStatus;
 };