elm_actionslider: Move enums to elm_actionslider.eo

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

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fbdfc39..1b573ff 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -141,7 +141,6 @@ elm_access.h \
 elm_actionslider.h \
 elm_actionslider_eo.h \
 elm_actionslider_legacy.h \
-elm_actionslider_common.h \
 elm_app_common.h \
 elm_app_server_eo.h \
 elm_app_server_view_eo.h \

diff --git a/src/lib/elm_actionslider.eo b/src/lib/elm_actionslider.eo
index a041d91..9d7d608 100644 (file)
--- a/src/lib/elm_actionslider.eo
+++ b/src/lib/elm_actionslider.eo
@@ -1,3 +1,18 @@
+enum Elm.Actionslider.Pos
+{
+  [[
+    @ingroup Actionslider
+    A position for indicators, magnets, and enabled items.
+   ]]
+   legacy: elm_actionslider;
+
+   none = 0, [[No position is set.]]
+   left = 1 << 0, [[Left position.]]
+   center = 1 << 1, [[Center position.]]
+   right = 1 << 2, [[Right position.]]
+   all = (1 << 3) - 1 [[All positions for left/center/right.]]
+}
+
 class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
 {
    eo_prefix: elm_obj_actionslider;
@@ -10,7 +25,7 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
             [[Get actionslider indicator position.]]
          }
          values {
-            pos: Elm_Actionslider_Pos; [[The position of the indicator.]]
+            pos: Elm.Actionslider.Pos; [[The position of the indicator.]]
          }
       }
       @property magnet_pos {
@@ -25,7 +40,7 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
             [[Get actionslider magnet position.]]
          }
          values {
-            pos: Elm_Actionslider_Pos; [[Bit mask indicating the magnet positions.]]
+            pos: Elm.Actionslider.Pos; [[Bit mask indicating the magnet positions.]]
          }
       }
       @property enabled_pos {
@@ -41,7 +56,7 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
             [[Get actionslider enabled position.]]
          }
          values {
-            pos: Elm_Actionslider_Pos; [[Bit mask indicating the enabled positions.]]
+            pos: Elm.Actionslider.Pos; [[Bit mask indicating the enabled positions.]]
          }
       }
       @property selected_label {

diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h
index ed7bd54..91868f8 100644 (file)
--- a/src/lib/elm_actionslider.h
+++ b/src/lib/elm_actionslider.h
@@ -50,7 +50,6 @@
  * @{
  */
 
-#include "elm_actionslider_common.h"
 #ifdef EFL_EO_API_SUPPORT
 #include "elm_actionslider_eo.h"
 #endif

diff --git a/src/lib/elm_actionslider_common.h b/src/lib/elm_actionslider_common.h
deleted file mode 100644 (file)
index e0c7450..0000000
--- a/src/lib/elm_actionslider_common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @addtogroup Actionslider
- *
- * @{
- */
-
-/**
- * A position for indicators, magnets, and enabled items.
- */
-typedef enum
-{
-   ELM_ACTIONSLIDER_NONE = 0, /**< no position is set */
-   ELM_ACTIONSLIDER_LEFT = 1 << 0, /**< left position */
-   ELM_ACTIONSLIDER_CENTER = 1 << 1, /**< center position */
-   ELM_ACTIONSLIDER_RIGHT = 1 << 2, /**< right position */
-   ELM_ACTIONSLIDER_ALL = (1 << 3) - 1 /**< all positions for left/center/right */
-} Elm_Actionslider_Pos;
-
-/**
- * @}
- */