X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Flayer.cpp;h=986616df83f866abf059b5f7e3e27c0d65c4b19d;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=4146aa2efaaedb481d72aacc137602ff719eba43;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/layer.cpp b/src/base/layer.cpp
index 4146aa2..986616d 100644
--- a/src/base/layer.cpp
+++ b/src/base/layer.cpp
@@ -22,7 +22,7 @@
 /**
  * Constructor.
  */
-RS_Layer::RS_Layer(const QString & name)
+Layer::Layer(const QString & name)
 {
 	setName(name);
 
@@ -33,31 +33,31 @@ RS_Layer::RS_Layer(const QString & name)
 	data.locked = false;
 }
 
-RS_Layer * RS_Layer::clone()
+Layer * Layer::clone()
 {
-	return new RS_Layer(*this);
+	return new Layer(*this);
 }
 
 /** sets a new name for this layer. */
-void RS_Layer::setName(const QString & name)
+void Layer::setName(const QString & name)
 {
 	data.name = name;
 }
 
 /** @return the name of this layer. */
-QString RS_Layer::getName() const
+QString Layer::getName() const
 {
 	return data.name;
 }
 
 /** sets the default pen for this layer. */
-void RS_Layer::setPen(const RS_Pen & pen)
+void Layer::setPen(const Pen & pen)
 {
 	data.pen = pen;
 }
 
 /** @return default pen for this layer. */
-RS_Pen RS_Layer::getPen() const
+Pen Layer::getPen() const
 {
 	return data.pen;
 }
@@ -66,7 +66,7 @@ RS_Pen RS_Layer::getPen() const
  * @retval true if this layer is frozen (invisible)
  * @retval false if this layer isn't frozen (visible)
  */
-bool RS_Layer::isFrozen() const
+bool Layer::isFrozen() const
 {
 	return data.frozen;
 	//getFlag(RS2::FlagFrozen);
@@ -76,7 +76,7 @@ bool RS_Layer::isFrozen() const
  * @retval true the layer has been converted already
  * @retval false the layer still needs to be converted
  */
-bool RS_Layer::isConverted() const
+bool Layer::isConverted() const
 {
 	return data.converted;
 }
@@ -84,7 +84,7 @@ bool RS_Layer::isConverted() const
 /**
  * Sets the converted flag
  */
-void RS_Layer::setConverted(bool c)
+void Layer::setConverted(bool c)
 {
 	data.converted = c;
 }
@@ -93,7 +93,7 @@ void RS_Layer::setConverted(bool c)
  * Toggles the visibility of this layer.
  * Freezes the layer if it's not frozen, thaws the layer otherwise
  */
-void RS_Layer::toggle()
+void Layer::toggle()
 {
 	//toggleFlag(RS2::FlagFrozen);
 	data.frozen = !data.frozen;
@@ -104,7 +104,7 @@ void RS_Layer::toggle()
  *
  * @param freeze true: freeze, false: defreeze
  */
-void RS_Layer::freeze(bool freeze)
+void Layer::freeze(bool freeze)
 {
 	data.frozen = freeze;
 	/*if (freeze) {
@@ -117,7 +117,7 @@ void RS_Layer::freeze(bool freeze)
 /**
  * Toggles the lock of this layer.
  */
-void RS_Layer::toggleLock()
+void Layer::toggleLock()
 {
 	//toggleFlag(RS2::FlagFrozen);
 	data.locked = !data.locked;
@@ -128,7 +128,7 @@ void RS_Layer::toggleLock()
  *
  * @param l true: lock, false: unlock
  */
-void RS_Layer::lock(bool l)
+void Layer::lock(bool l)
 {
 	data.locked = l;
 }
@@ -136,7 +136,7 @@ void RS_Layer::lock(bool l)
 /**
  * return the LOCK state of the Layer
  */
-bool RS_Layer::isLocked()
+bool Layer::isLocked()
 {
 	return data.locked;
 }
@@ -145,7 +145,7 @@ bool RS_Layer::isLocked()
  * Copies all attributes (pen) and the name of the layer.
  */
 /*
-RS_Layer & RS_Layer::operator=(const RS_Layer & l)
+Layer & Layer::operator=(const Layer & l)
 {
 	setName(l.getName());
 	setPen(l.getPen());
@@ -157,7 +157,7 @@ RS_Layer & RS_Layer::operator=(const RS_Layer & l)
 /**
  * Dumps the layers data to stdout.
  */
-std::ostream & operator<<(std::ostream & os, const RS_Layer & l)
+std::ostream & operator<<(std::ostream & os, const Layer & l)
 {
 	os << " name: " << l.getName().toLatin1().data()
 		<< " pen: " << l.getPen()