[gegl/property-keys] reindent gegl-op.h
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/property-keys] reindent gegl-op.h
- Date: Wed, 14 May 2014 16:08:56 +0000 (UTC)
commit f4daf625ea8acf1d5bd205d7e54eee5d7906f52b
Author: Øyvind Kolås <pippin gimp org>
Date: Wed May 14 17:53:55 2014 +0200
reindent gegl-op.h
gegl/gegl-op.h | 166 +++++++++++++++++++++++++++-----------------------------
1 files changed, 79 insertions(+), 87 deletions(-)
---
diff --git a/gegl/gegl-op.h b/gegl/gegl-op.h
index 41a2e83..1bd0fde 100644
--- a/gegl/gegl-op.h
+++ b/gegl/gegl-op.h
@@ -47,8 +47,8 @@ static void type_name##_class_finalize (TypeName##Class *klass); \
static GType type_name##_type_id = 0; \
static void type_name##_class_chant_intern_init (gpointer klass) \
{ \
- gegl_op_parent_class = g_type_class_peek_parent (klass); \
- gegl_op_class_intern_init (klass); \
+ gegl_op_parent_class = g_type_class_peek_parent (klass); \
+ gegl_op_class_intern_init (klass); \
type_name##_class_init ((TypeName##Class*) klass); \
} \
GType \
@@ -75,7 +75,7 @@ type_name##_register_type (GTypeModule *type_module) \
NULL /* value_table */ \
}; \
g_snprintf (tempname, sizeof (tempname), \
- "%s", #TypeName GEGL_OP_C_FILE); \
+ "%s", #TypeName GEGL_OP_C_FILE); \
for (p = tempname; *p; p++) \
if (*p=='.') *p='_'; \
\
@@ -88,10 +88,7 @@ type_name##_register_type (GTypeModule *type_module) \
}
-#define GEGL_PROPERTIES(op) \
- ((GeglProperties *) (((GeglOp *) (op))->properties))
-
-/****************************************************************************/
+#define GEGL_PROPERTIES(op) ((GeglProperties *) (((GeglOp*)(op))->properties))
#define MKCLASS(a) MKCLASS2(a)
#define MKCLASS2(a) a##Class
@@ -112,7 +109,6 @@ GEGL_DEFINE_DYNAMIC_OPERATION(GEGL_OP_PARENT)
#endif
-
#ifdef GEGL_OP_TYPE_META
#include <operation/gegl-operation-meta.h>
struct _GeglOp
@@ -183,14 +179,10 @@ gegl_module_register (GTypeModule *module)
#define gegl_property_curve(name, ...)
#define gegl_property_seed(name, rand_name, ...)
#define gegl_property_path(name, ...)
-#define gegl_op_register_enum(enum_name) \
-typedef enum {
-
-#define enum_value(value, nick) \
- value ,
-#define gegl_op_register_enum_end(enum) \
-} enum ;
+#define gegl_op_register_enum(enum_name) typedef enum {
+#define enum_value(value, nick) value ,
+#define gegl_op_register_enum_end(enum) } enum ;
#include GEGL_OP_C_FILE
@@ -198,7 +190,7 @@ typedef enum {
#undef enum_value
#undef gegl_op_register_enum_end
-#define gegl_op_register_enum(enum_name) \
+#define gegl_op_register_enum(enum_name) \
GType enum_name ## _get_type (void) G_GNUC_CONST; \
GType enum_name ## _get_type (void) \
{ \
@@ -209,13 +201,13 @@ GType enum_name ## _get_type (void) \
#define enum_value(value, nick) \
{ value, nick, nick },
-#define gegl_op_register_enum_end(enum) \
- { 0, NULL, NULL } \
- }; \
- etype = g_enum_register_static (#enum, values); \
- } \
- return etype; \
-} \
+#define gegl_op_register_enum_end(enum) \
+ { 0, NULL, NULL } \
+ }; \
+ etype = g_enum_register_static (#enum, values); \
+ } \
+ return etype; \
+} \
#include GEGL_OP_C_FILE
@@ -326,51 +318,51 @@ get_property (GObject *gobject,
switch (property_id)
{
-#define gegl_property_double(name,...) \
+#define gegl_property_double(name,...) \
case PROP_##name: \
g_value_set_double (value, properties->name); \
break;
-#define gegl_property_boolean(name,...) \
+#define gegl_property_boolean(name,...) \
case PROP_##name: \
- g_value_set_boolean (value, properties->name); \
+ g_value_set_boolean (value, properties->name); \
break;
-#define gegl_property_int(name,...) \
+#define gegl_property_int(name,...) \
case PROP_##name: \
- g_value_set_int (value, properties->name); \
+ g_value_set_int (value, properties->name); \
break;
-#define gegl_property_string(name, ...) \
+#define gegl_property_string(name, ...) \
case PROP_##name: \
g_value_set_string (value, properties->name); \
break;
-#define gegl_property_enum(name, enum, enum_name, ...) \
+#define gegl_property_enum(name, enum, enum_name, ...) \
case PROP_##name: \
g_value_set_enum (value, properties->name); \
break;
-#define gegl_property_object(name, ...) \
+#define gegl_property_object(name, ...) \
case PROP_##name: \
g_value_set_object (value, properties->name); \
break;
-#define gegl_property_pointer(name, ...) \
+#define gegl_property_pointer(name, ...) \
case PROP_##name: \
g_value_set_pointer (value, properties->name); \
break;
-#define gegl_property_format(name, ...) \
+#define gegl_property_format(name, ...) \
case PROP_##name: \
g_value_set_pointer (value, properties->name); \
break;
-#define gegl_property_color(name, ...) \
+#define gegl_property_color(name, ...) \
case PROP_##name: \
g_value_set_object (value, properties->name); \
break;
-#define gegl_property_curve(name, ...) \
+#define gegl_property_curve(name, ...) \
case PROP_##name: \
g_value_set_object (value, properties->name); \
break;
-#define gegl_property_seed(name, rand_name, ...) \
+#define gegl_property_seed(name, rand_name, ...) \
case PROP_##name: \
g_value_set_int (value, properties->name); \
break;
-#define gegl_property_path(name, ...) \
+#define gegl_property_path(name, ...) \
case PROP_##name: \
g_value_set_object (value, properties->name); \
break;
@@ -408,55 +400,55 @@ set_property (GObject *gobject,
switch (property_id)
{
-#define gegl_property_double(name, ...) \
+#define gegl_property_double(name, ...) \
case PROP_##name: \
properties->name = g_value_get_double (value); \
break;
-#define gegl_property_boolean(name, ...) \
+#define gegl_property_boolean(name, ...) \
case PROP_##name: \
- properties->name = g_value_get_boolean (value); \
+ properties->name = g_value_get_boolean (value); \
break;
-#define gegl_property_int(name, ...) \
+#define gegl_property_int(name, ...) \
case PROP_##name: \
- properties->name = g_value_get_int (value); \
+ properties->name = g_value_get_int (value); \
break;
-#define gegl_property_string(name, ...) \
+#define gegl_property_string(name, ...) \
case PROP_##name: \
if (properties->name) \
g_free (properties->name); \
properties->name = g_value_dup_string (value); \
break;
-#define gegl_property_enum(name, enum, enum_name, ...) \
+#define gegl_property_enum(name, enum, enum_name, ...) \
case PROP_##name: \
properties->name = g_value_get_enum (value); \
break;
-#define gegl_property_object(name, ...) \
+#define gegl_property_object(name, ...) \
case PROP_##name: \
if (properties->name != NULL) \
g_object_unref (properties->name); \
properties->name = g_value_dup_object (value); \
break;
-#define gegl_property_pointer(name, ...) \
+#define gegl_property_pointer(name, ...) \
case PROP_##name: \
properties->name = g_value_get_pointer (value); \
break;
-#define gegl_property_format(name, ...) \
+#define gegl_property_format(name, ...) \
case PROP_##name: \
properties->name = g_value_get_pointer (value); \
break;
-#define gegl_property_color(name, ...) \
+#define gegl_property_color(name, ...) \
case PROP_##name: \
if (properties->name != NULL) \
g_object_unref (properties->name); \
properties->name = g_value_dup_object (value); \
break;
-#define gegl_property_curve(name, ...) \
+#define gegl_property_curve(name, ...) \
case PROP_##name: \
if (properties->name != NULL) \
g_object_unref (properties->name); \
properties->name = g_value_dup_object (value); \
break;
-#define gegl_property_seed(name, rand_name, ...) \
+#define gegl_property_seed(name, rand_name, ...) \
case PROP_##name: \
properties->name = g_value_get_int (value); \
if (!properties->rand_name) \
@@ -464,7 +456,7 @@ set_property (GObject *gobject,
else \
gegl_random_set_seed (properties->rand_name, properties->name);\
break;
-#define gegl_property_path(name, ...) \
+#define gegl_property_path(name, ...) \
case PROP_##name: \
if (properties->name != NULL) \
{ \
@@ -513,7 +505,7 @@ static void gegl_op_destroy_notify (gpointer data)
#define gegl_property_double(name, ...)
#define gegl_property_boolean(name, ...)
#define gegl_property_int(name, ...)
-#define gegl_property_string(name, ...) \
+#define gegl_property_string(name, ...) \
if (properties->name) \
{ \
g_free (properties->name); \
@@ -528,25 +520,25 @@ static void gegl_op_destroy_notify (gpointer data)
}
#define gegl_property_pointer(name, ...)
#define gegl_property_format(name, ...)
-#define gegl_property_color(name, ...) \
+#define gegl_property_color(name, ...) \
if (properties->name) \
{ \
g_object_unref (properties->name); \
properties->name = NULL; \
}
-#define gegl_property_curve(name, ...) \
+#define gegl_property_curve(name, ...) \
if (properties->name) \
- {\
+ { \
g_object_unref (properties->name); \
properties->name = NULL; \
}
-#define gegl_property_seed(name, rand_name, ...)\
- if (properties->rand_name) \
- { \
- gegl_random_free (properties->rand_name); \
- properties->rand_name = NULL; \
+#define gegl_property_seed(name, rand_name, ...) \
+ if (properties->rand_name) \
+ { \
+ gegl_random_free (properties->rand_name); \
+ properties->rand_name = NULL; \
}
-#define gegl_property_path(name, ...) \
+#define gegl_property_path(name, ...) \
if (properties->name) \
{ \
g_object_unref (properties->name); \
@@ -573,8 +565,8 @@ static void gegl_op_destroy_notify (gpointer data)
static GObject *
gegl_op_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
{
GObject *obj;
GeglProperties *properties;
@@ -594,10 +586,10 @@ gegl_op_constructor (GType type,
#define gegl_property_pointer(name, ...)
#define gegl_property_format(name, ...)
#define gegl_property_color(name, ...) \
- if (properties->name == NULL) \
+ if (properties->name == NULL) \
{const char *def = gegl_operation_class_get_property_key (g_type_peek_class (type), name,
"default");properties->name = gegl_color_new(def?def:"black");}
-#define gegl_property_seed(name, rand_name, ...) \
- if (properties->rand_name == NULL) \
+#define gegl_property_seed(name, rand_name, ...) \
+ if (properties->rand_name == NULL) \
{properties->rand_name = gegl_random_new_with_seed (0);}
#define gegl_property_path(name, ...)
#define gegl_property_curve(name, ...)
@@ -634,39 +626,40 @@ gegl_op_class_intern_init (gpointer klass)
#define gegl_property_double(name, foo...) \
{ GParamSpec *pspec = gegl_param_spec_double_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_boolean(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_boolean_from_vararg (#name, foo); \
+#define gegl_property_boolean(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_boolean_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
#define gegl_property_int(name, foo...) \
{ GParamSpec *pspec = gegl_param_spec_int_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_string(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_string_from_vararg (#name, foo); \
+#define gegl_property_string(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_string_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_enum(name, enum, enum_name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_enum_from_vararg (#name, enum_name ## _get_type (), foo); \
+#define gegl_property_enum(name, enum, enum_name, foo... ) \
+ { GParamSpec *pspec = gegl_param_spec_enum_from_vararg (#name, \
+ enum_name ## _get_type (), foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_object(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_object_from_vararg (#name, foo); \
+#define gegl_property_object(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_object_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_pointer(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_pointer_from_vararg (#name, foo); \
+#define gegl_property_pointer(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_pointer_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_format(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_format_from_vararg (#name, foo); \
+#define gegl_property_format(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_format_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_seed(name, rand_name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_seed_from_vararg (#name, foo); \
+#define gegl_property_seed(name, rand_name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_seed_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_color(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_color_from_vararg (#name, foo); \
+#define gegl_property_color(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_color_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_path(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_path_from_vararg (#name, foo); \
+#define gegl_property_path(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_path_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
-#define gegl_property_curve(name, foo...) \
- { GParamSpec *pspec = gegl_param_spec_curve_from_vararg (#name, foo); \
+#define gegl_property_curve(name, foo...) \
+ { GParamSpec *pspec = gegl_param_spec_curve_from_vararg (#name, foo); \
g_object_class_install_property (object_class, PROP_##name, pspec);};
#include GEGL_OP_C_FILE
@@ -692,4 +685,3 @@ gegl_op_init_properties (GeglOp *self)
}
G_END_DECLS
-/****************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
