Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / entitycontainer.h

diff --git a/src/base/entitycontainer.h b/src/base/entitycontainer.h
index a8c4d9ebbea6ddb3a7e83eea4a946584da212fa6..f05572401446de5ebfd20d535073866c51bd7f90 100644 (file)
--- a/src/base/entitycontainer.h
+++ b/src/base/entitycontainer.h
@@ -15,17 +15,17 @@
  *
  * @author Andrew Mustun
  */
-class RS_EntityContainer: public RS_Entity
+class EntityContainer: public Entity
 {
        public:
-               RS_EntityContainer(RS_EntityContainer * parent = NULL, bool owner = true);
-               //RS_EntityContainer(const RS_EntityContainer& ec);
-               virtual ~RS_EntityContainer();
+               EntityContainer(EntityContainer * parent = NULL, bool owner = true);
+               //EntityContainer(const EntityContainer& ec);
+               virtual ~EntityContainer();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual void detach();
                virtual RS2::EntityType rtti() const;
-               void reparent(RS_EntityContainer * parent);
+               void reparent(EntityContainer * parent);
                virtual bool isContainer() const;
                virtual bool isAtomic() const;
                virtual double getLength();
@@ -38,29 +38,29 @@ class RS_EntityContainer: public RS_Entity
 
                virtual void selectWindow(Vector v1, Vector v2, bool select = true, bool cross = false);
 
-               virtual void addEntity(RS_Entity * entity);
-               virtual void insertEntity(int index, RS_Entity * entity);
-               virtual void replaceEntity(int index, RS_Entity * entity);
-               virtual bool removeEntity(RS_Entity * entity);
-               virtual RS_Entity * firstEntity(RS2::ResolveLevel level = RS2::ResolveNone);
-               virtual RS_Entity * lastEntity(RS2::ResolveLevel level = RS2::ResolveNone);
-               virtual RS_Entity * nextEntity(RS2::ResolveLevel level = RS2::ResolveNone);
-               virtual RS_Entity * prevEntity(RS2::ResolveLevel level = RS2::ResolveNone);
-               virtual RS_Entity * entityAt(uint index);
-               virtual RS_Entity * currentEntity();
+               virtual void addEntity(Entity * entity);
+               virtual void insertEntity(int index, Entity * entity);
+               virtual void replaceEntity(int index, Entity * entity);
+               virtual bool removeEntity(Entity * entity);
+               virtual Entity * firstEntity(RS2::ResolveLevel level = RS2::ResolveNone);
+               virtual Entity * lastEntity(RS2::ResolveLevel level = RS2::ResolveNone);
+               virtual Entity * nextEntity(RS2::ResolveLevel level = RS2::ResolveNone);
+               virtual Entity * prevEntity(RS2::ResolveLevel level = RS2::ResolveNone);
+               virtual Entity * entityAt(uint index);
+               virtual Entity * currentEntity();
                virtual int entityAt();
-               virtual int findEntity(RS_Entity * entity);
+               virtual int findEntity(Entity * entity);
                virtual void clear();
 
-       //      Q3PtrListIterator<RS_Entity> createIterator();
-//             QListIterator<RS_Entity *> createIterator();
+       //      Q3PtrListIterator<Entity> createIterator();
+//             QListIterator<Entity *> createIterator();
 
                virtual bool isEmpty();
                virtual unsigned long int count();
                virtual unsigned long int countDeep();
                virtual unsigned long int countSelected();
                virtual void setAutoUpdateBorders(bool enable);
-               virtual void adjustBorders(RS_Entity * entity);
+               virtual void adjustBorders(Entity * entity);
                virtual void calculateBorders();
                virtual void forcedCalculateBorders();
                virtual void updateDimensions();
@@ -71,11 +71,11 @@ class RS_EntityContainer: public RS_Entity
 
                virtual Vector getNearestEndpoint(const Vector & coord, double * dist = NULL);
 
-               RS_Entity * getNearestEntity(const Vector & point, double * dist = NULL,
+               Entity * getNearestEntity(const Vector & point, double * dist = NULL,
                        RS2::ResolveLevel level = RS2::ResolveAll);
 
                virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true,
-                       double * dist = NULL, RS_Entity ** entity = NULL);
+                       double * dist = NULL, Entity ** entity = NULL);
 
                virtual Vector getNearestCenter(const Vector & coord, double * dist = NULL);
                virtual Vector getNearestMiddle(const Vector & coord, double * dist = NULL);
@@ -84,7 +84,7 @@ class RS_EntityContainer: public RS_Entity
                virtual Vector getNearestRef(const Vector & coord, double * dist = NULL);
                virtual Vector getNearestSelectedRef(const Vector & coord, double * dist = NULL);
 
-               virtual double getDistanceToPoint(const Vector & coord, RS_Entity ** entity,
+               virtual double getDistanceToPoint(const Vector & coord, Entity ** entity,
                        RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
 
                virtual bool optimizeContours();
@@ -101,14 +101,14 @@ class RS_EntityContainer: public RS_Entity
                virtual void moveSelectedRef(const Vector & ref, const Vector & offset);
                virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-               friend std::ostream & operator<<(std::ostream & os, RS_EntityContainer & ec);
+               friend std::ostream & operator<<(std::ostream & os, EntityContainer & ec);
 
        protected:
                /** entities in the container */
-               QList<RS_Entity *> entities;
+               QList<Entity *> entities;
 
                /** sub container used only temporarly for iteration. */
-               RS_EntityContainer * subContainer;
+               EntityContainer * subContainer;
 
                /**
                 * Class variable:
@@ -118,7 +118,7 @@ class RS_EntityContainer: public RS_Entity
                static bool autoUpdateBorders;
 
        private:
-               QListIterator<RS_Entity *> entityIterator;
+               QListIterator<Entity *> entityIterator;
 };
 
 #endif // __ENTITYCONTAINER_H__