Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actiondrawlineangle.h

diff --git a/src/actions/actiondrawlineangle.h b/src/actions/actiondrawlineangle.h
index 5282c6600238cb207776bee133dcc8e55f6e89ae..3b87567ed4ff2e53d8f3c5fce62427337a9b8a16 100644 (file)
--- a/src/actions/actiondrawlineangle.h
+++ b/src/actions/actiondrawlineangle.h
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEANGLE_H__
 #define __ACTIONDRAWLINEANGLE_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
@@ -24,7 +24,8 @@ class ActionDrawLineAngle: public ActionInterface
                        SetLength     /**< Setting length in the command line. */
                };
 
-               ActionDrawLineAngle(RS_EntityContainer & container, GraphicView & graphicView, double angle = 0.0, bool fixedAngle = false);
+               ActionDrawLineAngle(EntityContainer & container, GraphicView & graphicView,
+                       double angle = 0.0, bool fixedAngle = false);
                ~ActionDrawLineAngle();
 
                virtual RS2::ActionType rtti();
@@ -35,7 +36,7 @@ class ActionDrawLineAngle: public ActionInterface
                virtual void mouseReleaseEvent(QMouseEvent * e);
                void preparePreview();
                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();
@@ -51,29 +52,17 @@ class ActionDrawLineAngle: public ActionInterface
                bool hasFixedAngle();
 
        protected:
-               /**
-                * Line data defined so far.
-                */
-               RS_LineData data;
-               /**
-                * Position.
-                */
+               /** Line data defined so far. */
+               LineData data;
+               /** Position. */
                Vector pos;
-               /**
-                * Line angle.
-                */
+               /** Line angle. */
                double angle;
-               /**
-                * Line length.
-                */
+               /** Line length. */
                double length;
-               /**
-                * Is the angle fixed?
-                */
+               /** Is the angle fixed? */
                bool fixedAngle;
-               /**
-                * Snap point (start, middle, end).
-                */
+               /** Snap point (start, middle, end). */
                int snpPoint;
 };