diff options
Diffstat (limited to 'clutter/clutter/clutter-script-parser.c')
-rw-r--r-- | clutter/clutter/clutter-script-parser.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/clutter/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c index f15b1d471..ac3bd94f8 100644 --- a/clutter/clutter/clutter-script-parser.c +++ b/clutter/clutter/clutter-script-parser.c @@ -492,8 +492,8 @@ _clutter_script_parse_color (ClutterScript *script, } static gboolean -parse_point_from_array (JsonArray *array, - ClutterPoint *point) +parse_point_from_array (JsonArray *array, + graphene_point_t *point) { if (json_array_get_length (array) != 2) return FALSE; @@ -505,8 +505,8 @@ parse_point_from_array (JsonArray *array, } static gboolean -parse_point_from_object (JsonObject *object, - ClutterPoint *point) +parse_point_from_object (JsonObject *object, + graphene_point_t *point) { if (json_object_has_member (object, "x")) point->x = json_object_get_double_member (object, "x"); @@ -522,9 +522,9 @@ parse_point_from_object (JsonObject *object, } gboolean -_clutter_script_parse_point (ClutterScript *script, - JsonNode *node, - ClutterPoint *point) +_clutter_script_parse_point (ClutterScript *script, + JsonNode *node, + graphene_point_t *point) { g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE); g_return_val_if_fail (node != NULL, FALSE); @@ -1364,9 +1364,9 @@ _clutter_script_parse_node (ClutterScript *script, return TRUE; } } - else if (p_type == CLUTTER_TYPE_POINT) + else if (p_type == GRAPHENE_TYPE_POINT) { - ClutterPoint point = CLUTTER_POINT_INIT_ZERO; + graphene_point_t point = GRAPHENE_POINT_INIT_ZERO; if (_clutter_script_parse_point (script, node, &point)) { @@ -1441,9 +1441,9 @@ _clutter_script_parse_node (ClutterScript *script, return TRUE; } } - else if (G_VALUE_HOLDS (value, CLUTTER_TYPE_POINT)) + else if (G_VALUE_HOLDS (value, GRAPHENE_TYPE_POINT)) { - ClutterPoint point = CLUTTER_POINT_INIT_ZERO; + graphene_point_t point = GRAPHENE_POINT_INIT_ZERO; if (_clutter_script_parse_point (script, node, &point)) { |