diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-31 21:23:10 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-31 21:23:10 +0000 |
| commit | 127543bae3c0a76770e197c7058a783dea18fe3e (patch) | |
| tree | c264cd9128264c9755aa45432ee6410a3f0ae302 /src/sp-tref.cpp | |
| parent | Merged from trunk (r12441). (diff) | |
| download | inkscape-127543bae3c0a76770e197c7058a783dea18fe3e.tar.gz inkscape-127543bae3c0a76770e197c7058a783dea18fe3e.zip | |
Removed placement news / explicit destructor calls.
(bzr r11608.1.113)
Diffstat (limited to 'src/sp-tref.cpp')
| -rw-r--r-- | src/sp-tref.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 87e8498f3..97c446c33 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -64,12 +64,12 @@ static void sp_tref_delete_self(SPObject *deleted, SPTRef *self); SPTRef::SPTRef() : SPItem() { this->stringChild = NULL; - new (&this->attributes) TextTagAttributes; + //new (&this->attributes) TextTagAttributes; this->href = NULL; this->uriOriginalRef = new SPTRefReference(this); - new (&this->_delete_connection) sigc::connection(); - new (&this->_changed_connection) sigc::connection(); + //new (&this->_delete_connection) sigc::connection(); + //new (&this->_changed_connection) sigc::connection(); this->_changed_connection = this->uriOriginalRef->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_tref_href_changed), this)); @@ -78,8 +78,8 @@ SPTRef::SPTRef() : SPItem() { SPTRef::~SPTRef() { delete this->uriOriginalRef; - this->_delete_connection.~connection(); - this->_changed_connection.~connection(); + //this->_delete_connection.~connection(); + //this->_changed_connection.~connection(); } void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) { @@ -94,7 +94,7 @@ void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) { } void SPTRef::release() { - this->attributes.~TextTagAttributes(); + //this->attributes.~TextTagAttributes(); this->_delete_connection.disconnect(); this->_changed_connection.disconnect(); |
