e_view_image: Change some function parameter to E_View

The source can be any type view.
So change to E_View from E_View_Image.

Change-Id: I11c8d9e5851874d98c302d8cf7f93a9da199dd7f

diff --git a/src/bin/core/e_view_image.c b/src/bin/core/e_view_image.c
index 6dffb37e07714d9b2809b7b5e19c1b8456fb5645..ea9184e96a63a69dd233f6e1d5b922feb15251f3 100644 (file)
--- a/src/bin/core/e_view_image.c
+++ b/src/bin/core/e_view_image.c
@@ -13,7 +13,7 @@ struct _E_View_Image
    E_View view;\r
 \r
    E_View_Native_Surface       native;\r
-   E_View_Image               *source;\r
+   E_View                     *source;\r
    E_View_Image_Pixels_Get_Cb  pixel_get_cb;\r
    void                       *pixel_get_cb_data;\r
    E_View_Image_Pixels_Get_Cb  pixel_noti_cb;\r
@@ -628,26 +628,26 @@ e_view_image_size_get(E_View_Image *image, int *w, int *h)
 }\r
 \r
 E_API bool\r
-e_view_image_source_set(E_View_Image *image, E_View_Image *src)\r
+e_view_image_source_set(E_View_Image *image, E_View *src)\r
 {\r
    if (src)\r
      {\r
-        if (evas_object_image_source_set(image->view.eo, src->view.eo))\r
-        {\r
-           image->source = src;\r
-           return true;\r
-        }\r
+        if (evas_object_image_source_set(image->view.eo, src->eo))\r
+          {\r
+             image->source = src;\r
+             return true;\r
+          }\r
         else\r
-        {\r
-          image->source = NULL;\r
-          return false;\r
-        }\r
+          {\r
+             image->source = NULL;\r
+             return false;\r
+          }\r
      }\r
    image->source = NULL;\r
    return evas_object_image_source_set(image->view.eo, NULL);\r
 }\r
 \r
-E_API E_View_Image *\r
+E_API E_View *\r
 e_view_image_source_get(E_View_Image *image)\r
 {\r
    return image->source;\r

diff --git a/src/include/e_view_image.h b/src/include/e_view_image.h
index a0ca6f76ffdf4c2123abc8b0c2805fde3ef1b571..d0e88b4d7dd8ec3bfaa58b044274223b0cd44ac4 100644 (file)
--- a/src/include/e_view_image.h
+++ b/src/include/e_view_image.h
@@ -353,12 +353,12 @@ void e_view_image_size_get(E_View_Image *image, int *w, int *h);
 /**
  * TODO
  */
-bool e_view_image_source_set(E_View_Image *image, E_View_Image *src);
+bool e_view_image_source_set(E_View_Image *image, E_View *src);
 
 /**
  * TODO
  */
-E_View_Image *e_view_image_source_get(E_View_Image *image);
+E_View *e_view_image_source_get(E_View_Image *image);
 
 /**
  * TODO

diff --git a/tests/tc-e_view_image.cpp b/tests/tc-e_view_image.cpp
index a174686313c64465b6424559aeb13a0f5011366c..8ed420e2cca909c9bb60ac1320bfd59aa64d9453 100755 (executable)
--- a/tests/tc-e_view_image.cpp
+++ b/tests/tc-e_view_image.cpp
@@ -947,11 +947,11 @@ TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
       .Times(1)
       .WillOnce(Return(EINA_TRUE));
 
-   Eina_Bool ret = e_view_image_source_set(image, img_source);
+   Eina_Bool ret = e_view_image_source_set(image, e_view_image_view_get(img_source));
    EXPECT_EQ(ret, EINA_TRUE);
 
-   E_View_Image * ret_img_source = e_view_image_source_get(image);
-   EXPECT_EQ(ret_img_source, img_source);
+   E_View *ret_img_source = e_view_image_source_get(image);
+   EXPECT_EQ(ret_img_source, e_view_image_view_get(img_source));
 
    EXPECT_CALL(*evasMock, evas_object_image_source_unset(obj))
       .Times(2)