From 01a03b13ecee7fb2a65970212de2063e135f1de6 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Fri, 8 Jan 2010 01:02:08 +0100 Subject: [PATCH] [ADG] Inserted "_get" in adg_entity_{global,local}_matrix First step in API consolidation. Starting point issue #8: http://dev.entidi.com/p/adg/issues/8/ --- adg/adg-adim.c | 2 +- adg/adg-entity.c | 14 +++++++------- adg/adg-entity.h | 4 ++-- adg/adg-enums.c | 2 +- adg/adg-ldim.c | 4 ++-- adg/adg-logo.c | 2 +- adg/adg-projection.c | 2 +- adg/adg-rdim.c | 2 +- adg/adg-stroke.c | 6 +++--- adg/adg-toy-text.c | 10 +++++----- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/adg/adg-adim.c b/adg/adg-adim.c index 949502d6..c9646ec6 100644 --- a/adg/adg-adim.c +++ b/adg/adg-adim.c @@ -588,7 +588,7 @@ arrange(AdgEntity *entity) return; } - local = adg_entity_local_matrix(entity); + local = adg_entity_get_local_matrix(entity); /* Apply the local matrix to the relevant points */ cpml_pair_transform(cpml_pair_copy(&ref1, adg_dim_get_ref1(dim)), local); diff --git a/adg/adg-entity.c b/adg/adg-entity.c index 2a5d5d50..d5b75b14 100644 --- a/adg/adg-entity.c +++ b/adg/adg-entity.c @@ -873,7 +873,7 @@ adg_entity_local_changed(AdgEntity *entity) } /** - * adg_entity_global_matrix: + * adg_entity_get_global_matrix: * @entity: an #AdgEntity object * * Gets the global matrix by combining all the global maps of the @@ -884,7 +884,7 @@ adg_entity_local_changed(AdgEntity *entity) * Returns: the global matrix or %NULL on errors **/ const AdgMatrix * -adg_entity_global_matrix(AdgEntity *entity) +adg_entity_get_global_matrix(AdgEntity *entity) { AdgEntityPrivate *data; @@ -896,7 +896,7 @@ adg_entity_global_matrix(AdgEntity *entity) } /** - * adg_entity_local_matrix: + * adg_entity_get_local_matrix: * @entity: an #AdgEntity object * @matrix: where to store the local matrix * @@ -907,7 +907,7 @@ adg_entity_global_matrix(AdgEntity *entity) * Returns: the local matrix or %NULL on errors **/ const AdgMatrix * -adg_entity_local_matrix(AdgEntity *entity) +adg_entity_get_local_matrix(AdgEntity *entity) { AdgEntityPrivate *data; @@ -1041,7 +1041,7 @@ global_changed(AdgEntity *entity) if (data->parent == NULL) { adg_matrix_copy(matrix, map); } else { - adg_matrix_copy(matrix, adg_entity_global_matrix(data->parent)); + adg_matrix_copy(matrix, adg_entity_get_global_matrix(data->parent)); adg_matrix_transform(matrix, map, ADG_TRANSFORM_BEFORE); } } @@ -1064,7 +1064,7 @@ local_changed(AdgEntity *entity) break; case ADG_MIX_ANCESTORS: if (data->parent != NULL) { - adg_matrix_copy(matrix, adg_entity_local_matrix(data->parent)); + adg_matrix_copy(matrix, adg_entity_get_local_matrix(data->parent)); adg_matrix_transform(matrix, &data->local_map, ADG_TRANSFORM_BEFORE); } else { adg_matrix_copy(matrix, &data->local_map); @@ -1072,7 +1072,7 @@ local_changed(AdgEntity *entity) break; case ADG_MIX_ANCESTORS_NORMALIZED: if (data->parent != NULL) { - adg_matrix_copy(matrix, adg_entity_local_matrix(data->parent)); + adg_matrix_copy(matrix, adg_entity_get_local_matrix(data->parent)); adg_matrix_transform(matrix, &data->local_map, ADG_TRANSFORM_BEFORE); } else { adg_matrix_copy(matrix, &data->local_map); diff --git a/adg/adg-entity.h b/adg/adg-entity.h index 8ca15084..cae5f26d 100644 --- a/adg/adg-entity.h +++ b/adg/adg-entity.h @@ -112,8 +112,8 @@ void adg_entity_set_style (AdgEntity *entity, void adg_entity_apply_dress (AdgEntity *entity, AdgDress dress, cairo_t *cr); -const AdgMatrix *adg_entity_global_matrix (AdgEntity *entity); -const AdgMatrix *adg_entity_local_matrix (AdgEntity *entity); +const AdgMatrix *adg_entity_get_global_matrix (AdgEntity *entity); +const AdgMatrix *adg_entity_get_local_matrix (AdgEntity *entity); const AdgMatrix *adg_entity_ctm (AdgEntity *entity); void adg_entity_global_changed (AdgEntity *entity); void adg_entity_local_changed (AdgEntity *entity); diff --git a/adg/adg-enums.c b/adg/adg-enums.c index 34726c53..bae7e834 100644 --- a/adg/adg-enums.c +++ b/adg/adg-enums.c @@ -87,7 +87,7 @@ * * Specifies how the maps of an #AdgEntity instance and its ancestors * should be combined to get a matrix. This is usually used by the - * adg_entity_local_matrix() method to get the local matrix. + * adg_entity_get_local_matrix() method to get the local matrix. **/ /** diff --git a/adg/adg-ldim.c b/adg/adg-ldim.c index ac4b206a..9835b5a8 100644 --- a/adg/adg-ldim.c +++ b/adg/adg-ldim.c @@ -525,7 +525,7 @@ arrange(AdgEntity *entity) break; } - local = adg_entity_local_matrix(entity); + local = adg_entity_get_local_matrix(entity); cpml_pair_copy(&ref1, adg_dim_get_ref1(dim)); cpml_pair_copy(&ref2, adg_dim_get_ref2(dim)); cpml_pair_copy(&base1, &data->geometry.base1); @@ -818,7 +818,7 @@ choose_outside(AdgLDim *ldim) data = ldim->data; quote = (AdgEntity *) adg_dim_get_quote((AdgDim *) ldim); - local = adg_entity_local_matrix((AdgEntity *) ldim); + local = adg_entity_get_local_matrix((AdgEntity *) ldim); marker1 = data->marker1 == NULL ? 0 : adg_marker_get_size(data->marker1); marker2 = data->marker2 == NULL ? 0 : adg_marker_get_size(data->marker2); diff --git a/adg/adg-logo.c b/adg/adg-logo.c index 6bd34601..9451c465 100644 --- a/adg/adg-logo.c +++ b/adg/adg-logo.c @@ -351,7 +351,7 @@ arrange(AdgEntity *entity) logo_class = ADG_LOGO_GET_CLASS(entity); data_class = logo_class->data_class; extents = (CpmlExtents *) adg_entity_extents(entity); - local = adg_entity_local_matrix(entity); + local = adg_entity_get_local_matrix(entity); arrange_class(logo_class); cpml_extents_copy(extents, &data_class->extents); diff --git a/adg/adg-projection.c b/adg/adg-projection.c index 69a87d7a..5acf16ac 100644 --- a/adg/adg-projection.c +++ b/adg/adg-projection.c @@ -348,7 +348,7 @@ arrange(AdgEntity *entity) data = ((AdgProjection *) entity)->data; projection_class = ADG_PROJECTION_GET_CLASS(entity); data_class = projection_class->data_class; - local = adg_entity_local_matrix(entity); + local = adg_entity_get_local_matrix(entity); arrange_class(projection_class, data->scheme); cpml_extents_copy(&extents, &data_class->extents); diff --git a/adg/adg-rdim.c b/adg/adg-rdim.c index 134730d8..4a945c3c 100644 --- a/adg/adg-rdim.c +++ b/adg/adg-rdim.c @@ -287,7 +287,7 @@ arrange(AdgEntity *entity) if (outside == ADG_THREE_STATE_UNKNOWN) outside = ADG_THREE_STATE_OFF; - local = adg_entity_local_matrix(entity); + local = adg_entity_get_local_matrix(entity); cpml_pair_copy(&ref1, adg_dim_get_ref1(dim)); cpml_pair_copy(&ref2, adg_dim_get_ref2(dim)); cpml_pair_copy(&base, &data->point.base); diff --git a/adg/adg-stroke.c b/adg/adg-stroke.c index 97a5405b..94ea3430 100644 --- a/adg/adg-stroke.c +++ b/adg/adg-stroke.c @@ -277,12 +277,12 @@ local_changed(AdgEntity *entity) AdgMatrix old; const AdgMatrix *new; - adg_matrix_copy(&old, adg_entity_local_matrix(entity)); + adg_matrix_copy(&old, adg_entity_get_local_matrix(entity)); if (PARENT_ENTITY_CLASS->local_changed) PARENT_ENTITY_CLASS->local_changed(entity); - new = adg_entity_local_matrix(entity); + new = adg_entity_get_local_matrix(entity); /* For simple translation, avoid the entity invalidation: * translate the extents of the same vector instead */ @@ -316,7 +316,7 @@ arrange(AdgEntity *entity) data = stroke->data; cpml_extents_copy(&extents, adg_trail_extents(data->trail)); - cpml_extents_transform(&extents, adg_entity_local_matrix(entity)); + cpml_extents_transform(&extents, adg_entity_get_local_matrix(entity)); adg_entity_set_extents(entity, &extents); } diff --git a/adg/adg-toy-text.c b/adg/adg-toy-text.c index 8a8ff1c8..1c946c0a 100644 --- a/adg/adg-toy-text.c +++ b/adg/adg-toy-text.c @@ -291,12 +291,12 @@ global_changed(AdgEntity *entity) AdgMatrix old; const AdgMatrix *new; - adg_matrix_copy(&old, adg_entity_global_matrix(entity)); + adg_matrix_copy(&old, adg_entity_get_global_matrix(entity)); if (PARENT_ENTITY_CLASS->global_changed) PARENT_ENTITY_CLASS->global_changed(entity); - new = adg_entity_global_matrix(entity); + new = adg_entity_get_global_matrix(entity); /* If scaling or rotation has changed, invalidate the font */ if (old.xx != new->xx || old.yy != new->yy || @@ -311,12 +311,12 @@ local_changed(AdgEntity *entity) const AdgMatrix *new; CpmlExtents extents; - adg_matrix_copy(&old, adg_entity_local_matrix(entity)); + adg_matrix_copy(&old, adg_entity_get_local_matrix(entity)); if (PARENT_ENTITY_CLASS->local_changed) PARENT_ENTITY_CLASS->local_changed(entity); - new = adg_entity_local_matrix(entity); + new = adg_entity_get_local_matrix(entity); /* If scaling or rotation has changed, invalidate the font */ if (old.xx != new->xx || old.yy != new->yy || @@ -388,7 +388,7 @@ arrange(AdgEntity *entity) cairo_scaled_font_glyph_extents(data->font, data->glyphs, data->num_glyphs, &cairo_extents); cpml_extents_from_cairo_text(&extents, &cairo_extents); - cpml_extents_transform(&extents, adg_entity_local_matrix(entity)); + cpml_extents_transform(&extents, adg_entity_get_local_matrix(entity)); } -- 2.11.4.GIT