Revision: 2133
http://synfig.svn.sourceforge.net/synfig/?rev=2133&view=rev
Author: dooglus
Date: 2008-10-26 20:01:28 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Removed a couple of functions that are never used.
Modified Paths:
--------------
synfig-core/trunk/src/synfig/loadcanvas.cpp
synfig-core/trunk/src/synfig/loadcanvas.h
Modified: synfig-core/trunk/src/synfig/loadcanvas.cpp
===================================================================
--- synfig-core/trunk/src/synfig/loadcanvas.cpp 2008-10-26 20:01:02 UTC (rev
2132)
+++ synfig-core/trunk/src/synfig/loadcanvas.cpp 2008-10-26 20:01:28 UTC (rev
2133)
@@ -144,21 +144,6 @@
return canvas;
}
-Canvas::Handle
-synfig::string_to_canvas(const String &data)
-{
- CanvasParser parser;
-
- parser.set_allow_errors(true);
-
- Canvas::Handle canvas=parser.parse_from_string(data);
-
- if(parser.error_count())
- return Canvas::Handle();
-
- return canvas;
-}
-
/* === M E T H O D S ======================================================= */
void
@@ -2116,8 +2101,6 @@
canvas->signal_deleted().connect(sigc::bind(sigc::ptr_fun(_remove_from_open_canvas_map),canvas.get()));
canvas->signal_file_name_changed().connect(sigc::bind(sigc::ptr_fun(_canvas_file_name_changed),canvas.get()));
-
-
const ValueNodeList&
value_node_list(canvas->value_node_list());
again:
@@ -2155,55 +2138,3 @@
}
return Canvas::Handle();
}
-
-Canvas::Handle
-CanvasParser::parse_from_string(const String &data)
-{
- try
- {
- ChangeLocale change_locale(LC_NUMERIC, "C");
- filename=_("<INTERNAL>");
- total_warnings_=0;
- xmlpp::DomParser parser;
- parser.parse_memory(data);
- xmlpp::Element *root=parser.get_document()->get_root_node();
- if(parser)
- {
- Canvas::Handle canvas(parse_canvas(root));
-
canvas->signal_deleted().connect(sigc::bind(sigc::ptr_fun(_remove_from_open_canvas_map),canvas.get()));
-
canvas->signal_file_name_changed().connect(sigc::bind(sigc::ptr_fun(_canvas_file_name_changed),canvas.get()));
-
- const ValueNodeList&
value_node_list(canvas->value_node_list());
- again:
- ValueNodeList::const_iterator iter;
-
for(iter=value_node_list.begin();iter!=value_node_list.end();++iter)
- {
- ValueNode::Handle value_node(*iter);
- if(value_node->is_exported() &&
value_node->get_id().find("Unnamed")==0)
- {
- canvas->remove_value_node(value_node);
- goto again;
- }
- }
-
- return canvas;
- }
- }
- catch(Exception::BadLinkName) { synfig::error("BadLinkName Thrown"); }
- catch(Exception::BadType) { synfig::error("BadType Thrown"); }
- catch(Exception::FileNotFound) { synfig::error("FileNotFound Thrown"); }
- catch(Exception::IDNotFound) { synfig::error("IDNotFound Thrown"); }
- catch(Exception::IDAlreadyExists) { synfig::error("IDAlreadyExists
Thrown"); }
- catch(const std::exception& ex)
- {
- synfig::error("Standard Exception: "+String(ex.what()));
- return Canvas::Handle();
- }
- catch(const String& str)
- {
- cerr<<str<<endl;
- // synfig::error(str);
- return Canvas::Handle();
- }
- return Canvas::Handle();
-}
Modified: synfig-core/trunk/src/synfig/loadcanvas.h
===================================================================
--- synfig-core/trunk/src/synfig/loadcanvas.h 2008-10-26 20:01:02 UTC (rev
2132)
+++ synfig-core/trunk/src/synfig/loadcanvas.h 2008-10-26 20:01:28 UTC (rev
2133)
@@ -120,9 +120,6 @@
//! \todo writeme
Canvas::Handle parse_from_file_as(const String &filename,const String
&as,String &errors);
- //! \todo writeme
- Canvas::Handle parse_from_string(const String &data);
-
private:
// Error/Warning handling functions
@@ -174,9 +171,6 @@
extern Canvas::Handle open_canvas(const String &filename,String &errors);
extern Canvas::Handle open_canvas_as(const String &filename,const String
&as,String &errors);
-//! Retrieves a Canvas from a string in XML format
-extern Canvas::Handle string_to_canvas(const String &data);
-
std::map<synfig::String, etl::loose_handle<Canvas> >& get_open_canvas_map();
}; // END of namespace synfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
