X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fdimdiametric.h;h=7f4ef8db91ecd16974727974b50d682fe64582c1;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=d3ea9590f2e32241d3d0ed60a20ce3f605684a98;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/dimdiametric.h b/src/base/dimdiametric.h
index d3ea959..7f4ef8d 100644
--- a/src/base/dimdiametric.h
+++ b/src/base/dimdiametric.h
@@ -6,13 +6,13 @@
 /**
  * Holds the data that defines a diametric dimension entity.
  */
-class RS_DimDiametricData
+class DimDiametricData
 {
 public:
     /**
      * Default constructor. Leaves the data object uninitialized.
      */
-    RS_DimDiametricData() {}
+    DimDiametricData() {}
 
     /**
      * Constructor with initialisation.
@@ -20,16 +20,16 @@ public:
      * @param definitionPoint Definition point of the diametric dimension.
      * @param leader Leader length.
      */
-    RS_DimDiametricData(const Vector& definitionPoint,
+    DimDiametricData(const Vector& definitionPoint,
                      double leader) {
         this->definitionPoint = definitionPoint;
         this->leader = leader;
     }
 
-    friend class RS_DimDiametric;
+    friend class DimDiametric;
     //friend class RS_ActionDimDiametric;
 
-    friend std::ostream & operator<<(std::ostream & os, const RS_DimDiametricData & dd)
+    friend std::ostream & operator<<(std::ostream & os, const DimDiametricData & dd)
     {
         os << "(" << dd.definitionPoint << "/" << dd.leader << ")";
         return os;
@@ -47,15 +47,15 @@ public:
  *
  * @author Andrew Mustun
  */
-class RS_DimDiametric: public RS_Dimension
+class DimDiametric: public Dimension
 {
 	public:
-		RS_DimDiametric(RS_EntityContainer * parent, const RS_DimensionData & d, const RS_DimDiametricData & ed);
-		virtual ~RS_DimDiametric();
+		DimDiametric(EntityContainer * parent, const DimensionData & d, const DimDiametricData & ed);
+		virtual ~DimDiametric();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
-		RS_DimDiametricData getEData() const;
+		DimDiametricData getEData() const;
 		virtual VectorSolutions getRefPoints();
 		virtual QString getMeasuredLabel();
 		virtual void update(bool autoText=false);
@@ -67,11 +67,11 @@ class RS_DimDiametric: public RS_Dimension
 		virtual void mirror(Vector axisPoint1, Vector axisPoint2);
 		virtual void moveRef(const Vector & ref, const Vector & offset);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_DimDiametric & d);
+		friend std::ostream & operator<<(std::ostream & os, const DimDiametric & d);
 
 	protected:
 		/** Extended data. */
-		RS_DimDiametricData edata;
+		DimDiametricData edata;
 };
 
 #endif