yakov pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6361fe2d14b4404c5c5f35e784c897d6ec56fe56
commit 6361fe2d14b4404c5c5f35e784c897d6ec56fe56
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Jul 7 14:43:39 2015 +0300
elm_dayselector: Move enums to elm_dayselector.eo
Move enums from elm_dayselector_common.h to elm_dayselector.eo in order to
make them
more accessible for bindings. Delete elm_dayselector_common.h.
---
src/lib/Makefile.am | 1 -
src/lib/elm_dayselector.eo | 32 +++++++++++++++++++++++++++-----
src/lib/elm_dayselector.h | 1 -
src/lib/elm_dayselector_common.h | 28 ----------------------------
4 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8a9d81d..10de18e 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -193,7 +193,6 @@ elm_datetime_common.h \
elm_datetime_eo.h \
elm_datetime_legacy.h \
elm_dayselector.h \
-elm_dayselector_common.h \
elm_dayselector_eo.h \
elm_dayselector_legacy.h \
elm_debug.h \
diff --git a/src/lib/elm_dayselector.eo b/src/lib/elm_dayselector.eo
index 61c2466..9f2cef3 100644
--- a/src/lib/elm_dayselector.eo
+++ b/src/lib/elm_dayselector.eo
@@ -1,3 +1,25 @@
+enum Elm.Dayselector.Day
+{
+ [[
+ @addtogroup Dayselector
+ Identifies the day of the week.
+ API can call the selection/unselection of day with this as a parameter.
+
+ @see elm_dayselector_day_selected_set()
+ @see elm_dayselector_day_selected_get()
+ ]]
+
+ legacy: elm_dayselector;
+ sun = 0,[[Indicates Sunday.]]
+ mon, [[Indicates Monday.]]
+ tue, [[Indicates Tuesday.]]
+ wed, [[Indicates Wednesday.]]
+ thu, [[Indicates Thursday.]]
+ fri, [[Indicates Friday.]]
+ sat, [[Indicates Saturday.]]
+ max [[Sentinel value, @b don't use.]]
+}
+
class Elm.Dayselector (Elm.Layout)
{
eo_prefix: elm_obj_dayselector;
@@ -24,7 +46,7 @@ class Elm.Dayselector (Elm.Layout)
@ingroup Dayselector */
}
values {
- day: Elm_Dayselector_Day; /*@ Dayselector_Day the first day that
the user wants to display. */
+ day: Elm.Dayselector.Day; /*@ Dayselector_Day the first day that
the user wants to display. */
}
}
@property weekend_length {
@@ -65,7 +87,7 @@ class Elm.Dayselector (Elm.Layout)
/*@
Get the weekend starting day of Dayselector.
- @return Elm_Dayselector_Day Day from where weekend starts.
+ @return Elm.Dayselector.Day Day from where weekend starts.
@see Elm_Dayselector_Day
@see elm_dayselector_weekend_start_set()
@@ -73,7 +95,7 @@ class Elm.Dayselector (Elm.Layout)
@ingroup Dayselector */
}
values {
- day: Elm_Dayselector_Day; /*@ Dayselector_Day the first day from
where weekend starts. */
+ day: Elm.Dayselector.Day; /*@ Dayselector_Day the first day from
where weekend starts. */
}
}
weekdays_names_set {
@@ -135,7 +157,7 @@ class Elm.Dayselector (Elm.Layout)
@ingroup Dayselector */
params {
- @in day: Elm_Dayselector_Day; /*@ Dayselector_Day that the user
want to set state. */
+ @in day: Elm.Dayselector.Day; /*@ Dayselector_Day that the user
want to set state. */
@in selected: bool; /*@ state of the day. @c EINA_TRUE is
selected. */
}
}
@@ -151,7 +173,7 @@ class Elm.Dayselector (Elm.Layout)
@ingroup Dayselector */
return: bool;
params {
- @in day: Elm_Dayselector_Day; /*@ Dayselector_Day that the user
want to know state. */
+ @in day: Elm.Dayselector.Day; /*@ Dayselector_Day that the user
want to know state. */
}
}
}
diff --git a/src/lib/elm_dayselector.h b/src/lib/elm_dayselector.h
index 9000997..feb5cf5 100644
--- a/src/lib/elm_dayselector.h
+++ b/src/lib/elm_dayselector.h
@@ -75,7 +75,6 @@
* @{
*/
-#include "elm_dayselector_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_dayselector_eo.h"
#endif
diff --git a/src/lib/elm_dayselector_common.h b/src/lib/elm_dayselector_common.h
deleted file mode 100644
index 076ac38..0000000
--- a/src/lib/elm_dayselector_common.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @addtogroup Dayselector
- *
- * @{
- */
-
-/**
- * Identifies the day of the week.
- * API can call the selection/unselection of day with this as a parameter.
- *
- * @see elm_dayselector_day_selected_set()
- * @see elm_dayselector_day_selected_get()
- */
-typedef enum
-{
- ELM_DAYSELECTOR_SUN = 0,/**< indicates Sunday */
- ELM_DAYSELECTOR_MON, /**< indicates Monday */
- ELM_DAYSELECTOR_TUE, /**< indicates Tuesday */
- ELM_DAYSELECTOR_WED, /**< indicates Wednesday */
- ELM_DAYSELECTOR_THU, /**< indicates Thursday */
- ELM_DAYSELECTOR_FRI, /**< indicates Friday */
- ELM_DAYSELECTOR_SAT, /**< indicates Saturday */
- ELM_DAYSELECTOR_MAX /**< Sentinel value, @b don't use */
-} Elm_Dayselector_Day;
-
-/**
- * @}
- */
--
