From cfe48de7f071e2e07a1f2f2ace3456f7b410e93b Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Fri, 5 Apr 2013 15:37:33 +0200
Subject: Merged Shape and subclasses. Cleaned up a bit.

(bzr r11608.1.76)
---
 src/sp-polyline.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/sp-polyline.cpp')

diff --git a/src/sp-polyline.cpp b/src/sp-polyline.cpp
index c97b96b73..a85d0d64a 100644
--- a/src/sp-polyline.cpp
+++ b/src/sp-polyline.cpp
@@ -30,9 +30,7 @@ namespace {
 	bool polyLineRegistered = SPFactory::instance().registerObject("svg:polyline", createPolyLine);
 }
 
-SPPolyLine::SPPolyLine() : SPShape(), CShape(this) {
-	delete this->cshape;
-	this->cshape = this;
+SPPolyLine::SPPolyLine() : SPShape() {
 	this->clpeitem = this;
 	this->citem = this;
 	this->cobject = this;
@@ -42,7 +40,7 @@ SPPolyLine::~SPPolyLine() {
 }
 
 void SPPolyLine::build(SPDocument * document, Inkscape::XML::Node * repr) {
-    CShape::build(document, repr);
+    SPShape::build(document, repr);
 
     this->readAttr("points");
 }
@@ -113,7 +111,7 @@ void SPPolyLine::set(unsigned int key, const gchar* value) {
             break;
 	}
 	default:
-            CShape::set(key, value);
+            SPShape::set(key, value);
             break;
     }
 }
@@ -127,7 +125,7 @@ Inkscape::XML::Node* SPPolyLine::write(Inkscape::XML::Document *xml_doc, Inkscap
         repr->mergeFrom(this->getRepr(), "id");
     }
 
-    CShape::write(xml_doc, repr, flags);
+    SPShape::write(xml_doc, repr, flags);
 
     return repr;
 }
-- 
cgit v1.2.3