X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimangular.h;fp=src%2Fbase%2Fdimangular.h;h=654e7c67a156e5a78fd7fa3313c97e0fc28a972e;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=4c3f71ef2ea04758cedba9c7276b9aa78f5fe486;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimangular.h b/src/base/dimangular.h
index 4c3f71e..654e7c6 100644
--- a/src/base/dimangular.h
+++ b/src/base/dimangular.h
@@ -6,13 +6,13 @@
 /**
  * Holds the data that defines a angular dimension entity.
  */
-class RS_DimAngularData
+class DimAngularData
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_DimAngularData() {}
+		DimAngularData() {}
 
 		/**
 		 * Constructor with initialisation.
@@ -20,7 +20,7 @@ class RS_DimAngularData
 		 * @param definitionPoint Definition point of the angular dimension.
 		 * @param leader Leader length.
 		 */
-		RS_DimAngularData(const Vector& definitionPoint1, const Vector& definitionPoint2,
+		DimAngularData(const Vector& definitionPoint1, const Vector& definitionPoint2,
 			const Vector& definitionPoint3, const Vector& definitionPoint4)
 		{
 			this->definitionPoint1 = definitionPoint1;
@@ -29,7 +29,7 @@ class RS_DimAngularData
 			this->definitionPoint4 = definitionPoint4;
 		}
 
-		friend std::ostream & operator<<(std::ostream& os, const RS_DimAngularData & dd)
+		friend std::ostream & operator<<(std::ostream& os, const DimAngularData & dd)
 		{
 			os << "(" << dd.definitionPoint1 << "/" << dd.definitionPoint2 << "/"
 				<< dd.definitionPoint3 << "/" << dd.definitionPoint3 << ")";
@@ -52,15 +52,15 @@ class RS_DimAngularData
  *
  * @author Andrew Mustun
  */
-class RS_DimAngular: public RS_Dimension
+class DimAngular: public Dimension
 {
 	public:
-		RS_DimAngular(RS_EntityContainer * parent, const RS_DimensionData & d, const RS_DimAngularData & ed);
-		virtual ~RS_DimAngular();
+		DimAngular(EntityContainer * parent, const DimensionData & d, const DimAngularData & ed);
+		virtual ~DimAngular();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
-		RS_DimAngularData getEData() const;
+		DimAngularData getEData() const;
 		virtual QString getMeasuredLabel();
 		double getAngle();
 		Vector getCenter();
@@ -78,11 +78,11 @@ class RS_DimAngular: public RS_Dimension
 		virtual void scale(Vector center, Vector factor);
 		virtual void mirror(Vector axisPoint1, Vector axisPoint2);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimAngular & d);
+		friend std::ostream & operator<<(std::ostream & os, const DimAngular & d);
 
 	protected:
 		/** Extended data. */
-		RS_DimAngularData edata;
+		DimAngularData edata;
 };
 
 #endif