diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-04-26 09:44:42 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <mc@M0nst3r.bouyguesbox.fr> | 2015-04-26 09:44:42 +0000 |
| commit | 1c6d7546699e45643c2ab8e1d41d7b6f4fc52365 (patch) | |
| tree | a56b6da9bb0f660d5986919ac8d75dc04113cd69 /src/sp-object.cpp | |
| parent | more cast cleanup (diff) | |
| parent | Rename libgc/ => inkgc/ to reflect difference from Boehm GC (diff) | |
| download | inkscape-1c6d7546699e45643c2ab8e1d41d7b6f4fc52365.tar.gz inkscape-1c6d7546699e45643c2ab8e1d41d7b6f4fc52365.zip | |
merge
(bzr r13922.1.12)
Diffstat (limited to 'src/sp-object.cpp')
| -rw-r--r-- | src/sp-object.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 4b4b05963..d4b8a15c0 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -61,14 +61,6 @@ using std::strstr; # define debug(f, a...) /* */ #endif -namespace { - SPObject* createObject() { - return new SPObject(); - } - - bool gridRegistered = SPFactory::instance().registerObject("inkscape:grid", createObject); -} - guint update_in_progress = 0; // guard against update-during-update Inkscape::XML::NodeEventVector object_event_vector = { @@ -629,7 +621,7 @@ void SPObject::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) const std::string type_string = NodeTraits::get_type_string(*child); - SPObject* ochild = SPFactory::instance().createObject(type_string); + SPObject* ochild = SPFactory::createObject(type_string); if (ochild == NULL) { // Currenty, there are many node types that do not have // corresponding classes in the SPObject tree. @@ -688,7 +680,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) { for (Inkscape::XML::Node *rchild = repr->firstChild() ; rchild != NULL; rchild = rchild->next()) { const std::string typeString = NodeTraits::get_type_string(*rchild); - SPObject* child = SPFactory::instance().createObject(typeString); + SPObject* child = SPFactory::createObject(typeString); if (child == NULL) { // Currenty, there are many node types that do not have // corresponding classes in the SPObject tree. |