X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.h;h=f729c4077f83b99761c0ce4aefabd7a02a81b974;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1e01f58ea999e766e34e750c0a750a4c9bddff5a;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer.h b/synfig-core/trunk/src/synfig/layer.h
index 1e01f58..f729c40 100644
--- a/synfig-core/trunk/src/synfig/layer.h
+++ b/synfig-core/trunk/src/synfig/layer.h
@@ -42,46 +42,81 @@
 /* === M A C R O S ========================================================= */
 
 //! \writeme
-#define SYNFIG_LAYER_MODULE_EXT public: static const char name__[], version__[], cvs_id__[], local_name__[], category__[]; static Layer *create();
+#define SYNFIG_LAYER_MODULE_EXT															\
+	public:																				\
+	static const char name__[], version__[], cvs_id__[], local_name__[], category__[];	\
+	static Layer *create();
 
 //! Sets the name of the layer
-#define SYNFIG_LAYER_SET_NAME(class,x) const char class::name__[]=x
+#define SYNFIG_LAYER_SET_NAME(class,x)													\
+	const char class::name__[]=x
 
 //! Sets the local name of the layer
-#define SYNFIG_LAYER_SET_LOCAL_NAME(class,x) const char class::local_name__[]=x;
+#define SYNFIG_LAYER_SET_LOCAL_NAME(class,x)											\
+	const char class::local_name__[]=x;
 
 //! Sets the category of the layer
-#define SYNFIG_LAYER_SET_CATEGORY(class,x) const char class::category__[]=x
+#define SYNFIG_LAYER_SET_CATEGORY(class,x)												\
+	const char class::category__[]=x
 
 //! Sets the version string for the layer
-#define SYNFIG_LAYER_SET_VERSION(class,x) const char class::version__[]=x
+#define SYNFIG_LAYER_SET_VERSION(class,x)												\
+	const char class::version__[]=x
 
 //! Sets the CVS ID string for the layer
-#define SYNFIG_LAYER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
+#define SYNFIG_LAYER_SET_CVS_ID(class,x)												\
+	const char class::cvs_id__[]=x
 
 //! \writeme
-#define SYNFIG_LAYER_INIT(class) synfig::Layer* class::create() { return new class(); }
+#define SYNFIG_LAYER_INIT(class)														\
+	synfig::Layer* class::create()														\
+	{																					\
+		return new class();																\
+	}
 
 //! \writeme
-#define IMPORT_PLUS(x,y) if(param==#x && value.same_type_as(x)) { value.put(&x);{y;}return true;}
+#define IMPORT_PLUS(x,y)																\
+	if (param==#x && value.same_type_as(x))												\
+	{																					\
+		value.put(&x);																	\
+		{																				\
+			y;																			\
+		}																				\
+		return true;																	\
+	}
 
 //! \writeme
-#define IMPORT_AS(x,y) if(param==y && value.same_type_as(x)) { value.put(&x); return true;}
+#define IMPORT_AS(x,y)																	\
+	if (param==y && value.same_type_as(x))												\
+	{																					\
+		value.put(&x);																	\
+		return true;																	\
+	}
 
 //! \writeme
-#define IMPORT(x) IMPORT_AS(x,#x)
+#define IMPORT(x)																		\
+	IMPORT_AS(x,#x)
 
 //! \writeme
-#define EXPORT_AS(x,y) if(param==y) { return ValueBase(x); }
+#define EXPORT_AS(x,y)																	\
+	if (param==y)																		\
+		return ValueBase(x);
 
 //! \writeme
-#define EXPORT(x)					EXPORT_AS(x,#x)
+#define EXPORT(x)																		\
+	EXPORT_AS(x,#x)
 
 //! \writeme
-#define EXPORT_NAME()	if(param=="Name" || param=="name" || param=="name__") { return name__; } if(param=="local_name__") { return dgettext("synfig",local_name__); }
+#define EXPORT_NAME()																	\
+	if (param=="Name" || param=="name" || param=="name__")								\
+		return name__;																	\
+	else if (param=="local_name__")														\
+		return dgettext("synfig",local_name__);
 
 //! \writeme
-#define EXPORT_VERSION()	if(param=="Version" || param=="version" || param=="version__") { return version__; }
+#define EXPORT_VERSION()																\
+	if (param=="Version" || param=="version" || param=="version__")						\
+		return version__;
 
 //! This is used as the category for layer book entries which represent aliases of layers.
 //! It prevents these layers showing up in the menu.
@@ -139,8 +174,18 @@ public:
 		String cvs_id;
 		String version;
 		BookEntry() { }
-		BookEntry(Factory factory, const String& name,const String& local_name,const String& category,const String& cvs_id,const String& version):
-			factory(factory),name(name),local_name(local_name),category(category),cvs_id(cvs_id),version(version) { }
+		BookEntry(Factory		 factory,
+				  const String	&name,
+				  const String	&local_name,
+				  const String	&category,
+				  const String	&cvs_id,
+				  const String	&version):
+			factory(factory),
+			name(name),
+			local_name(local_name),
+			category(category),
+			cvs_id(cvs_id),
+			version(version) { }
 	};
 
 	typedef std::map<String,BookEntry> Book;
@@ -437,10 +482,8 @@ public:
 	**  context until the final blend operation. */
 	virtual bool reads_context()const;
 
-#ifdef THIS_CODE_IS_NOT_USED
 	//! Duplicates the Layer without duplicating the value nodes
-	virtual Layer *simple_clone()const;
-#endif /* THIS_CODE_IS_NOT_USED */
+	virtual Handle simple_clone()const;
 
 protected: