X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Finformation.h;h=36829776954360da6f226c588e9e3d8605d4c0ce;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=4af79949024416d953a9c2c395b4ced58e16ab00;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/information.h b/src/base/information.h
index 4af7994..3682977 100644
--- a/src/base/information.h
+++ b/src/base/information.h
@@ -14,29 +14,29 @@
  *
  * @author Andrew Mustun
  */
-class RS_Information
+class Information
 {
 	public:
-		RS_Information(RS_EntityContainer & entityContainer);
+		Information(EntityContainer & entityContainer);
 
 		static bool isDimension(RS2::EntityType type);
-		static bool isTrimmable(RS_Entity * e);
-		static bool isTrimmable(RS_Entity * e1, RS_Entity * e2);
+		static bool isTrimmable(Entity * e);
+		static bool isTrimmable(Entity * e1, Entity * e2);
 		Vector getNearestEndpoint(const Vector & point, double * dist = NULL) const;
 		Vector getNearestPointOnEntity(const Vector & point, bool onEntity = true,
-			double * dist = NULL, RS_Entity ** entity = NULL) const;
-		RS_Entity * getNearestEntity(const Vector & point, double * dist = NULL,
+			double * dist = NULL, Entity ** entity = NULL) const;
+		Entity * getNearestEntity(const Vector & point, double * dist = NULL,
 			RS2::ResolveLevel level = RS2::ResolveAll) const;
-		static VectorSolutions getIntersection(RS_Entity * e1, RS_Entity * e2, bool onEntities = false);
-		static VectorSolutions getIntersectionLineLine(RS_Line * e1, RS_Line * e2);
-		static VectorSolutions getIntersectionLineArc(RS_Line * line, RS_Arc * arc);
-		static VectorSolutions getIntersectionArcArc(RS_Arc * e1, RS_Arc * e2);
-		static VectorSolutions getIntersectionLineEllipse(RS_Line * line, RS_Ellipse * ellipse);
-		static bool isPointInsideContour(const Vector & point, RS_EntityContainer * contour,
+		static VectorSolutions getIntersection(Entity * e1, Entity * e2, bool onEntities = false);
+		static VectorSolutions getIntersectionLineLine(Line * e1, Line * e2);
+		static VectorSolutions getIntersectionLineArc(Line * line, Arc * arc);
+		static VectorSolutions getIntersectionArcArc(Arc * e1, Arc * e2);
+		static VectorSolutions getIntersectionLineEllipse(Line * line, Ellipse * ellipse);
+		static bool isPointInsideContour(const Vector & point, EntityContainer * contour,
 			bool * onContour = NULL);
 
 	protected:
-		RS_EntityContainer * container;
+		EntityContainer * container;
 };
 
 #endif