X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fpen.h;fp=src%2Fbase%2Fpen.h;h=a49c3e71c535972d58a99435959cc9e0cb5025d2;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=526dadec7afbf1640eff2d7acb8c0f5142ef6b5e;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/pen.h b/src/base/pen.h
index 526dade..a49c3e7 100644
--- a/src/base/pen.h
+++ b/src/base/pen.h
@@ -1,7 +1,7 @@
 #ifndef __PEN_H__
 #define __PEN_H__
 
-#include "rs.h"
+#include "enums.h"
 #include "color.h"
 #include "flags.h"
 
@@ -12,13 +12,13 @@
  * @author James Hammons
  * @author Andrew Mustun
  */
-class RS_Pen: public RS_Flags
+class Pen: public Flags
 {
 	public:
-		RS_Pen();
-		RS_Pen(const RS_Color & c, RS2::LineWidth w, RS2::LineType t);
-		RS_Pen(unsigned int f);
-		virtual ~RS_Pen();
+		Pen();
+		Pen(const Color & c, RS2::LineWidth w, RS2::LineType t);
+		Pen(unsigned int f);
+		virtual ~Pen();
 
 		RS2::LineType getLineType() const;
 		void setLineType(RS2::LineType t);
@@ -26,19 +26,19 @@ class RS_Pen: public RS_Flags
 		void setWidth(RS2::LineWidth w);
 		double getScreenWidth() const;
 		void setScreenWidth(double w);
-		const RS_Color & getColor() const;
-		void setColor(const RS_Color & c);
+		const Color & getColor() const;
+		void setColor(const Color & c);
 		bool isValid();
-		bool operator==(const RS_Pen & p) const;
-		bool operator!=(const RS_Pen & p) const;
+		bool operator==(const Pen & p) const;
+		bool operator!=(const Pen & p) const;
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Pen & p);
+		friend std::ostream & operator<<(std::ostream & os, const Pen & p);
 
 	protected:
 		RS2::LineType lineType;
 		RS2::LineWidth width;
 		double screenWidth;
-		RS_Color color;
+		Color color;
 };
 
 #endif