Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / canvasinterface.h

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.h b/synfig-studio/trunk/src/synfigapp/canvasinterface.h
index 878f562..5bb3ec0 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.h
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.h
@@ -211,13 +211,13 @@ public:
        etl::loose_handle<Instance> get_instance()const { return instance_; }
 
        //! Changes the name of the canvas. Undoable.
-       bool set_name(const synfig::String &x);
+       void set_name(const synfig::String &x);
 
        //! Changes the description of the canvas. Undoable.
-       bool set_description(const synfig::String &x);
+       void set_description(const synfig::String &x);
 
        //! Changes the ID of the canvas. Undoable.
-       bool set_id(const synfig::String &x);
+       void set_id(const synfig::String &x);
 
        //! Convenience function to retrieve the name of the canvas
        synfig::String get_name()const { return get_canvas()->get_name(); }
@@ -256,7 +256,7 @@ public:
        Mode get_mode()const;
 
        //! Creates a new layer, of type \c id at the top of the layer stack
-       synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
+       // synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
 
        synfig::Layer::Handle add_layer_to(synfig::String id,synfig::Canvas::Handle canvas, int depth=0);
 
@@ -271,7 +271,7 @@ public:
 
        void set_rend_desc(const synfig::RendDesc &rend_desc);
 
-       bool import(const synfig::String &filename, bool copy=false);
+       bool import(const synfig::String &filename, synfig::String &errors, synfig::String &warnings, bool resize_image=false);
 
 
        void waypoint_duplicate(synfigapp::ValueDesc value_desc,synfig::Waypoint waypoint);