projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix most of the warnings from doxygen for synfig-studio sources.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
canvasinterface.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index
0de2d97
..
87971c0
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@
-79,7
+79,7
@@
using namespace synfigapp;
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-CanvasInterface::CanvasInterface(
loose_handle<Instance> instance,handle<
Canvas> canvas):
+CanvasInterface::CanvasInterface(
etl::loose_handle<Instance> instance,etl::handle<synfig::
Canvas> canvas):
instance_(instance),
canvas_(canvas),
cur_time_(canvas->rend_desc().get_frame_start()),
instance_(instance),
canvas_(canvas),
cur_time_(canvas->rend_desc().get_frame_start()),
@@
-134,7
+134,7
@@
CanvasInterface::refresh_current_values()
}
etl::handle<CanvasInterface>
}
etl::handle<CanvasInterface>
-CanvasInterface::create(
loose_handle<Instance> instance,handle<
Canvas> canvas)
+CanvasInterface::create(
etl::loose_handle<Instance> instance, etl::handle<synfig::
Canvas> canvas)
{
etl::handle<CanvasInterface> intrfc;
intrfc=new CanvasInterface(instance,canvas);
{
etl::handle<CanvasInterface> intrfc;
intrfc=new CanvasInterface(instance,canvas);
@@
-176,7
+176,7
@@
CanvasInterface::get_mode()const
Layer::Handle
Layer::Handle
-CanvasInterface::add_layer_to(
String name,
Canvas::Handle canvas, int depth)
+CanvasInterface::add_layer_to(
synfig::String name, synfig::
Canvas::Handle canvas, int depth)
{
synfigapp::Action::PassiveGrouper group(get_instance().get(),_("Add Layer To"));
{
synfigapp::Action::PassiveGrouper group(get_instance().get(),_("Add Layer To"));
@@
-284,7
+284,7
@@
CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
bool
bool
-CanvasInterface::convert(ValueDesc value_desc, String type)
+CanvasInterface::convert(ValueDesc value_desc,
synfig::
String type)
{
Action::Handle action(Action::ValueDescConvert::create());
{
Action::Handle action(Action::ValueDescConvert::create());
@@
-420,7
+420,7
@@
CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc)
}
bool
}
bool
-CanvasInterface::set_name(const String &x)
+CanvasInterface::set_name(const
synfig::
String &x)
{
//! \todo This needs to be converted into an action
get_canvas()->set_name(x);
{
//! \todo This needs to be converted into an action
get_canvas()->set_name(x);
@@
-429,7
+429,7
@@
CanvasInterface::set_name(const String &x)
}
bool
}
bool
-CanvasInterface::set_description(const String &x)
+CanvasInterface::set_description(const
synfig::
String &x)
{
//! \todo This needs to be converted into an action
get_canvas()->set_description(x);
{
//! \todo This needs to be converted into an action
get_canvas()->set_description(x);
@@
-437,7
+437,7
@@
CanvasInterface::set_description(const String &x)
}
bool
}
bool
-CanvasInterface::set_id(const String &x)
+CanvasInterface::set_id(const
synfig::
String &x)
{
//! \todo This needs to be converted into an action
get_canvas()->set_id(x);
{
//! \todo This needs to be converted into an action
get_canvas()->set_id(x);
@@
-481,7
+481,7
@@
CanvasInterface::import(const synfig::String &filename, bool /*copy*/)
if (filename_extension(filename) == "")
{
if (filename_extension(filename) == "")
{
- get_ui_interface()->error(
"Filename must have an extension!"
);
+ get_ui_interface()->error(
_("Filename must have an extension!")
);
return false;
}
return false;
}
@@
-625,7
+625,7
@@
CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin
void
void
-CanvasInterface::auto_export(ValueNode::Handle /*value_node*/)
+CanvasInterface::auto_export(
synfig::
ValueNode::Handle /*value_node*/)
{
/*
// Check to see if we are already exported.
{
/*
// Check to see if we are already exported.