Phase two of adding polyline functionality...

[architektonas] / src / actions / actiondrawimage.h

diff --git a/src/actions/actiondrawimage.h b/src/actions/actiondrawimage.h
index 79b3e8f874bedd1062d70d7cf12a16a00f5b06f0..41b43b72524bbf070c0f131e48e25613b47a8bd3 100644 (file)
--- a/src/actions/actiondrawimage.h
+++ b/src/actions/actiondrawimage.h
@@ -2,7 +2,7 @@
 #define __ACTIONDRAWIMAGE_H__
 
 #include <QtGui>
-#include "rs_image.h"
+#include "image.h"
 #include "actioninterface.h"
 
 /**
@@ -30,7 +30,7 @@ class ActionDrawImage: public ActionInterface
                };
 
        public:
-               ActionDrawImage(RS_EntityContainer & container, GraphicView & graphicView);
+               ActionDrawImage(EntityContainer & container, GraphicView & graphicView);
                ~ActionDrawImage();
 
                virtual RS2::ActionType rtti();
@@ -40,7 +40,7 @@ class ActionDrawImage: 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 showOptions();
                virtual void hideOptions();
@@ -53,7 +53,7 @@ class ActionDrawImage: public ActionInterface
                void setFactor(double f);
 
        protected:
-               RS_ImageData data;
+               ImageData data;
                QImage img;
 
                /** Last status before entering option. */