From 6c88fa50f03c3ab8f0d0c9fd1b0a9f6659875457 Mon Sep 17 00:00:00 2001 From: Robert Staudinger Date: Mon, 10 Aug 2009 18:14:46 +0200 Subject: [property] Initialise new "serialize" method in property vtables. --- ccss-cairo/ccss-cairo-appearance-parser.c | 3 +- ccss-cairo/ccss-cairo-style.c | 9 ++-- ccss-gtk/ccss-gtk-property.c | 3 +- ccss/ccss-background-parser.c | 21 ++++++--- ccss/ccss-border-image-parser.c | 3 +- ccss/ccss-border-parser.c | 78 ++++++++++++++++++++----------- ccss/ccss-color-parser.c | 3 +- ccss/ccss-padding-parser.c | 15 ++++-- ccss/ccss-property-parser.c | 3 +- examples/example-4.c | 4 +- 10 files changed, 95 insertions(+), 47 deletions(-) diff --git a/ccss-cairo/ccss-cairo-appearance-parser.c b/ccss-cairo/ccss-cairo-appearance-parser.c index 2cfa44f..e43e3fa 100644 --- a/ccss-cairo/ccss-cairo-appearance-parser.c +++ b/ccss-cairo/ccss-cairo-appearance-parser.c @@ -218,7 +218,8 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) appearance_destroy, .convert = (ccss_property_convert_f) appearance_convert, .factory = appearance_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/ccss-cairo/ccss-cairo-style.c b/ccss-cairo/ccss-cairo-style.c index 877bfe5..8197a7f 100644 --- a/ccss-cairo/ccss-cairo-style.c +++ b/ccss-cairo/ccss-cairo-style.c @@ -839,21 +839,24 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) gap_destroy_nop, .convert = (ccss_property_convert_f) gap_side_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "ccss-gap-start", .create = NULL, .destroy = (ccss_property_destroy_f) gap_destroy_nop, .convert = (ccss_property_convert_f) gap_start_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "ccss-gap-width", .create = NULL, .destroy = (ccss_property_destroy_f) gap_destroy_nop, .convert = (ccss_property_convert_f) gap_width_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/ccss-gtk/ccss-gtk-property.c b/ccss-gtk/ccss-gtk-property.c index f9ca73e..d6e631e 100644 --- a/ccss-gtk/ccss-gtk-property.c +++ b/ccss-gtk/ccss-gtk-property.c @@ -537,7 +537,8 @@ static ccss_property_class_t const _properties[] = { .destroy = (ccss_property_destroy_f) property_destroy, .convert = (ccss_property_convert_f) property_convert, .factory = property_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/ccss/ccss-background-parser.c b/ccss/ccss-background-parser.c index 6014f23..1e35888 100644 --- a/ccss/ccss-background-parser.c +++ b/ccss/ccss-background-parser.c @@ -633,49 +633,56 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) background_attachment_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background-image", .create = background_image_create, .destroy = (ccss_property_destroy_f) background_image_destroy, .convert = (ccss_property_convert_f) background_image_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background-position", .create = background_position_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) background_position_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background-repeat", .create = background_repeat_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) background_repeat_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background-size", .create = background_size_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) background_size_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "background", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = background_factory, - .inherit = background_inherit + .inherit = background_inherit, + .serialize = NULL }, { .name = NULL } diff --git a/ccss/ccss-border-image-parser.c b/ccss/ccss-border-image-parser.c index 43d2dbc..e18fd69 100644 --- a/ccss/ccss-border-image-parser.c +++ b/ccss/ccss-border-image-parser.c @@ -255,7 +255,8 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) border_image_destroy, .convert = (ccss_property_convert_f) border_image_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/ccss/ccss-border-parser.c b/ccss/ccss-border-parser.c index c4e5734..0aafb08 100644 --- a/ccss/ccss-border-parser.c +++ b/ccss/ccss-border-parser.c @@ -1125,182 +1125,208 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_radius_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-bottom-right-radius", .create = border_radius_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_radius_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-bottom-left-radius", .create = border_radius_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_radius_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-top-left-radius", .create = border_radius_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_radius_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-radius", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_radius_convert, .factory = border_radius_factory, - .inherit = border_radius_inherit + .inherit = border_radius_inherit, + .serialize = NULL }, { .name = "border-left-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-left-style", .create = border_style_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_style_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-left-width", .create = border_width_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_width_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-top-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-top-style", .create = border_style_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_style_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-top-width", .create = border_width_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_width_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-right-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-right-style", .create = border_style_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_style_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-right-width", .create = border_width_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_width_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-bottom-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-bottom-style", .create = border_style_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_style_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-bottom-width", .create = border_width_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_width_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "border-left", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = border_left_factory, - .inherit = border_left_inherit + .inherit = border_left_inherit, + .serialize = NULL }, { .name = "border-top", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = border_top_factory, - .inherit = border_top_inherit + .inherit = border_top_inherit, + .serialize = NULL }, { .name = "border-right", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = border_right_factory, - .inherit = border_right_inherit + .inherit = border_right_inherit, + .serialize = NULL }, { .name = "border-bottom", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = border_bottom_factory, - .inherit = border_bottom_inherit + .inherit = border_bottom_inherit, + .serialize = NULL }, { .name = "border-color", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = border_color_factory, - .inherit = border_color_inherit + .inherit = border_color_inherit, + .serialize = NULL }, { .name = "border-style", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_style_convert, .factory = border_style_factory, - .inherit = border_style_inherit + .inherit = border_style_inherit, + .serialize = NULL }, { .name = "border-width", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_width_convert, .factory = border_width_factory, - .inherit = border_width_inherit + .inherit = border_width_inherit, + .serialize = NULL }, { .name = "border", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = NULL, .factory = border_factory, - .inherit = border_inherit + .inherit = border_inherit, + .serialize = NULL }, { .name = "border-spacing", .create = border_spacing_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) border_spacing_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL, } diff --git a/ccss/ccss-color-parser.c b/ccss/ccss-color-parser.c index 0d01e7f..069bfab 100644 --- a/ccss/ccss-color-parser.c +++ b/ccss/ccss-color-parser.c @@ -642,7 +642,8 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) ccss_color_convert, .factory = ccss_color_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/ccss/ccss-padding-parser.c b/ccss/ccss-padding-parser.c index 1b18d6f..cd9fc5f 100644 --- a/ccss/ccss-padding-parser.c +++ b/ccss/ccss-padding-parser.c @@ -244,35 +244,40 @@ static ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) padding_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "padding-right", .create = padding_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) padding_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "padding-bottom", .create = padding_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) padding_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "padding-left", .create = padding_create, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) padding_convert, .factory = NULL, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = "padding", .create = NULL, .destroy = (ccss_property_destroy_f) g_free, .convert = (ccss_property_convert_f) padding_convert, .factory = padding_factory, - .inherit = padding_inherit + .inherit = padding_inherit, + .serialize = NULL }, { .name = NULL } diff --git a/ccss/ccss-property-parser.c b/ccss/ccss-property-parser.c index fac10a1..689b815 100644 --- a/ccss/ccss-property-parser.c +++ b/ccss/ccss-property-parser.c @@ -148,7 +148,8 @@ ccss_property_class_t const _ptable[] = { .destroy = (ccss_property_destroy_f) property_destroy, .convert = (ccss_property_convert_f) property_convert, .factory = property_factory, - .inherit = NULL + .inherit = NULL, + .serialize = NULL }, { .name = NULL } diff --git a/examples/example-4.c b/examples/example-4.c index 26598d1..0702d0c 100644 --- a/examples/example-4.c +++ b/examples/example-4.c @@ -73,7 +73,9 @@ static ccss_property_class_t const _properties[] = { .create = (ccss_property_create_f) font_family_new, .destroy = (ccss_property_destroy_f) font_family_free, .convert = (ccss_property_convert_f) font_family_convert, - .factory = NULL + .factory = NULL, + .inherit = NULL, + .serialize = NULL }, { .name = NULL } -- cgit v1.2.3