elm.Image: use eolian eva.images enum values in elm_image.eo and remove unused elm_im...

diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 40fb597..7ea2597 100644 (file)
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -253,7 +253,6 @@ elm_icon.h \
 elm_icon_eo.h \
 elm_icon_legacy.h \
 elm_image.h \
-elm_image_common.h \
 elm_image_eo.h \
 elm_image_legacy.h \
 elm_index.h \

diff --git a/legacy/elementary/src/lib/elm_image.eo b/legacy/elementary/src/lib/elm_image.eo
index c16599c..dada8c5 100644 (file)
--- a/legacy/elementary/src/lib/elm_image.eo
+++ b/legacy/elementary/src/lib/elm_image.eo
@@ -1,4 +1,25 @@
-type Elm.Image.Orient: Evas_Image_Orient; [[Using Evas_Image_Orient enums. @since 1.14]]
+import evas_image;
+
+enum Elm.Image_Orient
+{
+   [[
+     Using Evas_Image_Orient enums.
+     @since 1.14
+   ]]
+   legacy: elm_image;
+   orient_none     =  Evas.Image_Orient.orient_none,
+   orient_0        =  Evas.Image_Orient.orient_0,
+   rotate_90       =  Evas.Image_Orient.orient_90,
+   orient_90       =  Evas.Image_Orient.orient_90,
+   rotate_180      =  Evas.Image_Orient.orient_180,
+   orient_180      =  Evas.Image_Orient.orient_180,
+   rotate_270      =  Evas.Image_Orient.orient_270,
+   orient_270      =  Evas.Image_Orient.orient_270,
+   flip_horizontal =  Evas.Image_Orient.flip_horizontal,
+   flip_vertical   =  Evas.Image_Orient.flip_vertical,
+   flip_transpose  =  Evas.Image_Orient.flip_transpose,
+   flip_transverse =  Evas.Image_Orient.flip_transverse
+}
 
 struct Elm.Image.Progress
 {
@@ -161,7 +182,7 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
          get {
          }
          values {
-            orient: Elm.Image.Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]]
+            orient: Elm.Image_Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]]
          }
       }
       @property fill_outside {

diff --git a/legacy/elementary/src/lib/elm_image.h b/legacy/elementary/src/lib/elm_image.h
index 2041ab1..c14dc23 100644 (file)
--- a/legacy/elementary/src/lib/elm_image.h
+++ b/legacy/elementary/src/lib/elm_image.h
@@ -41,7 +41,6 @@
  * @{
  */
 
-#include <elm_image_common.h>
 #ifdef EFL_EO_API_SUPPORT
 #include <elm_image_eo.h>
 #endif

diff --git a/legacy/elementary/src/lib/elm_image_common.h b/legacy/elementary/src/lib/elm_image_common.h
deleted file mode 100644 (file)
index 8e670cb..0000000
--- a/legacy/elementary/src/lib/elm_image_common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @addtogroup Image
- *
- * @{
- */
-
-/**
- * Using Evas_Image_Orient enums
- * @since 1.14
- */
-#define ELM_IMAGE_ORIENT_NONE     EVAS_IMAGE_ORIENT_NONE
-#define ELM_IMAGE_ORIENT_0        EVAS_IMAGE_ORIENT_0
-#define ELM_IMAGE_ROTATE_90       EVAS_IMAGE_ORIENT_90
-#define ELM_IMAGE_ORIENT_90       EVAS_IMAGE_ORIENT_90
-#define ELM_IMAGE_ROTATE_180      EVAS_IMAGE_ORIENT_180
-#define ELM_IMAGE_ORIENT_180      EVAS_IMAGE_ORIENT_180
-#define ELM_IMAGE_ROTATE_270      EVAS_IMAGE_ORIENT_270
-#define ELM_IMAGE_ORIENT_270      EVAS_IMAGE_ORIENT_270
-#define ELM_IMAGE_FLIP_HORIZONTAL EVAS_IMAGE_FLIP_HORIZONTAL
-#define ELM_IMAGE_FLIP_VERTICAL   EVAS_IMAGE_FLIP_VERTICAL
-#define ELM_IMAGE_FLIP_TRANSPOSE  EVAS_IMAGE_FLIP_TRANSPOSE
-#define ELM_IMAGE_FLIP_TRANSVERSE EVAS_IMAGE_FLIP_TRANSVERSE
-
-/**
- * @}
- */