X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fpaintinterface.h;fp=src%2Fbase%2Fpaintinterface.h;h=94701cf4fb21cdfd562223350d9fd7c4a2bd74f0;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=072d33336b18969a5f77b512af4d0cb65f4aeaf2;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/paintinterface.h b/src/base/paintinterface.h
index 072d333..94701cf 100644
--- a/src/base/paintinterface.h
+++ b/src/base/paintinterface.h
@@ -2,7 +2,7 @@
 #define ____PAINTINTERFACE_H____
 
 #include <QtGui>
-#include "rs.h"
+#include "enums.h"
 #include "vector.h"
 #include "color.h"
 #include "pen.h"
@@ -38,16 +38,16 @@ class PaintInterface
 			double angle, double angle1, double angle2, bool reversed);
 		void drawImg(QImage & img, const Vector & pos,
 			double angle, const Vector & factor, int sx, int sy, int sw, int sh);
-		void fillRect(int x1, int y1, int w, int h, const RS_Color & col);
+		void fillRect(int x1, int y1, int w, int h, const Color & col);
 		void fillTriangle(const Vector & p1, const Vector & p2, const Vector & p3);
-		void drawHandle(const Vector & p, const RS_Color & c, int size = -1);
+		void drawHandle(const Vector & p, const Color & c, int size = -1);
 		void setPreviewPen();
-		RS_Pen getPen();
-		void setPen(const RS_Pen & pen);
-		void setPen(const RS_Color & color);
+		Pen getPen();
+		void setPen(const Pen & pen);
+		void setPen(const Color & color);
 		void setPen(int r, int g, int b);
 		void disablePen();
-		void setBrush(const RS_Color & color);
+		void setBrush(const Color & color);
 		void disableBrush();
 		void drawPolygon(const QPolygon & p);
 		void erase();
@@ -73,7 +73,7 @@ class PaintInterface
 		 * A fixed offset added to all entities drawn (useful for previews).
 		 */
 		Vector offset;
-		RS_Pen lpen;
+		Pen lpen;
 };
 
 #endif	// __PAINTINTERFACE_H____