elm_icon: Move enums to elm_icon.eo

Move enums from elm_icon_common.h to elm_icon.eo in order to make them
more accessible for bindings. Delete elm_icon_common.h.

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c863d74..57067e4 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -250,7 +250,6 @@ elm_hover_common.h \
 elm_hover_eo.h \
 elm_hover_legacy.h \
 elm_icon.h \
-elm_icon_common.h \
 elm_icon_eo.h \
 elm_icon_legacy.h \
 elm_image.h \

diff --git a/src/lib/elm_icon.eo b/src/lib/elm_icon.eo
index 281fdd4..3206aae 100644 (file)
--- a/src/lib/elm_icon.eo
+++ b/src/lib/elm_icon.eo
@@ -1,3 +1,29 @@
+enum Elm.Icon.Type
+{
+   legacy: elm_icon;
+   none,
+   file,
+   standard
+}
+
+enum Elm.Icon.Lookup_Order
+{
+   [[
+      @addtogroup Icon
+      @enum Elm_Icon_Lookup_Order
+      @typedef Elm_Icon_Lookup_Order
+
+      Lookup order used by elm_icon_standard_set(). Should look for icons in the
+      theme, FDO paths, or both?
+   ]]
+   legacy: elm_icon_lookup;
+   fdo_theme, [[Icon look up order: freedesktop, theme.]]
+   theme_fdo, [[Icon look up order: theme, freedesktop.]]
+   fdo, [[Icon look up order: freedesktop.]]
+   theme [[Icon look up order: theme.]]
+}
+
+
 class Elm.Icon (Elm.Image)
 {
    eo_prefix: elm_obj_icon;
@@ -16,7 +42,7 @@ class Elm.Icon (Elm.Image)
             ]]
          }
          values {
-            order: Elm_Icon_Lookup_Order(1); [[The icon lookup order (can be
+            order: Elm.Icon.Lookup_Order(Elm.Icon.Lookup_Order.theme_fdo); [[The icon lookup order (can be
                                                one of ELM_ICON_LOOKUP_FDO_THEME,
                                                ELM_ICON_LOOKUP_THEME_FDO,
                                                ELM_ICON_LOOKUP_FDO or

diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index 1073a35..67ed57b 100644 (file)
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -143,7 +143,6 @@
  * @li @ref tutorial_icon
  */
 
-#include "elm_icon_common.h"
 #ifdef EFL_EO_API_SUPPORT
 #include "elm_icon_eo.h"
 #endif

diff --git a/src/lib/elm_icon_common.h b/src/lib/elm_icon_common.h
deleted file mode 100644 (file)
index e4646ad..0000000
--- a/src/lib/elm_icon_common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @addtogroup Icon
- *
- * @{
- */
-
-typedef enum
-{
-   ELM_ICON_NONE,
-   ELM_ICON_FILE,
-   ELM_ICON_STANDARD
-} Elm_Icon_Type;
-
-/**
- * @enum Elm_Icon_Lookup_Order
- * @typedef Elm_Icon_Lookup_Order
- *
- * Lookup order used by elm_icon_standard_set(). Should look for icons in the
- * theme, FDO paths, or both?
- */
-typedef enum
-{
-   ELM_ICON_LOOKUP_FDO_THEME, /**< icon look up order: freedesktop, theme */
-   ELM_ICON_LOOKUP_THEME_FDO, /**< icon look up order: theme, freedesktop */
-   ELM_ICON_LOOKUP_FDO, /**< icon look up order: freedesktop */
-   ELM_ICON_LOOKUP_THEME /**< icon look up order: theme */
-} Elm_Icon_Lookup_Order;
-
-/**
- * @}
- */