X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Finstance.cpp;h=8bdfc3d9ef31a8d13bd14058dbbcfa2b2a362cef;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=fd62d7583f5f6e7bdb87028ad9d89deeb7400ebc;hpb=def9948f0466c7507dfc98192caea35e5a0c7e42;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp
index fd62d75..8bdfc3d 100644
--- 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 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));
@@ -119,7 +122,7 @@ Instance::~Instance()
 } // END of studio::Instance::~Instance()
 
 handle<CanvasInterface>
-Instance::find_canvas_interface(handle<Canvas> canvas)
+Instance::find_canvas_interface(synfig::Canvas::Handle canvas)
 {
 	if(!canvas)
 		return 0;
@@ -148,7 +151,7 @@ Instance::save()const
 }
 
 bool
-Instance::save_as(const std::string &file_name)
+Instance::save_as(const synfig::String &file_name)
 {
 	bool ret;