Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / snapper.h

diff --git a/src/base/snapper.h b/src/base/snapper.h
index 990e4aea1170d0300ad9c807a182baec904a43a5..a37cf3305313d1e43355d815465d8b50904d282b 100644 (file)
--- a/src/base/snapper.h
+++ b/src/base/snapper.h
@@ -2,11 +2,11 @@
 #define __SNAPPER_H__
 
 #include <QtCore>
-#include "rs.h"
+#include "enums.h"
 #include "vector.h"
 
-class RS_Entity;
-class RS_EntityContainer;
+class Entity;
+class EntityContainer;
 class GraphicView;
 class PaintInterface;
 
@@ -20,19 +20,19 @@ class PaintInterface;
  *
  * @author Andrew Mustun
  */
-class RS_Snapper
+class Snapper
 {
        public:
-               RS_Snapper(RS_EntityContainer & container, GraphicView & graphicView);
-               RS_Snapper();
-               virtual ~RS_Snapper();
+               Snapper(EntityContainer & container, GraphicView & graphicView);
+               Snapper();
+               virtual ~Snapper();
 
                void init();
                void finish();
 
-               void SetContainer(RS_EntityContainer *);
+               void SetContainer(EntityContainer *);
                void SetGraphicView(GraphicView *);
-               RS_Entity * getKeyEntity();
+               Entity * getKeyEntity();
                void setSnapMode(RS2::SnapMode snapMode);
                void setSnapRestriction(RS2::SnapRestriction snapRes);
                RS2::SnapMode getSnapMode(void);
@@ -53,8 +53,8 @@ class RS_Snapper
                Vector restrictHorizontal(Vector coord);
                Vector restrictVertical(Vector coord);
 
-               RS_Entity * catchEntity(const Vector & pos, RS2::ResolveLevel level = RS2::ResolveNone);
-               RS_Entity * catchEntity(QMouseEvent * e, RS2::ResolveLevel level = RS2::ResolveNone);
+               Entity * catchEntity(const Vector & pos, RS2::ResolveLevel level = RS2::ResolveNone);
+               Entity * catchEntity(QMouseEvent * e, RS2::ResolveLevel level = RS2::ResolveNone);
 
                virtual void suspend();
                virtual void resume();
@@ -97,9 +97,9 @@ for setting the coordinates?
 //             void xorSnapper();
 
        protected:
-               RS_EntityContainer * container;
+               EntityContainer * container;
                GraphicView * graphicView;
-               RS_Entity * keyEntity;
+               Entity * keyEntity;
                Vector snapCoord;
                Vector snapSpot;
                RS2::SnapMode snapMode;