X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmodule.h;h=26638cd6866b2ff694a160410c4a0d91ecce4d56;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=e618820170eef2769c1f8083dd06bd5dedbf4f60;hpb=933391e568dac0fa4409875800a331d219fe9b59;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/module.h b/synfig-core/trunk/src/synfig/module.h
index e618820..26638cd 100644
--- a/synfig-core/trunk/src/synfig/module.h
+++ b/synfig-core/trunk/src/synfig/module.h
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -90,9 +91,23 @@
 #define BEGIN_LAYERS {
 
 //! DEPRECATED - use #INCLUDE_LAYER(class)
-#define LAYER(class)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,class::name__,dgettext("synfig",class::local_name__),dgettext("synfig",class::category__),class::cvs_id__,class::version__));
-//#define LAYER(x) synfig::Layer::book()[synfig::String(x::name__)]=x::create;
-#define LAYER_ALIAS(class,alias)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,alias,alias,CATEGORY_DO_NOT_USE,class::cvs_id__,class::version__));
+#define LAYER(class)																			\
+	synfig::Layer::register_in_book(															\
+		synfig::Layer::BookEntry(class::create,													\
+								 class::name__,													\
+								 dgettext("synfig", class::local_name__),						\
+								 class::category__,												\
+								 class::cvs_id__,												\
+								 class::version__));
+
+#define LAYER_ALIAS(class,alias)																\
+	synfig::Layer::register_in_book(															\
+		synfig::Layer::BookEntry(class::create,													\
+								 alias,															\
+								 alias,															\
+								 CATEGORY_DO_NOT_USE,											\
+								 class::cvs_id__,												\
+								 class::version__));
 
 //! Marks the end of the layers in the module's inventory
 #define END_LAYERS }
@@ -167,7 +182,7 @@ public:
 
 	static bool subsys_init(const String &prefix);
 	static bool subsys_stop();
-	static bool register_default_modules();
+	static void register_default_modules(ProgressCallback *cb=NULL);
 
 	static void Register(Handle mod);
 	static bool Register(const String &module_name, ProgressCallback *cb=NULL);