From: Carlos Lopez Date: Sat, 21 Aug 2010 09:17:41 +0000 (+0200) Subject: Use macros for the get static and set static members X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ccde400e7d43c5cab4c49f4455bc90415c912bea;p=synfig.git Use macros for the get static and set static members --- diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp index 3106d8c..33fffd3 100644 --- a/synfig-core/src/synfig/layer.cpp +++ b/synfig-core/src/synfig/layer.cpp @@ -295,7 +295,7 @@ Layer::set_param(const String ¶m, const ValueBase &value) if(param=="z_depth" && value.same_type_as(z_depth_)) { z_depth_=value.get(z_depth_); - z_depth_static=value.get_static(); + set_param_static(param, value.get_static()); return true; } return false; @@ -304,11 +304,7 @@ Layer::set_param(const String ¶m, const ValueBase &value) bool Layer::set_param_static(const String ¶m, const bool x) { - if(param=="z_depth" && z_depth_static!=x) - { - z_depth_static=x; - return true; - } + SET_STATIC(z_depth,x) return false; } @@ -317,8 +313,7 @@ Layer::set_param_static(const String ¶m, const bool x) bool Layer::get_param_static(const String ¶m) const { - if(param=="z_depth") - return z_depth_static; + GET_STATIC(z_depth); return false; } diff --git a/synfig-core/src/synfig/layer.h b/synfig-core/src/synfig/layer.h index 51bf681..8a6a2e6 100644 --- a/synfig-core/src/synfig/layer.h +++ b/synfig-core/src/synfig/layer.h @@ -130,6 +130,19 @@ //! It prevents these layers showing up in the menu. #define CATEGORY_DO_NOT_USE "Do Not Use" +//! x=variable name, y=static bool value +#define SET_STATIC(x,y) \ + if(param==#x && x ## _static != y) \ + { \ + x ## _static = y; \ + return true; \ + } + +#define GET_STATIC(x) \ + if(param==#x) \ + return x ## _static; \ + + /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ diff --git a/synfig-core/src/synfig/layer_composite.cpp b/synfig-core/src/synfig/layer_composite.cpp index 24cae52..93f040a 100644 --- a/synfig-core/src/synfig/layer_composite.cpp +++ b/synfig-core/src/synfig/layer_composite.cpp @@ -227,16 +227,9 @@ Layer_Composite::get_param(const String & param)const bool Layer_Composite::set_param_static(const String ¶m, const bool x) { - if(param=="amount" && amount_static!=x) - { - amount_static=x; - return true; - } - if(param=="blend_method" && blend_method_static!=x) - { - blend_method_static=x; - return true; - } + + SET_STATIC(amount, x) + SET_STATIC(blend_method, x) return Layer::set_param_static(param, x); } @@ -246,11 +239,8 @@ bool Layer_Composite::get_param_static(const String ¶m) const { - if(param=="amount") - return amount_static; - - if(param=="blend_method") - return blend_method_static; + GET_STATIC(amount); + GET_STATIC(blend_method); return Layer::get_param_static(param); }