X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimlinear.h;fp=src%2Fbase%2Fdimlinear.h;h=fbedb126a314f243a7db34418ce43c15edd5831f;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=80ed0b19800419066cd19381eca2571ec3af58db;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimlinear.h b/src/base/dimlinear.h
index 80ed0b1..fbedb12 100644
--- a/src/base/dimlinear.h
+++ b/src/base/dimlinear.h
@@ -6,13 +6,13 @@
 /**
  * Holds the data that defines a linear dimension entity.
  */
-class RS_DimLinearData
+class DimLinearData
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_DimLinearData() {}
+		DimLinearData() {}
 
 		/**
 		 * Constructor with initialisation.
@@ -22,7 +22,7 @@ class RS_DimLinearData
 		 * @param angle Rotation angle in rad.
 		 * @param oblique Oblique angle in rad.
 		 */
-		RS_DimLinearData(const Vector & extensionPoint1,
+		DimLinearData(const Vector & extensionPoint1,
 			const Vector & extensionPoint2,
 			double angle, double oblique)
 		{
@@ -32,10 +32,10 @@ class RS_DimLinearData
 			this->oblique = oblique;
 		}
 
-		friend class RS_DimLinear;
+		friend class DimLinear;
 		friend class RS_ActionDimLinear;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimLinearData & dd)
+		friend std::ostream & operator<<(std::ostream & os, const DimLinearData & dd)
 		{
 			os << "(" << dd.extensionPoint1 << "/" << dd.extensionPoint1 << ")";
 			return os;
@@ -57,15 +57,15 @@ class RS_DimLinearData
  *
  * @author Andrew Mustun
  */
-class RS_DimLinear: public RS_Dimension
+class DimLinear: public Dimension
 {
 	public:
-		RS_DimLinear(RS_EntityContainer * parent, const RS_DimensionData & d, const RS_DimLinearData & ed);
-		virtual ~RS_DimLinear();
+		DimLinear(EntityContainer * parent, const DimensionData & d, const DimLinearData & ed);
+		virtual ~DimLinear();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
-		RS_DimLinearData getEData() const;
+		DimLinearData getEData() const;
 		virtual VectorSolutions getRefPoints();
 		virtual QString getMeasuredLabel();
 		virtual void update(bool autoText = false);
@@ -82,11 +82,11 @@ class RS_DimLinear: public RS_Dimension
 		virtual void stretch(Vector firstCorner, Vector secondCorner, Vector offset);
 		virtual void moveRef(const Vector & ref, const Vector & offset);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimLinear & d);
+		friend std::ostream & operator<<(std::ostream & os, const DimLinear & d);
 
 	protected:
 		/** Extended data. */
-		RS_DimLinearData edata;
+		DimLinearData edata;
 };
 
 #endif