summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-10-22 22:36:38 +0200
committerBenjamin Otte <otte@redhat.com>2015-01-07 14:26:46 +0100
commitf51419adb0034ad784d013db4e57bbdbc7b80153 (patch)
tree0f1ccd82e83f882ef138a883843c9e085a6e33c2 /gtk
parent314a1689167b6e944230ae7d8be1cac3d43af7b2 (diff)
downloadgtk+-f51419adb0034ad784d013db4e57bbdbc7b80153.tar.gz
cssstylefuncs: Rename functions
This is in preaparation for the big GtkCssComputedValues => GtkCssStyle rename
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcsscustomproperty.c2
-rw-r--r--gtk/gtkcssprovider.c4
-rw-r--r--gtk/gtkcssstylefuncs.c20
-rw-r--r--gtk/gtkcssstylefuncsprivate.h6
-rw-r--r--gtk/gtkcsstypedvalue.c4
5 files changed, 18 insertions, 18 deletions
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 31cfefd0f7..d401759a61 100644
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -75,7 +75,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);
+ success = _gtk_css_style_funcs_parse_value (&value, parser);
}
if (!success)
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 0ebe32b4e8..aa61771d36 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1727,8 +1727,8 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
val->section != NULL ? gtk_css_section_get_file (val->section) : NULL,
val->value);
- found = _gtk_css_style_parse_value (value,
- scanner->parser);
+ found = _gtk_css_style_funcs_parse_value (value,
+ scanner->parser);
gtk_css_scanner_destroy (scanner);
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index d196550c58..56f5cdf0d6 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -1075,8 +1075,8 @@ gtk_css_style_funcs_init (void)
* Returns: %TRUE if parsing succeeded.
**/
gboolean
-_gtk_css_style_parse_value (GValue *value,
- GtkCssParser *parser)
+_gtk_css_style_funcs_parse_value (GValue *value,
+ GtkCssParser *parser)
{
GtkStyleParseFunc func;
@@ -1111,8 +1111,8 @@ _gtk_css_style_parse_value (GValue *value,
* valid value, a random string will be printed instead.
**/
void
-_gtk_css_style_print_value (const GValue *value,
- GString *string)
+_gtk_css_style_funcs_print_value (const GValue *value,
+ GString *string)
{
GtkStylePrintFunc func;
@@ -1153,12 +1153,12 @@ _gtk_css_style_print_value (const GValue *value,
* Returns: the resulting value
**/
GtkCssValue *
-_gtk_css_style_compute_value (GtkStyleProviderPrivate *provider,
- GtkCssComputedValues *values,
- GtkCssComputedValues *parent_values,
- GType target_type,
- GtkCssValue *specified,
- GtkCssDependencies *dependencies)
+_gtk_css_style_funcs_compute_value (GtkStyleProviderPrivate *provider,
+ GtkCssComputedValues *values,
+ GtkCssComputedValues *parent_values,
+ GType target_type,
+ GtkCssValue *specified,
+ GtkCssDependencies *dependencies)
{
GtkStyleComputeFunc func;
diff --git a/gtk/gtkcssstylefuncsprivate.h b/gtk/gtkcssstylefuncsprivate.h
index df13b80949..47c52a5c69 100644
--- a/gtk/gtkcssstylefuncsprivate.h
+++ b/gtk/gtkcssstylefuncsprivate.h
@@ -24,11 +24,11 @@
G_BEGIN_DECLS
-gboolean _gtk_css_style_parse_value (GValue *value,
+gboolean _gtk_css_style_funcs_parse_value (GValue *value,
GtkCssParser *parser);
-void _gtk_css_style_print_value (const GValue *value,
+void _gtk_css_style_funcs_print_value (const GValue *value,
GString *string);
-GtkCssValue * _gtk_css_style_compute_value (GtkStyleProviderPrivate *provider,
+GtkCssValue * _gtk_css_style_funcs_compute_value (GtkStyleProviderPrivate *provider,
GtkCssComputedValues *values,
GtkCssComputedValues *parent_values,
GType target_type,
diff --git a/gtk/gtkcsstypedvalue.c b/gtk/gtkcsstypedvalue.c
index 54716182a6..be2458469a 100644
--- a/gtk/gtkcsstypedvalue.c
+++ b/gtk/gtkcsstypedvalue.c
@@ -45,7 +45,7 @@ gtk_css_value_typed_compute (GtkCssValue *value,
{
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (_gtk_css_style_property_lookup_by_id (property_id));
- return _gtk_css_style_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
+ return _gtk_css_style_funcs_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
}
static gboolean
@@ -68,7 +68,7 @@ static void
gtk_css_value_typed_print (const GtkCssValue *value,
GString *string)
{
- _gtk_css_style_print_value (&value->value, string);
+ _gtk_css_style_funcs_print_value (&value->value, string);
}
static const GtkCssValueClass GTK_CSS_VALUE_TYPED = {