diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-07 16:28:22 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-07 16:28:22 +0000 |
| commit | 27e2102f96a5554bcd5310ec11435d155773b279 (patch) | |
| tree | e5f982c25aed199f9027a6277b17302f97b4c80c /src/sp-flowdiv.cpp | |
| parent | Merged FilterPrimitive and subclasses. (diff) | |
| download | inkscape-27e2102f96a5554bcd5310ec11435d155773b279.tar.gz inkscape-27e2102f96a5554bcd5310ec11435d155773b279.zip | |
Merge Object and subclasses. Merging of SP- and C-classes complete.
(bzr r11608.1.86)
Diffstat (limited to 'src/sp-flowdiv.cpp')
| -rw-r--r-- | src/sp-flowdiv.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp index 1052b4a64..13233748d 100644 --- a/src/sp-flowdiv.cpp +++ b/src/sp-flowdiv.cpp @@ -45,7 +45,6 @@ namespace { } SPFlowdiv::SPFlowdiv() : SPItem() { - this->cobject = this; } SPFlowdiv::~SPFlowdiv() { @@ -179,7 +178,6 @@ Inkscape::XML::Node* SPFlowdiv::write(Inkscape::XML::Document *xml_doc, Inkscape */ SPFlowtspan::SPFlowtspan() : SPItem() { - this->cobject = this; } SPFlowtspan::~SPFlowtspan() { @@ -312,7 +310,6 @@ Inkscape::XML::Node *SPFlowtspan::write(Inkscape::XML::Document *xml_doc, Inksca * */ SPFlowpara::SPFlowpara() : SPItem() { - this->cobject = this; } SPFlowpara::~SPFlowpara() { @@ -442,20 +439,18 @@ Inkscape::XML::Node *SPFlowpara::write(Inkscape::XML::Document *xml_doc, Inkscap * */ -SPFlowline::SPFlowline() : SPObject(), CObject(this) { - delete this->cobject; - this->cobject = this; +SPFlowline::SPFlowline() : SPObject() { } SPFlowline::~SPFlowline() { } void SPFlowline::release() { - CObject::release(); + SPObject::release(); } void SPFlowline::modified(unsigned int flags) { - CObject::modified(flags); + SPObject::modified(flags); if (flags & SP_OBJECT_MODIFIED_FLAG) { flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; @@ -472,7 +467,7 @@ Inkscape::XML::Node *SPFlowline::write(Inkscape::XML::Document *xml_doc, Inkscap } else { } - CObject::write(xml_doc, repr, flags); + SPObject::write(xml_doc, repr, flags); return repr; } @@ -482,20 +477,18 @@ Inkscape::XML::Node *SPFlowline::write(Inkscape::XML::Document *xml_doc, Inkscap * */ -SPFlowregionbreak::SPFlowregionbreak() : SPObject(), CObject(this) { - delete this->cobject; - this->cobject = this; +SPFlowregionbreak::SPFlowregionbreak() : SPObject() { } SPFlowregionbreak::~SPFlowregionbreak() { } void SPFlowregionbreak::release() { - CObject::release(); + SPObject::release(); } void SPFlowregionbreak::modified(unsigned int flags) { - CObject::modified(flags); + SPObject::modified(flags); if (flags & SP_OBJECT_MODIFIED_FLAG) { flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; @@ -512,7 +505,7 @@ Inkscape::XML::Node *SPFlowregionbreak::write(Inkscape::XML::Document *xml_doc, } else { } - CObject::write(xml_doc, repr, flags); + SPObject::write(xml_doc, repr, flags); return repr; } |