Partially fix 1568818: Declare mathematical operators so that we can animate gradient...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_scale.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index 2911b84..ef0ac19 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file valuenode_scale.cpp
 **     \brief Template File
 **
-**     $Id: valuenode_scale.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -44,7 +45,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -54,7 +55,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-ValueNode_Scale::ValueNode_Scale():LinkableValueNode(sinfg::ValueBase::TYPE_NIL)
+ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL)
 {
        set_scalar(1.0);
 }
@@ -78,11 +79,11 @@ ValueNode_Scale::create(const ValueBase& x)
                break;
        default:
                assert(0);
-               throw runtime_error("sinfg::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));                     
+               throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));
        }
        assert(value_node);
        assert(value_node->get_type()==x.get_type());
-       
+
        return value_node;
 }
 
@@ -92,7 +93,7 @@ ValueNode_Scale::create_new()const
        return new ValueNode_Scale();
 }
 
-sinfg::ValueNode_Scale::~ValueNode_Scale()
+synfig::ValueNode_Scale::~ValueNode_Scale()
 {
        unlink_all();
 }
@@ -150,8 +151,8 @@ ValueNode_Scale::get_value_node()const
 }
 
 
-sinfg::ValueBase
-sinfg::ValueNode_Scale::operator()(Time t)const
+synfig::ValueBase
+synfig::ValueNode_Scale::operator()(Time t)const
 {
        if(!value_node || !scalar)
                throw runtime_error(strprintf("ValueNode_Scale: %s",_("One or both of my parameters aren't set!")));
@@ -191,13 +192,13 @@ ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
 {
        if(!(i==0 || i==1))
                return false;
-       
+
        if(i==0 && !set_value_node(x))
                return false;
        else
        if(i==1 && !set_scalar(x))
                return false;
-       
+
        signal_child_changed()(i);signal_value_changed()();
 
        return true;
@@ -229,7 +230,7 @@ ValueNode_Scale::link_local_name(int i)const
        else if(i==1)
                return _("Scalar");
        return String();
-}      
+}
 
 String
 ValueNode_Scale::link_name(int i)const
@@ -249,7 +250,7 @@ ValueNode_Scale::get_link_index_from_name(const String &name)const
                return 0;
        if(name=="scalar")
                return 1;
-       
+
        throw Exception::BadLinkName(name);
 }