From: Carlos Lopez <genetita@gmail.com>
Date: Thu, 26 Aug 2010 16:17:31 +0000 (+0200)
Subject: Remove under score from the z_depth parameter to allow use the macros properly
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=95e671c091f35812d7c83559c595ebfd3ce45cb4;p=synfig.git

Remove under score from the z_depth parameter to allow use the macros properly
---

diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp
index e4e7f25..17984ba 100644
--- a/synfig-core/src/synfig/layer.cpp
+++ b/synfig-core/src/synfig/layer.cpp
@@ -135,9 +135,9 @@ Layer::subsys_stop()
 
 Layer::Layer():
 	active_(true),
-	z_depth_(0.0f),
+	z_depth(0.0f),
 	dirty_time_(Time::end()),
-	z_depth__static(false)
+	z_depth_static(false)
 {
 	_LayerCounter::counter++;
 }
@@ -293,14 +293,14 @@ Layer::on_changed()
 bool
 Layer::set_param(const String &param, const ValueBase &value)
 {
-	IMPORT_AS(z_depth_,"z_depth")
+	IMPORT(z_depth)
 	return false;
 }
 
 bool
 Layer::set_param_static(const String &param, const bool x)
 {
-	SET_STATIC(z_depth_,x)
+	SET_STATIC(z_depth,x)
 
 	return false;
 }
@@ -309,7 +309,7 @@ Layer::set_param_static(const String &param, const bool x)
 bool
 Layer::get_param_static(const String &param) const
 {
-	GET_STATIC(z_depth_);
+	GET_STATIC(z_depth);
 
 	return false;
 }
@@ -325,7 +325,7 @@ float
 Layer::get_z_depth(const synfig::Time& t)const
 {
 	if(!dynamic_param_list().count("z_depth"))
-		return z_depth_;
+		return z_depth;
 	return (*dynamic_param_list().find("z_depth")->second)(t).get(Real());
 }
 
@@ -466,7 +466,7 @@ Layer::get_param(const String & param)const
 	if(param=="z_depth")
 	{
 		synfig::ValueBase ret(get_z_depth());
-		ret.set_static(z_depth__static);
+		ret.set_static(z_depth_static);
 		return ret;
 	}
 	return ValueBase();
@@ -562,7 +562,7 @@ Layer::get_param_vocab()const
 {
 	Layer::Vocab ret;
 
-	ret.push_back(ParamDesc(z_depth_,"z_depth")
+	ret.push_back(ParamDesc(z_depth,"z_depth")
 		.set_local_name(_("Z Depth"))
 		.set_animation_only(true)
 	);
diff --git a/synfig-core/src/synfig/layer.h b/synfig-core/src/synfig/layer.h
index 87e91a1..51a47a0 100644
--- a/synfig-core/src/synfig/layer.h
+++ b/synfig-core/src/synfig/layer.h
@@ -270,10 +270,10 @@ private:
 	String description_;
 
 	//! The depth parameter of the layer in the layer stack
-	float z_depth_;
+	float z_depth;
 
 	//! True if zdepth is not affected when in animation mode
-	bool z_depth__static;
+	bool z_depth_static;
 
 	//! \writeme
 	mutable Time dirty_time_;
@@ -393,13 +393,13 @@ public:
 	int get_depth()const;
 
 	//! Gets the non animated z depth of the layer
-	float get_z_depth()const { return z_depth_; }
+	float get_z_depth()const { return z_depth; }
 
 	//! Gets the z depth of the layer at a time t
 	float get_z_depth(const synfig::Time& t)const;
 
 	//! Sets the z depth of the layer (non animated)
-	void set_z_depth(float x) { z_depth_=x; }
+	void set_z_depth(float x) { z_depth=x; }
 
 	//! Sets the Canvas that this Layer is a part of
 	void set_canvas(etl::loose_handle<Canvas> canvas);