When loading .sif files, show any warnings in the GUI. When loading .sif files with...

[synfig.git] / synfig-core / trunk / src / synfig / loadcanvas.h

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h
index 9c53d12..c527f03 100644 (file)
--- 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,10 +117,13 @@ 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; }
 
        //! \todo writeme
        Canvas::Handle parse_from_file_as(const String &filename,const String &as,String &errors);
 
+       static std::set<String> loading_;
+
 private:
 
        // Error/Warning handling functions
@@ -168,8 +172,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);
+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();