Added copyright lines for files I've edited this year.

[synfig.git] / synfig-studio / trunk / src / synfigapp / instance.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp
index c4a9397..cb2f681 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/synfig-studio/trunk/src/synfigapp/instance.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -39,6 +40,8 @@
 #include <synfig/valuenode_reference.h>
 #include <map>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -79,7 +82,7 @@ synfigapp::find_instance(etl::handle<synfig::Canvas> canvas)
 
 /* === M E T H O D S ======================================================= */
 
-Instance::Instance(Canvas::Handle canvas):
+Instance::Instance(etl::handle<synfig::Canvas> canvas):
        CVSInfo(canvas->get_file_name()),
        canvas_(canvas)
 {
@@ -91,7 +94,7 @@ Instance::Instance(Canvas::Handle canvas):
 } // END of synfigapp::Instance::Instance()
 
 handle<Instance>
-Instance::create(Canvas::Handle canvas)
+Instance::create(etl::handle<synfig::Canvas> canvas)
 {
        // Construct a new instance
        handle<Instance> instance(new Instance(canvas));
@@ -115,11 +118,13 @@ Instance::set_file_name(const synfig::String &name)
 Instance::~Instance()
 {
        instance_map_.erase(canvas_);
-       synfig::info("studio::Instance::~Instance(): Deleted");
-} // END of studio::Instance::~Instance()
+
+       if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+               synfig::info("Instance::~Instance(): Deleted");
+}
 
 handle<CanvasInterface>
-Instance::find_canvas_interface(handle<Canvas> canvas)
+Instance::find_canvas_interface(synfig::Canvas::Handle canvas)
 {
        if(!canvas)
                return 0;
@@ -148,19 +153,7 @@ Instance::save()const
 }
 
 bool
-Instance::save_as(const std::string &file_name)const
-{
-       bool ret=save_canvas(file_name,canvas_);
-       if(ret)
-       {
-               reset_action_count();
-               const_cast<sigc::signal<void>& >(signal_saved_)();
-       }
-       return ret;
-}
-
-bool
-Instance::save_as(const std::string &file_name)
+Instance::save_as(const synfig::String &file_name)
 {
        bool ret;
 
@@ -176,9 +169,7 @@ Instance::save_as(const std::string &file_name)
                signal_saved_();
        }
        else
-       {
                set_file_name(old_file_name);
-       }
 
        signal_filename_changed_();