Tidying.

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

diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index 986ed7e..4724d04 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@ -131,7 +131,7 @@ bool
 ValueNode_TimedSwap::set_swap_time(const ValueNode::Handle &x)
 {
        if(!x
-               || !ValueBase(ValueBase::TYPE_TIME).same_as(x->get_type())
+               || !ValueBase(ValueBase::TYPE_TIME).same_type_as(x->get_type())
                && !PlaceholderValueNode::Handle::cast_dynamic(x)
        )
                return false;
@@ -155,7 +155,7 @@ bool
 ValueNode_TimedSwap::set_swap_length(const ValueNode::Handle &x)
 {
        if(!x || (
-               !ValueBase(ValueBase::TYPE_TIME).same_as(x->get_type())
+               !ValueBase(ValueBase::TYPE_TIME).same_type_as(x->get_type())
                && !PlaceholderValueNode::Handle::cast_dynamic(x)
                )
        )
@@ -290,8 +290,9 @@ ValueNode_TimedSwap::link_local_name(int i)const
                return _("Swap Time");
        case 3:
                return _("Swap Duration");
+       default:
+               return 0;
        }
-       return 0;
 }
 
 String
@@ -308,8 +309,9 @@ ValueNode_TimedSwap::link_name(int i)const
                return "time";
        case 3:
                return "length";
+       default:
+               return String();
        }
-       return 0;
 }
 
 int