summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-07-07 12:09:29 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-07-08 10:23:38 +0300
commit6a64977e8c52569de89e7e359f2777ad38d2f4e8 (patch)
treeca365d16c56ff5188a1f266b2efad58ae0c1e7af
parentc49296c3bd990c7681f5b0b00e19253fbd2a5e7d (diff)
downloadelementary-6a64977e8c52569de89e7e359f2777ad38d2f4e8.tar.gz
elm_clock: Move enums to elm_clock.eo
Move enums from elm_clock_common.h to elm_clock.eo in order to make them more accessible for bindings.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_clock.eo27
-rw-r--r--src/lib/elm_clock.h1
-rw-r--r--src/lib/elm_clock_common.h31
4 files changed, 26 insertions, 34 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c52c884d3..8a9d81ded 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -176,7 +176,6 @@ elm_check_legacy.h \
elm_clock.h \
elm_clock_eo.h \
elm_clock_legacy.h \
-elm_clock_common.h \
elm_cnp.h \
elm_colorselector.h \
elm_colorselector_eo.h \
diff --git a/src/lib/elm_clock.eo b/src/lib/elm_clock.eo
index 4cb9e1556..e6e521ef1 100644
--- a/src/lib/elm_clock.eo
+++ b/src/lib/elm_clock.eo
@@ -1,3 +1,28 @@
+enum Elm.Clock.Edit_Mode
+{
+ [[
+ @addtogroup Clock
+ @enum Elm_Clock_Edit_Mode
+
+ Identifiers for which clock digits should be editable, when a
+ clock widget is in edition mode. Values may be OR-ed together to
+ make a mask, naturally.
+
+ @see elm_clock_edit_set()
+ @see elm_clock_edit_mode_set()
+ ]]
+
+ legacy: elm_clock_edit;
+ default = 0, [[Default value. Means that all digits are editable, when in edition mode.]]
+ hour_decimal = 1 << 0, [[Decimal digit of hours value should be editable.]]
+ hour_unit = 1 << 1, [[Unit digit of hours value should be editable.]]
+ min_decimal = 1 << 2, [[Decimal digit of minutes value should be editable.]]
+ min_unit = 1 << 3, [[Unit digit of minutes value should be editable.]]
+ sec_decimal = 1 << 4, [[Decimal digit of seconds value should be editable.]]
+ sec_unit = 1 << 5, [[Unit digit of seconds value should be editable.]]
+ all = (1 << 6) - 1 [[All digits should be editable.]]
+}
+
class Elm.Clock (Elm.Layout)
{
eo_prefix: elm_obj_clock;
@@ -235,7 +260,7 @@ class Elm.Clock (Elm.Layout)
@ingroup Clock */
}
values {
- digedit: Elm_Clock_Edit_Mode; /*@ Bit mask indicating the digits to be editable
+ digedit: Elm.Clock.Edit_Mode; /*@ Bit mask indicating the digits to be editable
(values in #Elm_Clock_Edit_Mode). */
}
}
diff --git a/src/lib/elm_clock.h b/src/lib/elm_clock.h
index 04633cd8f..7ba928510 100644
--- a/src/lib/elm_clock.h
+++ b/src/lib/elm_clock.h
@@ -57,7 +57,6 @@
* @{
*/
-#include "elm_clock_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_clock_eo.h"
#endif
diff --git a/src/lib/elm_clock_common.h b/src/lib/elm_clock_common.h
deleted file mode 100644
index 4253ff897..000000000
--- a/src/lib/elm_clock_common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @addtogroup Clock
- *
- * @{
- */
-
-/**
- * @enum Elm_Clock_Edit_Mode
- *
- * Identifiers for which clock digits should be editable, when a
- * clock widget is in edition mode. Values may be OR-ed together to
- * make a mask, naturally.
- *
- * @see elm_clock_edit_set()
- * @see elm_clock_edit_mode_set()
- */
-typedef enum
-{
- ELM_CLOCK_EDIT_DEFAULT = 0, /**< Default value. Means that all digits are editable, when in edition mode. */
- ELM_CLOCK_EDIT_HOUR_DECIMAL = 1 << 0, /**< Decimal digit of hours value should be editable */
- ELM_CLOCK_EDIT_HOUR_UNIT = 1 << 1, /**< Unit digit of hours value should be editable */
- ELM_CLOCK_EDIT_MIN_DECIMAL = 1 << 2, /**< Decimal digit of minutes value should be editable */
- ELM_CLOCK_EDIT_MIN_UNIT = 1 << 3, /**< Unit digit of minutes value should be editable */
- ELM_CLOCK_EDIT_SEC_DECIMAL = 1 << 4, /**< Decimal digit of seconds value should be editable */
- ELM_CLOCK_EDIT_SEC_UNIT = 1 << 5, /**< Unit digit of seconds value should be editable */
- ELM_CLOCK_EDIT_ALL = (1 << 6) - 1 /**< All digits should be editable */
-} Elm_Clock_Edit_Mode;
-
-/**
- * @}
- */