Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / insert.h

diff --git a/src/base/insert.h b/src/base/insert.h
index b6e17ae1971b9845ad6b6bdbaa8c3d9f4aa68a4b..a9fbe65356981deb88364fe46709ba4550ab504d 100644 (file)
--- a/src/base/insert.h
+++ b/src/base/insert.h
@@ -8,13 +8,13 @@
 /**
  * Holds the data that defines an insert.
  */
-class RS_InsertData
+class InsertData
 {
        public:
                /**
                 * Default constructor.
                 */
-               RS_InsertData() {}
+               InsertData() {}
 
                /**
                 * @param name The name of the block used as an identifier.
@@ -26,7 +26,7 @@ class RS_InsertData
                 * @param spacing Spacing between rows and cols.
                 * @param blockSource Source for the block to insert if other than parent.
                 *    Normally blocks are requested from the entity's parent but the
-                *    block can also come from another resource. RS_Text uses that
+                *    block can also come from another resource. Text uses that
                 *    to share the blocks (letters) from a font.
                 * @param updateMode RS2::Update will update the insert entity instantly
                 *    RS2::NoUpdate will not update the insert. You can update
@@ -34,8 +34,8 @@ class RS_InsertData
                 *    often the case since you might want to adjust attributes
                 *    after creating an insert entity.
                 */
-               RS_InsertData(const QString & name, Vector insertionPoint, Vector scaleFactor,
-                       double angle, int cols, int rows, Vector spacing, RS_BlockList * blockSource = NULL,
+               InsertData(const QString & name, Vector insertionPoint, Vector scaleFactor,
+                       double angle, int cols, int rows, Vector spacing, BlockList * blockSource = NULL,
                        RS2::UpdateMode updateMode = RS2::Update)
                {
                        this->name = name;
@@ -49,9 +49,9 @@ class RS_InsertData
                        this->updateMode = updateMode;
                }
 
-               friend class RS_Insert;
+               friend class Insert;
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_InsertData & d)
+               friend std::ostream & operator<<(std::ostream & os, const InsertData & d)
                {
                        os << "(" << d.name.toLatin1().data() << ")";
                        return os;
@@ -63,7 +63,7 @@ class RS_InsertData
                double angle;
                int cols, rows;
                Vector spacing;
-               RS_BlockList * blockSource;
+               BlockList * blockSource;
                RS2::UpdateMode updateMode;
 };
 
@@ -76,18 +76,18 @@ class RS_InsertData
  *
  * @author Andrew Mustun
  */
-class RS_Insert: public RS_EntityContainer
+class Insert: public EntityContainer
 {
        public:
-               RS_Insert(RS_EntityContainer * parent, const RS_InsertData & d);
-               virtual ~RS_Insert();
+               Insert(EntityContainer * parent, const InsertData & d);
+               virtual ~Insert();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
-               RS_InsertData getData() const;
-               virtual void reparent(RS_EntityContainer * parent);
+               InsertData getData() const;
+               virtual void reparent(EntityContainer * parent);
 
-               RS_Block * getBlockForInsert();
+               Block * getBlockForInsert();
                virtual void update();
 
                QString getName() const;
@@ -114,11 +114,11 @@ class RS_Insert: public RS_EntityContainer
                virtual void scale(Vector center, Vector factor);
                virtual void mirror(Vector axisPoint1, Vector axisPoint2);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_Insert & i);
+               friend std::ostream & operator<<(std::ostream & os, const Insert & i);
 
        protected:
-               RS_InsertData data;
-               RS_Block * block;
+               InsertData data;
+               Block * block;
 };
 
 #endif