diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-01 23:41:30 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-01 23:41:30 +0000 |
| commit | 69f3b6f1abb2bb422935d43262e1e99aab359954 (patch) | |
| tree | e1e2d2b0504d22e81b04501155995f5694a4cd7b /src/sp-string.cpp | |
| parent | Added experimental constructor to SPRect. Memory leaks because of non-virtual... (diff) | |
| download | inkscape-69f3b6f1abb2bb422935d43262e1e99aab359954.tar.gz inkscape-69f3b6f1abb2bb422935d43262e1e99aab359954.zip | |
Added constructors to SP classes.
(bzr r11608.1.67)
Diffstat (limited to 'src/sp-string.cpp')
| -rw-r--r-- | src/sp-string.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/sp-string.cpp b/src/sp-string.cpp index 1625729b1..332ccaf31 100644 --- a/src/sp-string.cpp +++ b/src/sp-string.cpp @@ -37,7 +37,7 @@ # SPSTRING #####################################################*/ -G_DEFINE_TYPE(SPString, sp_string, SP_TYPE_OBJECT); +G_DEFINE_TYPE(SPString, sp_string, G_TYPE_OBJECT); static void sp_string_class_init(SPStringClass *classname) @@ -51,9 +51,9 @@ CString::CString(SPString* str) : CObject(str) { CString::~CString() { } -static void -sp_string_init(SPString *string) -{ +SPString::SPString() : SPObject() { + SPString* string = this; + string->cstring = new CString(string); string->typeHierarchy.insert(typeid(SPString)); @@ -63,6 +63,12 @@ sp_string_init(SPString *string) new (&string->string) Glib::ustring(); } +static void +sp_string_init(SPString *string) +{ + new (string) SPString(); +} + void CString::build(SPDocument *doc, Inkscape::XML::Node *repr) { SPString* object = this->spstring; object->cstring->read_content(); |