X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.h;h=bf5f053aa7bbb7534e7929b6ea6ffbf5dd8950b7;hb=99e2b11a81d17de6155de18e0c91ae5efe08613f;hp=be093fe41dcac190589bdfadd6d8ee1727fcaf8f;hpb=6c6dde907eadafe73e401781fd2ffb6c6223ec85;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h
index be093fe..bf5f053 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.h
+++ b/synfig-core/trunk/src/synfig/loadcanvas.h
@@ -74,6 +74,7 @@ private:
 	String path;
 
 	String errors_text;
+	String warnings_text;
 
 	GUID guid_;
 
@@ -116,12 +117,14 @@ public:
 	const synfig::String& get_path()const { return path; }
 
 	const synfig::String& get_errors_text()const { return errors_text; }
+	const synfig::String& get_warnings_text()const { return warnings_text; }
+
+	static void register_canvas_in_map(Canvas::Handle canvas, String as);
 
 	//! \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);
+	static std::set<String> loading_;
 
 private:
 
@@ -171,11 +174,8 @@ private:
 
 //!	Loads a canvas from \a filename
 /*!	\return	The Canvas's handle on success, an empty handle on failure */
-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);
+extern Canvas::Handle open_canvas(const String &filename,String &errors,String &warnings);
+extern Canvas::Handle open_canvas_as(const String &filename,const String &as,String &errors,String &warnings);
 
 std::map<synfig::String, etl::loose_handle<Canvas> >& get_open_canvas_map();