Fix most of the warnings from doxygen for synfig-studio sources.

git-svn-id: http://svn.voria.com/code@1205 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/doxygen.cfg.in b/synfig-studio/trunk/doxygen.cfg.in
index 9c4e01a..11cc015 100644 (file)
--- a/synfig-studio/trunk/doxygen.cfg.in
+++ b/synfig-studio/trunk/doxygen.cfg.in
@@ -478,7 +478,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = src/template.cpp src/template.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index aa161fd..eeb3ed3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -2149,7 +2149,7 @@ App::set_selected_canvas_view(etl::loose_handle<CanvasView> canvas_view)
 }
 
 etl::loose_handle<Instance>
-App::get_instance(Canvas::Handle canvas)
+App::get_instance(etl::handle<synfig::Canvas> canvas)
 {
        if(!canvas) return 0;
        canvas=canvas->get_root();

diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
index 2420133..70d5dd9 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
+++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp
@@ -853,7 +853,7 @@ studio::AudioContainer::~AudioContainer()
        if(imp) delete (imp);
 }
 
-bool studio::AudioContainer::load(const string &filename,const string &filedirectory)
+bool studio::AudioContainer::load(const std::string &filename,const std::string &filedirectory)
 {
        if(!imp)
        {
@@ -1189,9 +1189,9 @@ void studio::AudioContainer::AudioImp::clear()
 }
 
 #ifdef WITH_FMOD
-void AudioContainer::AudioImp::start_scrubbing(double t)
+void studio::AudioContainer::AudioImp::start_scrubbing(double t)
 #else
-void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
+void studio::AudioContainer::AudioImp::start_scrubbing(double /*t*/)
 #endif
 {
        //synfig::info("Start scrubbing: %lf", t);
@@ -1243,7 +1243,7 @@ void AudioContainer::AudioImp::start_scrubbing(double /*t*/)
        #endif
 }
 
-void AudioContainer::AudioImp::stop_scrubbing()
+void studio::AudioContainer::AudioImp::stop_scrubbing()
 {
        //synfig::info("Stop scrubbing");
 
@@ -1265,9 +1265,9 @@ void AudioContainer::AudioImp::stop_scrubbing()
 }
 
 #ifdef WITH_FMOD
-void AudioContainer::AudioImp::scrub(double t)
+void studio::AudioContainer::AudioImp::scrub(double t)
 #else
-void AudioContainer::AudioImp::scrub(double /*t*/)
+void studio::AudioContainer::AudioImp::scrub(double /*t*/)
 #endif
 {
        #ifdef WITH_FMOD

diff --git a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
index 79cfbd2..e880f87 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp
@@ -57,7 +57,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-CanvasOptions::CanvasOptions(loose_handle<studio::CanvasView> canvas_view):
+CanvasOptions::CanvasOptions(etl::loose_handle<CanvasView> canvas_view):
        Gtk::Dialog(_("Canvas Options"),*canvas_view,false,true),
        canvas_view_(canvas_view),
        toggle_grid_snap(_("_Snap to grid"), true),

diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
index 63e5dae..73c9425 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp
@@ -59,7 +59,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-CanvasProperties::CanvasProperties(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+CanvasProperties::CanvasProperties(Gtk::Window& parent,etl::handle<synfigapp::CanvasInterface> canvas_interface):
        Gtk::Dialog(_("Canvas Properties"),parent,false,true),
        canvas_interface_(canvas_interface)
 {

diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
index 32d63a2..86d4277 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
@@ -329,7 +329,7 @@ CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gt
 }
 
 bool
-CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_first_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
 {
        iter=children().begin();
        while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node])
@@ -353,7 +353,7 @@ CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk:
 }
 
 bool
-CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_next_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter)
 {
        if(!iter) return find_first_value_node(value_node,iter);
 

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index ecd8088..89ce488 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1990,7 +1990,7 @@ CanvasView::close_instance()
 }
 
 handle<CanvasView>
