Applied the following dooglus patches from the sourceforge tracker:

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
index 3e03ed6..e29b378 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file valuenode_composite.cpp
 **     \brief Template File
 **
 **     $Id: valuenode_composite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
 **
 **     \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
 */
 /* ========================================================================= */
@@ -43,7 +44,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -53,7 +54,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
+synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
        LinkableValueNode(value.get_type())
 {
        switch(get_type())
@@ -109,7 +110,7 @@ ValueNode_Composite::create_new()const
 }
 
 ValueBase
-sinfg::ValueNode_Composite::operator()(Time t)const
+synfig::ValueNode_Composite::operator()(Time t)const
 {
        switch(get_type())
        {
@@ -155,7 +156,7 @@ sinfg::ValueNode_Composite::operator()(Time t)const
                        return ret;
                }
                default:
-                       sinfg::error(string("ValueNode_Composite::operator():")+_("Bad type for composite"));
+                       synfig::error(string("ValueNode_Composite::operator():")+_("Bad type for composite"));
                        assert(components[0]);
                        return (*components[0])(t);
        }
@@ -175,7 +176,7 @@ ValueNode_Composite::link_count()const
        case ValueBase::TYPE_BLINEPOINT:
                return 6;
        default:
-               sinfg::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
+               synfig::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
                return 1;
        }
 }