projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use LinkableValueNode members functions when possible in the derived valuenodes.
[synfig.git]
/
synfig-core
/
src
/
synfig
/
valuenode_and.h
diff --git
a/synfig-core/src/synfig/valuenode_and.h
b/synfig-core/src/synfig/valuenode_and.h
index
8a13014
..
4f704e3
100644
(file)
--- a/
synfig-core/src/synfig/valuenode_and.h
+++ b/
synfig-core/src/synfig/valuenode_and.h
@@
-46,21
+46,11
@@
public:
typedef etl::handle<const ValueNode_And> ConstHandle;
ValueNode_And(const ValueBase &x);
typedef etl::handle<const ValueNode_And> ConstHandle;
ValueNode_And(const ValueBase &x);
-
virtual ValueBase operator()(Time t)const;
virtual ValueBase operator()(Time t)const;
-
virtual ~ValueNode_And();
virtual ~ValueNode_And();
-
virtual String get_name()const;
virtual String get_local_name()const;
virtual String get_name()const;
virtual String get_local_name()const;
-
-
virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
- virtual int link_count()const;
- virtual String link_name(int i)const;
-
- virtual String link_local_name(int i)const;
- virtual int get_link_index_from_name(const String &name)const;
protected:
LinkableValueNode* create_new()const;
protected:
LinkableValueNode* create_new()const;
@@
-68,10
+58,10
@@
protected:
public:
using synfig::LinkableValueNode::get_link_vfunc;
public:
using synfig::LinkableValueNode::get_link_vfunc;
-
using synfig::LinkableValueNode::set_link_vfunc;
static bool check_type(ValueBase::Type type);
static ValueNode_And* create(const ValueBase &x);
using synfig::LinkableValueNode::set_link_vfunc;
static bool check_type(ValueBase::Type type);
static ValueNode_And* create(const ValueBase &x);
+ virtual LinkableValueNode::Vocab get_children_vocab_vfunc()const;
}; // END of class ValueNode_And
}; // END of namespace synfig
}; // END of class ValueNode_And
}; // END of namespace synfig