X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimension.h;h=50360da2157b66789fe87d21db302f3aabc74496;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=fadc601540bf0752bdbf6b16f37f3e8f0af82134;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimension.h b/src/base/dimension.h
index fadc601..50360da 100644
--- a/src/base/dimension.h
+++ b/src/base/dimension.h
@@ -6,13 +6,13 @@
 /**
  * Holds the data that is common to all dimension entities.
  */
-class RS_DimensionData: public RS_Flags
+class DimensionData: public Flags
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_DimensionData() {}
+		DimensionData() {}
 
 		/**
 		 * Constructor with initialisation.
@@ -30,7 +30,7 @@ class RS_DimensionData: public RS_Flags
 		 * @param angle Rotation angle of dimension text away from
 		 *         default orientation.
 		 */
-		RS_DimensionData(const Vector & definitionPoint,
+		DimensionData(const Vector & definitionPoint,
 			const Vector & middleOfText,
 			RS2::VAlign valign,
 			RS2::HAlign halign,
@@ -51,13 +51,13 @@ class RS_DimensionData: public RS_Flags
 			this->angle = angle;
 		}
 
-		friend class RS_Dimension;
-		friend class RS_DimAligned;
-		friend class RS_DimLinear;
+		friend class Dimension;
+		friend class DimAligned;
+		friend class DimLinear;
 		friend class RS_ActionDimAligned;
 		friend class RS_ActionDimLinear;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimensionData & dd)
+		friend std::ostream & operator<<(std::ostream & os, const DimensionData & dd)
 		{
 			os << "(" << dd.definitionPoint << ")";
 			return os;
@@ -93,13 +93,13 @@ class RS_DimensionData: public RS_Flags
  *
  * @author Andrew Mustun
  */
-class RS_Dimension: public RS_EntityContainer
+class Dimension: public EntityContainer
 {
 	public:
-		RS_Dimension(RS_EntityContainer * parent, const RS_DimensionData & d);
-		virtual ~RS_Dimension();
+		Dimension(EntityContainer * parent, const DimensionData & d);
+		virtual ~Dimension();
 
-		RS_DimensionData getData() const;
+		DimensionData getData() const;
 		Vector getNearestRef(const Vector & coord, double * dist);
 		Vector getNearestSelectedRef(const Vector & coord, double * dist);
 		QString getLabel(bool resolve = true);
@@ -142,7 +142,7 @@ class RS_Dimension: public RS_EntityContainer
 
 	protected:
 		/** Data common to all dimension entities. */
-		RS_DimensionData data;
+		DimensionData data;
 };
 
 #endif