In the middle of removing Snapper class/fixing snapper rendering...

[architektonas] / src / base / actioninterface.h

diff --git a/src/base/actioninterface.h b/src/base/actioninterface.h
index 7647b20438c9c1fe1fab76ce2c5eb2fcf9330d9d..5ae1d6be36505b00c7bb7faaf7b89f1dc2d6ba97 100644 (file)
--- a/src/base/actioninterface.h
+++ b/src/base/actioninterface.h
@@ -2,13 +2,13 @@
 #define __ACTIONINTERFACE_H__
 
 #include <QtGui>
-#include "rs.h"
+#include "enums.h"
 
-class RS_CommandEvent;
-class RS_Document;
+class CommandEvent;
+class Document;
 class Drawing;
-class RS_Entity;
-class RS_EntityContainer;
+class Entity;
+class EntityContainer;
 class GraphicView;
 class Vector;
 
@@ -28,7 +28,7 @@ class ActionInterface: public QObject
 //mebbe... Well, that's what he says above. Though it would be just as easy to
 //prefix a QObject::tr in front of translated strings...
        public:
-               ActionInterface(const char * name, RS_EntityContainer &,
+               ActionInterface(const char * name, EntityContainer &,
                        GraphicView &);
                virtual ~ActionInterface();
 
@@ -41,7 +41,7 @@ class ActionInterface: public QObject
                virtual void keyPressEvent(QKeyEvent * e);
                virtual void keyReleaseEvent(QKeyEvent * e);
                virtual void coordinateEvent(Vector *);
-               virtual void commandEvent(RS_CommandEvent *);
+               virtual void commandEvent(CommandEvent *);
                virtual QStringList getAvailableCommands();
                virtual void setStatus(int status);
                virtual int getStatus();
@@ -63,8 +63,8 @@ class ActionInterface: public QObject
                QString msgAvailableCommands();
                //built-in for now, we'll see how it goes...
                Vector snapPoint(QMouseEvent *);
-               RS_Entity * catchEntity(QMouseEvent *, RS2::ResolveLevel level = RS2::ResolveNone);
-               RS_Entity * catchEntity(Vector, RS2::ResolveLevel level = RS2::ResolveNone);
+               Entity * catchEntity(QMouseEvent *, RS2::ResolveLevel level = RS2::ResolveNone);
+               Entity * catchEntity(Vector, RS2::ResolveLevel level = RS2::ResolveNone);
 #warning "!!! The following functions are DEPRECATED and only in place to help with porting.. !!!"
                void drawSnapper(void);
                void deleteSnapper(void);
@@ -81,33 +81,32 @@ class ActionInterface: public QObject
                 * corner (status 0), and selecting the second corner (status 1).
                 */
                int status;
+               bool snapperVisibility;
+               bool previewVisibility;
+               int suspendCount;
 
        protected:
                /** Action name. Used internally for debugging */
                QString name;
-
                /**
                 * This flag is set when the action has terminated and can be deleted.
                 */
                bool finished;
-
                /**
                 * Pointer to the graphic is this container is a graphic. NULL otherwise
                 */
                Drawing * graphic;
-
                /**
                 * Pointer to the document (graphic or block) or NULL.
                 */
-               RS_Document * document;
-
+               Document * document;
                /**
                 * Predecessor of this action or NULL.
                 */
                ActionInterface * predecessor;
-
+               // hm.
                GraphicView * graphicView;
-               RS_EntityContainer * container;
+               EntityContainer * container;
 };
 
 #endif // __ACTIONINTERFACE_H__