summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-31 21:23:10 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-31 21:23:10 +0000
commit127543bae3c0a76770e197c7058a783dea18fe3e (patch)
treec264cd9128264c9755aa45432ee6410a3f0ae302 /src
parentMerged from trunk (r12441). (diff)
downloadinkscape-127543bae3c0a76770e197c7058a783dea18fe3e.tar.gz
inkscape-127543bae3c0a76770e197c7058a783dea18fe3e.zip
Removed placement news / explicit destructor calls.
(bzr r11608.1.113)
Diffstat (limited to 'src')
-rw-r--r--src/sp-flowregion.cpp4
-rw-r--r--src/sp-flowtext.cpp4
-rw-r--r--src/sp-gradient.cpp4
-rw-r--r--src/sp-item-group.cpp4
-rw-r--r--src/sp-item.cpp2
-rw-r--r--src/sp-namedview.cpp2
-rw-r--r--src/sp-pattern.cpp4
-rw-r--r--src/sp-string.cpp4
-rw-r--r--src/sp-text.cpp8
-rw-r--r--src/sp-tref.cpp12
-rw-r--r--src/sp-tspan.cpp8
-rw-r--r--src/sp-use.cpp12
12 files changed, 34 insertions, 34 deletions
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index fab4c1f23..3a0aef6be 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -42,7 +42,7 @@ static void GetDest(SPObject* child,Shape **computed);
SPFlowregion::SPFlowregion() : SPItem() {
- new (&this->computed) std::vector<Shape*>;
+ //new (&this->computed) std::vector<Shape*>;
}
SPFlowregion::~SPFlowregion() {
@@ -50,7 +50,7 @@ SPFlowregion::~SPFlowregion() {
delete *it;
}
- this->computed.~vector<Shape*>();
+ //this->computed.~vector<Shape*>();
}
void SPFlowregion::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 4ee0a64b1..c7ef579ac 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -45,11 +45,11 @@ namespace {
SPFlowtext::SPFlowtext() : SPItem() {
this->par_indent = 0;
- new (&this->layout) Inkscape::Text::Layout();
+ //new (&this->layout) Inkscape::Text::Layout();
}
SPFlowtext::~SPFlowtext() {
- this->layout.~Layout();
+ //this->layout.~Layout();
}
void SPFlowtext::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) {
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 2cdf2198f..adfff3609 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -170,7 +170,7 @@ SPGradient::SPGradient() : SPPaintServer(), units(),
this->vector.built = false;
this->vector.stops.clear();
- new (&this->modified_connection) sigc::connection();
+ //new (&this->modified_connection) sigc::connection();
}
SPGradient::~SPGradient() {
@@ -227,7 +227,7 @@ void SPGradient::release()
this->ref = NULL;
}
- this->modified_connection.~connection();
+ //this->modified_connection.~connection();
SPPaintServer::release();
}
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 7044f2f7f..36a42f704 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -67,11 +67,11 @@ namespace {
SPGroup::SPGroup() : SPLPEItem() {
this->_layer_mode = SPGroup::GROUP;
- new (&this->_display_modes) std::map<unsigned int, SPGroup::LayerMode>();
+ //new (&this->_display_modes) std::map<unsigned int, SPGroup::LayerMode>();
}
SPGroup::~SPGroup() {
- this->_display_modes.~map();
+ //this->_display_modes.~map();
}
void SPGroup::build(SPDocument *document, Inkscape::XML::Node *repr) {
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index f313ed7c1..9e44bda38 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -418,7 +418,7 @@ void SPItem::release() {
item->display = sp_item_view_list_remove(item->display, item->display);
}
- item->_transformed_signal.~signal();
+ //item->_transformed_signal.~signal();
}
void SPItem::set(unsigned int key, gchar const* value) {
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index e05ce7fd2..452c640b3 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -286,7 +286,7 @@ void SPNamedView::release() {
SPObjectGroup::release();
- namedview->snap_manager.~SnapManager();
+ //namedview->snap_manager.~SnapManager();
}
void SPNamedView::set(unsigned int key, const gchar* value) {
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 34063cb16..1aec904ae 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -75,7 +75,7 @@ SPPattern::SPPattern() : SPPaintServer() {
this->viewBox_set = FALSE;
- new (&this->modified_connection) sigc::connection();
+ //new (&this->modified_connection) sigc::connection();
}
SPPattern::~SPPattern() {
@@ -111,7 +111,7 @@ void SPPattern::release() {
this->ref = NULL;
}
- this->modified_connection.~connection();
+ //this->modified_connection.~connection();
SPPaintServer::release();
}
diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index 690903ce8..a826d182d 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -47,7 +47,7 @@ namespace {
#####################################################*/
SPString::SPString() : SPObject() {
- new (&this->string) Glib::ustring();
+ //new (&this->string) Glib::ustring();
}
SPString::~SPString() {
@@ -64,7 +64,7 @@ void SPString::release() {
SPString* object = this;
SPString *string = SP_STRING(object);
- string->string.~ustring();
+ //string->string.~ustring();
SPObject::release();
}
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 89d1f6510..3771238e0 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -72,8 +72,8 @@ namespace {
# SPTEXT
#####################################################*/
SPText::SPText() : SPItem() {
- new (&this->layout) Inkscape::Text::Layout;
- new (&this->attributes) TextTagAttributes;
+ //new (&this->layout) Inkscape::Text::Layout;
+ //new (&this->attributes) TextTagAttributes;
}
SPText::~SPText() {
@@ -92,8 +92,8 @@ void SPText::build(SPDocument *doc, Inkscape::XML::Node *repr) {
}
void SPText::release() {
- this->attributes.~TextTagAttributes();
- this->layout.~Layout();
+ //this->attributes.~TextTagAttributes();
+ //this->layout.~Layout();
SPItem::release();
}
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();
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 41afb1761..00cdf5722 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -63,7 +63,7 @@ namespace {
#####################################################*/
SPTSpan::SPTSpan() : SPItem() {
this->role = SP_TSPAN_ROLE_UNSPECIFIED;
- new (&this->attributes) TextTagAttributes;
+ //new (&this->attributes) TextTagAttributes;
}
SPTSpan::~SPTSpan() {
@@ -81,7 +81,7 @@ void SPTSpan::build(SPDocument *doc, Inkscape::XML::Node *repr) {
}
void SPTSpan::release() {
- this->attributes.~TextTagAttributes();
+ //this->attributes.~TextTagAttributes();
SPItem::release();
}
@@ -227,7 +227,7 @@ gchar* SPTSpan::description() {
void refresh_textpath_source(SPTextPath* offset);
SPTextPath::SPTextPath() : SPItem() {
- new (&this->attributes) TextTagAttributes;
+ //new (&this->attributes) TextTagAttributes;
this->startOffset._set = false;
this->originalPath = NULL;
@@ -271,7 +271,7 @@ void SPTextPath::build(SPDocument *doc, Inkscape::XML::Node *repr) {
}
void SPTextPath::release() {
- this->attributes.~TextTagAttributes();
+ //this->attributes.~TextTagAttributes();
if (this->originalPath) {
delete this->originalPath;
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index d923410c8..3822527a3 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -60,10 +60,10 @@ SPUse::SPUse() : SPItem() {
this->height.unset(SVGLength::PERCENT, 1.0, 1.0);
this->href = NULL;
- new (&this->_delete_connection) sigc::connection();
- new (&this->_changed_connection) sigc::connection();
+ //new (&this->_delete_connection) sigc::connection();
+ //new (&this->_changed_connection) sigc::connection();
- new (&this->_transformed_connection) sigc::connection();
+ //new (&this->_transformed_connection) sigc::connection();
this->ref = new SPUseReference(this);
@@ -80,10 +80,10 @@ SPUse::~SPUse() {
delete this->ref;
this->ref = 0;
- this->_delete_connection.~connection();
- this->_changed_connection.~connection();
+ //this->_delete_connection.~connection();
+ //this->_changed_connection.~connection();
- this->_transformed_connection.~connection();
+ //this->_transformed_connection.~connection();
}
void SPUse::build(SPDocument *document, Inkscape::XML::Node *repr) {