Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / base / text.h

diff --git a/src/base/text.h b/src/base/text.h
index 4149b71d54b1908cf28d64f59e35fa3e184d33d3..399cedb28b8da251e953dfb1297c7ebf974a9e81 100644 (file)
--- a/src/base/text.h
+++ b/src/base/text.h
@@ -7,13 +7,13 @@
 /**
  * Holds the data that defines a text entity.
  */
-class RS_TextData
+class TextData
 {
        public:
                /**
                 * Default constructor. Leaves the data object uninitialized.
                 */
-               RS_TextData() {}
+               TextData() {}
 
                /**
                 * Constructor with initialisation.
@@ -35,7 +35,7 @@ class RS_TextData
                 *    often the case since you might want to adjust attributes
                 *    after creating a text entity.
                 */
-               RS_TextData(const Vector & insertionPoint, double height, double width,
+               TextData(const Vector & insertionPoint, double height, double width,
                        RS2::VAlign valign, RS2::HAlign halign, RS2::TextDrawingDirection drawingDirection,
                        RS2::TextLineSpacingStyle lineSpacingStyle, double lineSpacingFactor,
                        const QString& text, const QString & style, double angle,
@@ -55,9 +55,9 @@ class RS_TextData
                        this->updateMode = updateMode;
                }
 
-               friend class RS_Text;
+               friend class Text;
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_TextData & td)
+               friend std::ostream & operator<<(std::ostream & os, const TextData & td)
                {
                        os << "(" << td.text.toLatin1().data() << ")";
                        return os;
@@ -98,17 +98,17 @@ class RS_TextData
  *
  * @author Andrew Mustun
  */
-class RS_Text: public RS_EntityContainer
+class Text: public EntityContainer
 {
        public:
-               RS_Text(RS_EntityContainer * parent, const RS_TextData & d);
-               virtual ~RS_Text();
+               Text(EntityContainer * parent, const TextData & d);
+               virtual ~Text();
 
-               virtual RS_Entity * clone();
+               virtual Entity * clone();
                virtual RS2::EntityType rtti() const;
-               RS_TextData getData() const;
+               TextData getData() const;
                void update();
-               void updateAddLine(RS_EntityContainer * textLine, int lineCounter);
+               void updateAddLine(EntityContainer * textLine, int lineCounter);
                int getNumberOfLines();
 
                Vector getInsertionPoint();
@@ -145,10 +145,10 @@ class RS_Text: public RS_EntityContainer
                virtual bool hasEndpointsWithinWindow(Vector v1, Vector v2);
                virtual void stretch(Vector firstCorner, Vector secondCorner, Vector offset);
 
-               friend std::ostream & operator<<(std::ostream & os, const RS_Text & p);
+               friend std::ostream & operator<<(std::ostream & os, const Text & p);
 
        protected:
-               RS_TextData data;
+               TextData data;
                /**
                * Text width used by the current contents of this text entity.
                * This property is updated by the update method.