Working on 1796971: Make dialog_save_as() return a bool saying whether it saved anyth...

[synfig.git] / synfig-studio / trunk / src / gtkmm / duckmatic.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index 5dbbaf0..ff263be 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -256,11 +256,8 @@ Duckmatic::is_duck_group_selectable(const etl::handle<Duck>& x)const
                        layer_name=="curve_gradient"
                )
                        return false;
-               if(
-                       (layer_name=="PasteCanvas"||
-                       layer_name=="paste_canvas")
-                       && !layer->get_param("children_lock").get(bool())
-               )
+               if((layer_name=="PasteCanvas"|| layer_name=="paste_canvas") &&
+                  !layer->get_param("children_lock").get(bool()))
                        return false;
        }
        return true;
@@ -1455,7 +1452,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                                duck->set_origin(last_duck());
 /*
                                                                ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-                                                               if(value.same_as(synfig::Point()))
+                                                               if(value.same_type_as(synfig::Point()))
                                                                        duck->set_origin(value.get(synfig::Point()));
 */
                                                        }
@@ -1484,7 +1481,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                                duck->set_origin(last_duck());
 /*
                                                                ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-                                                               if(value.same_as(synfig::Point()))
+                                                               if(value.same_type_as(synfig::Point()))
                                                                        duck->set_origin(value.get(synfig::Point()));
 */
                                                }
@@ -1506,7 +1503,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                width->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".w");
                                                {
                                                        ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_hint()).get_value(get_time()));
-                                                       if(value.same_as(synfig::Real()))
+                                                       if(value.same_type_as(synfig::Real()))
                                                                width->set_scalar(value.get(synfig::Real())*0.5f);
                                                }
                                        }
@@ -1612,7 +1609,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                                duck->set_origin(last_duck());
 /*
                                                                ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-                                                               if(value.same_as(synfig::Point()))
+                                                               if(value.same_type_as(synfig::Point()))
                                                                        duck->set_origin(value.get(synfig::Point()));
 */
 //                                             if(!param_desc->get_origin().empty())
@@ -1767,7 +1764,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
                                                                duck->set_origin(last_duck());
 /*
                                                                ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-                                                               if(value.same_as(synfig::Point()))
+                                                               if(value.same_type_as(synfig::Point()))
                                                                        duck->set_origin(value.get(synfig::Point()));
 */
 //                                             if(!param_desc->get_origin().empty())