diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-05 20:45:01 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-05 20:45:01 +0000 |
| commit | 8073924aacdda310fb7492750f78d5389b3186af (patch) | |
| tree | c3262862b40047b8cde8d549263ba2f2f04277e3 /src/sp-tref.cpp | |
| parent | merged from trunk (r12265) (diff) | |
| download | inkscape-8073924aacdda310fb7492750f78d5389b3186af.tar.gz inkscape-8073924aacdda310fb7492750f78d5389b3186af.zip | |
Merged Item.
(bzr r11608.1.81)
Diffstat (limited to 'src/sp-tref.cpp')
| -rw-r--r-- | src/sp-tref.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 1929b6820..6c6490ad5 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -63,9 +63,7 @@ static void build_string_from_root(Inkscape::XML::Node *root, Glib::ustring *ret static void sp_tref_href_changed(SPObject *old_ref, SPObject *ref, SPTRef *tref); static void sp_tref_delete_self(SPObject *deleted, SPTRef *self); -SPTRef::SPTRef() : SPItem(), CItem(this) { - delete this->citem; - this->citem = this; +SPTRef::SPTRef() : SPItem() { this->cobject = this; this->stringChild = NULL; @@ -89,7 +87,7 @@ SPTRef::~SPTRef() { } void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) { - CItem::build(document, repr); + SPItem::build(document, repr); this->readAttr( "xlink:href" ); this->readAttr( "x" ); @@ -110,7 +108,7 @@ void SPTRef::release() { this->uriOriginalRef->detach(); - CItem::release(); + SPItem::release(); } void SPTRef::set(unsigned int key, const gchar* value) { @@ -147,14 +145,14 @@ void SPTRef::set(unsigned int key, const gchar* value) { this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } } else { // default - CItem::set(key, value); + SPItem::set(key, value); } } void SPTRef::update(SPCtx *ctx, guint flags) { debug("0x%p",this); - CItem::update(ctx, flags); + SPItem::update(ctx, flags); if (flags & SP_OBJECT_MODIFIED_FLAG) { flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; @@ -207,7 +205,7 @@ Inkscape::XML::Node* SPTRef::write(Inkscape::XML::Document *xml_doc, Inkscape::X g_free(uri_string); } - CItem::write(xml_doc, repr, flags); + SPItem::write(xml_doc, repr, flags); return repr; } @@ -246,7 +244,7 @@ gchar* SPTRef::description() { char *child_desc; if (SP_IS_ITEM(referred)) { - child_desc = SP_ITEM(referred)->description(); + child_desc = SP_ITEM(referred)->getDetailedDescription(); } else { child_desc = g_strdup(""); } |