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-font-face.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-font-face.cpp')
| -rw-r--r-- | src/sp-font-face.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp index d91910bec..39242b870 100644 --- a/src/sp-font-face.cpp +++ b/src/sp-font-face.cpp @@ -269,10 +269,7 @@ namespace { bool fontFaceRegistered = SPFactory::instance().registerObject("svg:font-face", createFontFace); } -SPFontFace::SPFontFace() : SPObject(), CObject(this) { - delete this->cobject; - this->cobject = this; - +SPFontFace::SPFontFace() : SPObject() { std::vector<FontFaceStyleType> style; style.push_back(SP_FONTFACE_STYLE_ALL); this->font_style = style; @@ -328,7 +325,7 @@ SPFontFace::~SPFontFace() { } void SPFontFace::build(SPDocument *document, Inkscape::XML::Node *repr) { - CObject::build(document, repr); + SPObject::build(document, repr); SPFontFace* object = this; @@ -379,7 +376,7 @@ void SPFontFace::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *re SPFontFace *f = SP_FONTFACE(object); - CObject::child_added(child, ref); + SPObject::child_added(child, ref); sp_fontface_children_modified(f); object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG); @@ -394,14 +391,14 @@ void SPFontFace::remove_child(Inkscape::XML::Node *child) { SPFontFace *f = SP_FONTFACE(object); - CObject::remove_child(child); + SPObject::remove_child(child); sp_fontface_children_modified(f); object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG); } void SPFontFace::release() { - CObject::release(); + SPObject::release(); } void SPFontFace::set(unsigned int key, const gchar *value) { @@ -689,7 +686,7 @@ void SPFontFace::set(unsigned int key, const gchar *value) { break; } default: - CObject::set(key, value); + SPObject::set(key, value); break; } } @@ -736,7 +733,7 @@ void SPFontFace::update(SPCtx *ctx, guint flags) { object->readAttr( "overline-thickness" ); } - CObject::update(ctx, flags); + SPObject::update(ctx, flags); } #define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key)); @@ -823,7 +820,7 @@ Inkscape::XML::Node* SPFontFace::write(Inkscape::XML::Document *xml_doc, Inkscap COPY_ATTR(repr, object->getRepr(), "overline-thickness"); } - CObject::write(xml_doc, repr, flags); + SPObject::write(xml_doc, repr, flags); return repr; } |