Fix 1862720: "libltdl library and headers out of sync" - applied patch by Daniel...

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
index b03ec01..f92b1ce 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file valuenode_subtract.cpp
-**     \brief Template File
+/* === S Y N F I G ========================================================= */
+/*!    \file valuenode_twotone.cpp
+**     \brief Implementation of the "Two-Tone" valuenode conversion.
 **
-**     $Id: valuenode_twotone.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
 */
 /* ========================================================================= */
@@ -41,7 +42,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -51,7 +52,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(sinfg::ValueBase::TYPE_GRADIENT)
+synfig::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT)
 {
        set_link("color1",ValueNode_Const::create(Color::black()));
        set_link("color2",ValueNode_Const::create(Color::white()));
@@ -71,23 +72,23 @@ ValueNode_TwoTone::create(const ValueBase& x)
        if(id!=ValueBase::TYPE_GRADIENT)
        {
                assert(0);
-               throw runtime_error("sinfg::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id));                     
-       }               
+               throw runtime_error("synfig::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id));
+       }
 
        ValueNode_TwoTone* value_node=new ValueNode_TwoTone();
 
        assert(value_node->get_type()==id);
-       
+
        return value_node;
 }
 
-sinfg::ValueNode_TwoTone::~ValueNode_TwoTone()
+synfig::ValueNode_TwoTone::~ValueNode_TwoTone()
 {
        unlink_all();
 }
 
 bool
-sinfg::ValueNode_TwoTone::set_lhs(ValueNode::Handle a)
+synfig::ValueNode_TwoTone::set_lhs(ValueNode::Handle a)
 {
        if(a->get_type()!=ValueBase::TYPE_COLOR)
                return false;
@@ -98,7 +99,7 @@ sinfg::ValueNode_TwoTone::set_lhs(ValueNode::Handle a)
 }
 
 bool
-sinfg::ValueNode_TwoTone::set_rhs(ValueNode::Handle b)
+synfig::ValueNode_TwoTone::set_rhs(ValueNode::Handle b)
 {
        if(b->get_type()!=ValueBase::TYPE_COLOR)
                return false;
@@ -106,8 +107,8 @@ sinfg::ValueNode_TwoTone::set_rhs(ValueNode::Handle b)
        return true;
 }
 
-sinfg::ValueBase
-sinfg::ValueNode_TwoTone::operator()(Time t)const
+synfig::ValueBase
+synfig::ValueNode_TwoTone::operator()(Time t)const
 {
        return Gradient((*ref_a)(t).get(Color()),(*ref_b)(t).get(Color()));
 }
@@ -159,9 +160,10 @@ ValueNode_TwoTone::link_local_name(int i)const
                        return _("Color1");
                case 1:
                        return _("Color2");
+               default:
+                       return String();
        }
-       return String();
-}      
+}
 
 String
 ValueNode_TwoTone::link_name(int i)const
@@ -173,9 +175,10 @@ ValueNode_TwoTone::link_name(int i)const
                        return "color1";
                case 1:
                        return "color2";
+               default:
+                       return String();
        }
-       return String();
-}      
+}
 
 int
 ValueNode_TwoTone::get_link_index_from_name(const String &name)const