From 8db4e0ec8898be36c4bf9720b0fe78308870e97a Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Sat, 10 Jan 2009 14:24:40 +0100 Subject: [PATCH] [AdgMatrix] Renamed adg_matrix_set() to adg_matrix_copy() As this function copies a source matrix into the subject matrix, the old name was simply wrong. --- adg/adg-container.c | 20 ++++++++++---------- adg/adg-entity.c | 4 ++-- adg/adg-matrix.c | 6 +++--- adg/adg-matrix.h | 2 +- docs/adg-sections.txt | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/adg/adg-container.c b/adg/adg-container.c index dd6f01ee..bdf165e0 100644 --- a/adg/adg-container.c +++ b/adg/adg-container.c @@ -213,12 +213,12 @@ set_property(GObject *object, adg_container_add(container, g_value_get_object(value)); break; case PROP_MODEL_TRANSFORMATION: - adg_matrix_set(&container->priv->model_transformation, - g_value_get_boxed(value)); + adg_matrix_copy(&container->priv->model_transformation, + g_value_get_boxed(value)); break; case PROP_PAPER_TRANSFORMATION: - adg_matrix_set(&container->priv->paper_transformation, - g_value_get_boxed(value)); + adg_matrix_copy(&container->priv->paper_transformation, + g_value_get_boxed(value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -312,8 +312,8 @@ model_matrix_changed(AdgEntity *entity, AdgMatrix *parent_matrix) parent_matrix, &container->priv->model_transformation); else - adg_matrix_set(&container->priv->model_matrix, - &container->priv->model_transformation); + adg_matrix_copy(&container->priv->model_matrix, + &container->priv->model_transformation); adg_container_propagate_by_name(container, "model-matrix-changed", &container->priv->model_matrix); @@ -331,8 +331,8 @@ paper_matrix_changed(AdgEntity *entity, AdgMatrix *parent_matrix) parent_matrix, &container->priv->paper_transformation); else - adg_matrix_set(&container->priv->paper_matrix, - &container->priv->paper_transformation); + adg_matrix_copy(&container->priv->paper_matrix, + &container->priv->paper_transformation); adg_container_propagate_by_name(container, "paper-matrix-changed", &container->priv->paper_matrix); @@ -593,7 +593,7 @@ adg_container_set_model_transformation(AdgContainer *container, parent = (AdgEntity *) adg_entity_get_parent(entity); parent_matrix = parent ? adg_entity_get_model_matrix(parent) : NULL; - adg_matrix_set(&container->priv->model_transformation, transformation); + adg_matrix_copy(&container->priv->model_transformation, transformation); adg_entity_model_matrix_changed(entity, parent_matrix); } @@ -635,6 +635,6 @@ adg_container_set_paper_transformation(AdgContainer *container, parent = (AdgEntity *) adg_entity_get_parent(entity); parent_matrix = parent ? adg_entity_get_paper_matrix(parent) : NULL; - adg_matrix_set(&container->priv->paper_transformation, transformation); + adg_matrix_copy(&container->priv->paper_transformation, transformation); adg_entity_paper_matrix_changed(entity, parent_matrix); } diff --git a/adg/adg-entity.c b/adg/adg-entity.c index e94dca0e..46d70229 100644 --- a/adg/adg-entity.c +++ b/adg/adg-entity.c @@ -523,7 +523,7 @@ adg_entity_build_paper2model(AdgEntity *entity, AdgMatrix *matrix) g_return_val_if_fail(ADG_IS_ENTITY(entity), FALSE); g_return_val_if_fail(matrix != NULL, FALSE); - adg_matrix_set(matrix, adg_entity_get_model_matrix(entity)); + adg_matrix_copy(matrix, adg_entity_get_model_matrix(entity)); status = cairo_matrix_invert(matrix); if (status != CAIRO_STATUS_SUCCESS) { g_error("Unable to invert model matrix (cairo message: %s)", @@ -553,7 +553,7 @@ adg_entity_build_model2paper(AdgEntity *entity, AdgMatrix *matrix) g_return_val_if_fail(ADG_IS_ENTITY(entity), FALSE); g_return_val_if_fail(matrix != NULL, FALSE); - adg_matrix_set(matrix, adg_entity_get_paper_matrix(entity)); + adg_matrix_copy(matrix, adg_entity_get_paper_matrix(entity)); status = cairo_matrix_invert(matrix); if (status != CAIRO_STATUS_SUCCESS) { g_error("Unable to invert paper matrix (cairo message: %s)", diff --git a/adg/adg-matrix.c b/adg/adg-matrix.c index db15d2f7..0f8a28fd 100644 --- a/adg/adg-matrix.c +++ b/adg/adg-matrix.c @@ -104,16 +104,16 @@ adg_matrix_is_null(const AdgMatrix * matrix) } /** - * adg_matrix_set: + * adg_matrix_copy: * @matrix: the destination #AdgMatrix * @src: the source #AdgMatrix * * Copies @matrix to @dst. * * Return value: @matrix - */ + **/ AdgMatrix * -adg_matrix_set(AdgMatrix * matrix, const AdgMatrix * src) +adg_matrix_copy(AdgMatrix *matrix, const AdgMatrix *src) { g_return_val_if_fail(matrix != NULL, matrix); g_return_val_if_fail(src != NULL, matrix); diff --git a/adg/adg-matrix.h b/adg/adg-matrix.h index ecdb8eec..12c0b837 100644 --- a/adg/adg-matrix.h +++ b/adg/adg-matrix.h @@ -36,7 +36,7 @@ typedef cairo_matrix_t AdgMatrix; GType adg_matrix_get_type (void) G_GNUC_CONST; AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix); const AdgMatrix * adg_matrix_get_fallback (void) G_GNUC_CONST; -AdgMatrix * adg_matrix_set (AdgMatrix *matrix, +AdgMatrix * adg_matrix_copy (AdgMatrix *matrix, const AdgMatrix *src); void adg_matrix_init_null (AdgMatrix *matrix); gboolean adg_matrix_is_null (const AdgMatrix *matrix); diff --git a/docs/adg-sections.txt b/docs/adg-sections.txt index 4272f408..8174c2f8 100644 --- a/docs/adg-sections.txt +++ b/docs/adg-sections.txt @@ -34,7 +34,7 @@ adg_matrix_is_null adg_matrix_get_fallback adg_matrix_dup -adg_matrix_set +adg_matrix_copy adg_matrix_equal ADG_TYPE_MATRIX -- 2.11.4.GIT