Fixed hatch dialog, added snap/preview to circle tools.

[architektonas] / src / actions / actiondrawtext.h

diff --git a/src/actions/actiondrawtext.h b/src/actions/actiondrawtext.h
index 92c338040982ea9e8ef08a5fc106cb9993df2dcc..cae4c38d52651e65adc5368704ca2d38ba28803d 100644 (file)
--- a/src/actions/actiondrawtext.h
+++ b/src/actions/actiondrawtext.h
@@ -2,7 +2,7 @@
 #define __ACTIONDRAWTEXT_H__
 
 #include "actioninterface.h"
-#include "rs_text.h"
+#include "text.h"
 
 /**
  * This action class can handle user events to draw texts.
@@ -23,7 +23,7 @@ class ActionDrawText: public ActionInterface
                };
 
        public:
-               ActionDrawText(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDrawText(EntityContainer & container, GraphicView & graphicView);
                ~ActionDrawText();
 
                virtual RS2::ActionType rtti();
@@ -34,7 +34,7 @@ class ActionDrawText: public ActionInterface
                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();
@@ -47,7 +47,7 @@ class ActionDrawText: public ActionInterface
                double getAngle();
 
        private:
-               RS_TextData data;
+               TextData data;
                Vector pos;
                bool textChanged;
 };