Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp
index 1f0011e..de3c54b 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp
@@ -2,7 +2,7 @@
 /*!    \file valuenodelinkdisconnect.cpp
 **     \brief Template File
 **
-**     $Id: valuenodelinkdisconnect.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
@@ -33,6 +33,8 @@
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,13 +46,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ValueNodeLinkDisconnect);
-ACTION_SET_NAME(Action::ValueNodeLinkDisconnect,"value_node_link_disconnect");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkDisconnect,_("Disconnect ValueNode Link"));
+ACTION_SET_NAME(Action::ValueNodeLinkDisconnect,"ValueNodeLinkDisconnect");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkDisconnect,N_("Disconnect ValueNode Link"));
 ACTION_SET_TASK(Action::ValueNodeLinkDisconnect,"disconnect");
 ACTION_SET_CATEGORY(Action::ValueNodeLinkDisconnect,Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeLinkDisconnect,0);
 ACTION_SET_VERSION(Action::ValueNodeLinkDisconnect,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeLinkDisconnect,"$Id: valuenodelinkdisconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeLinkDisconnect,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -68,7 +70,7 @@ Action::ParamVocab
 Action::ValueNodeLinkDisconnect::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("parent_value_node",Param::TYPE_VALUENODE)
                .set_local_name(_("Parent ValueNode"))
        );
@@ -86,9 +88,9 @@ Action::ValueNodeLinkDisconnect::get_param_vocab()
 }
 
 bool
-Action::ValueNodeLinkDisconnect::is_canidate(const ParamList &x)
+Action::ValueNodeLinkDisconnect::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -97,21 +99,21 @@ Action::ValueNodeLinkDisconnect::set_param(const synfig::String& name, const Act
        if(name=="parent_value_node" && param.get_type()==Param::TYPE_VALUENODE)
        {
                parent_value_node=LinkableValueNode::Handle::cast_dynamic(param.get_value_node());
-               
+
                return static_cast<bool>(parent_value_node);
        }
 
        if(name=="index" && param.get_type()==Param::TYPE_INTEGER)
        {
                index=param.get_integer();
-               
+
                return true;
        }
 
        if(name=="time" && param.get_type()==Param::TYPE_TIME)
        {
                time=param.get_time();
-               
+
                return true;
        }
 
@@ -130,19 +132,19 @@ void
 Action::ValueNodeLinkDisconnect::perform()
 {
        if(parent_value_node->link_count()<=index)
-               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);             
-               
+               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);
+
        old_value_node=parent_value_node->get_link(index);
 
        if(!parent_value_node->set_link(index,ValueNode_Const::create((*old_value_node)(time))))
                throw Error(_("Parent would not accept link"));
-       
+
        /*
        if(get_canvas()->get_time()!=time)
                set_dirty(true);
        else
                set_dirty(false);
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(parent_value_node);
@@ -154,16 +156,16 @@ void
 Action::ValueNodeLinkDisconnect::undo()
 {
        if(parent_value_node->link_count()<=index)
-               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);             
-               
+               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);
+
        if(!parent_value_node->set_link(index,old_value_node))
                throw Error(_("Parent would not accept old link"));
-       
+
        /*if(get_canvas()->get_time()!=time)
                set_dirty(true);
        else
                set_dirty(false);
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(parent_value_node);