projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning from g++ 4.3.
[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
1dd1171
..
8bdfc3d
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/instance.cpp
@@
-40,6
+40,8
@@
#include <synfig/valuenode_reference.h>
#include <map>
#include <synfig/valuenode_reference.h>
#include <map>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-80,7
+82,7
@@
synfigapp::find_instance(etl::handle<synfig::Canvas> canvas)
/* === M E T H O D S ======================================================= */
/* === 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)
{
CVSInfo(canvas->get_file_name()),
canvas_(canvas)
{
@@
-92,7
+94,7
@@
Instance::Instance(Canvas::Handle canvas):
} // END of synfigapp::Instance::Instance()
handle<Instance>
} // 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));
{
// Construct a new instance
handle<Instance> instance(new Instance(canvas));
@@
-120,7
+122,7
@@
Instance::~Instance()
} // END of studio::Instance::~Instance()
handle<CanvasInterface>
} // 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;
{
if(!canvas)
return 0;
@@
-149,7
+151,7
@@
Instance::save()const
}
bool
}
bool
-Instance::save_as(const s
td::s
tring &file_name)
+Instance::save_as(const s
ynfig::S
tring &file_name)
{
bool ret;
{
bool ret;