X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fimage.h;h=54fa790bdfd153a755ea0f720b2dced56fe326fe;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=082c26cef336e8841a489e61f440aa77ca4cdde4;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/image.h b/src/base/image.h
index 082c26c..54fa790 100644
--- a/src/base/image.h
+++ b/src/base/image.h
@@ -7,17 +7,17 @@
 /**
  * Holds the data that defines a line.
  */
-class RS_ImageData
+class ImageData
 {
 	public:
 		/**
 		 * Default constructor. Leaves the data object uninitialized.
 		 */
-		RS_ImageData()
+		ImageData()
 		{
 		}
 
-		RS_ImageData(int handle,    const Vector & insertionPoint, const Vector & uVector, const Vector & vVector, const Vector & size, const QString & file, int brightness, int contrast, int fade)
+		ImageData(int handle,    const Vector & insertionPoint, const Vector & uVector, const Vector & vVector, const Vector & size, const QString & file, int brightness, int contrast, int fade)
 		{
 			this->handle = handle;
 			this->insertionPoint = insertionPoint;
@@ -30,7 +30,7 @@ class RS_ImageData
 			this->fade = fade;
 		}
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_ImageData & ld)
+		friend std::ostream & operator<<(std::ostream & os, const ImageData & ld)
 		{
 			os << "(" << ld.insertionPoint << ")";
 			return os;
@@ -62,16 +62,16 @@ class RS_ImageData
  *
  * @author Andrew Mustun
  */
-class RS_Image: public RS_AtomicEntity
+class Image: public AtomicEntity
 {
 	public:
-		RS_Image(RS_EntityContainer * parent, const RS_ImageData & d);
-		virtual ~RS_Image();
+		Image(EntityContainer * parent, const ImageData & d);
+		virtual ~Image();
 
-		virtual RS_Entity * clone();
+		virtual Entity * clone();
 		virtual RS2::EntityType rtti() const;
 		virtual void update();
-		RS_ImageData getData() const;
+		ImageData getData() const;
 		virtual Vector getInsertionPoint() const;
 		void setInsertionPoint(Vector ip);
 		QString getFile() const;
@@ -90,11 +90,11 @@ class RS_Image: public RS_AtomicEntity
 		double getImageHeight();
 
 		virtual Vector getNearestEndpoint(const Vector & coord, double * dist = NULL);
-		virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true, double * dist = NULL, RS_Entity * * entity = NULL);
+		virtual Vector getNearestPointOnEntity(const Vector & coord, bool onEntity = true, double * dist = NULL, Entity * * entity = NULL);
 		virtual Vector getNearestCenter(const Vector & coord, double * dist = NULL);
 		virtual Vector getNearestMiddle(const Vector & coord, double * dist = NULL);
 		virtual Vector getNearestDist(double distance, const Vector & coord, double * dist = NULL);
-		virtual double getDistanceToPoint(const Vector & coord, RS_Entity * * entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
+		virtual double getDistanceToPoint(const Vector & coord, Entity * * entity = NULL, RS2::ResolveLevel level = RS2::ResolveNone, double solidDist = RS_MAXDOUBLE);
 		virtual double getLength();
 		virtual void move(Vector offset);
 		virtual void rotate(Vector center, double angle);
@@ -103,12 +103,12 @@ class RS_Image: public RS_AtomicEntity
 		/*virtual void stretch(Vector firstCorner,Vector secondCorner, Vector offset);*/
 		virtual void draw(PaintInterface * painter, GraphicView * view, double patternOffset = 0.0);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Image & l);
+		friend std::ostream & operator<<(std::ostream & os, const Image & l);
 
 		virtual void calculateBorders();
 
 	protected:
-		RS_ImageData data;
+		ImageData data;
 		QImage img;
 };