X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.h;h=dc665c2036e76a3fbd458344c45ea4b2cc616bad;hb=6efbfa12668470ae552d366baf539f5be142a002;hp=3c9ce1030e9f023dba1cbebcc0cadcbeb038c068;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h
index 3c9ce10..dc665c2 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.h
+++ b/synfig-core/trunk/src/synfig/loadcanvas.h
@@ -73,6 +73,9 @@ private:
 
 	String path;
 
+	String errors_text;
+	String warnings_text;
+
 	GUID guid_;
 
 	/*
@@ -113,13 +116,19 @@ public:
 
 	const synfig::String& get_path()const { return path; }
 
-	//! \todo writeme
-	Canvas::Handle parse_from_file(const String &filename);
+	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);
 
-	Canvas::Handle parse_from_file_as(const String &filename,const String &as);
+#ifdef _DEBUG
+	static void show_canvas_map(String file, int line, String text);
+#endif	// _DEBUG
 
 	//! \todo writeme
-	Canvas::Handle parse_from_string(const String &data);
+	Canvas::Handle parse_from_file_as(const String &filename,const String &as,String &errors);
+
+	static std::set<String> loading_;
 
 private:
 
@@ -169,11 +178,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);
-extern Canvas::Handle open_canvas_as(const String &filename,const String &as);
-
-//! 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();