summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-07-28 19:34:56 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-07-28 19:34:56 +0000
commit653be18705548ae8ab5a0358ecf77feca1b22e54 (patch)
tree9703f02e780a36093c55711ace8fc7e8e311f827 /src
parentFix placement news and calls to destructor. Fixes crash regressions #1348891,... (diff)
downloadinkscape-653be18705548ae8ab5a0358ecf77feca1b22e54.tar.gz
inkscape-653be18705548ae8ab5a0358ecf77feca1b22e54.zip
noop: remove commented-out code that is dangerous and should not come back
(bzr r13475)
Diffstat (limited to 'src')
-rw-r--r--src/sp-flowregion.cpp3
-rw-r--r--src/sp-gradient.cpp2
-rw-r--r--src/sp-item-group.cpp2
-rw-r--r--src/sp-item.cpp4
-rw-r--r--src/sp-string.cpp1
-rw-r--r--src/sp-text.cpp5
-rw-r--r--src/sp-tref.cpp7
-rw-r--r--src/sp-tspan.cpp2
8 files changed, 0 insertions, 26 deletions
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index e8e5c3d95..32d3b0f60 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -42,15 +42,12 @@ static void GetDest(SPObject* child,Shape **computed);
SPFlowregion::SPFlowregion() : SPItem() {
- //new (&this->computed) std::vector<Shape*>;
}
SPFlowregion::~SPFlowregion() {
for (std::vector<Shape*>::iterator it = this->computed.begin() ; it != this->computed.end() ; ++it) {
delete *it;
}
-
- //this->computed.~vector<Shape*>();
}
void SPFlowregion::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 1479acd69..70c54451a 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -262,8 +262,6 @@ SPGradient::SPGradient() : SPPaintServer(), units(),
this->vector.built = false;
this->vector.stops.clear();
-
- //new (&this->modified_connection) sigc::connection();
}
SPGradient::~SPGradient() {
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 7af4e3320..657aca692 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -70,11 +70,9 @@ namespace {
SPGroup::SPGroup() : SPLPEItem() {
this->_layer_mode = SPGroup::GROUP;
- //new (&this->_display_modes) std::map<unsigned int, SPGroup::LayerMode>();
}
SPGroup::~SPGroup() {
- //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 0cdff6546..a3f1a5d64 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -118,10 +118,6 @@ SPItem::SPItem() : SPObject() {
mask_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(mask_ref_changed), this));
avoidRef = new SPAvoidRef(this);
-
- //new (&constraints) std::vector<SPGuideConstraint>();
-
- //new (&_transformed_signal) sigc::signal<void, Geom::Affine const *, SPItem *>();
}
SPItem::~SPItem() {
diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index 08755a5fc..e9dfc168b 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -47,7 +47,6 @@ namespace {
#####################################################*/
SPString::SPString() : SPObject() {
- //new (&this->string) Glib::ustring();
}
SPString::~SPString() {
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 9a7f0b7a0..ccc5adf59 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -70,8 +70,6 @@ namespace {
# SPTEXT
#####################################################*/
SPText::SPText() : SPItem() {
- //new (&this->layout) Inkscape::Text::Layout;
- //new (&this->attributes) TextTagAttributes;
}
SPText::~SPText() {
@@ -90,9 +88,6 @@ void SPText::build(SPDocument *doc, Inkscape::XML::Node *repr) {
}
void SPText::release() {
- //this->attributes.~TextTagAttributes();
- //this->layout.~Layout();
-
SPItem::release();
}
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index edbb9faa7..0f6eb106f 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -64,12 +64,8 @@ static void sp_tref_delete_self(SPObject *deleted, SPTRef *self);
SPTRef::SPTRef() : SPItem() {
this->stringChild = NULL;
- //new (&this->attributes) TextTagAttributes;
-
this->href = NULL;
this->uriOriginalRef = new SPTRefReference(this);
- //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));
@@ -77,9 +73,6 @@ SPTRef::SPTRef() : SPItem() {
SPTRef::~SPTRef() {
delete this->uriOriginalRef;
-
- //this->_delete_connection.~connection();
- //this->_changed_connection.~connection();
}
void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) {
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 8c4105777..58a4da75c 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -227,8 +227,6 @@ const char* SPTSpan::displayName() const {
void refresh_textpath_source(SPTextPath* offset);
SPTextPath::SPTextPath() : SPItem() {
- //new (&this->attributes) TextTagAttributes;
-
this->startOffset._set = false;
this->originalPath = NULL;
this->isUpdating=false;