From 24c6c102d628a2562e43fc92a8711d631c1ce02a Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Sat, 28 Aug 2010 11:21:02 +0200 Subject: [PATCH] Remove set and get parameter static members in inherited Layer classes since it is not needed. --- synfig-core/src/modules/lyr_std/curvewarp.cpp | 12 ------------ synfig-core/src/modules/lyr_std/curvewarp.h | 2 -- synfig-core/src/modules/mod_filter/blur.cpp | 13 ------------- synfig-core/src/modules/mod_filter/blur.h | 3 --- synfig-core/src/modules/mod_filter/radialblur.cpp | 12 ------------ synfig-core/src/modules/mod_filter/radialblur.h | 2 -- synfig-core/src/modules/mod_geometry/circle.cpp | 15 --------------- synfig-core/src/modules/mod_geometry/circle.h | 3 --- synfig-core/src/synfig/layer_bitmap.cpp | 14 -------------- synfig-core/src/synfig/layer_bitmap.h | 3 --- synfig-core/src/synfig/layer_composite.cpp | 21 --------------------- synfig-core/src/synfig/layer_composite.h | 2 -- synfig-core/src/synfig/layer_motionblur.cpp | 14 -------------- synfig-core/src/synfig/layer_motionblur.h | 2 -- 14 files changed, 118 deletions(-) diff --git a/synfig-core/src/modules/lyr_std/curvewarp.cpp b/synfig-core/src/modules/lyr_std/curvewarp.cpp index 865d35f..131cef0 100644 --- a/synfig-core/src/modules/lyr_std/curvewarp.cpp +++ b/synfig-core/src/modules/lyr_std/curvewarp.cpp @@ -379,18 +379,6 @@ CurveWarp::get_param(const String & param)const return ValueBase(); } -bool -CurveWarp::set_param_static(const String ¶m, const bool x) -{ - return Layer::set_param_static(param, x); -} - -bool -CurveWarp::get_param_static(const String ¶m)const -{ - return Layer::get_param_static(param); -} - Layer::Vocab CurveWarp::get_param_vocab()const { diff --git a/synfig-core/src/modules/lyr_std/curvewarp.h b/synfig-core/src/modules/lyr_std/curvewarp.h index ae83ba0..a287887 100644 --- a/synfig-core/src/modules/lyr_std/curvewarp.h +++ b/synfig-core/src/modules/lyr_std/curvewarp.h @@ -67,8 +67,6 @@ public: virtual bool set_param(const String ¶m, const ValueBase &value); virtual ValueBase get_param(const String ¶m)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; virtual Point transform(const Point &point_, Real *dist=NULL, Real *along=0, int quality=10)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; diff --git a/synfig-core/src/modules/mod_filter/blur.cpp b/synfig-core/src/modules/mod_filter/blur.cpp index 7946c36..35ee6f7 100644 --- a/synfig-core/src/modules/mod_filter/blur.cpp +++ b/synfig-core/src/modules/mod_filter/blur.cpp @@ -108,19 +108,6 @@ Blur_Layer::get_param(const String ¶m)const return Layer_Composite::get_param(param); } -bool -Blur_Layer::set_param_static(const String ¶m, const bool x) -{ - return Layer_Composite::set_param_static(param, x); -} - -bool -Blur_Layer::get_param_static(const String ¶m)const -{ - return Layer_Composite::get_param_static(param); -} - - Color Blur_Layer::get_color(Context context, const Point &pos)const { diff --git a/synfig-core/src/modules/mod_filter/blur.h b/synfig-core/src/modules/mod_filter/blur.h index 419c6a4..cfe8a2f 100644 --- a/synfig-core/src/modules/mod_filter/blur.h +++ b/synfig-core/src/modules/mod_filter/blur.h @@ -51,9 +51,6 @@ public: virtual ValueBase get_param(const String & param)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; - virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; diff --git a/synfig-core/src/modules/mod_filter/radialblur.cpp b/synfig-core/src/modules/mod_filter/radialblur.cpp index f5d5972..7d93fd3 100644 --- a/synfig-core/src/modules/mod_filter/radialblur.cpp +++ b/synfig-core/src/modules/mod_filter/radialblur.cpp @@ -101,18 +101,6 @@ RadialBlur::get_param(const String ¶m)const return Layer_Composite::get_param(param); } -bool -RadialBlur::set_param_static(const String ¶m, const bool x) -{ - return Layer_Composite::set_param_static(param, x); -} - -bool -RadialBlur::get_param_static(const String ¶m)const -{ - return Layer_Composite::get_param_static(param); -} - Layer::Vocab RadialBlur::get_param_vocab()const { diff --git a/synfig-core/src/modules/mod_filter/radialblur.h b/synfig-core/src/modules/mod_filter/radialblur.h index fad7b30..197eb2f 100644 --- a/synfig-core/src/modules/mod_filter/radialblur.h +++ b/synfig-core/src/modules/mod_filter/radialblur.h @@ -59,8 +59,6 @@ public: virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const synfig::String & param)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; virtual Vocab get_param_vocab()const; diff --git a/synfig-core/src/modules/mod_geometry/circle.cpp b/synfig-core/src/modules/mod_geometry/circle.cpp index 6721ad4..5c8d059 100644 --- a/synfig-core/src/modules/mod_geometry/circle.cpp +++ b/synfig-core/src/modules/mod_geometry/circle.cpp @@ -118,21 +118,6 @@ Circle::get_param(const String ¶m)const return Layer_Composite::get_param(param); } - -bool -Circle::set_param_static(const String ¶m, const bool x) -{ - return Layer_Composite::set_param_static(param, x); -} - - -bool -Circle::get_param_static(const String ¶m) const -{ - return Layer_Composite::get_param_static(param); -} - - Layer::Vocab Circle::get_param_vocab()const { diff --git a/synfig-core/src/modules/mod_geometry/circle.h b/synfig-core/src/modules/mod_geometry/circle.h index 29193c3..f7cd379 100644 --- a/synfig-core/src/modules/mod_geometry/circle.h +++ b/synfig-core/src/modules/mod_geometry/circle.h @@ -104,9 +104,6 @@ public: virtual ValueBase get_param(const String ¶m)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; - virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; diff --git a/synfig-core/src/synfig/layer_bitmap.cpp b/synfig-core/src/synfig/layer_bitmap.cpp index 742b023..7519182 100644 --- a/synfig-core/src/synfig/layer_bitmap.cpp +++ b/synfig-core/src/synfig/layer_bitmap.cpp @@ -524,17 +524,3 @@ Layer_Bitmap::get_bounding_rect()const { return Rect(tl,br); } - - -bool -Layer_Bitmap::set_param_static(const String ¶m, const bool x) -{ - return Layer_Composite::set_param_static(param, x); -} - - -bool -Layer_Bitmap::get_param_static(const String ¶m) const -{ - return Layer_Composite::get_param_static(param); -} diff --git a/synfig-core/src/synfig/layer_bitmap.h b/synfig-core/src/synfig/layer_bitmap.h index 018570d..b62a93e 100644 --- a/synfig-core/src/synfig/layer_bitmap.h +++ b/synfig-core/src/synfig/layer_bitmap.h @@ -62,9 +62,6 @@ public: virtual ValueBase get_param(const String & param)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; - virtual Color get_color(Context context, const Point &pos)const; virtual Vocab get_param_vocab()const; diff --git a/synfig-core/src/synfig/layer_composite.cpp b/synfig-core/src/synfig/layer_composite.cpp index 2e9daeb..70d4430 100644 --- a/synfig-core/src/synfig/layer_composite.cpp +++ b/synfig-core/src/synfig/layer_composite.cpp @@ -236,24 +236,3 @@ Layer_Composite::get_param(const String & param)const //! to see if it can handle that parameter's string. return Layer::get_param(param); } - -bool -Layer_Composite::set_param_static(const String ¶m, const bool x) -{ - - //SET_STATIC(amount, x) - //SET_STATIC(blend_method, x) - - return Layer::set_param_static(param, x); -} - - -bool -Layer_Composite::get_param_static(const String ¶m) const -{ - - //GET_STATIC(amount); - //GET_STATIC(blend_method); - - return Layer::get_param_static(param); -} diff --git a/synfig-core/src/synfig/layer_composite.h b/synfig-core/src/synfig/layer_composite.h index b173cfd..46a07b6 100644 --- a/synfig-core/src/synfig/layer_composite.h +++ b/synfig-core/src/synfig/layer_composite.h @@ -86,8 +86,6 @@ public: virtual ValueBase get_param(const String ¶m)const; //!Returns the rectangle that includes the context of the layer and //! the intersection of the layer in case it is active and not onto - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; virtual Rect get_full_bounding_rect(Context context)const; //! Renders the layer composited on the context and puts it on the target surface. virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; diff --git a/synfig-core/src/synfig/layer_motionblur.cpp b/synfig-core/src/synfig/layer_motionblur.cpp index 03bd076..61fa152 100644 --- a/synfig-core/src/synfig/layer_motionblur.cpp +++ b/synfig-core/src/synfig/layer_motionblur.cpp @@ -266,17 +266,3 @@ Layer_MotionBlur::accelerated_render(Context context,Surface *surface,int qualit return true; } - - -bool -Layer_MotionBlur::set_param_static(const String ¶m, const bool x) -{ - return Layer_Composite::set_param_static(param, x); -} - - -bool -Layer_MotionBlur::get_param_static(const String ¶m) const -{ - return Layer_Composite::get_param_static(param); -} diff --git a/synfig-core/src/synfig/layer_motionblur.h b/synfig-core/src/synfig/layer_motionblur.h index 31e2c17..9b4391c 100644 --- a/synfig-core/src/synfig/layer_motionblur.h +++ b/synfig-core/src/synfig/layer_motionblur.h @@ -60,8 +60,6 @@ public: Layer_MotionBlur(); virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; - virtual bool set_param_static(const String ¶m, const bool x); - virtual bool get_param_static(const String ¶m) const; virtual Color get_color(Context context, const Point &pos)const; virtual void set_time(Context context, Time time)const; virtual void set_time(Context context, Time time, const Point &point)const; -- 2.7.4