[gtk+] cssstylefuncs: Remove base argument

[Benjamin Otte <otte src gnome org>]

commit 1367ef7e54c034347e5f281fec734e68751cd6fd
Author: Benjamin Otte <otte redhat com>
Date:   Wed Apr 18 21:52:36 2012 +0200

    cssstylefuncs: Remove base argument
    
    The GtkCssParser keeps track of the base file now.

 gtk/gtkcsscustomproperty.c    |    2 +-
 gtk/gtkcssprovider.c          |    3 +--
 gtk/gtkcssstylefuncs.c        |   29 +++++------------------------
 gtk/gtkcssstylefuncsprivate.h |    3 +--
 gtk/gtkwin32theme.c           |    1 -
 gtk/gtkwin32themeprivate.h    |    1 -
 6 files changed, 8 insertions(+), 31 deletions(-)
---
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 8f50d8a..9c0cb81 100644
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -69,7 +69,7 @@ gtk_css_custom_property_parse_value (GtkStyleProperty *property,
     {
       g_value_init (&value, gtk_css_custom_property_get_specified_type (custom->pspec));
 
-      success = _gtk_css_style_parse_value (&value, parser, base);
+      success = _gtk_css_style_parse_value (&value, parser);
     }
 
   if (!success)
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 31bf889..05422d6 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1558,8 +1558,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
 					     val->value);
 
 	      found = _gtk_css_style_parse_value (value,
-						  scanner->parser,
-						  NULL);
+						  scanner->parser);
 
 	      gtk_css_scanner_destroy (scanner);
 
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index 538079d..9db3510 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -49,7 +49,6 @@ static GHashTable *print_funcs = NULL;
 static GHashTable *compute_funcs = NULL;
 
 typedef gboolean         (* GtkStyleParseFunc)             (GtkCssParser           *parser,
-                                                            GFile                  *base,
                                                             GValue                 *value);
 typedef void             (* GtkStylePrintFunc)             (const GValue           *value,
                                                             GString                *string);
