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

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

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index f22de86..f8098b7 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -2,7 +2,7 @@
 /*!    \file action.cpp
 **     \brief Template File
 **
-**     $Id: action.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -110,6 +110,8 @@
 
 #include "canvasinterface.h"
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -128,21 +130,21 @@ synfigapp::Action::Book *book_;
 
 #define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \
        be.name=x::name__; \
-       be.local_name=x::local_name__; \
+       be.local_name=gettext(x::local_name__); \
        be.version=x::version__; \
        be.task=x::task__; \
        be.priority=x::priority__; \
        be.category=x::category__; \
        be.factory=x::create; \
        be.get_param_vocab=x::get_param_vocab; \
-       be.is_canidate=x::is_canidate; \
+       be.is_candidate=x::is_candidate; \
        }
-       
+
 
 Action::Main::Main()
 {
        book_=new synfigapp::Action::Book();
-       
+
        ADD_ACTION(Action::LayerRemove);
        ADD_ACTION(Action::LayerMove);
        ADD_ACTION(Action::LayerRaise);
@@ -155,10 +157,10 @@ Action::Main::Main()
        ADD_ACTION(Action::LayerEncapsulate);
        ADD_ACTION(Action::LayerDuplicate);
        ADD_ACTION(Action::LayerSetDesc);
-       
-       ADD_ACTION(Action::ValueNodeConstSet);  
-       ADD_ACTION(Action::ValueNodeAdd);       
-       ADD_ACTION(Action::ValueNodeReplace);   
+
+       ADD_ACTION(Action::ValueNodeConstSet);
+       ADD_ACTION(Action::ValueNodeAdd);
+       ADD_ACTION(Action::ValueNodeReplace);
        ADD_ACTION(Action::ValueNodeLinkConnect);
        ADD_ACTION(Action::ValueNodeLinkDisconnect);
        ADD_ACTION(Action::ValueNodeDynamicListInsert);
@@ -170,7 +172,7 @@ Action::Main::Main()
        ADD_ACTION(Action::ValueNodeDynamicListRotateOrder);
        ADD_ACTION(Action::ValueNodeRename);
        ADD_ACTION(Action::ValueNodeRemove);
-       
+
        ADD_ACTION(Action::ValueDescSet);
        ADD_ACTION(Action::ValueDescExport);
        ADD_ACTION(Action::ValueDescConvert);
@@ -208,7 +210,7 @@ Action::Main::Main()
 
        ADD_ACTION(Action::GradientSet);
        ADD_ACTION(Action::ColorSet);
-       
+
        ADD_ACTION(Action::TimepointsMove);
        ADD_ACTION(Action::TimepointsCopy);
        ADD_ACTION(Action::TimepointsDelete);
@@ -222,7 +224,7 @@ Action::Main::Main()
 Action::Main::~Main()
 {
        delete book_;
-       
+
 }
 
 
@@ -230,19 +232,19 @@ 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?
-       return book()[name].factory();  
+       return book()[name].factory();
 }
 
 
-Action::CanidateList
-Action::compile_canidate_list(const ParamList& param_list, Category category)
+Action::CandidateList
+Action::compile_candidate_list(const ParamList& param_list, Category category)
 {
-       Action::CanidateList ret;
-       
+       Action::CandidateList ret;
+
        Book::const_iterator iter;
 
        //synfig::info("param_list.size()=%d",param_list.size());
@@ -251,20 +253,20 @@ Action::compile_canidate_list(const ParamList& param_list, Category category)
        {
                if((iter->second.category&category))
                {
-                       if(iter->second.is_canidate(param_list))
+                       if(iter->second.is_candidate(param_list))
                                ret.push_back(iter->second);
                        else
                        {
-                               //synfig::info("Action \"%s\" is not a canidate",iter->second.name.c_str());
+                               //synfig::info("Action \"%s\" is not a candidate",iter->second.name.c_str());
                        }
                }
        }
-       
+
        return ret;
 }
 
-Action::CanidateList::iterator
-Action::CanidateList::find(const String& x)
+Action::CandidateList::iterator
+Action::CandidateList::find(const synfig::String& x)
 {
        iterator iter;
        for(iter=begin();iter!=end();++iter)
@@ -277,7 +279,7 @@ void
 Action::Base::set_param_list(const ParamList &param_list)
 {
        ParamList::const_iterator iter;
-       
+
        for(iter=param_list.begin();iter!=param_list.end();++iter)
                set_param(iter->first,iter->second);
 }
@@ -286,7 +288,7 @@ void
 Super::perform()
 {
        set_dirty(false);
-       
+
        prepare();
 
        ActionList::const_iterator iter;
@@ -365,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)
 {
@@ -382,7 +384,7 @@ Action::ParamVocab
 Action::CanvasSpecific::get_param_vocab()
 {
        ParamVocab ret;
-       
+
        ret.push_back(ParamDesc("canvas",Param::TYPE_CANVAS)
                .set_local_name(_("Canvas"))
                .set_desc(_("Selected Canvas"))
@@ -393,7 +395,7 @@ Action::CanvasSpecific::get_param_vocab()
                .set_desc(_("Canvas Interface"))
                .set_optional(true)
        );
-       
+
 
        return ret;
 }
@@ -406,7 +408,7 @@ CanvasSpecific::set_param(const synfig::String& name, const Param &param)
                if(!param.get_canvas())
                        return false;
                set_canvas(param.get_canvas());
-               
+
                return true;
        }
        if(name=="canvas_interface" && param.get_type()==Param::TYPE_CANVASINTERFACE)
@@ -416,13 +418,13 @@ CanvasSpecific::set_param(const synfig::String& name, const Param &param)
                set_canvas_interface(param.get_canvas_interface());
                if(!get_canvas())
                        set_canvas(get_canvas_interface()->get_canvas());
-               
+
                return true;
        }
        if(name=="edit_mode" && param.get_type()==Param::TYPE_EDITMODE)
        {
                set_edit_mode(param.get_edit_mode());
-               
+
                return true;
        }
 
@@ -442,9 +444,9 @@ CanvasSpecific::get_edit_mode()const
 {
        if(mode_!=MODE_UNDEFINED)
                return mode_;
-       
+
        if(get_canvas_interface())
                return get_canvas_interface()->get_mode();
-       
+
        return MODE_NORMAL;
 }