projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1694393: save 'pref.*' keys first, so the window manager hint preference is loade...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_subtract.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
index
4d1cc1d
..
ea97493
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_subtract.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_subtract.cpp
@@
-2,7
+2,7
@@
/*! \file valuenode_subtract.cpp
** \brief Template File
**
/*! \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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-69,7
+69,7
@@
ValueNode_Subtract*
ValueNode_Subtract::create(const ValueBase& x)
{
ValueBase::Type id(x.get_type());
ValueNode_Subtract::create(const ValueBase& x)
{
ValueBase::Type id(x.get_type());
-
+
ValueNode_Subtract* value_node=new ValueNode_Subtract();
switch(id)
{
ValueNode_Subtract* value_node=new ValueNode_Subtract();
switch(id)
{
@@
-86,10
+86,10
@@
ValueNode_Subtract::create(const ValueBase& x)
break;
default:
assert(0);
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);
}
assert(value_node->get_type()==id);
-
+
return value_node;
}
return value_node;
}
@@
-117,10
+117,10
@@
bool
synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a)
{
ref_a=a;
synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a)
{
ref_a=a;
-
+
if(PlaceholderValueNode::Handle::cast_dynamic(a))
return true;
if(PlaceholderValueNode::Handle::cast_dynamic(a))
return true;
-
+
if(!ref_a || !ref_b)
set_type(ValueBase::TYPE_NIL);
else
if(!ref_a || !ref_b)
set_type(ValueBase::TYPE_NIL);
else
@@
-263,7
+263,7
@@
ValueNode_Subtract::link_local_name(int i)const
return _("Scalar");
}
return String();
return _("Scalar");
}
return String();
-}
+}
String
ValueNode_Subtract::link_name(int i)const
String
ValueNode_Subtract::link_name(int i)const
@@
-279,7
+279,7
@@
ValueNode_Subtract::link_name(int i)const
return "scalar";
}
return String();
return "scalar";
}
return String();
-}
+}
int
ValueNode_Subtract::get_link_index_from_name(const String &name)const
int
ValueNode_Subtract::get_link_index_from_name(const String &name)const
@@
-308,7
+308,7
@@
ValueNode_Subtract::get_local_name()const
bool
ValueNode_Subtract::check_type(ValueBase::Type type)
{
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
|| type==ValueBase::TYPE_REAL
|| type==ValueBase::TYPE_INTEGER
|| type==ValueBase::TYPE_COLOR