X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Flayer.h;fp=src%2Fbase%2Flayer.h;h=249fc73a56c9edb208891c5c5ffe3f1b919d9978;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=187b675e0cf5d01c5924e64e0ea8703dcfa4bf10;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/layer.h b/src/base/layer.h
index 187b675..249fc73 100644
--- a/src/base/layer.h
+++ b/src/base/layer.h
@@ -16,12 +16,12 @@
 /**
  * Holds the data that defines a layer.
  */
-class RS_LayerData
+class LayerData
 {
 	public:
-		RS_LayerData() {}
+		LayerData() {}
 
-		RS_LayerData(const QString & name, const RS_Pen & pen, bool frozen, bool locked)
+		LayerData(const QString & name, const Pen & pen, bool frozen, bool locked)
 		{
 			this->name = name;
 			this->pen = pen;
@@ -33,7 +33,7 @@ class RS_LayerData
 		QString name;
 
 		//! default pen for this layer
-		RS_Pen pen;
+		Pen pen;
 
 		//! Frozen flag
 		bool frozen;
@@ -50,17 +50,17 @@ class RS_LayerData
  *
  * @author Andrew Mustun
  */
-class RS_Layer
+class Layer
 {
 	public:
-		explicit RS_Layer(const QString & name);
-		//RS_Layer(const char* name);
+		explicit Layer(const QString & name);
+		//Layer(const char* name);
 
-		RS_Layer * clone();
+		Layer * clone();
 		void setName(const QString & name);
 		QString getName() const;
-		void setPen(const RS_Pen & pen);
-		RS_Pen getPen() const;
+		void setPen(const Pen & pen);
+		Pen getPen() const;
 		bool isFrozen() const;
 		bool isConverted() const;
 		void setConverted(bool c);
@@ -69,15 +69,15 @@ class RS_Layer
 		void toggleLock();
 		void lock(bool l);
 		bool isLocked();
-		//RS_Layer & operator=(const RS_Layer & l);
+		//Layer & operator=(const Layer & l);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Layer & l);
+		friend std::ostream & operator<<(std::ostream & os, const Layer & l);
 
-		//friend class RS_LayerList;
+		//friend class LayerList;
 
 	private:
 		//! Layer data
-		RS_LayerData data;
+		LayerData data;
 };
 
 #endif