@@ -162,7 +161,6 @@ enum_print (int         value,
 
 static gboolean
 rgba_value_parse (GtkCssParser *parser,
-                  GFile        *base,
                   GValue       *value)
 {
   GtkSymbolicColor *symbolic;
@@ -231,7 +229,6 @@ rgba_value_compute (GtkStyleContext *context,
 
 static gboolean 
 color_value_parse (GtkCssParser *parser,
-                   GFile        *base,
                    GValue       *value)
 {
   GtkSymbolicColor *symbolic;
@@ -310,7 +307,6 @@ color_value_compute (GtkStyleContext *context,
 
 static gboolean
 symbolic_color_value_parse (GtkCssParser *parser,
-                            GFile        *base,
                             GValue       *value)
 {
   GtkSymbolicColor *symbolic;
@@ -341,7 +337,6 @@ symbolic_color_value_print (const GValue *value,
 
 static gboolean 
 font_description_value_parse (GtkCssParser *parser,
-                              GFile        *base,
                               GValue       *value)
 {
   PangoFontDescription *font_desc;
@@ -383,7 +378,6 @@ font_description_value_print (const GValue *value,
 
 static gboolean 
 boolean_value_parse (GtkCssParser *parser,
-                     GFile        *base,
                      GValue       *value)
 {
   if (_gtk_css_parser_try (parser, "true", TRUE) ||
@@ -417,14 +411,13 @@ boolean_value_print (const GValue *value,
 
 static gboolean 
 int_value_parse (GtkCssParser *parser,
-                 GFile        *base,
                  GValue       *value)
 {
   gint i;
 
   if (_gtk_css_parser_begins_with (parser, '-'))
     {
-      int res = _gtk_win32_theme_int_parse (parser, base, &i);
+      int res = _gtk_win32_theme_int_parse (parser, &i);
       if (res >= 0)
 	{
 	  g_value_set_int (value, i);
@@ -452,7 +445,6 @@ int_value_print (const GValue *value,
 
 static gboolean 
 uint_value_parse (GtkCssParser *parser,
-                  GFile        *base,
                   GValue       *value)
 {
   guint u;
@@ -476,7 +468,6 @@ uint_value_print (const GValue *value,
 
 static gboolean 
 double_value_parse (GtkCssParser *parser,
-                    GFile        *base,
                     GValue       *value)
 {
   gdouble d;
@@ -500,7 +491,6 @@ double_value_print (const GValue *value,
 
 static gboolean 
 float_value_parse (GtkCssParser *parser,
-                   GFile        *base,
                    GValue       *value)
 {
   gdouble d;
@@ -524,7 +514,6 @@ float_value_print (const GValue *value,
 
 static gboolean 
 string_value_parse (GtkCssParser *parser,
-                    GFile        *base,
                     GValue       *value)
 {
   char *str = _gtk_css_parser_read_string (parser);
@@ -545,7 +534,6 @@ string_value_print (const GValue *value,
 
 static gboolean 
 theming_engine_value_parse (GtkCssParser *parser,
-                            GFile        *base,
                             GValue       *value)
 {
   GtkThemingEngine *engine;
@@ -599,7 +587,6 @@ theming_engine_value_print (const GValue *value,
 
 static gboolean 
 border_value_parse (GtkCssParser *parser,
-                    GFile        *base,
                     GValue       *value)
 {
   GtkBorder border = { 0, };
@@ -612,7 +599,7 @@ border_value_parse (GtkCssParser *parser,
 	{
 	  /* These are strictly speaking signed, but we want to be able to use them
 	     for unsigned types too, as the actual ranges of values make this safe */
-	  int res = _gtk_win32_theme_int_parse (parser, base, &numbers[i]);
+	  int res = _gtk_win32_theme_int_parse (parser, &numbers[i]);
 
 	  if (res == 0) /* Parse error, report */
 	    return FALSE;
@@ -670,7 +657,6 @@ border_value_print (const GValue *value, GString *string)
 
 static gboolean 
 gradient_value_parse (GtkCssParser *parser,
-                      GFile        *base,
                       GValue       *value)
 {
   GtkGradient *gradient;
@@ -701,7 +687,6 @@ gradient_value_print (const GValue *value,
 
 static gboolean 
 pattern_value_parse (GtkCssParser *parser,
-                     GFile        *base,
                      GValue       *value)
 {
   if (_gtk_css_parser_try (parser, "none", TRUE))
@@ -712,7 +697,7 @@ pattern_value_parse (GtkCssParser *parser,
     {
       g_value_unset (value);
       g_value_init (value, GTK_TYPE_GRADIENT);
-      return gradient_value_parse (parser, base, value);
+      return gradient_value_parse (parser, value);
     }
   else
     {
@@ -852,7 +837,6 @@ pattern_value_compute (GtkStyleContext *context,
 
 static gboolean 
 enum_value_parse (GtkCssParser *parser,
-                  GFile        *base,
                   GValue       *value)
 {
   int v;
@@ -875,7 +859,6 @@ enum_value_print (const GValue *value,
 
 static gboolean 
 flags_value_parse (GtkCssParser *parser,
-                   GFile        *base,
                    GValue       *value)
 {
   GFlagsClass *flags_class;
@@ -1027,7 +1010,6 @@ gtk_css_style_funcs_init (void)
  * _gtk_css_style_parse_value:
  * @value: the value to parse into. Must be a valid initialized #GValue
  * @parser: the parser to parse from
- * @base: the base URL for @parser
  *
  * This is the generic parsing function used for CSS values. If the
  * function fails to parse a value, it will emit an error on @parser,
@@ -1037,8 +1019,7 @@ gtk_css_style_funcs_init (void)
  **/
 gboolean
 _gtk_css_style_parse_value (GValue       *value,
-                            GtkCssParser *parser,
-                            GFile        *base)
+                            GtkCssParser *parser)
 {
   GtkStyleParseFunc func;
 
@@ -1061,7 +1042,7 @@ _gtk_css_style_parse_value (GValue       *value,
       return FALSE;
     }
 
-  return (*func) (parser, base, value);
+  return (*func) (parser, value);
 }
 
 /**
diff --git a/gtk/gtkcssstylefuncsprivate.h b/gtk/gtkcssstylefuncsprivate.h
index 647a950..f8b180b 100644
--- a/gtk/gtkcssstylefuncsprivate.h
+++ b/gtk/gtkcssstylefuncsprivate.h
@@ -25,8 +25,7 @@
 G_BEGIN_DECLS
 
 gboolean            _gtk_css_style_parse_value             (GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkCssParser           *parser);
 void                _gtk_css_style_print_value             (const GValue           *value,
                                                             GString                *string);
 GtkCssValue *       _gtk_css_style_compute_value           (GtkStyleContext        *context,
diff --git a/gtk/gtkwin32theme.c b/gtk/gtkwin32theme.c
index ebc7e85..d8b04a6 100644
--- a/gtk/gtkwin32theme.c
+++ b/gtk/gtkwin32theme.c
@@ -315,7 +315,6 @@ _gtk_win32_theme_part_create_surface (HTHEME theme,
 
 int
 _gtk_win32_theme_int_parse (GtkCssParser      *parser,
-			    GFile             *base,
 			    int               *value)
 {
   char *class;
diff --git a/gtk/gtkwin32themeprivate.h b/gtk/gtkwin32themeprivate.h
index 22a2a54..88d8660 100644
--- a/gtk/gtkwin32themeprivate.h
+++ b/gtk/gtkwin32themeprivate.h
@@ -49,7 +49,6 @@ cairo_surface_t *  _gtk_win32_theme_part_create_surface  (HTHEME       theme,
 							  int         *y_offs_out);
 
 int                _gtk_win32_theme_int_parse     (GtkCssParser      *parser,
-						   GFile             *base,
 						   int               *value);
 GtkSymbolicColor  *_gtk_win32_theme_color_parse   (GtkCssParser      *parser);
 gboolean           _gtk_win32_theme_color_resolve (const char        *theme_class,