From e205859d4ff566c6ce2c4009190a64fcdc890514 Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Sat, 21 Aug 2010 13:03:38 +0200 Subject: [PATCH] Use macros for circle layer --- synfig-core/src/modules/mod_geometry/circle.cpp | 46 ++++++------------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/synfig-core/src/modules/mod_geometry/circle.cpp b/synfig-core/src/modules/mod_geometry/circle.cpp index dcf8cef..3e33b3a 100644 --- a/synfig-core/src/modules/mod_geometry/circle.cpp +++ b/synfig-core/src/modules/mod_geometry/circle.cpp @@ -127,32 +127,11 @@ bool Circle::set_param_static(const String ¶m, const bool x) { - if(param=="color" && color_static!=x) - { - color_static=x; - return true; - } - if(param=="radius" && radius_static!=x) - { - radius_static=x; - return true; - } - - if(param=="origin" && origin_static!=x) - { - origin_static=x; - return true; - } - if(param=="feather" && feather_static!=x) - { - feather_static=x; - return true; - } - if(param=="falloff" && falloff_static!=x) - { - falloff_static=x; - return true; - } + SET_STATIC(color, x) + SET_STATIC(radius, x) + SET_STATIC(origin, x) + SET_STATIC(feather, x) + SET_STATIC(falloff, x) return Layer_Composite::set_param_static(param, x); } @@ -162,16 +141,11 @@ bool Circle::get_param_static(const String ¶m) const { - if(param=="color") - return color_static; - if(param=="radius") - return radius_static; - if(param=="origin") - return origin_static; - if(param=="feather") - return feather_static; - if(param=="falloff") - return falloff_static; + GET_STATIC(color) + GET_STATIC(radius) + GET_STATIC(origin) + GET_STATIC(feather) + GET_STATIC(falloff) return Layer_Composite::get_param_static(param); } -- 2.7.4