-CanvasView::create(loose_handle<Instance> instance,handle<Canvas> canvas)
+CanvasView::create(etl::loose_handle<Instance> instance, etl::handle<synfig::Canvas> canvas)
 {
        etl::handle<studio::CanvasView> view(new CanvasView(instance,instance->synfigapp::Instance::find_canvas_interface(canvas)));
        instance->canvas_view_list().push_front(view);
@@ -2536,7 +2536,7 @@ CanvasView::on_keyframe_button_pressed()
 }
 
 bool
-CanvasView::duck_change_param(const Point &value,synfig::Layer::Handle layer, synfig::String param_name)
+CanvasView::duck_change_param(const synfig::Point &value,synfig::Layer::Handle layer, synfig::String param_name)
 {
        return canvas_interface()->change_value(synfigapp::ValueDesc(layer,param_name),value);
 }
@@ -2569,7 +2569,7 @@ CanvasView::on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp:
 }
 
 void
-CanvasView::selected_layer_color_set(Color color)
+CanvasView::selected_layer_color_set(synfig::Color color)
 {
        synfigapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers());
        synfigapp::SelectionManager::LayerList::iterator iter;
@@ -2588,7 +2588,7 @@ CanvasView::selected_layer_color_set(Color color)
 }
 
 void
-CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
+CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig::Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
 {
        int transforms(0);
        String layer_name;
@@ -3421,7 +3421,7 @@ CanvasView::on_audio_file_change(const std::string &f)
 }
 
 void
-CanvasView::on_audio_offset_change(const Time &t)
+CanvasView::on_audio_offset_change(const synfig::Time &t)
 {
        canvas_interface()->set_meta_data("audiooffset",t.get_string());
 }

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
index 847a349..c1e6c87 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@ -878,6 +878,10 @@ CellRenderer_TimeTrack::activate_vfunc(
 
 
 
+// The following three functions don't get documented correctly by
+// doxygen 1.5.[23] because of a bug with any function whose name
+// begins with 'property'.  Fixed in doxygen 1.5.4 apparently.  See
+// http://bugzilla.gnome.org/show_bug.cgi?id=471185 .
 Glib::PropertyProxy<synfigapp::ValueDesc>
 CellRenderer_TimeTrack::property_value_desc()
 {

diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
index fecae7b..7814161 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
@@ -185,7 +185,7 @@ ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/)
 }
 
 void
-ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
+ChildrenTreeStore::on_canvas_added(synfig::Canvas::Handle canvas)
 {
        Gtk::TreeRow row = *(prepend(canvas_row.children()));
 
@@ -208,13 +208,13 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
 }
 
 void
-ChildrenTreeStore::on_canvas_removed(Canvas::Handle /*canvas*/)
+ChildrenTreeStore::on_canvas_removed(synfig::Canvas::Handle /*canvas*/)
 {
        rebuild_canvases();
 }
 
 void
-ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
+ChildrenTreeStore::on_value_node_added(synfig::ValueNode::Handle value_node)
 {
 //     if(value_node->get_id().find("Unnamed")!=String::npos)
 //             return;
@@ -225,7 +225,7 @@ ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_deleted(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_deleted(synfig::ValueNode::Handle value_node)
 {
        Gtk::TreeIter iter;
        //int i(0);
@@ -298,7 +298,7 @@ ChildrenTreeStore::execute_changed_value_nodes()
 }
 
 void
-ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_changed(synfig::ValueNode::Handle value_node)
 {
 
        if(!value_node->is_exported())
@@ -333,7 +333,7 @@ ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
 }
 
 void
-ChildrenTreeStore::on_value_node_renamed(etl::handle<ValueNode> value_node)
+ChildrenTreeStore::on_value_node_renamed(synfig::ValueNode::Handle value_node)
 {
        rebuild_value_nodes();
 }

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
index 0a5351e..3da655e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp
@@ -55,7 +55,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent, etl::handle<synfigapp::CanvasInterface> canvas_interface):
        Gtk::Dialog(_("Keyframe Dialog"),parent,false,true),
        canvas_interface(canvas_interface)
 {

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
index 22bf351..0782869 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
@@ -69,7 +69,7 @@ Dialog_Preview::~Dialog_Preview()
 {
 }
 
-void Dialog_Preview::set_preview(handle<Preview>       prev)
+void Dialog_Preview::set_preview(etl::handle<Preview> prev)
 {
        get_window().clear();
        preview.set_preview(prev);

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index 4aa9ed0..0382ce7 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@ -501,7 +501,7 @@ BlackLevelSelector::on_event(GdkEvent *event)
 
 
 void
-Dialog_Setup::set_time_format(Time::Format x)
+Dialog_Setup::set_time_format(synfig::Time::Format x)
 {
        time_format=x;
        if(x<=Time::FORMAT_VIDEO)

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
index 672f06b..a92f6dc 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp
@@ -152,7 +152,7 @@ DockDialog::~DockDialog()
        {
                dock_book_list.front()->clear();
 
-               //! \fixme: UGLY HACK
+               //! \todo Fix this UGLY HACK
                // The following line really should be uncommented,
                // but it causes crashes. Without it, a small
                // memory hole is created--but at least it doesn't crash

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index 37aefe3..f0d4f66 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -408,7 +408,7 @@ Duckmatic::end_duck_drag()
 }
 
 Point
-Duckmatic::snap_point_to_grid(const Point& x, float radius)const
+Duckmatic::snap_point_to_grid(const synfig::Point& x, float radius)const
 {
        Point ret(x);
 

diff --git a/synfig-studio/trunk/src/gtkmm/general.h b/synfig-studio/trunk/src/gtkmm/general.h
index d8a2854..6397097 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/general.h
+++ b/synfig-studio/trunk/src/gtkmm/general.h
@@ -1,5 +1,5 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file synfigstudio/src/gtkmm/general.h
+/*!    \file gtkmm/general.h
 **     \brief General header file for synfigstudio
 **
 **     $Id$

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 61dbabc..89981ad 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -74,7 +74,7 @@ int studio::Instance::instance_count_=0;
 
 /* === M E T H O D S ======================================================= */
 
-Instance::Instance(Canvas::Handle canvas):
+Instance::Instance(synfig::Canvas::Handle canvas):
        synfigapp::Instance             (canvas),
 //     canvas_tree_store_              (Gtk::TreeStore::create(CanvasTreeModel())),
 //     canvas_tree_store_              (Gtk::TreeStore::create()),
@@ -122,7 +122,7 @@ Instance::get_visible_canvases()const
 }
 
 handle<Instance>
-Instance::create(Canvas::Handle canvas)
+Instance::create(synfig::Canvas::Handle canvas)
 {
        // Construct a new instance
        handle<Instance> instance(new Instance(canvas));
@@ -146,7 +146,7 @@ Instance::create(Canvas::Handle canvas)
 }
 
 handle<CanvasView>
-Instance::find_canvas_view(Canvas::Handle canvas)
+Instance::find_canvas_view(etl::handle<synfig::Canvas> canvas)
 {
        if(!canvas)
                return 0;
@@ -164,7 +164,7 @@ Instance::find_canvas_view(Canvas::Handle canvas)
 }
 
 void
-Instance::focus(Canvas::Handle canvas)
+Instance::focus(etl::handle<synfig::Canvas> canvas)
 {
        handle<CanvasView> canvas_view=find_canvas_view(canvas);
        assert(canvas_view);
@@ -370,7 +370,7 @@ Instance::close()
 
 
 void
-Instance::insert_canvas(Gtk::TreeRow row,Canvas::Handle canvas)
+Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas)
 {
        CanvasTreeModel canvas_tree_model;
        assert(canvas);
@@ -920,7 +920,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 }
 
 void
-Instance::process_action(String name, synfigapp::Action::ParamList param_list)
+Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list)
 {
        assert(synfigapp::Action::book().count(name));
 

diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
index b6cc877..0075930 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp
@@ -666,7 +666,7 @@ KeyframeTreeStore::unref_node_vfunc (iterator& xiter)const
 }
 
 Gtk::TreeModel::Path
-KeyframeTreeStore::get_path_vfunc (const TreeModel::iterator& gtk_iter)const
+KeyframeTreeStore::get_path_vfunc (const iterator& gtk_iter)const
 {
        Gtk::TreeModel::Path path;
 
@@ -796,7 +796,7 @@ KeyframeTreeStore::find_row(const synfig::Keyframe &keyframe)
 }
 
 void
-KeyframeTreeStore::add_keyframe(Keyframe keyframe)
+KeyframeTreeStore::add_keyframe(synfig::Keyframe keyframe)
 {
        try
        {
@@ -817,7 +817,7 @@ KeyframeTreeStore::add_keyframe(Keyframe keyframe)
 }
 
 void
-KeyframeTreeStore::remove_keyframe(Keyframe keyframe)
+KeyframeTreeStore::remove_keyframe(synfig::Keyframe keyframe)
 {
        try
        {
@@ -843,7 +843,7 @@ KeyframeTreeStore::remove_keyframe(Keyframe keyframe)
 }
 
 void
-KeyframeTreeStore::change_keyframe(Keyframe keyframe)
+KeyframeTreeStore::change_keyframe(synfig::Keyframe keyframe)
 {
        try
        {

diff --git a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
index f0e4d2c..787b054 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
@@ -80,7 +80,7 @@ bool KeyMapSettings::set_key(const char *path, guint key, Gdk::ModifierType mod,
        }
 }
 
-bool KeyMapSettings::get_key(const char *path, AccelKey *key)
+bool KeyMapSettings::get_key(const char *path, Gtk::AccelKey *key)
 {
        GtkAccelKey     ac;
        if(gtk_accel_map_lookup_entry(path,&ac))

diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
index d6d3293..003f167 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp
@@ -850,7 +850,7 @@ LayerGroupTreeStore::on_group_changed(synfig::String /*group*/)
 }
 
 void
-LayerGroupTreeStore::on_group_pair_added(String group, etl::handle<Layer> layer)
+LayerGroupTreeStore::on_group_pair_added(synfig::String group, etl::handle<synfig::Layer> layer)
 {
        if(!layer->get_canvas())
                return;
@@ -865,7 +865,7 @@ LayerGroupTreeStore::on_group_pair_added(String group, etl::handle<Layer> layer)
 }
 
 void
-LayerGroupTreeStore::on_group_pair_removed(String group, etl::handle<Layer> layer)
+LayerGroupTreeStore::on_group_pair_removed(synfig::String group, etl::handle<synfig::Layer> layer)
 {
        if(!layer->get_canvas())
                return;
@@ -987,7 +987,7 @@ LayerGroupTreeStore::find_layer_row(const synfig::Layer::Handle &layer, Gtk::Tre
 }
 
 bool
-LayerGroupTreeStore::find_group_row(const String &group, Gtk::TreeModel::Children::iterator &iter)
+LayerGroupTreeStore::find_group_row(const synfig::String &group, Gtk::TreeModel::Children::iterator &iter)
 {
        Gtk::TreeModel::Children::iterator prev;
        return find_group_row_(group,children(),iter,prev);

diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
index fd9d191..bde9efe 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
@@ -522,13 +522,13 @@ LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc)
 }
 
 void
-LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/)
+LayerParamTreeStore::on_value_node_added(synfig::ValueNode::Handle /*value_node*/)
 {
 //     queue_refresh();
 }
 
 void
-LayerParamTreeStore::on_value_node_deleted(etl::handle<ValueNode> /*value_node*/)
+LayerParamTreeStore::on_value_node_deleted(synfig::ValueNode::Handle /*value_node*/)
 {
 //     queue_refresh();
 }
@@ -546,7 +546,7 @@ LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*val
 }
 
 void
-LayerParamTreeStore::on_value_node_changed(etl::handle<ValueNode> /*value_node*/)
+LayerParamTreeStore::on_value_node_changed(synfig::ValueNode::Handle /*value_node*/)
 {
        queue_refresh();
 }

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 8df5ef2..f65fbc7 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -409,7 +409,7 @@ LayerTree::on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::H
 }
 
 void
-LayerTree::select_layer(Layer::Handle layer)
+LayerTree::select_layer(synfig::Layer::Handle layer)
 {
        Gtk::TreeModel::Children::iterator iter;
        if(layer_tree_store_->find_layer_row(layer,iter))

diff --git a/synfig-studio/trunk/src/gtkmm/preview.cpp b/synfig-studio/trunk/src/gtkmm/preview.cpp
index 3ab8dfa..74a0f8f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/preview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/preview.cpp
@@ -701,7 +701,7 @@ void studio::Widget_Preview::disconnect_preview(Preview *prev)
        }
 }
 
-void studio::Widget_Preview::set_preview(handle<Preview>       prev)
+void studio::Widget_Preview::set_preview(etl::handle<Preview>  prev)
 {
        preview = prev;
 

diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp
index 2ac8737..4c1eb03 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/render.cpp
+++ b/synfig-studio/trunk/src/gtkmm/render.cpp
@@ -57,7 +57,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-RenderSettings::RenderSettings(Gtk::Window& parent,handle<synfigapp::CanvasInterface> canvas_interface):
+RenderSettings::RenderSettings(Gtk::Window& parent, etl::handle<synfigapp::CanvasInterface> canvas_interface):
        Gtk::Dialog(_("Render Settings"),parent,false,true),
        canvas_interface_(canvas_interface),
        adjustment_quality(3,0,9),

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 4761c4c..aeed4f5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -388,7 +388,7 @@ Toolbox::~Toolbox()
 }
 
 void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const synfig::String& statename)
 {
        std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
 

diff --git a/synfig-studio/trunk/src/gtkmm/valuelink.cpp b/synfig-studio/trunk/src/gtkmm/valuelink.cpp
index 28d55a4..910bc3a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/valuelink.cpp
+++ b/synfig-studio/trunk/src/gtkmm/valuelink.cpp
@@ -115,13 +115,13 @@ String ValueBaseLink::link_name(int i)const
        }else return String();
 }
 
