[color] Deprecate struct fields.

5 files changed, 84 insertions, 11 deletions

diff --git a/ccss-tests/test-parser.c b/ccss-tests/test-parser.c
index 3422968..bf1ad79 100644
--- a/ccss-tests/test-parser.c
+++ b/ccss-tests/test-parser.c
@@ -86,17 +86,17 @@ test_color (void)
 					       "color",
 					       (ccss_property_t const **) &color);
 		g_assert (ret);
-		g_assert (ccss_property_get_state (&color->base) == CCSS_PROPERTY_STATE_SET);
+		g_assert (ccss_property_get_state ((ccss_property_t *) color) == CCSS_PROPERTY_STATE_SET);
 
 		/* Only compare defined values (i.e. > 0). */
 		if (_values[i][0] >= 0.)
-			ccss_assert_float_equal (color->red, _values[i][0]);
+			ccss_assert_float_equal (ccss_color_get_red (color), _values[i][0]);
 		if (_values[i][1] >= 0.)
-			ccss_assert_float_equal (color->green, _values[i][1]);
+			ccss_assert_float_equal (ccss_color_get_green (color), _values[i][1]);
 		if (_values[i][2] >= 0.)
-			ccss_assert_float_equal (color->blue, _values[i][2]);
+			ccss_assert_float_equal (ccss_color_get_blue (color), _values[i][2]);
 		if (_values[i][3] >= 0.)
-			ccss_assert_float_equal (color->alpha, _values[i][3]);
+			ccss_assert_float_equal (ccss_color_get_alpha (color), _values[i][3]);
 
 		ccss_style_destroy (style);
 	}
diff --git a/ccss/Makefile.am b/ccss/Makefile.am
index 0424234..3a2cb97 100644
--- a/ccss/Makefile.am
+++ b/ccss/Makefile.am
@@ -34,6 +34,7 @@ libccss_1_la_SOURCES = \
 	ccss-border-parser.h \
 	ccss-border-image-parser.c \
 	ccss-border-image-parser.h \
+	ccss-color.c \
 	ccss-color-parser.c \
 	ccss-grammar.c \
 	ccss-grammar-function.c \
diff --git a/ccss/ccss-color.c b/ccss/ccss-color.c
new file mode 100644
index 0000000..3597ca9
--- /dev/null
+++ b/ccss/ccss-color.c
@@ -0,0 +1,56 @@
+/* vim: set ts=8 sw=8 noexpandtab: */
+
+/* The `C' CSS Library.
+ * Copyright (C) 2008 Robert Staudinger
+ *
+ * This  library is free  software; you can  redistribute it and/or
+ * modify it  under  the terms  of the  GNU Lesser  General  Public
+ * License  as published  by the Free  Software  Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed  in the hope that it will be useful,
+ * but  WITHOUT ANY WARRANTY; without even  the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License  along  with  this library;  if not,  write to  the Free
+ * Software Foundation, Inc., 51  Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <glib.h>
+#include "ccss-color.h"
+
+double
+ccss_color_get_red (ccss_color_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->red;
+}
+
+double
+ccss_color_get_green (ccss_color_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->green;
+}
+
+double
+ccss_color_get_blue (ccss_color_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->blue;
+}
+
+double
+ccss_color_get_alpha (ccss_color_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->alpha;
+}
+
diff --git a/ccss/ccss-color.h b/ccss/ccss-color.h
index 44a4ee2..c269226 100644
--- a/ccss/ccss-color.h
+++ b/ccss/ccss-color.h
@@ -22,21 +22,32 @@
 #ifndef CCSS_COLOR_H
 #define CCSS_COLOR_H
 
-#include <stdbool.h>
 #include <ccss/ccss-macros.h>
 #include <ccss/ccss-property.h>
 
 CCSS_BEGIN_DECLS
 
 typedef struct {
-	ccss_property_t	base;
+	CCSS_DEPRECATED (ccss_property_t	base);
 
-	float		red;
-	float		green;
-	float		blue;
-	float		alpha;
+	CCSS_DEPRECATED (float			red);
+	CCSS_DEPRECATED (float			green);
+	CCSS_DEPRECATED (float			blue);
+	CCSS_DEPRECATED (float			alpha);
 } ccss_color_t;
 
+double
+ccss_color_get_red	(ccss_color_t const *self);
+
+double
+ccss_color_get_green	(ccss_color_t const *self);
+
+double
+ccss_color_get_blue	(ccss_color_t const *self);
+
+double
+ccss_color_get_alpha	(ccss_color_t const *self);
+
 CCSS_END_DECLS
 
 #endif /* CCSS_COLOR_H */
diff --git a/ccss/ccss.sym b/ccss/ccss.sym
index 799840d..27938fa 100644
--- a/ccss/ccss.sym
+++ b/ccss/ccss.sym
@@ -1,4 +1,8 @@
 ccss_block_add_property
+ccss_color_get_alpha
+ccss_color_get_blue
+ccss_color_get_green
+ccss_color_get_red
 ccss_color_parse
 ccss_grammar_add_functions
 ccss_grammar_add_properties
@@ -14,6 +18,7 @@ ccss_grammar_lookup_function
 ccss_grammar_lookup_property
 ccss_grammar_reference
 ccss_node_init
+ccss_padding_get_padding
 ccss_position_get_hsize
 ccss_position_get_pos
 ccss_position_get_size