[PATCH weston v2 10/14] ivi-shell: remove ivi_layout_layer_get_orientation API

[Ucan, Emre (ADITG/SW1)]

Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
 ivi-shell/ivi-layout-export.h    |   10 ----------
 ivi-shell/ivi-layout.c           |   12 ------------
 tests/ivi_layout-internal-test.c |   10 +++-------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 21fe96c..86315f6 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -554,16 +554,6 @@ struct ivi_layout_interface {
 					 enum wl_output_transform orientation);
 
 	/**
-	 * \brief Gets the orientation of a layer.
-	 *
-	 * \return (enum wl_output_transform)
-	 *              if the method call was successful
-	 * \return WL_OUTPUT_TRANSFORM_NORMAL if the method call was failed
-	 */
-	enum wl_output_transform
-		(*layer_get_orientation)(struct ivi_layout_layer *ivilayer);
-
-	/**
 	 * \brief Add a ivi_surface to a ivi_layer which is currently managed by the service
 	 *
 	 * \return IVI_SUCCEEDED if the method call was successful
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index fefdb7f..cc503e2 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1936,17 +1936,6 @@ ivi_layout_layer_set_orientation(struct ivi_layout_layer *ivilayer,
 	return IVI_SUCCEEDED;
 }
 
-static enum wl_output_transform
-ivi_layout_layer_get_orientation(struct ivi_layout_layer *ivilayer)
-{
-	if (ivilayer == NULL) {
-		weston_log("ivi_layout_layer_get_orientation: invalid argument\n");
-		return 0;
-	}
-
-	return ivilayer->prop.orientation;
-}
-
 int32_t
 ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
 				  struct ivi_layout_surface **pSurface,
@@ -2667,7 +2656,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
 	.layer_set_position			= ivi_layout_layer_set_position,
 	.layer_set_dimension			= ivi_layout_layer_set_dimension,
 	.layer_set_orientation			= ivi_layout_layer_set_orientation,
-	.layer_get_orientation			= ivi_layout_layer_get_orientation,
 	.layer_add_surface			= ivi_layout_layer_add_surface,
 	.layer_remove_surface			= ivi_layout_layer_remove_surface,
 	.layer_set_render_order			= ivi_layout_layer_set_render_order,
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index 9596a40..7ec2948 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -211,18 +211,16 @@ test_layer_orientation(struct test_context *ctx)
 	ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
 	iassert(ivilayer != NULL);
 
-	iassert(lyt->layer_get_orientation(ivilayer) == WL_OUTPUT_TRANSFORM_NORMAL);
+	prop = lyt->get_properties_of_layer(ivilayer);
+	iassert(prop->orientation == WL_OUTPUT_TRANSFORM_NORMAL);
 
 	iassert(lyt->layer_set_orientation(
 		ivilayer, WL_OUTPUT_TRANSFORM_90) == IVI_SUCCEEDED);
 
-	iassert(lyt->layer_get_orientation(ivilayer) == WL_OUTPUT_TRANSFORM_NORMAL);
+	iassert(prop->orientation == WL_OUTPUT_TRANSFORM_NORMAL);
 
 	lyt->commit_changes();
 
-	iassert(lyt->layer_get_orientation(ivilayer) == WL_OUTPUT_TRANSFORM_90);
-
-	prop = lyt->get_properties_of_layer(ivilayer);
 	iassert(prop->orientation == WL_OUTPUT_TRANSFORM_90);
 
 	lyt->layer_destroy(ivilayer);
@@ -428,8 +426,6 @@ test_layer_bad_orientation(struct test_context *ctx)
 		NULL, WL_OUTPUT_TRANSFORM_90) == IVI_FAILED);
 
 	lyt->commit_changes();
-
-	iassert(lyt->layer_get_orientation(NULL) == WL_OUTPUT_TRANSFORM_NORMAL);
 }
 
 static void
-- 
1.7.9.5