[gtk+] styleproperty: Remove base argument
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] styleproperty: Remove base argument
- Date: Fri, 11 May 2012 14:45:12 +0000 (UTC)
commit a7f238138ec567b14293e728222147e326ff7154
Author: Benjamin Otte <otte redhat com>
Date: Wed Apr 18 22:04:44 2012 +0200
styleproperty: Remove base argument
from _gtk_style_property_parse_value(). The GtkCssParser takes care of
that now.
gtk/gtkcsscustomproperty.c | 3 +--
gtk/gtkcssprovider.c | 3 +--
gtk/gtkcssshorthandproperty.c | 3 +--
gtk/gtkcssstyleproperty.c | 3 +--
gtk/gtkstyleproperty.c | 6 ++----
gtk/gtkstylepropertyprivate.h | 6 ++----
6 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 9c0cb81..f017f7c 100644
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -42,8 +42,7 @@ gtk_css_custom_property_get_specified_type (GParamSpec *pspec)
static GtkCssValue *
gtk_css_custom_property_parse_value (GtkStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property);
GValue value = G_VALUE_INIT;
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 05422d6..d57ccd0 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2200,8 +2200,7 @@ parse_declaration (GtkCssScanner *scanner,
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
value = _gtk_style_property_parse_value (property,
- scanner->parser,
- gtk_css_scanner_get_base_url (scanner));
+ scanner->parser);
if (value == NULL)
{
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index 96e8c63..c6ca614 100644
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -86,8 +86,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty *property,
static GtkCssValue *
gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property);
GtkCssValue **data;
diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 8a34bdc..cc08e18 100644
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -147,8 +147,7 @@ _gtk_css_style_property_query (GtkStyleProperty *property,
static GtkCssValue *
gtk_css_style_property_parse_value (GtkStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property);
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 87234e0..74245d6 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -132,7 +132,6 @@ _gtk_style_property_init (GtkStyleProperty *property)
* _gtk_style_property_parse_value:
* @property: the property
* @parser: the parser to parse from
- * @base: the base file for @aprser
*
* Tries to parse the given @property from the given @parser into
* @value. The type that @value will be assigned is dependant on
@@ -148,8 +147,7 @@ _gtk_style_property_init (GtkStyleProperty *property)
**/
GtkCssValue *
_gtk_style_property_parse_value (GtkStyleProperty *property,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkStylePropertyClass *klass;
@@ -158,7 +156,7 @@ _gtk_style_property_parse_value (GtkStyleProperty *property,
klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
- return klass->parse_value (property, parser, base);
+ return klass->parse_value (property, parser);
}
/**
diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 56fb82b..a92afdc 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -58,8 +58,7 @@ struct _GtkStylePropertyClass
GtkStyleQueryFunc query_func,
gpointer query_data);
GtkCssValue * (* parse_value) (GtkStyleProperty * property,
- GtkCssParser *parser,
- GFile *base);
+ GtkCssParser *parser);
GHashTable *properties;
};
@@ -73,8 +72,7 @@ GtkStyleProperty * _gtk_style_property_lookup (const char
const char * _gtk_style_property_get_name (GtkStyleProperty *property);
GtkCssValue * _gtk_style_property_parse_value (GtkStyleProperty * property,
- GtkCssParser *parser,
- GFile *base);
+ GtkCssParser *parser);
GType _gtk_style_property_get_value_type(GtkStyleProperty * property);
void _gtk_style_property_query (GtkStyleProperty * property,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]