AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 04:31:09 +00:00
Code Issues Projects Releases Wiki Activity

css style: Rename some static functions

Browse Source 
Make the font property functions follow the general naming
scheme, and remove pango from the names.
This commit is contained in:
Matthias Clasen 2016-04-18 09:43:10 -04:00
parent bbb45a2b2d
commit 31a12c6a23
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gtk/gtkcssstylepropertyimpl.c
View File

@ -274,8 +274,8 @@ font_family_assign (GtkCssStyleProperty *property,
} }
static GtkCssValue * static GtkCssValue *
parse_pango_style (GtkCssStyleProperty *property, font_style_parse (GtkCssStyleProperty *property,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssValue *value = _gtk_css_font_style_value_try_parse (parser); GtkCssValue *value = _gtk_css_font_style_value_try_parse (parser);
@ -286,24 +286,24 @@ parse_pango_style (GtkCssStyleProperty *property,
} }
static void static void
query_pango_style (GtkCssStyleProperty *property, font_style_query (GtkCssStyleProperty *property,
const GtkCssValue *css_value, const GtkCssValue *css_value,
GValue *value) GValue *value)
{ {
g_value_init (value, PANGO_TYPE_STYLE); g_value_init (value, PANGO_TYPE_STYLE);
g_value_set_enum (value, _gtk_css_font_style_value_get (css_value)); g_value_set_enum (value, _gtk_css_font_style_value_get (css_value));
} }
static GtkCssValue * static GtkCssValue *
assign_pango_style (GtkCssStyleProperty *property, font_style_assign (GtkCssStyleProperty *property,
const GValue *value) const GValue *value)
{ {
return _gtk_css_font_style_value_new (g_value_get_enum (value)); return _gtk_css_font_style_value_new (g_value_get_enum (value));
} }
static GtkCssValue * static GtkCssValue *
parse_pango_weight (GtkCssStyleProperty *property, font_weight_parse (GtkCssStyleProperty *property,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssValue *value = _gtk_css_font_weight_value_try_parse (parser); GtkCssValue *value = _gtk_css_font_weight_value_try_parse (parser);
@ -314,24 +314,24 @@ parse_pango_weight (GtkCssStyleProperty *property,
} }
static void static void
query_pango_weight (GtkCssStyleProperty *property, font_weight_query (GtkCssStyleProperty *property,
const GtkCssValue *css_value, const GtkCssValue *css_value,
GValue *value) GValue *value)
{ {
g_value_init (value, PANGO_TYPE_WEIGHT); g_value_init (value, PANGO_TYPE_WEIGHT);
g_value_set_enum (value, _gtk_css_font_weight_value_get (css_value)); g_value_set_enum (value, _gtk_css_font_weight_value_get (css_value));
} }
static GtkCssValue * static GtkCssValue *
assign_pango_weight (GtkCssStyleProperty *property, font_weight_assign (GtkCssStyleProperty *property,
const GValue *value) const GValue *value)
{ {
return _gtk_css_font_weight_value_new (g_value_get_enum (value)); return _gtk_css_font_weight_value_new (g_value_get_enum (value));
} }
static GtkCssValue * static GtkCssValue *
parse_pango_variant (GtkCssStyleProperty *property, font_variant_parse (GtkCssStyleProperty *property,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssValue *value = _gtk_css_font_variant_value_try_parse (parser); GtkCssValue *value = _gtk_css_font_variant_value_try_parse (parser);
@ -342,8 +342,8 @@ parse_pango_variant (GtkCssStyleProperty *property,
} }
static void static void
query_pango_variant (GtkCssStyleProperty *property, font_variant_query (GtkCssStyleProperty *property,
const GtkCssValue *css_value, const GtkCssValue *css_value,
GValue *value) GValue *value)
{ {
g_value_init (value, PANGO_TYPE_VARIANT); g_value_init (value, PANGO_TYPE_VARIANT);
@ -351,15 +351,15 @@ query_pango_variant (GtkCssStyleProperty *property,
} }
static GtkCssValue * static GtkCssValue *
assign_pango_variant (GtkCssStyleProperty *property, font_variant_assign (GtkCssStyleProperty *property,
const GValue *value) const GValue *value)
{ {
return _gtk_css_font_variant_value_new (g_value_get_enum (value)); return _gtk_css_font_variant_value_new (g_value_get_enum (value));
} }
static GtkCssValue * static GtkCssValue *
parse_pango_stretch (GtkCssStyleProperty *property, font_stretch_parse (GtkCssStyleProperty *property,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssValue *value = _gtk_css_font_stretch_value_try_parse (parser); GtkCssValue *value = _gtk_css_font_stretch_value_try_parse (parser);
@ -370,17 +370,17 @@ parse_pango_stretch (GtkCssStyleProperty *property,
} }
static void static void
query_pango_stretch (GtkCssStyleProperty *property, font_stretch_query (GtkCssStyleProperty *property,
const GtkCssValue *css_value, const GtkCssValue *css_value,
GValue *value) GValue *value)
{ {
g_value_init (value, PANGO_TYPE_STRETCH); g_value_init (value, PANGO_TYPE_STRETCH);
g_value_set_enum (value, _gtk_css_font_stretch_value_get (css_value)); g_value_set_enum (value, _gtk_css_font_stretch_value_get (css_value));
} }
static GtkCssValue * static GtkCssValue *
assign_pango_stretch (GtkCssStyleProperty *property, font_stretch_assign (GtkCssStyleProperty *property,
const GValue *value) const GValue *value)
{ {
return _gtk_css_font_stretch_value_new (g_value_get_enum (value)); return _gtk_css_font_stretch_value_new (g_value_get_enum (value));
} }
@ -1097,36 +1097,36 @@ _gtk_css_style_property_init_properties (void)
PANGO_TYPE_STYLE, PANGO_TYPE_STYLE,
GTK_STYLE_PROPERTY_INHERIT, GTK_STYLE_PROPERTY_INHERIT,
GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT, GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT,
parse_pango_style, font_style_parse,
query_pango_style, font_style_query,
assign_pango_style, font_style_assign,
_gtk_css_font_style_value_new (PANGO_STYLE_NORMAL)); _gtk_css_font_style_value_new (PANGO_STYLE_NORMAL));
gtk_css_style_property_register ("font-variant", gtk_css_style_property_register ("font-variant",
GTK_CSS_PROPERTY_FONT_VARIANT, GTK_CSS_PROPERTY_FONT_VARIANT,
PANGO_TYPE_VARIANT, PANGO_TYPE_VARIANT,
GTK_STYLE_PROPERTY_INHERIT, GTK_STYLE_PROPERTY_INHERIT,
GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT, GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT,
parse_pango_variant, font_variant_parse,
query_pango_variant, font_variant_query,
assign_pango_variant, font_variant_assign,
_gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL)); _gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL));
gtk_css_style_property_register ("font-weight", gtk_css_style_property_register ("font-weight",
GTK_CSS_PROPERTY_FONT_WEIGHT, GTK_CSS_PROPERTY_FONT_WEIGHT,
PANGO_TYPE_WEIGHT, PANGO_TYPE_WEIGHT,
GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT, GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT,
parse_pango_weight, font_weight_parse,
query_pango_weight, font_weight_query,
assign_pango_weight, font_weight_assign,
_gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL)); _gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL));
gtk_css_style_property_register ("font-stretch", gtk_css_style_property_register ("font-stretch",
GTK_CSS_PROPERTY_FONT_STRETCH, GTK_CSS_PROPERTY_FONT_STRETCH,
PANGO_TYPE_STRETCH, PANGO_TYPE_STRETCH,
GTK_STYLE_PROPERTY_INHERIT, GTK_STYLE_PROPERTY_INHERIT,
GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT, GTK_CSS_AFFECTS_FONT | GTK_CSS_AFFECTS_TEXT,
parse_pango_stretch, font_stretch_parse,
query_pango_stretch, font_stretch_query,
assign_pango_stretch, font_stretch_assign,
_gtk_css_font_stretch_value_new (PANGO_STRETCH_NORMAL)); _gtk_css_font_stretch_value_new (PANGO_STRETCH_NORMAL));
gtk_css_style_property_register ("letter-spacing", gtk_css_style_property_register ("letter-spacing",