From 91a197d3b116e1b0301deaeeea32246b30ff9a4a Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Sun, 10 Jan 2010 20:53:05 +0100 Subject: [PATCH] [ADG] s/adg_entity_extents/adg_entity_get_extents/ Renamed extents method to fulfill the API guidelines. Fixing issue #8: http://dev.entidi.com/p/adg/issues/8/ --- adg/adg-alignment.c | 2 +- adg/adg-container.c | 2 +- adg/adg-dim.c | 6 +++--- adg/adg-entity.c | 4 ++-- adg/adg-entity.h | 2 +- adg/adg-hatch.c | 2 +- adg/adg-ldim.c | 8 ++++---- adg/adg-logo.c | 2 +- adg/adg-stroke.c | 4 ++-- adg/adg-table.c | 8 ++++---- adg/adg-toy-text.c | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/adg/adg-alignment.c b/adg/adg-alignment.c index 985e2d2f..ed1088fb 100644 --- a/adg/adg-alignment.c +++ b/adg/adg-alignment.c @@ -251,7 +251,7 @@ arrange(AdgEntity *entity) if (PARENT_ENTITY_CLASS->arrange) PARENT_ENTITY_CLASS->arrange(entity); - extents = adg_entity_extents(entity); + extents = adg_entity_get_extents(entity); /* The children are displaced only if the extents are valid */ if (!extents->is_defined) diff --git a/adg/adg-container.c b/adg/adg-container.c index 4730c656..362d939d 100644 --- a/adg/adg-container.c +++ b/adg/adg-container.c @@ -451,7 +451,7 @@ add_extents(AdgEntity *entity, CpmlExtents *container_extents) { CpmlExtents extents; - cpml_extents_copy(&extents, adg_entity_extents(entity)); + cpml_extents_copy(&extents, adg_entity_get_extents(entity)); cpml_extents_transform(&extents, adg_entity_get_global_map(entity)); cpml_extents_add(container_extents, &extents); diff --git a/adg/adg-dim.c b/adg/adg-dim.c index ef1d2f8d..68e76ae1 100644 --- a/adg/adg-dim.c +++ b/adg/adg-dim.c @@ -989,7 +989,7 @@ arrange(AdgEntity *entity) adg_entity_arrange(container_entity); /* Basic value */ - extents = adg_entity_extents(value_entity); + extents = adg_entity_get_extents(value_entity); width = extents->size.x; /* Limit values (min and max) */ @@ -1000,11 +1000,11 @@ arrange(AdgEntity *entity) /* Minimum limit */ if (min_entity != NULL) - cpml_extents_copy(&min_extents, adg_entity_extents(min_entity)); + cpml_extents_copy(&min_extents, adg_entity_get_extents(min_entity)); /* Maximum limit */ if (max_entity != NULL) - cpml_extents_copy(&max_extents, adg_entity_extents(max_entity)); + cpml_extents_copy(&max_extents, adg_entity_get_extents(max_entity)); shift = adg_dim_style_get_limits_shift(data->dim_style); if (min_entity != NULL && max_entity != NULL) diff --git a/adg/adg-entity.c b/adg/adg-entity.c index fe22a534..8242ebc5 100644 --- a/adg/adg-entity.c +++ b/adg/adg-entity.c @@ -640,7 +640,7 @@ adg_entity_set_local_method(AdgEntity *entity, AdgMixMethod local_method) } /** - * adg_entity_extents: + * adg_entity_get_extents: * @entity: an #AdgEntity * * Gets the bounding box of @entity. The returned struct is @@ -658,7 +658,7 @@ adg_entity_set_local_method(AdgEntity *entity, AdgMixMethod local_method) * Returns: the bounding box of @entity or %NULL on errors **/ const CpmlExtents * -adg_entity_extents(AdgEntity *entity) +adg_entity_get_extents(AdgEntity *entity) { AdgEntityPrivate *data; diff --git a/adg/adg-entity.h b/adg/adg-entity.h index 962ab1cc..066e748a 100644 --- a/adg/adg-entity.h +++ b/adg/adg-entity.h @@ -97,7 +97,7 @@ AdgMixMethod adg_entity_get_local_method (AdgEntity *entity); void adg_entity_set_local_method (AdgEntity *entity, AdgMixMethod local_method); const CpmlExtents * - adg_entity_extents (AdgEntity *entity); + adg_entity_get_extents (AdgEntity *entity); void adg_entity_set_extents (AdgEntity *entity, const CpmlExtents *extents); AdgStyle * adg_entity_style (AdgEntity *entity, diff --git a/adg/adg-hatch.c b/adg/adg-hatch.c index 04742eb9..458f8b33 100644 --- a/adg/adg-hatch.c +++ b/adg/adg-hatch.c @@ -216,7 +216,7 @@ render(AdgEntity *entity, cairo_t *cr) AdgFillStyle *fill_style = (AdgFillStyle *) adg_entity_style(entity, data->fill_dress); - adg_fill_style_set_extents(fill_style, adg_entity_extents(entity)); + adg_fill_style_set_extents(fill_style, adg_entity_get_extents(entity)); cairo_save(cr); cairo_transform(cr, adg_entity_get_local_matrix(entity)); diff --git a/adg/adg-ldim.c b/adg/adg-ldim.c index b0617ad3..fd8b26b7 100644 --- a/adg/adg-ldim.c +++ b/adg/adg-ldim.c @@ -622,7 +622,7 @@ arrange(AdgEntity *entity) adg_matrix_copy(&data->quote.local_map, adg_entity_get_local_map(quote_entity)); - cpml_extents_copy("e_extents, adg_entity_extents(quote_entity)); + cpml_extents_copy("e_extents, adg_entity_get_extents(quote_entity)); cpml_extents_transform("e_extents, &map); cpml_extents_add(&extents, "e_extents); } @@ -636,7 +636,7 @@ arrange(AdgEntity *entity) adg_marker_set_segment(data->marker1, data->trail, outside ? 2 : 1); adg_entity_local_changed(marker1_entity); - cpml_extents_copy(&marker1_extents, adg_entity_extents(marker1_entity)); + cpml_extents_copy(&marker1_extents, adg_entity_get_extents(marker1_entity)); cpml_extents_transform(&marker1_extents, adg_entity_get_global_map(marker1_entity)); cpml_extents_add(&extents, &marker1_extents); @@ -651,7 +651,7 @@ arrange(AdgEntity *entity) adg_marker_set_segment(data->marker2, data->trail, outside ? 3 : 1); adg_entity_local_changed(marker2_entity); - cpml_extents_copy(&marker2_extents, adg_entity_extents(marker2_entity)); + cpml_extents_copy(&marker2_extents, adg_entity_get_extents(marker2_entity)); cpml_extents_transform(&marker2_extents, adg_entity_get_global_map(marker2_entity)); cpml_extents_add(&extents, &marker2_extents); @@ -822,7 +822,7 @@ choose_outside(AdgLDim *ldim) marker1 = data->marker1 == NULL ? 0 : adg_marker_get_size(data->marker1); marker2 = data->marker2 == NULL ? 0 : adg_marker_get_size(data->marker2); - needed = adg_entity_extents(quote)->size.x + marker1 + marker2; + needed = adg_entity_get_extents(quote)->size.x + marker1 + marker2; available = data->geometry.distance * local->xx; return needed > available; diff --git a/adg/adg-logo.c b/adg/adg-logo.c index baacd477..871ce4dc 100644 --- a/adg/adg-logo.c +++ b/adg/adg-logo.c @@ -350,7 +350,7 @@ arrange(AdgEntity *entity) logo_class = ADG_LOGO_GET_CLASS(entity); data_class = logo_class->data_class; - extents = (CpmlExtents *) adg_entity_extents(entity); + extents = (CpmlExtents *) adg_entity_get_extents(entity); local = adg_entity_get_local_matrix(entity); arrange_class(logo_class); diff --git a/adg/adg-stroke.c b/adg/adg-stroke.c index 4ce4a00f..6f2c5d34 100644 --- a/adg/adg-stroke.c +++ b/adg/adg-stroke.c @@ -290,7 +290,7 @@ local_changed(AdgEntity *entity) old.xy == new->xy && old.yx == new->yx) { CpmlExtents extents; - cpml_extents_copy(&extents, adg_entity_extents(entity)); + cpml_extents_copy(&extents, adg_entity_get_extents(entity)); extents.org.x += new->x0 - old.x0; extents.org.y += new->y0 - old.y0; @@ -309,7 +309,7 @@ arrange(AdgEntity *entity) CpmlExtents extents; /* Check for cached result */ - if (adg_entity_extents(entity)->is_defined) + if (adg_entity_get_extents(entity)->is_defined) return; stroke = (AdgStroke *) entity; diff --git a/adg/adg-table.c b/adg/adg-table.c index 7a37301c..e358221f 100644 --- a/adg/adg-table.c +++ b/adg/adg-table.c @@ -1051,7 +1051,7 @@ arrange(AdgEntity *entity) table = (AdgTable *) entity; data = table->data; - cpml_extents_copy(&extents, adg_entity_extents(entity)); + cpml_extents_copy(&extents, adg_entity_get_extents(entity)); /* Resolve the table style */ if (data->table_style == NULL) @@ -1169,7 +1169,7 @@ arrange_frame(AdgEntity *entity) return; path = adg_path_new(); - extents = adg_entity_extents(entity); + extents = adg_entity_get_extents(entity); cpml_pair_copy(&pair, &extents->org); adg_path_move_to(path, &pair); @@ -1540,12 +1540,12 @@ cell_arrange_size(AdgTableCell *cell) size->x = 0; if (cell->title != NULL) { - extents = adg_entity_extents((AdgEntity *) title_alignment); + extents = adg_entity_get_extents((AdgEntity *) title_alignment); size->x = extents->size.x; } if (cell->value != NULL) { - extents = adg_entity_extents((AdgEntity *) value_alignment); + extents = adg_entity_get_extents((AdgEntity *) value_alignment); if (extents->size.x > size->x) size->x = extents->size.x; } diff --git a/adg/adg-toy-text.c b/adg/adg-toy-text.c index 259237f1..4b9e3e20 100644 --- a/adg/adg-toy-text.c +++ b/adg/adg-toy-text.c @@ -323,7 +323,7 @@ local_changed(AdgEntity *entity) old.xy != new->xy || old.yx != new->yx) unset_font((AdgToyText *) entity); - cpml_extents_copy(&extents, adg_entity_extents(entity)); + cpml_extents_copy(&extents, adg_entity_get_extents(entity)); if (extents.is_defined) { /* Update the extents to the new local map */ -- 2.11.4.GIT