X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimaligned.h;h=d4ed81787e2a4c7b04a984718eca7906a92d86f1;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=a8a7e4fc0854f28e8d5025f8e54ecbbcc2bc39e9;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimaligned.h b/src/base/dimaligned.h
index a8a7e4f..d4ed817 100644
--- a/src/base/dimaligned.h
+++ b/src/base/dimaligned.h
@@ -6,13 +6,13 @@
 /**
  * Holds the data that defines an aligned dimension entity.
  */
-class RS_DimAlignedData
+class DimAlignedData
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_DimAlignedData() {}
+		DimAlignedData() {}
 
 		/**
 		 * Constructor with initialisation.
@@ -22,16 +22,16 @@ class RS_DimAlignedData
 		 * @para extensionPoint2 Definition point. Startpoint of the
 		 *         second extension line.
 		 */
-		RS_DimAlignedData(const Vector & extensionPoint1, const Vector & extensionPoint2)
+		DimAlignedData(const Vector & extensionPoint1, const Vector & extensionPoint2)
 		{
 			this->extensionPoint1 = extensionPoint1;
 			this->extensionPoint2 = extensionPoint2;
 		}
 
-		friend class RS_DimAligned;
+		friend class DimAligned;
 		friend class ActionDimAligned;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimAlignedData & dd)
+		friend std::ostream & operator<<(std::ostream & os, const DimAlignedData & dd)
 		{
 			os << "(" << dd.extensionPoint1 << "/" << dd.extensionPoint1 << ")";
 			return os;
@@ -49,15 +49,15 @@ class RS_DimAlignedData
  *
  * @author Andrew Mustun
  */
-class RS_DimAligned: public RS_Dimension
+class DimAligned: public Dimension
 {
 	public:
-		RS_DimAligned(RS_EntityContainer * parent, const RS_DimensionData & d, const RS_DimAlignedData & ed);
-		virtual ~RS_DimAligned();
+		DimAligned(EntityContainer * parent, const DimensionData & d, const DimAlignedData & ed);
+		virtual ~DimAligned();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
-		RS_DimAlignedData getEData() const;
+		DimAlignedData getEData() const;
 		virtual VectorSolutions getRefPoints();
 		virtual QString getMeasuredLabel();
 		virtual void update(bool autoText = false);
@@ -73,11 +73,11 @@ class RS_DimAligned: 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_DimAligned & d);
+		friend std::ostream & operator<<(std::ostream & os, const DimAligned & d);
 
 	protected:
 		/** Extended data. */
-		RS_DimAlignedData edata;
+		DimAlignedData edata;
 };
 
 #endif