-int ValueBaseLink::get_link_index_from_name(const String &name)const
+int ValueBaseLink::get_link_index_from_name(const synfig::String &name)const
 {
        throw Exception::BadLinkName(name);
 }
 
 //list management stuff
-ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(ValueNode::Handle x) const
+ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(synfig::ValueNode::Handle x) const
 {
        for(list_type::const_iterator i = list.begin(); i != list.end(); ++i)
        {
@@ -133,7 +133,7 @@ ValueBaseLink::list_type::const_iterator ValueBaseLink::findlink(ValueNode::Hand
 
        return list.end();
 }
-ValueBaseLink::list_type::iterator ValueBaseLink::findlink(ValueNode::Handle x)
+ValueBaseLink::list_type::iterator ValueBaseLink::findlink(synfig::ValueNode::Handle x)
 {
        for(list_type::iterator i = list.begin(); i != list.end(); ++i)
        {
@@ -146,7 +146,7 @@ ValueBaseLink::list_type::iterator ValueBaseLink::findlink(ValueNode::Handle x)
        return list.end();
 }
 
-void ValueBaseLink::add(ValueNode::Handle v)
+void ValueBaseLink::add(synfig::ValueNode::Handle v)
 {
        list_type::iterator i = findlink(v);
 
@@ -156,7 +156,7 @@ void ValueBaseLink::add(ValueNode::Handle v)
        }
 }
 
-void ValueBaseLink::remove(ValueNode::Handle v)
+void ValueBaseLink::remove(synfig::ValueNode::Handle v)
 {
        list_type::iterator i = findlink(v);
 

diff --git a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
index c91a45c..e151644 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
@@ -62,21 +62,21 @@ Widget_CanvasChooser::~Widget_CanvasChooser()
 }
 
 void
-Widget_CanvasChooser::set_parent_canvas(etl::handle<synfig::Canvas> x)
+Widget_CanvasChooser::set_parent_canvas(synfig::Canvas::Handle x)
 {
        assert(x);
        parent_canvas=x;
 }
 
 void
-Widget_CanvasChooser::set_value_(etl::handle<synfig::Canvas> data)
+Widget_CanvasChooser::set_value_(synfig::Canvas::Handle data)
 {
        set_value(data);
        activate();
 }
 
 void
-Widget_CanvasChooser::set_value(etl::handle<synfig::Canvas> data)
+Widget_CanvasChooser::set_value(synfig::Canvas::Handle data)
 {
        assert(parent_canvas);
        canvas=data;

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
index bd71591..81ccf3a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
@@ -72,29 +72,29 @@ void
 ColorSlider::set_type(Type x) { type=x; queue_draw(); }
 
 void
-ColorSlider::set_color(Color x) { color_=x; queue_draw(); }
+ColorSlider::set_color(synfig::Color x) { color_=x; queue_draw(); }
 
 void
-ColorSlider::slider_color_TYPE_R(Color &color, float amount) { color.set_r(amount); }
+ColorSlider::slider_color_TYPE_R(synfig::Color &color, float amount) { color.set_r(amount); }
 void
-ColorSlider::slider_color_TYPE_G(Color &color, float amount) { color.set_g(amount); }
+ColorSlider::slider_color_TYPE_G(synfig::Color &color, float amount) { color.set_g(amount); }
 void
-ColorSlider::slider_color_TYPE_B(Color &color, float amount) { color.set_b(amount); }
+ColorSlider::slider_color_TYPE_B(synfig::Color &color, float amount) { color.set_b(amount); }
 void
-ColorSlider::slider_color_TYPE_Y(Color &color, float amount) { color.set_y(amount); }
+ColorSlider::slider_color_TYPE_Y(synfig::Color &color, float amount) { color.set_y(amount); }
 void
-ColorSlider::slider_color_TYPE_U(Color &color, float amount) { color.set_u(amount-0.5f); }
+ColorSlider::slider_color_TYPE_U(synfig::Color &color, float amount) { color.set_u(amount-0.5f); }
 void
-ColorSlider::slider_color_TYPE_V(Color &color, float amount) { color.set_v(amount-0.5f); }
+ColorSlider::slider_color_TYPE_V(synfig::Color &color, float amount) { color.set_v(amount-0.5f); }
 void
-ColorSlider::slider_color_TYPE_HUE(Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
+ColorSlider::slider_color_TYPE_HUE(synfig::Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
 void
-ColorSlider::slider_color_TYPE_SAT(Color &color, float amount) { color.set_s(amount*0.5f); }
+ColorSlider::slider_color_TYPE_SAT(synfig::Color &color, float amount) { color.set_s(amount*0.5f); }
 void
-ColorSlider::slider_color_TYPE_A(Color &color, float amount) { color.set_a(amount); }
+ColorSlider::slider_color_TYPE_A(synfig::Color &color, float amount) { color.set_a(amount); }
 
 void
-ColorSlider::adjust_color(Type type, Color &color, float amount)
+ColorSlider::adjust_color(Type type, synfig::Color &color, float amount)
 {
        static const slider_color_func jump_table[int(TYPE_END)] =
        {

diff --git a/synfig-studio/trunk/src/gtkmm/widget_filename.cpp b/synfig-studio/trunk/src/gtkmm/widget_filename.cpp
index 9959e51..c88bf57 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_filename.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_filename.cpp
@@ -80,7 +80,7 @@ Widget_Filename::set_has_frame(bool x)
 
 
 void
-Widget_Filename::set_value(const string &data)
+Widget_Filename::set_value(const std::string &data)
 {
        entry_filename->set_text(data);
 }

diff --git a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
index 1b83214..38d9097 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
@@ -202,7 +202,7 @@ Widget_Vector::on_value_changed()
 }
 
 void
-Widget_Vector::set_canvas(Canvas::LooseHandle x)
+Widget_Vector::set_canvas(synfig::Canvas::LooseHandle x)
 {
        canvas_=x;
        if(x)

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 8b77f93..d65d3d0 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -2422,7 +2422,7 @@ again:
 }
 
 void
-studio::WorkArea::async_render_preview(Time time)
+studio::WorkArea::async_render_preview(synfig::Time time)
 {
        cur_time=time;
        //tile_book.clear();
@@ -2443,7 +2443,7 @@ WorkArea::async_render_preview()
 }
 
 bool
-studio::WorkArea::sync_render_preview(Time time)
+studio::WorkArea::sync_render_preview(synfig::Time time)
 {
        cur_time=time;
        //tile_book.clear();

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index a1fdd69..f8098b7 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -232,7 +232,7 @@ Action::Book& Action::book() { return *book_; }
 
 
 Action::Handle
-Action::create(const String &name)
+Action::create(const synfig::String &name)
 {
        if(!book().count(name))
                return 0; //! \todo perhaps we should throw something instead?
@@ -266,7 +266,7 @@ Action::compile_candidate_list(const ParamList& param_list, Category category)
 }
 
 Action::CandidateList::iterator
-Action::CandidateList::find(const String& x)
+Action::CandidateList::find(const synfig::String& x)
 {
        iterator iter;
        for(iter=begin();iter!=end();++iter)
@@ -367,7 +367,7 @@ Super::add_action_front(etl::handle<Undoable> action)
 }
 
 
-Group::Group(const std::string &str):
+Group::Group(const synfig::String &str):
        name_(str),
        ready_(true)
 {

diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp
index daeab59..33f71f9 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action_system.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp
@@ -66,7 +66,7 @@ Action::System::~System()
 }
 
 bool
-Action::System::perform_action(handle<Action::Base> action)
+Action::System::perform_action(etl::handle<Action::Base> action)
 {
        handle<UIInterface> uim(get_ui_interface());
 
@@ -209,7 +209,7 @@ Action::System::perform_action(handle<Action::Base> action)
 }
 
 bool
-synfigapp::Action::System::undo_(handle<UIInterface> uim)
+synfigapp::Action::System::undo_(etl::handle<UIInterface> uim)
 {
        handle<Action::Undoable> action(undo_action_stack().front());
        most_recent_action_=action;
@@ -308,7 +308,7 @@ synfigapp::Action::System::undo()
 }
 
 bool
-Action::System::redo_(handle<UIInterface> uim)
+Action::System::redo_(etl::handle<UIInterface> uim)
 {
        handle<Action::Undoable> action(redo_action_stack().front());
        most_recent_action_=action;
@@ -542,7 +542,7 @@ Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
        return false;
 }
 
-Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instance_,synfig::String name_):
+Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<System> instance_,synfig::String name_):
        instance_(instance_),
        name_(name_),
        redraw_requested_(false),
@@ -553,7 +553,7 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instanc
 }
 
 void
-Action::PassiveGrouper::request_redraw(handle<CanvasInterface> x)
+Action::PassiveGrouper::request_redraw(etl::handle<CanvasInterface> x)
 {
 /*     DEBUGPOINT();
        if(instance_->group_stack_.empty())

diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp
index d829225..dec80fb 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp
@@ -147,7 +147,7 @@ Action::KeyframeSet::prepare()
 #define old_2_new(x)   (((x)-old_begin)/(old_end-old_begin)*(new_end-new_begin)+new_begin)
 
 int
-Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,const Time& old_begin,const Time& old_end,const Time& new_begin,const Time& new_end)
+Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end)
 {
        ValueNode_DynamicList::Handle value_node(ValueNode_DynamicList::Handle::cast_static(value_desc.get_parent_value_node()));
        ValueNode_DynamicList::ListEntry& list_entry(value_node->list[value_desc.get_index()]);
@@ -205,7 +205,7 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c
 }
 
 int
-Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,const Time& old_begin,const Time& old_end,const Time& new_begin,const Time& new_end)
+Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end)
 {
        ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_static(value_desc.get_value_node()));
 

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
index ed8d4b1..d65e3e6 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
@@ -122,7 +122,7 @@ Action::LayerRemove::perform()
                // If we couldn't find the layer in the canvas, then bail
                if(*iter2!=layer)
                {
-                       /*!     \fixme We should really undo all prior removals
+                       /*!     \todo We should really undo all prior removals
                        **      before we go throwing shit around */
                        throw Error(_("This layer doesn't exist anymore."));
                }
@@ -132,7 +132,7 @@ Action::LayerRemove::perform()
                // bail
                if(get_canvas()!=subcanvas && !subcanvas->is_inline())
                {
-                       /*!     \fixme We should really undo all prior removals
+                       /*!     \todo We should really undo all prior removals
                        **      before we go throwing shit around */
                        throw Error(_("This layer doesn't belong to this canvas anymore"));
                }

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 09113a8..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 ======================================================= */
 
-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()),
@@ -134,7 +134,7 @@ CanvasInterface::refresh_current_values()
 }
 
 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);
@@ -176,7 +176,7 @@ CanvasInterface::get_mode()const
 
 
 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"));
 
@@ -284,7 +284,7 @@ CanvasInterface::add_layer_to(String name, Canvas::Handle canvas, int depth)
 
 
 bool
-CanvasInterface::convert(ValueDesc value_desc, String type)
+CanvasInterface::convert(ValueDesc value_desc, synfig::String type)
 {
        Action::Handle  action(Action::ValueDescConvert::create());
 
@@ -420,7 +420,7 @@ CanvasInterface::set_rend_desc(const synfig::RendDesc &rend_desc)
 }
 
 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);
