Rename get_param_vocab to get_children_vocab and use a wrapper for the pure virtual...

diff --git a/synfig-core/src/modules/mod_noise/valuenode_random.cpp b/synfig-core/src/modules/mod_noise/valuenode_random.cpp
index 70c9ecd..22d6666 100644 (file)
--- a/synfig-core/src/modules/mod_noise/valuenode_random.cpp
+++ b/synfig-core/src/modules/mod_noise/valuenode_random.cpp
@@ -302,7 +302,7 @@ ValueNode_Random::randomize_seed()
 }
 
 LinkableValueNode::Vocab
-ValueNode_Random::get_param_vocab()const
+ValueNode_Random::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/modules/mod_noise/valuenode_random.h b/synfig-core/src/modules/mod_noise/valuenode_random.h
index 2732dc8..021c0cc 100644 (file)
--- a/synfig-core/src/modules/mod_noise/valuenode_random.h
+++ b/synfig-core/src/modules/mod_noise/valuenode_random.h
@@ -82,7 +82,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Random* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Random
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode.cpp b/synfig-core/src/synfig/valuenode.cpp
index a47394e..1ff921e 100644 (file)
--- a/synfig-core/src/synfig/valuenode.cpp
+++ b/synfig-core/src/synfig/valuenode.cpp
@@ -672,7 +672,7 @@ LinkableValueNode::get_description(int index, bool show_exported_name)const
 String
 LinkableValueNode::link_name(int i)const
 {
-       Vocab vocab(get_param_vocab());
+       Vocab vocab(get_children_vocab());
        Vocab::iterator iter(vocab.begin());
        int j=0;
        for(; iter!=vocab.end(), j<i; iter++, j++);
@@ -682,7 +682,7 @@ LinkableValueNode::link_name(int i)const
 String
 LinkableValueNode::link_local_name(int i)const
 {
-       Vocab vocab(get_param_vocab());
+       Vocab vocab(get_children_vocab());
        Vocab::iterator iter(vocab.begin());
        int j=0;
        for(; iter!=vocab.end(), j<i; iter++, j++);
@@ -692,10 +692,16 @@ LinkableValueNode::link_local_name(int i)const
 int
 LinkableValueNode::get_link_index_from_name(const String &name)const
 {
-       Vocab vocab(get_param_vocab());
+       Vocab vocab(get_children_vocab());
        Vocab::iterator iter(vocab.begin());
        int j=0;
        for(; iter!=vocab.end(); iter++, j++)
                if(iter->get_name()==name) return j;
        throw Exception::BadLinkName(name);
 }
+
+LinkableValueNode::Vocab
+LinkableValueNode::get_children_vocab()const
+{
+       return get_children_vocab_vfunc();
+}

diff --git a/synfig-core/src/synfig/valuenode.h b/synfig-core/src/synfig/valuenode.h
index 8a1552e..7fde918 100644 (file)
--- a/synfig-core/src/synfig/valuenode.h
+++ b/synfig-core/src/synfig/valuenode.h
@@ -396,8 +396,8 @@ public:
        //! Return a full description of the linked ValueNode given by the index
        String get_description(int index = -1, bool show_exported_name = true)const;
 
-       //! Gets the parameter vocabulary for linkable value nodes
-       virtual Vocab get_param_vocab()const=0;
+       //! Gets the children vocabulary for linkable value nodes
+       virtual Vocab get_children_vocab()const;
 
 protected:
        //! Sets the type of the ValueNode
@@ -411,6 +411,9 @@ protected:
 
        //! Returns the cached times values for all the children (linked Value Nodes)
        virtual void get_times_vfunc(Node::time_set &set) const;
+
+       //! Pure Virtual member to get the children vocabulary
+       virtual Vocab get_children_vocab_vfunc()const=0;
 }; // END of class LinkableValueNode
 
 /*!    \class ValueNodeList

diff --git a/synfig-core/src/synfig/valuenode_add.cpp b/synfig-core/src/synfig/valuenode_add.cpp
index a45d2c5..901f899 100644 (file)
--- a/synfig-core/src/synfig/valuenode_add.cpp
+++ b/synfig-core/src/synfig/valuenode_add.cpp
@@ -206,7 +206,7 @@ ValueNode_Add::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Add::get_param_vocab() const
+ValueNode_Add::get_children_vocab_vfunc() const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_add.h b/synfig-core/src/synfig/valuenode_add.h
index ee0c5cd..19fa300 100644 (file)
--- a/synfig-core/src/synfig/valuenode_add.h
+++ b/synfig-core/src/synfig/valuenode_add.h
@@ -60,7 +60,7 @@ public:
        virtual String get_name()const;
        virtual String get_local_name()const;
        static bool check_type(ValueBase::Type type);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Add
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_and.cpp b/synfig-core/src/synfig/valuenode_and.cpp
index cae2beb..d2f9e46 100644 (file)
--- a/synfig-core/src/synfig/valuenode_and.cpp
+++ b/synfig-core/src/synfig/valuenode_and.cpp
@@ -139,7 +139,7 @@ ValueNode_And::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_And::get_param_vocab() const
+ValueNode_And::get_children_vocab_vfunc() const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_and.h b/synfig-core/src/synfig/valuenode_and.h
index fb09e9a..f80d408 100644 (file)
--- a/synfig-core/src/synfig/valuenode_and.h
+++ b/synfig-core/src/synfig/valuenode_and.h
@@ -62,7 +62,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_And* create(const ValueBase &x);
-       virtual LinkableValueNode::Vocab get_param_vocab()const;
+       virtual LinkableValueNode::Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_And
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_anglestring.cpp b/synfig-core/src/synfig/valuenode_anglestring.cpp
index f18621b..7dbb73c 100644 (file)
--- a/synfig-core/src/synfig/valuenode_anglestring.cpp
+++ b/synfig-core/src/synfig/valuenode_anglestring.cpp
@@ -168,7 +168,7 @@ ValueNode_AngleString::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_AngleString::get_param_vocab()const
+ValueNode_AngleString::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_anglestring.h b/synfig-core/src/synfig/valuenode_anglestring.h
index 2051672..30fa303 100644 (file)
--- a/synfig-core/src/synfig/valuenode_anglestring.h
+++ b/synfig-core/src/synfig/valuenode_anglestring.h
@@ -66,7 +66,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_AngleString* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_AngleString
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_atan2.cpp b/synfig-core/src/synfig/valuenode_atan2.cpp
index 844fbad..ceec7a7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_atan2.cpp
+++ b/synfig-core/src/synfig/valuenode_atan2.cpp
@@ -178,7 +178,7 @@ ValueNode_Atan2::get_link_index_from_name(const String &name)const
 }
 
 LinkableValueNode::Vocab
-ValueNode_Atan2::get_param_vocab()const
+ValueNode_Atan2::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_atan2.h b/synfig-core/src/synfig/valuenode_atan2.h
index 2bef724..845883c 100644 (file)
--- a/synfig-core/src/synfig/valuenode_atan2.h
+++ b/synfig-core/src/synfig/valuenode_atan2.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Atan2* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Atan2
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_bline.cpp b/synfig-core/src/synfig/valuenode_bline.cpp
index 2131bf5..c84db97 100644 (file)
--- a/synfig-core/src/synfig/valuenode_bline.cpp
+++ b/synfig-core/src/synfig/valuenode_bline.cpp
@@ -845,7 +845,7 @@ ValueNode_BLine::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_BLine::get_param_vocab()const
+ValueNode_BLine::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
        for(unsigned int i=0; i<list.size();i++)

diff --git a/synfig-core/src/synfig/valuenode_bline.h b/synfig-core/src/synfig/valuenode_bline.h
index fd4ca69..1b44bdf 100644 (file)
--- a/synfig-core/src/synfig/valuenode_bline.h
+++ b/synfig-core/src/synfig/valuenode_bline.h
@@ -89,7 +89,7 @@ public:
        //using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_BLine* create(const ValueBase &x=ValueBase::TYPE_LIST);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_BLine
 
 typedef ValueNode_BLine::ListEntry::ActivepointList ActivepointList;

diff --git a/synfig-core/src/synfig/valuenode_blinecalctangent.cpp b/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
index e595915..0598276 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalctangent.cpp
@@ -271,7 +271,7 @@ ValueNode_BLineCalcTangent::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_BLineCalcTangent::get_param_vocab()const
+ValueNode_BLineCalcTangent::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_blinecalctangent.h b/synfig-core/src/synfig/valuenode_blinecalctangent.h
index d48e7d6..9952cbe 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalctangent.h
+++ b/synfig-core/src/synfig/valuenode_blinecalctangent.h
@@ -76,7 +76,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_BLineCalcTangent* create(const ValueBase &x=ValueBase::TYPE_VECTOR);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_BLineCalcTangent
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp b/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
index 23ea773..7346207 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalcvertex.cpp
@@ -222,7 +222,7 @@ ValueNode_BLineCalcVertex::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_BLineCalcVertex::get_param_vocab()const
+ValueNode_BLineCalcVertex::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_blinecalcvertex.h b/synfig-core/src/synfig/valuenode_blinecalcvertex.h
index c0606b0..fc95a7d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcvertex.h
+++ b/synfig-core/src/synfig/valuenode_blinecalcvertex.h
@@ -71,7 +71,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_BLineCalcVertex* create(const ValueBase &x=ValueBase::TYPE_VECTOR);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_BLineCalcVertex
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
index 4dc989c..d78f99a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
+++ b/synfig-core/src/synfig/valuenode_blinecalcwidth.cpp
@@ -230,7 +230,7 @@ ValueNode_BLineCalcWidth::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_BLineCalcWidth::get_param_vocab()const
+ValueNode_BLineCalcWidth::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_blinecalcwidth.h b/synfig-core/src/synfig/valuenode_blinecalcwidth.h
index 30f2cbd..c1ef188 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinecalcwidth.h
+++ b/synfig-core/src/synfig/valuenode_blinecalcwidth.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_BLineCalcWidth* create(const ValueBase &x=ValueBase::TYPE_REAL);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_BLineCalcWidth
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_blinereversetangent.cpp b/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
index b25f8cf..dcdee81 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
+++ b/synfig-core/src/synfig/valuenode_blinereversetangent.cpp
@@ -202,7 +202,7 @@ ValueNode_BLineRevTangent::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_BLineRevTangent::get_param_vocab()const
+ValueNode_BLineRevTangent::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_blinereversetangent.h b/synfig-core/src/synfig/valuenode_blinereversetangent.h
index e3a60b3..a0d1b63 100644 (file)
--- a/synfig-core/src/synfig/valuenode_blinereversetangent.h
+++ b/synfig-core/src/synfig/valuenode_blinereversetangent.h
@@ -72,7 +72,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_BLineRevTangent* create(const ValueBase &x=ValueBase::TYPE_VECTOR);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_BLineRevTangent
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_compare.cpp b/synfig-core/src/synfig/valuenode_compare.cpp
index ba7abe6..d5d09fa 100644 (file)
--- a/synfig-core/src/synfig/valuenode_compare.cpp
+++ b/synfig-core/src/synfig/valuenode_compare.cpp
@@ -197,7 +197,7 @@ ValueNode_Compare::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Compare::get_param_vocab()const
+ValueNode_Compare::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_compare.h b/synfig-core/src/synfig/valuenode_compare.h
index de1821d..a7de9e4 100644 (file)
--- a/synfig-core/src/synfig/valuenode_compare.h
+++ b/synfig-core/src/synfig/valuenode_compare.h
@@ -76,7 +76,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Compare* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Compare
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_composite.cpp b/synfig-core/src/synfig/valuenode_composite.cpp
index 1981a82..da06185 100644 (file)
--- a/synfig-core/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/src/synfig/valuenode_composite.cpp
@@ -446,7 +446,7 @@ ValueNode_Composite::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Composite::get_param_vocab()const
+ValueNode_Composite::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_composite.h b/synfig-core/src/synfig/valuenode_composite.h
index 32cdf96..c684aa8 100644 (file)
--- a/synfig-core/src/synfig/valuenode_composite.h
+++ b/synfig-core/src/synfig/valuenode_composite.h
@@ -68,7 +68,7 @@ public:
        using synfig::LinkableValueNode::get_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Composite* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Composite
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_cos.cpp b/synfig-core/src/synfig/valuenode_cos.cpp
index 253d8e0..41fda7d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_cos.cpp
+++ b/synfig-core/src/synfig/valuenode_cos.cpp
@@ -184,7 +184,7 @@ ValueNode_Cos::get_link_index_from_name(const String &name)const
 }
 
 LinkableValueNode::Vocab
-ValueNode_Cos::get_param_vocab()const
+ValueNode_Cos::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_cos.h b/synfig-core/src/synfig/valuenode_cos.h
index 8321562..b835f31 100644 (file)
--- a/synfig-core/src/synfig/valuenode_cos.h
+++ b/synfig-core/src/synfig/valuenode_cos.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Cos* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Cos
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_dotproduct.cpp b/synfig-core/src/synfig/valuenode_dotproduct.cpp
index a90e99d..afb8a31 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dotproduct.cpp
+++ b/synfig-core/src/synfig/valuenode_dotproduct.cpp
@@ -197,7 +197,7 @@ ValueNode_DotProduct::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_DotProduct::get_param_vocab()const
+ValueNode_DotProduct::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_dotproduct.h b/synfig-core/src/synfig/valuenode_dotproduct.h
index 8e3cc2f..0a6e63a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dotproduct.h
+++ b/synfig-core/src/synfig/valuenode_dotproduct.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_DotProduct* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_DotProduct
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_duplicate.cpp b/synfig-core/src/synfig/valuenode_duplicate.cpp
index fdfc8b4..d371d75 100644 (file)
--- a/synfig-core/src/synfig/valuenode_duplicate.cpp
+++ b/synfig-core/src/synfig/valuenode_duplicate.cpp
@@ -217,7 +217,7 @@ ValueNode_Duplicate::check_type(ValueBase::Type type __attribute__ ((unused)))
 }
 
 LinkableValueNode::Vocab
-ValueNode_Duplicate::get_param_vocab()const
+ValueNode_Duplicate::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_duplicate.h b/synfig-core/src/synfig/valuenode_duplicate.h
index bc58454..d9b2f63 100644 (file)
--- a/synfig-core/src/synfig/valuenode_duplicate.h
+++ b/synfig-core/src/synfig/valuenode_duplicate.h
@@ -78,7 +78,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Duplicate* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Duplicate
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_dynamiclist.cpp b/synfig-core/src/synfig/valuenode_dynamiclist.cpp
index 01fec8b..6afc157 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dynamiclist.cpp
+++ b/synfig-core/src/synfig/valuenode_dynamiclist.cpp
@@ -908,7 +908,7 @@ ValueNode_DynamicList::insert_time(const Time& location, const Time& delta)
 }
 
 LinkableValueNode::Vocab
-ValueNode_DynamicList::get_param_vocab()const
+ValueNode_DynamicList::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
        for(unsigned int i=0; i<list.size();i++)

diff --git a/synfig-core/src/synfig/valuenode_dynamiclist.h b/synfig-core/src/synfig/valuenode_dynamiclist.h
index 343b34c..defea1d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_dynamiclist.h
+++ b/synfig-core/src/synfig/valuenode_dynamiclist.h
@@ -236,7 +236,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_DynamicList* create_from(const ValueBase &x=ValueBase::TYPE_GRADIENT);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_DynamicList
 
 typedef ValueNode_DynamicList::ListEntry::Activepoint Activepoint;

diff --git a/synfig-core/src/synfig/valuenode_exp.cpp b/synfig-core/src/synfig/valuenode_exp.cpp
index 1a114bf..7b96298 100644 (file)
--- a/synfig-core/src/synfig/valuenode_exp.cpp
+++ b/synfig-core/src/synfig/valuenode_exp.cpp
@@ -177,7 +177,7 @@ ValueNode_Exp::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Exp::get_param_vocab()const
+ValueNode_Exp::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_exp.h b/synfig-core/src/synfig/valuenode_exp.h
index ea929b8..8d835fc 100644 (file)
--- a/synfig-core/src/synfig/valuenode_exp.h
+++ b/synfig-core/src/synfig/valuenode_exp.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Exp* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Exp
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_gradientcolor.cpp b/synfig-core/src/synfig/valuenode_gradientcolor.cpp
index 690d973..980cf08 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientcolor.cpp
+++ b/synfig-core/src/synfig/valuenode_gradientcolor.cpp
@@ -187,7 +187,7 @@ ValueNode_GradientColor::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_GradientColor::get_param_vocab()const
+ValueNode_GradientColor::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_gradientcolor.h b/synfig-core/src/synfig/valuenode_gradientcolor.h
index 8abcb0f..3bf2e3b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientcolor.h
+++ b/synfig-core/src/synfig/valuenode_gradientcolor.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_GradientColor* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_GradientColor
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_gradientrotate.cpp b/synfig-core/src/synfig/valuenode_gradientrotate.cpp
index 156f32e..f2496da 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientrotate.cpp
+++ b/synfig-core/src/synfig/valuenode_gradientrotate.cpp
@@ -197,7 +197,7 @@ ValueNode_GradientRotate::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_GradientRotate::get_param_vocab()const
+ValueNode_GradientRotate::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_gradientrotate.h b/synfig-core/src/synfig/valuenode_gradientrotate.h
index 95c838a..fca157a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_gradientrotate.h
+++ b/synfig-core/src/synfig/valuenode_gradientrotate.h
@@ -83,7 +83,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_GradientRotate* create(const ValueBase &x=ValueBase::TYPE_GRADIENT);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_GradientRotate
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_greyed.cpp b/synfig-core/src/synfig/valuenode_greyed.cpp
index dacf05c..a68a9ac 100644 (file)
--- a/synfig-core/src/synfig/valuenode_greyed.cpp
+++ b/synfig-core/src/synfig/valuenode_greyed.cpp
@@ -82,7 +82,7 @@ ValueNode_Greyed::get_local_name()const
 }
 
 LinkableValueNode::Vocab
-ValueNode_Greyed::get_param_vocab()const
+ValueNode_Greyed::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_greyed.h b/synfig-core/src/synfig/valuenode_greyed.h
index 9b32a31..6435c98 100644 (file)
--- a/synfig-core/src/synfig/valuenode_greyed.h
+++ b/synfig-core/src/synfig/valuenode_greyed.h
@@ -50,7 +50,7 @@ protected:
 
 public:
        static ValueNode_Greyed* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Greyed
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_integer.cpp b/synfig-core/src/synfig/valuenode_integer.cpp
index d5ddc8d..12b3a9c 100644 (file)
--- a/synfig-core/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/src/synfig/valuenode_integer.cpp
@@ -199,7 +199,7 @@ ValueNode_Integer::check_type(ValueBase::Type type __attribute__ ((unused)))
 }
 
 LinkableValueNode::Vocab
-ValueNode_Integer::get_param_vocab()const
+ValueNode_Integer::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_integer.h b/synfig-core/src/synfig/valuenode_integer.h
index 55547d6..1ed99d8 100644 (file)
--- a/synfig-core/src/synfig/valuenode_integer.h
+++ b/synfig-core/src/synfig/valuenode_integer.h
@@ -72,7 +72,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Integer* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Integer
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_intstring.cpp b/synfig-core/src/synfig/valuenode_intstring.cpp
index 3bc3579..408469e 100644 (file)
--- a/synfig-core/src/synfig/valuenode_intstring.cpp
+++ b/synfig-core/src/synfig/valuenode_intstring.cpp
@@ -200,7 +200,7 @@ ValueNode_IntString::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_IntString::get_param_vocab()const
+ValueNode_IntString::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_intstring.h b/synfig-core/src/synfig/valuenode_intstring.h
index 42052df..c19f7c5 100644 (file)
--- a/synfig-core/src/synfig/valuenode_intstring.h
+++ b/synfig-core/src/synfig/valuenode_intstring.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_IntString* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_IntString
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_join.cpp b/synfig-core/src/synfig/valuenode_join.cpp
index 3ce8b17..bc01031 100644 (file)
--- a/synfig-core/src/synfig/valuenode_join.cpp
+++ b/synfig-core/src/synfig/valuenode_join.cpp
@@ -227,7 +227,7 @@ ValueNode_Join::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Join::get_param_vocab()const
+ValueNode_Join::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_join.h b/synfig-core/src/synfig/valuenode_join.h
index 5a2a753..e13f951 100644 (file)
--- a/synfig-core/src/synfig/valuenode_join.h
+++ b/synfig-core/src/synfig/valuenode_join.h
@@ -76,7 +76,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Join* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Join
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_linear.cpp b/synfig-core/src/synfig/valuenode_linear.cpp
index 7967f3b..2fabe01 100644 (file)
--- a/synfig-core/src/synfig/valuenode_linear.cpp
+++ b/synfig-core/src/synfig/valuenode_linear.cpp
@@ -228,7 +228,7 @@ ValueNode_Linear::get_link_index_from_name(const String &name)const
 
 
 LinkableValueNode::Vocab
-ValueNode_Linear::get_param_vocab()const
+ValueNode_Linear::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_linear.h b/synfig-core/src/synfig/valuenode_linear.h
index b8732ba..35c53bb 100644 (file)
--- a/synfig-core/src/synfig/valuenode_linear.h
+++ b/synfig-core/src/synfig/valuenode_linear.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Linear* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Linear
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_log.cpp b/synfig-core/src/synfig/valuenode_log.cpp
index 3e67dd8..4ddb8a7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_log.cpp
+++ b/synfig-core/src/synfig/valuenode_log.cpp
@@ -184,7 +184,7 @@ ValueNode_Logarithm::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Logarithm::get_param_vocab()const
+ValueNode_Logarithm::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_log.h b/synfig-core/src/synfig/valuenode_log.h
index 8ce4b20..2448925 100644 (file)
--- a/synfig-core/src/synfig/valuenode_log.h
+++ b/synfig-core/src/synfig/valuenode_log.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Logarithm* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Logarithm
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_not.cpp b/synfig-core/src/synfig/valuenode_not.cpp
index 95fba31..dfe0f9a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_not.cpp
+++ b/synfig-core/src/synfig/valuenode_not.cpp
@@ -159,7 +159,7 @@ ValueNode_Not::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Not::get_param_vocab()const
+ValueNode_Not::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_not.h b/synfig-core/src/synfig/valuenode_not.h
index db71f64..5051f57 100644 (file)
--- a/synfig-core/src/synfig/valuenode_not.h
+++ b/synfig-core/src/synfig/valuenode_not.h
@@ -71,7 +71,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Not* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Not
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_or.cpp b/synfig-core/src/synfig/valuenode_or.cpp
index 2773072..2a94e88 100644 (file)
--- a/synfig-core/src/synfig/valuenode_or.cpp
+++ b/synfig-core/src/synfig/valuenode_or.cpp
@@ -168,7 +168,7 @@ ValueNode_Or::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Or::get_param_vocab()const
+ValueNode_Or::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_or.h b/synfig-core/src/synfig/valuenode_or.h
index 3fb02cf..f954964 100644 (file)
--- a/synfig-core/src/synfig/valuenode_or.h
+++ b/synfig-core/src/synfig/valuenode_or.h
@@ -72,7 +72,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Or* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Or
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_pow.cpp b/synfig-core/src/synfig/valuenode_pow.cpp
index b6fcae6..0b9d319 100644 (file)
--- a/synfig-core/src/synfig/valuenode_pow.cpp
+++ b/synfig-core/src/synfig/valuenode_pow.cpp
@@ -207,7 +207,7 @@ ValueNode_Pow::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Pow::get_param_vocab()const
+ValueNode_Pow::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_pow.h b/synfig-core/src/synfig/valuenode_pow.h
index ab0fea6..6cd7255 100644 (file)
--- a/synfig-core/src/synfig/valuenode_pow.h
+++ b/synfig-core/src/synfig/valuenode_pow.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Pow* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Pow
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
index c9f24cb..5d320b6 100644 (file)
--- a/synfig-core/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
@@ -315,7 +315,7 @@ ValueNode_RadialComposite::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_RadialComposite::get_param_vocab()const
+ValueNode_RadialComposite::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_radialcomposite.h b/synfig-core/src/synfig/valuenode_radialcomposite.h
index 2933b00..5a412e6 100644 (file)
--- a/synfig-core/src/synfig/valuenode_radialcomposite.h
+++ b/synfig-core/src/synfig/valuenode_radialcomposite.h
@@ -68,7 +68,7 @@ public:
        using synfig::LinkableValueNode::get_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_RadialComposite* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_RadialComposite
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp
index eb9ebfb..6132c1a 100644 (file)
--- a/synfig-core/src/synfig/valuenode_range.cpp
+++ b/synfig-core/src/synfig/valuenode_range.cpp
@@ -307,7 +307,7 @@ ValueNode_Range::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Range::get_param_vocab()const
+ValueNode_Range::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_range.h b/synfig-core/src/synfig/valuenode_range.h
index 4c11f58..c347472 100644 (file)
--- a/synfig-core/src/synfig/valuenode_range.h
+++ b/synfig-core/src/synfig/valuenode_range.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Range* create(const ValueBase &value=ValueBase());
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Range
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_realstring.cpp b/synfig-core/src/synfig/valuenode_realstring.cpp
index 399c1d9..181ef15 100644 (file)
--- a/synfig-core/src/synfig/valuenode_realstring.cpp
+++ b/synfig-core/src/synfig/valuenode_realstring.cpp
@@ -208,7 +208,7 @@ ValueNode_RealString::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_RealString::get_param_vocab()const
+ValueNode_RealString::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_realstring.h b/synfig-core/src/synfig/valuenode_realstring.h
index 28477e2..8584e98 100644 (file)
--- a/synfig-core/src/synfig/valuenode_realstring.h
+++ b/synfig-core/src/synfig/valuenode_realstring.h
@@ -76,7 +76,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_RealString* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_RealString
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_reciprocal.cpp b/synfig-core/src/synfig/valuenode_reciprocal.cpp
index b4f8d8a..11362b9 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reciprocal.cpp
+++ b/synfig-core/src/synfig/valuenode_reciprocal.cpp
@@ -189,7 +189,7 @@ ValueNode_Reciprocal::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Reciprocal::get_param_vocab()const
+ValueNode_Reciprocal::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_reciprocal.h b/synfig-core/src/synfig/valuenode_reciprocal.h
index 498b1fa..b7d396b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reciprocal.h
+++ b/synfig-core/src/synfig/valuenode_reciprocal.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Reciprocal* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Reciprocal
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_reference.cpp b/synfig-core/src/synfig/valuenode_reference.cpp
index 3de4642..fa89437 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reference.cpp
+++ b/synfig-core/src/synfig/valuenode_reference.cpp
@@ -168,7 +168,7 @@ ValueNode_Reference::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Reference::get_param_vocab()const
+ValueNode_Reference::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_reference.h b/synfig-core/src/synfig/valuenode_reference.h
index d44f9ed..f2329af 100644 (file)
--- a/synfig-core/src/synfig/valuenode_reference.h
+++ b/synfig-core/src/synfig/valuenode_reference.h
@@ -76,7 +76,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Reference* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Reference
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_repeat_gradient.cpp b/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
index 85be66d..601a176 100644 (file)
--- a/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
+++ b/synfig-core/src/synfig/valuenode_repeat_gradient.cpp
@@ -244,7 +244,7 @@ ValueNode_Repeat_Gradient::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Repeat_Gradient::get_param_vocab()const
+ValueNode_Repeat_Gradient::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_repeat_gradient.h b/synfig-core/src/synfig/valuenode_repeat_gradient.h
index a56238b..931783c 100644 (file)
--- a/synfig-core/src/synfig/valuenode_repeat_gradient.h
+++ b/synfig-core/src/synfig/valuenode_repeat_gradient.h
@@ -83,7 +83,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Repeat_Gradient* create(const ValueBase &x=ValueBase::TYPE_GRADIENT);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Repeat_Gradient
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_scale.cpp b/synfig-core/src/synfig/valuenode_scale.cpp
index 2a22b50..da38c54 100644 (file)
--- a/synfig-core/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/src/synfig/valuenode_scale.cpp
@@ -277,7 +277,7 @@ ValueNode_Scale::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Scale::get_param_vocab()const
+ValueNode_Scale::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_scale.h b/synfig-core/src/synfig/valuenode_scale.h
index b09192d..85fb1a6 100644 (file)
--- a/synfig-core/src/synfig/valuenode_scale.h
+++ b/synfig-core/src/synfig/valuenode_scale.h
@@ -86,7 +86,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Scale* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Scale
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/src/synfig/valuenode_segcalctangent.cpp
index 5a8059a..5dd3150 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalctangent.cpp
+++ b/synfig-core/src/synfig/valuenode_segcalctangent.cpp
@@ -183,7 +183,7 @@ ValueNode_SegCalcTangent::create_new()const
 }
 
 LinkableValueNode::Vocab
-ValueNode_SegCalcTangent::get_param_vocab()const
+ValueNode_SegCalcTangent::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_segcalctangent.h b/synfig-core/src/synfig/valuenode_segcalctangent.h
index 8529e97..26910e7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalctangent.h
+++ b/synfig-core/src/synfig/valuenode_segcalctangent.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_SegCalcTangent* create(const ValueBase &x=ValueBase::TYPE_VECTOR);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_SegCalcTangent
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
index 9170907..81525af 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/src/synfig/valuenode_segcalcvertex.cpp
@@ -181,7 +181,7 @@ ValueNode_SegCalcVertex::create_new()const
 }
 
 LinkableValueNode::Vocab
-ValueNode_SegCalcVertex::get_param_vocab()const
+ValueNode_SegCalcVertex::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_segcalcvertex.h b/synfig-core/src/synfig/valuenode_segcalcvertex.h
index 6ff2df4..6053585 100644 (file)
--- a/synfig-core/src/synfig/valuenode_segcalcvertex.h
+++ b/synfig-core/src/synfig/valuenode_segcalcvertex.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_SegCalcVertex* create(const ValueBase &x=ValueBase::TYPE_VECTOR);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_SegCalcVertex
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_sine.cpp b/synfig-core/src/synfig/valuenode_sine.cpp
index 21efad9..3ebe280 100644 (file)
--- a/synfig-core/src/synfig/valuenode_sine.cpp
+++ b/synfig-core/src/synfig/valuenode_sine.cpp
@@ -181,7 +181,7 @@ ValueNode_Sine::get_link_index_from_name(const String &name)const
 }
 
 LinkableValueNode::Vocab
-ValueNode_Sine::get_param_vocab()const
+ValueNode_Sine::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_sine.h b/synfig-core/src/synfig/valuenode_sine.h
index 8ba508d..0e5b9ec 100644 (file)
--- a/synfig-core/src/synfig/valuenode_sine.h
+++ b/synfig-core/src/synfig/valuenode_sine.h
@@ -74,7 +74,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Sine* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Sine
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_step.cpp b/synfig-core/src/synfig/valuenode_step.cpp
index 11efeca..9b9a160 100644 (file)
--- a/synfig-core/src/synfig/valuenode_step.cpp
+++ b/synfig-core/src/synfig/valuenode_step.cpp
@@ -232,7 +232,7 @@ ValueNode_Step::get_link_index_from_name(const String &name)const
 }
 
 LinkableValueNode::Vocab
-ValueNode_Step::get_param_vocab()const
+ValueNode_Step::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_step.h b/synfig-core/src/synfig/valuenode_step.h
index 2f40e90..a24514d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_step.h
+++ b/synfig-core/src/synfig/valuenode_step.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Step* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Step
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_stripes.cpp b/synfig-core/src/synfig/valuenode_stripes.cpp
index d5ecd4f..f214176 100644 (file)
--- a/synfig-core/src/synfig/valuenode_stripes.cpp
+++ b/synfig-core/src/synfig/valuenode_stripes.cpp
@@ -235,7 +235,7 @@ ValueNode_Stripes::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Stripes::get_param_vocab()const
+ValueNode_Stripes::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_stripes.h b/synfig-core/src/synfig/valuenode_stripes.h
index 5106631..9cce737 100644 (file)
--- a/synfig-core/src/synfig/valuenode_stripes.h
+++ b/synfig-core/src/synfig/valuenode_stripes.h
@@ -80,7 +80,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Stripes* create(const ValueBase &x=ValueBase::TYPE_GRADIENT);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Stripes
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_subtract.cpp b/synfig-core/src/synfig/valuenode_subtract.cpp
index 3689f16..7436551 100644 (file)
--- a/synfig-core/src/synfig/valuenode_subtract.cpp
+++ b/synfig-core/src/synfig/valuenode_subtract.cpp
@@ -247,7 +247,7 @@ ValueNode_Subtract::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Subtract::get_param_vocab()const
+ValueNode_Subtract::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_subtract.h b/synfig-core/src/synfig/valuenode_subtract.h
index 41fcede..f9f4738 100644 (file)
--- a/synfig-core/src/synfig/valuenode_subtract.h
+++ b/synfig-core/src/synfig/valuenode_subtract.h
@@ -73,7 +73,7 @@ public:
        //! Gets the scalar value_node
        ValueNode::Handle get_scalar()const { return scalar; }
 
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Subtract
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_switch.cpp b/synfig-core/src/synfig/valuenode_switch.cpp
index 56f1ff0..5fc50ce 100644 (file)
--- a/synfig-core/src/synfig/valuenode_switch.cpp
+++ b/synfig-core/src/synfig/valuenode_switch.cpp
@@ -182,7 +182,7 @@ ValueNode_Switch::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_Switch::get_param_vocab()const
+ValueNode_Switch::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_switch.h b/synfig-core/src/synfig/valuenode_switch.h
index b7ce36c..b58216b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_switch.h
+++ b/synfig-core/src/synfig/valuenode_switch.h
@@ -79,7 +79,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_Switch* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_Switch
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_timedswap.cpp b/synfig-core/src/synfig/valuenode_timedswap.cpp
index 008d6a3..7e1b56f 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/src/synfig/valuenode_timedswap.cpp
@@ -278,7 +278,7 @@ ValueNode_TimedSwap::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_TimedSwap::get_param_vocab()const
+ValueNode_TimedSwap::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_timedswap.h b/synfig-core/src/synfig/valuenode_timedswap.h
index 32b972e..2e235f3 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timedswap.h
+++ b/synfig-core/src/synfig/valuenode_timedswap.h
@@ -78,7 +78,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_TimedSwap* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_TimedSwap
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_timeloop.cpp b/synfig-core/src/synfig/valuenode_timeloop.cpp
index 1182399..34f2750 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timeloop.cpp
+++ b/synfig-core/src/synfig/valuenode_timeloop.cpp
@@ -201,7 +201,7 @@ ValueNode_TimeLoop::check_type(ValueBase::Type type)
 
 
 LinkableValueNode::Vocab
-ValueNode_TimeLoop::get_param_vocab()const
+ValueNode_TimeLoop::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_timeloop.h b/synfig-core/src/synfig/valuenode_timeloop.h
index a323634..bc37404 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timeloop.h
+++ b/synfig-core/src/synfig/valuenode_timeloop.h
@@ -75,7 +75,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_TimeLoop* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_TimeLoop
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_timestring.cpp b/synfig-core/src/synfig/valuenode_timestring.cpp
index 184dda7..bdc140d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timestring.cpp
+++ b/synfig-core/src/synfig/valuenode_timestring.cpp
@@ -187,7 +187,7 @@ ValueNode_TimeString::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_TimeString::get_param_vocab()const
+ValueNode_TimeString::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_timestring.h b/synfig-core/src/synfig/valuenode_timestring.h
index 2291d88..ed29f71 100644 (file)
--- a/synfig-core/src/synfig/valuenode_timestring.h
+++ b/synfig-core/src/synfig/valuenode_timestring.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_TimeString* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_TimeString
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_twotone.cpp b/synfig-core/src/synfig/valuenode_twotone.cpp
index c4aecc3..89850f7 100644 (file)
--- a/synfig-core/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/src/synfig/valuenode_twotone.cpp
@@ -187,7 +187,7 @@ ValueNode_TwoTone::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_TwoTone::get_param_vocab()const
+ValueNode_TwoTone::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_twotone.h b/synfig-core/src/synfig/valuenode_twotone.h
index 782d858..a5caed3 100644 (file)
--- a/synfig-core/src/synfig/valuenode_twotone.h
+++ b/synfig-core/src/synfig/valuenode_twotone.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_TwoTone* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_TwoTone
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_vectorangle.cpp b/synfig-core/src/synfig/valuenode_vectorangle.cpp
index 8d15361..93fe494 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorangle.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorangle.cpp
@@ -168,7 +168,7 @@ ValueNode_VectorAngle::check_type(ValueBase::Type type)
 
 
 LinkableValueNode::Vocab
-ValueNode_VectorAngle::get_param_vocab()const
+ValueNode_VectorAngle::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_vectorangle.h b/synfig-core/src/synfig/valuenode_vectorangle.h
index 9ee6bbf..e8068df 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorangle.h
+++ b/synfig-core/src/synfig/valuenode_vectorangle.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_VectorAngle* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_VectorAngle
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_vectorlength.cpp b/synfig-core/src/synfig/valuenode_vectorlength.cpp
index 16d803c..79fc79f 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorlength.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorlength.cpp
@@ -166,7 +166,7 @@ ValueNode_VectorLength::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_VectorLength::get_param_vocab()const
+ValueNode_VectorLength::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_vectorlength.h b/synfig-core/src/synfig/valuenode_vectorlength.h
index a4d376e..d195684 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorlength.h
+++ b/synfig-core/src/synfig/valuenode_vectorlength.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_VectorLength* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_VectorLength
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_vectorx.cpp b/synfig-core/src/synfig/valuenode_vectorx.cpp
index 779095c..0716e7b 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorx.cpp
+++ b/synfig-core/src/synfig/valuenode_vectorx.cpp
@@ -166,7 +166,7 @@ ValueNode_VectorX::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_VectorX::get_param_vocab()const
+ValueNode_VectorX::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_vectorx.h b/synfig-core/src/synfig/valuenode_vectorx.h
index 0c73a91..61744f2 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectorx.h
+++ b/synfig-core/src/synfig/valuenode_vectorx.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_VectorX* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_VectorX
 
 }; // END of namespace synfig

diff --git a/synfig-core/src/synfig/valuenode_vectory.cpp b/synfig-core/src/synfig/valuenode_vectory.cpp
index db437d1..68b6045 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectory.cpp
+++ b/synfig-core/src/synfig/valuenode_vectory.cpp
@@ -166,7 +166,7 @@ ValueNode_VectorY::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_VectorY::get_param_vocab()const
+ValueNode_VectorY::get_children_vocab_vfunc()const
 {
        LinkableValueNode::Vocab ret;
 

diff --git a/synfig-core/src/synfig/valuenode_vectory.h b/synfig-core/src/synfig/valuenode_vectory.h
index 6c54991..d5d498d 100644 (file)
--- a/synfig-core/src/synfig/valuenode_vectory.h
+++ b/synfig-core/src/synfig/valuenode_vectory.h
@@ -73,7 +73,7 @@ public:
        using synfig::LinkableValueNode::set_link_vfunc;
        static bool check_type(ValueBase::Type type);
        static ValueNode_VectorY* create(const ValueBase &x);
-       virtual Vocab get_param_vocab()const;
+       virtual Vocab get_children_vocab_vfunc()const;
 }; // END of class ValueNode_VectorY
 
 }; // END of namespace synfig

diff --git a/synfig-studio/src/gui/trees/canvastreestore.cpp b/synfig-studio/src/gui/trees/canvastreestore.cpp
index 77ffe4b..7c9a4b6 100644 (file)
--- a/synfig-studio/src/gui/trees/canvastreestore.cpp
+++ b/synfig-studio/src/gui/trees/canvastreestore.cpp
@@ -427,7 +427,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool
                        if(linkable && do_children)
                        {
                                row[model.link_count] = linkable->link_count();
-                               LinkableValueNode::Vocab vocab(linkable->get_param_vocab());
+                               LinkableValueNode::Vocab vocab(linkable->get_children_vocab());
                                LinkableValueNode::Vocab::iterator iter(vocab.begin());
                                for(int i=0;i<linkable->link_count();i++, iter++)
                                {