[gtk+/wip/cssvalue: 135/142] styleproperty: Remove equal_func vfunc
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cssvalue: 135/142] styleproperty: Remove equal_func vfunc
- Date: Sat, 7 Apr 2012 19:57:42 +0000 (UTC)
commit c132816e37786577593336d2bd1dd738f2bc6c84
Author: Benjamin Otte <otte redhat com>
Date: Sat Apr 7 10:39:51 2012 +0200
styleproperty: Remove equal_func vfunc
Equality tests are done with _gtk_css_value_equal(). There is no need to
do it per-property, equal values will still be equal.
This essentially reverts 24f5d54329e028347bd76af42e86ed190c1229a2 and
92c7a7171e1240b6d961ee5b6f9ab6b596e98904.
gtk/gtkcssstyleproperty.c | 32 ---------------------
gtk/gtkcssstylepropertyimpl.c | 57 --------------------------------------
gtk/gtkcssstylepropertyprivate.h | 7 ----
3 files changed, 0 insertions(+), 96 deletions(-)
---
diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 82d0a88..411291f 100644
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -244,21 +244,12 @@ gtk_css_style_property_real_compute_value (GtkCssStyleProperty *property,
return _gtk_css_value_ref (specified);
}
-static gboolean
-gtk_css_style_property_real_equal (GtkCssStyleProperty *property,
- GtkCssValue *value1,
- GtkCssValue *value2)
-{
- return _gtk_css_value_equal (value1, value2);
-}
-
static void
_gtk_css_style_property_init (GtkCssStyleProperty *property)
{
property->parse_value = gtk_css_style_property_real_parse_value;
property->print_value = gtk_css_style_property_real_print_value;
property->compute_value = gtk_css_style_property_real_compute_value;
- property->equal_func = gtk_css_style_property_real_equal;
}
/**
@@ -431,26 +422,3 @@ _gtk_css_style_property_print_value (GtkCssStyleProperty *property,
else
property->print_value (property, value, string);
}
-
-/**
- * _gtk_css_style_property_is_equal:
- * @property: the property
- * @value1: the first value to compare
- * @value2: the second value to compare
- *
- * Compares @value1 and @value2 for equality. Both values must be the
- * result of a call _gtk_css_style_property_compute_value().
- *
- * Returns: %TRUE if @value1 and @value2 are equal
- **/
-gboolean
-_gtk_css_style_property_is_equal (GtkCssStyleProperty *property,
- GtkCssValue *value1,
- GtkCssValue *value2)
-{
- g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), FALSE);
- g_return_val_if_fail (value1 != NULL, FALSE);
- g_return_val_if_fail (value2 != NULL, FALSE);
-
- return property->equal_func (property, value1, value2);
-}
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index ad7c57a..7f6b4a1 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -77,7 +77,6 @@ gtk_css_style_property_register (const char * name,
GtkCssStylePropertyComputeFunc compute_value,
GtkCssStylePropertyQueryFunc query_value,
GtkCssStylePropertyAssignFunc assign_value,
- GtkCssStylePropertyEqualFunc equal_func,
GtkCssValue * initial_value)
{
GtkCssStyleProperty *node;
@@ -102,8 +101,6 @@ gtk_css_style_property_register (const char * name,
node->compute_value = compute_value;
node->query_value = query_value;
node->assign_value = assign_value;
- if (equal_func)
- node->equal_func = equal_func;
_gtk_css_value_unref (initial_value);
@@ -921,7 +918,6 @@ _gtk_css_style_property_init_properties (void)
color_property_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
gtk_css_style_property_register ("font-size",
@@ -933,7 +929,6 @@ _gtk_css_style_property_init_properties (void)
font_size_compute,
query_length_as_double,
assign_length_from_double,
- NULL,
/* XXX: This should be 'normal' */
_gtk_css_number_value_new (10.0, GTK_CSS_PX));
@@ -948,7 +943,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
@@ -961,7 +955,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
font_family_query,
font_family_assign,
- NULL,
_gtk_css_array_value_new (_gtk_css_string_value_new ("Sans")));
gtk_css_style_property_register ("font-style",
GTK_CSS_PROPERTY_FONT_STYLE,
@@ -972,7 +965,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_style,
assign_pango_style,
- NULL,
_gtk_css_font_style_value_new (PANGO_STYLE_NORMAL));
gtk_css_style_property_register ("font-variant",
GTK_CSS_PROPERTY_FONT_VARIANT,
@@ -983,7 +975,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_variant,
assign_pango_variant,
- NULL,
_gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL));
gtk_css_style_property_register ("font-weight",
GTK_CSS_PROPERTY_FONT_WEIGHT,
@@ -994,7 +985,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_weight,
assign_pango_weight,
- NULL,
_gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL));
gtk_css_style_property_register ("text-shadow",
@@ -1006,7 +996,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("icon-shadow",
@@ -1018,7 +1007,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("box-shadow",
@@ -1030,7 +1018,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("margin-top",
@@ -1042,7 +1029,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-left",
GTK_CSS_PROPERTY_MARGIN_LEFT,
@@ -1053,7 +1039,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-bottom",
GTK_CSS_PROPERTY_MARGIN_BOTTOM,
@@ -1064,7 +1049,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-right",
GTK_CSS_PROPERTY_MARGIN_RIGHT,
@@ -1075,7 +1059,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-top",
GTK_CSS_PROPERTY_PADDING_TOP,
@@ -1086,7 +1069,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-left",
GTK_CSS_PROPERTY_PADDING_LEFT,
@@ -1097,7 +1079,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-bottom",
GTK_CSS_PROPERTY_PADDING_BOTTOM,
@@ -1108,7 +1089,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-right",
GTK_CSS_PROPERTY_PADDING_RIGHT,
@@ -1119,7 +1099,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
/* IMPORTANT: compute_border_width() requires that the border-width
* properties be immeditaly followed by the border-style properties
@@ -1133,7 +1112,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-top-width",
GTK_CSS_PROPERTY_BORDER_TOP_WIDTH,
@@ -1144,7 +1122,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-left-style",
GTK_CSS_PROPERTY_BORDER_LEFT_STYLE,
@@ -1155,7 +1132,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-left-width",
GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH,
@@ -1166,7 +1142,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-bottom-style",
GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE,
@@ -1177,7 +1152,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-bottom-width",
GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
@@ -1188,7 +1162,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-right-style",
GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE,
@@ -1199,7 +1172,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-right-width",
GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH,
@@ -1210,7 +1182,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-top-left-radius",
@@ -1222,7 +1193,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-top-right-radius",
@@ -1234,7 +1204,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-bottom-right-radius",
@@ -1246,7 +1215,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-bottom-left-radius",
@@ -1258,7 +1226,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
- NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
@@ -1271,7 +1238,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
- NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("outline-width",
GTK_CSS_PROPERTY_OUTLINE_WIDTH,
@@ -1282,7 +1248,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("outline-offset",
GTK_CSS_PROPERTY_OUTLINE_OFFSET,
@@ -1293,7 +1258,6 @@ _gtk_css_style_property_init_properties (void)
outline_compute,
query_length_as_int,
assign_length_from_int,
- NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("background-clip",
@@ -1305,7 +1269,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX));
gtk_css_style_property_register ("background-origin",
GTK_CSS_PROPERTY_BACKGROUND_ORIGIN,
@@ -1316,7 +1279,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX));
gtk_css_style_property_register ("background-size",
GTK_CSS_PROPERTY_BACKGROUND_SIZE,
@@ -1327,7 +1289,6 @@ _gtk_css_style_property_init_properties (void)
background_size_compute,
NULL,
NULL,
- NULL,
_gtk_css_bg_size_value_new (NULL, NULL));
gtk_css_style_property_register ("background-position",
GTK_CSS_PROPERTY_BACKGROUND_POSITION,
@@ -1338,7 +1299,6 @@ _gtk_css_style_property_init_properties (void)
background_position_compute,
NULL,
NULL,
- NULL,
_gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PERCENT),
_gtk_css_number_value_new (0, GTK_CSS_PERCENT)));
@@ -1351,7 +1311,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@@ -1364,7 +1323,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@@ -1377,7 +1335,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@@ -1390,7 +1347,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@@ -1403,7 +1359,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
- NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@@ -1417,7 +1372,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_background_repeat_value_new (GTK_CSS_REPEAT_STYLE_REPEAT,
GTK_CSS_REPEAT_STYLE_REPEAT));
gtk_css_style_property_register ("background-image",
@@ -1429,7 +1383,6 @@ _gtk_css_style_property_init_properties (void)
css_image_value_compute,
css_image_value_query,
css_image_value_assign,
- NULL,
_gtk_css_image_value_new (NULL));
gtk_css_style_property_register ("border-image-source",
@@ -1441,7 +1394,6 @@ _gtk_css_style_property_init_properties (void)
css_image_value_compute,
css_image_value_query,
css_image_value_assign,
- NULL,
_gtk_css_image_value_new (NULL));
gtk_css_style_property_register ("border-image-repeat",
GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT,
@@ -1452,7 +1404,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_border_repeat_value_new (GTK_CSS_REPEAT_STYLE_STRETCH,
GTK_CSS_REPEAT_STYLE_STRETCH));
@@ -1465,7 +1416,6 @@ _gtk_css_style_property_init_properties (void)
compute_border,
query_border,
assign_border,
- NULL,
_gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
@@ -1479,7 +1429,6 @@ _gtk_css_style_property_init_properties (void)
compute_border,
query_border,
assign_border,
- NULL,
_gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
@@ -1494,7 +1443,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_array_value_new (_gtk_css_string_value_new ("all")));
gtk_css_style_property_register ("transition-duration",
GTK_CSS_PROPERTY_TRANSITION_DURATION,
@@ -1505,7 +1453,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
gtk_css_style_property_register ("transition-timing-function",
GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,
@@ -1516,7 +1463,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_array_value_new (
_gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 0.1)));
gtk_css_style_property_register ("transition-delay",
@@ -1528,7 +1474,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- NULL,
_gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
gtk_css_style_property_register ("engine",
@@ -1540,7 +1485,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
engine_query,
engine_assign,
- NULL,
_gtk_css_engine_value_new (gtk_theming_engine_load (NULL)));
/* Private property holding the binding sets */
@@ -1553,7 +1497,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
bindings_value_query,
bindings_value_assign,
- NULL,
_gtk_css_array_value_new (NULL));
}
diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h
index f095dc1..86bc550 100644
--- a/gtk/gtkcssstylepropertyprivate.h
+++ b/gtk/gtkcssstylepropertyprivate.h
@@ -48,9 +48,6 @@ typedef void (* GtkCssStylePropertyQueryFunc) (GtkCssStyleProperty
GValue *value);
typedef GtkCssValue * (* GtkCssStylePropertyAssignFunc) (GtkCssStyleProperty *property,
const GValue *value);
-typedef gboolean (* GtkCssStylePropertyEqualFunc) (GtkCssStyleProperty *property,
- GtkCssValue *value1,
- GtkCssValue *value2);
struct _GtkCssStyleProperty
{
GtkStyleProperty parent;
@@ -65,7 +62,6 @@ struct _GtkCssStyleProperty
GtkCssStylePropertyComputeFunc compute_value;
GtkCssStylePropertyQueryFunc query_value;
GtkCssStylePropertyAssignFunc assign_value;
- GtkCssStylePropertyEqualFunc equal_func;
};
struct _GtkCssStylePropertyClass
@@ -95,9 +91,6 @@ GtkCssValue * _gtk_css_style_property_compute_value (GtkCssStyleProp
void _gtk_css_style_property_print_value (GtkCssStyleProperty *property,
GtkCssValue *value,
GString *string);
-gboolean _gtk_css_style_property_is_equal (GtkCssStyleProperty *property,
- GtkCssValue *value1,
- GtkCssValue *value2);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
