Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / module.h

diff --git a/synfig-core/trunk/src/synfig/module.h b/synfig-core/trunk/src/synfig/module.h
index ec06be3..26638cd 100644 (file)
--- a/synfig-core/trunk/src/synfig/module.h
+++ b/synfig-core/trunk/src/synfig/module.h
@@ -91,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 }
@@ -168,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);