@@ -429,7 +429,7 @@ CanvasInterface::set_name(const String &x)
 }
 
 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);
@@ -437,7 +437,7 @@ CanvasInterface::set_description(const String &x)
 }
 
 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);
@@ -625,7 +625,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin
 
 
 void
-CanvasInterface::auto_export(ValueNode::Handle /*value_node*/)
+CanvasInterface::auto_export(synfig::ValueNode::Handle /*value_node*/)
 {
 /*
        // Check to see if we are already exported.

diff --git a/synfig-studio/trunk/src/synfigapp/general.h b/synfig-studio/trunk/src/synfigapp/general.h
index ac1708b..817624b 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/general.h
+++ b/synfig-studio/trunk/src/synfigapp/general.h
@@ -1,5 +1,5 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file synfigstudio/src/synfigapp/general.h
+/*!    \file synfigapp/general.h
 **     \brief Te
 **
 **     $Id$

diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp
index 6c048b2..8bdfc3d 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/synfig-studio/trunk/src/synfigapp/instance.cpp
@@ -82,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)
 {
@@ -94,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));
@@ -122,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;
@@ -151,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;
 

diff --git a/synfig-studio/trunk/src/synfigapp/main.cpp b/synfig-studio/trunk/src/synfigapp/main.cpp
index 0403926..b7fb9b9 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/main.cpp
+++ b/synfig-studio/trunk/src/synfigapp/main.cpp
@@ -86,7 +86,7 @@ static synfig::Waypoint::Interpolation interpolation_;
 
 /* === M E T H O D S ======================================================= */
 
-synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
+synfigapp::Main::Main(const synfig::String &basepath, synfig::ProgressCallback *cb):
        synfig::Main(basepath,cb),
        ref_count_(synfigapp_ref_count_)
 {

diff --git a/synfig-studio/trunk/src/synfigapp/uimanager.cpp b/synfig-studio/trunk/src/synfigapp/uimanager.cpp
index 9ee6af2..68a39a1 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/uimanager.cpp
+++ b/synfig-studio/trunk/src/synfigapp/uimanager.cpp
@@ -76,7 +76,7 @@ ConsoleUIInterface::yes_no(const std::string &title, const std::string &message,
 }
 
 UIInterface::Response
-ConsoleUIInterface::yes_no_cancel(const string &title, const string &message,Response dflt)
+ConsoleUIInterface::yes_no_cancel(const std::string &title, const std::string &message, Response dflt)
 {
        cout<<title<<": "<<message<<' ';
        if(dflt==RESPONSE_NO)

diff --git a/synfig-studio/trunk/src/template.cpp b/synfig-studio/trunk/src/template.cpp
index 29cb9e0..0adf303 100644 (file)
--- a/synfig-studio/trunk/src/template.cpp
+++ b/synfig-studio/trunk/src/template.cpp
@@ -1,5 +1,5 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file synfigstudio/src/template.cpp
+/*!    \file template.cpp
 **     \brief Template File
 **
 **     $Id$

diff --git a/synfig-studio/trunk/src/template.h b/synfig-studio/trunk/src/template.h
index 3cf0f10..fbba143 100644 (file)
--- a/synfig-studio/trunk/src/template.h
+++ b/synfig-studio/trunk/src/template.h
@@ -1,5 +1,5 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file synfigstudio/src/template.h
+/*!    \file template.h
 **     \brief Template Header
 **
 **     $Id$