From 3aa8aedb47ccad305b1a55aa03308f4becd6d497 Mon Sep 17 00:00:00 2001 From: Nobuhiko Tanibata Date: Mon, 22 Jun 2015 15:32:23 +0900 Subject: [PATCH] ivi-shell: rename to ivi_layout_layer_destroy() "remove" is not proper name beacause it destorys a layer. The name of the api is changed from layer_remove to layer_destroy. Signed-off-by: Nobuhiko Tanibata Reviewed-by: Pekka Paalanen --- ivi-shell/ivi-layout-export.h | 2 +- ivi-shell/ivi-layout.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h index 68d37603..8a920098 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h @@ -470,7 +470,7 @@ struct ivi_controller_interface { /** * \brief Removes a ivi_layer which is currently managed by the service */ - void (*layer_remove)(struct ivi_layout_layer *ivilayer); + void (*layer_destroy)(struct ivi_layout_layer *ivilayer); /** * \brief Get all ivi_layers which are currently registered and managed diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index b4165a82..5f9235c2 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -1904,7 +1904,7 @@ ivi_layout_layer_remove_notification_by_callback(struct ivi_layout_layer *ivilay } static void -ivi_layout_layer_remove(struct ivi_layout_layer *ivilayer) +ivi_layout_layer_destroy(struct ivi_layout_layer *ivilayer) { struct ivi_layout *layout = get_instance(); @@ -3005,7 +3005,7 @@ static struct ivi_controller_interface ivi_controller_interface = { .add_notification_remove_layer = ivi_layout_add_notification_remove_layer, .remove_notification_remove_layer = ivi_layout_remove_notification_remove_layer, .layer_create_with_dimension = ivi_layout_layer_create_with_dimension, - .layer_remove = ivi_layout_layer_remove, + .layer_destroy = ivi_layout_layer_destroy, .get_layers = ivi_layout_get_layers, .get_id_of_layer = ivi_layout_get_id_of_layer, .get_layer_from_id = ivi_layout_get_layer_from_id,