X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fpaintinterface.h;h=94701cf4fb21cdfd562223350d9fd7c4a2bd74f0;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=acd0ad490d2f2213f957cc31982d2b160cd0807c;hpb=dd17716b803ab2aa4163b905904a078f9fa5ae02;p=architektonas

diff --git a/src/base/paintinterface.h b/src/base/paintinterface.h
index acd0ad4..94701cf 100644
--- a/src/base/paintinterface.h
+++ b/src/base/paintinterface.h
@@ -1,11 +1,11 @@
-#ifndef __PAINTINTERFACE_H__
-#define __PAINTINTERFACE_H__
+#ifndef ____PAINTINTERFACE_H____
+#define ____PAINTINTERFACE_H____
 
 #include <QtGui>
-#include "rs.h"
+#include "enums.h"
 #include "vector.h"
-#include "rs_color.h"
-#include "rs_pen.h"
+#include "color.h"
+#include "pen.h"
 
 // This is an interface class to the rest of the RS_* functions that are supposed
 // to be toolkit independent, but, because the author of QCad had no idea how to
@@ -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__
+#endif	// __PAINTINTERFACE_H____