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-string.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-string.cpp')
| -rw-r--r-- | src/sp-string.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/sp-string.cpp b/src/sp-string.cpp index a5df0c726..67f86033e 100644 --- a/src/sp-string.cpp +++ b/src/sp-string.cpp @@ -46,10 +46,7 @@ namespace { # SPSTRING #####################################################*/ -SPString::SPString() : SPObject(), CObject(this) { - delete this->cobject; - this->cobject = this; - +SPString::SPString() : SPObject() { new (&this->string) Glib::ustring(); } @@ -60,7 +57,7 @@ void SPString::build(SPDocument *doc, Inkscape::XML::Node *repr) { SPString* object = this; object->read_content(); - CObject::build(doc, repr); + SPObject::build(doc, repr); } void SPString::release() { @@ -69,7 +66,7 @@ void SPString::release() { string->string.~ustring(); - CObject::release(); + SPObject::release(); } @@ -117,7 +114,7 @@ void SPString::read_content() { } void SPString::update(SPCtx *ctx, unsigned flags) { -// CObject::onUpdate(ctx, flags); +// SPObject::onUpdate(ctx, flags); if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) { /* Parent style or we ourselves changed, so recalculate */ |