X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_subtract.cpp;h=b561a61a9fd188006e0b4b836d20f240a34e7382;hb=bf92e1e2c959ab1fb668fa5a8274004a6f30a140;hp=ca31e290446ab1c009c529df71a5f9d96119d809;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp index ca31e29..b561a61 100644 --- a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp @@ -2,19 +2,20 @@ /*! \file valuenode_subtract.cpp ** \brief Template File ** -** $Id: valuenode_subtract.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 */ /* ========================================================================= */ @@ -68,7 +69,7 @@ ValueNode_Subtract* ValueNode_Subtract::create(const ValueBase& x) { ValueBase::Type id(x.get_type()); - + ValueNode_Subtract* value_node=new ValueNode_Subtract(); switch(id) { @@ -85,10 +86,10 @@ ValueNode_Subtract::create(const ValueBase& x) break; default: assert(0); - throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id)); + throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id)); } assert(value_node->get_type()==id); - + return value_node; } @@ -116,10 +117,10 @@ bool synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a) { ref_a=a; - + if(PlaceholderValueNode::Handle::cast_dynamic(a)) return true; - + if(!ref_a || !ref_b) set_type(ValueBase::TYPE_NIL); else @@ -260,9 +261,10 @@ ValueNode_Subtract::link_local_name(int i)const return _("RHS"); case 2: return _("Scalar"); + default: + return String(); } - return String(); -} +} String ValueNode_Subtract::link_name(int i)const @@ -276,9 +278,10 @@ ValueNode_Subtract::link_name(int i)const return "rhs"; case 2: return "scalar"; + default: + return String(); } - return String(); -} +} int ValueNode_Subtract::get_link_index_from_name(const String &name)const @@ -307,7 +310,7 @@ ValueNode_Subtract::get_local_name()const bool ValueNode_Subtract::check_type(ValueBase::Type type) { - return type==ValueBase::TYPE_VECTOR + return type==ValueBase::TYPE_VECTOR || type==ValueBase::TYPE_REAL || type==ValueBase::TYPE_INTEGER || type==ValueBase::TYPE_COLOR