rename elm_check to Efl.Ui.Check

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>

10 files changed, 38 insertions, 40 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e51f3f87af..7d5d211cc4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -107,7 +107,7 @@ src/lib/elementary/elm_box.c
 src/lib/elementary/elm_bubble.c
 src/lib/elementary/elm_button.c
 src/lib/elementary/elm_calendar.c
-src/lib/elementary/elm_check.c
+src/lib/elementary/efl_ui_check.c
 src/lib/elementary/elm_clock.c
 src/lib/elementary/elm_cnp.c
 src/lib/elementary/elm_colorselector.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 2f55fad000..b9a59a5456 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -7,7 +7,7 @@ elm_public_eolian_files = \
 	lib/elementary/elm_bg.eo \
 	lib/elementary/elm_button.eo \
 	lib/elementary/elm_calendar.eo \
-	lib/elementary/elm_check.eo \
+	lib/elementary/efl_ui_check.eo \
 	lib/elementary/elm_clock.eo \
 	lib/elementary/elm_colorselector.eo \
 	lib/elementary/elm_combobox.eo \
@@ -217,7 +217,7 @@ includesunstable_HEADERS = \
 	lib/elementary/elm_widget_bubble.h \
 	lib/elementary/elm_widget_button.h \
 	lib/elementary/elm_widget_calendar.h \
-	lib/elementary/elm_widget_check.h \
+	lib/elementary/efl_ui_check_private.h \
 	lib/elementary/elm_widget_clock.h \
 	lib/elementary/elm_widget_colorselector.h \
 	lib/elementary/elm_widget_conform.h \
@@ -341,7 +341,7 @@ includesub_HEADERS = \
 	lib/elementary/elm_calendar_legacy.h \
 	lib/elementary/elm_calendar_common.h \
 	lib/elementary/elm_check.h \
-	lib/elementary/elm_check_eo.h \
+	lib/elementary/efl_ui_check.eo.h \
 	lib/elementary/elm_check_legacy.h \
 	lib/elementary/elm_clock.h \
 	lib/elementary/elm_clock_eo.h \
@@ -555,7 +555,7 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/elm_bubble.c \
 	lib/elementary/elm_button.c \
 	lib/elementary/elm_calendar.c \
-	lib/elementary/elm_check.c \
+	lib/elementary/efl_ui_check.c \
 	lib/elementary/elm_clock.c \
 	lib/elementary/elm_cnp.c \
 	lib/elementary/elm_code_line.c \
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/efl_ui_check.c
index 4e2b746235..0cbe71395b 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -10,11 +10,11 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 #include "efl_ui_nstate.eo.h"
-#include "elm_widget_check.h"
+#include "efl_ui_check_private.h"
 
-#define MY_CLASS ELM_CHECK_CLASS
+#define MY_CLASS EFL_UI_CHECK_CLASS
 
-#define MY_CLASS_NAME "Elm_Check"
+#define MY_CLASS_NAME "Efl.Ui.Check"
 #define MY_CLASS_NAME_LEGACY "elm_check"
 
 static const Elm_Layout_Part_Alias_Description _text_aliases[] =
@@ -100,11 +100,11 @@ _icon_signal_emit(Evas_Object *obj)
 }
 
 EOLIAN static Elm_Atspi_State_Set
-_elm_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
+_efl_ui_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
 {
    Elm_Atspi_State_Set states = 0;
 
-   states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_CHECK_CLASS));
+   states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
 
    if (elm_check_state_get(obj))
        STATE_TYPE_SET(states, ELM_ATSPI_STATE_CHECKED);
@@ -116,7 +116,7 @@ _elm_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Check_Data
  * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
  * can changed the theme API */
 EOLIAN static Eina_Bool
-_elm_check_elm_widget_sub_object_del(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj)
+_efl_ui_check_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
@@ -131,7 +131,7 @@ _elm_check_elm_widget_sub_object_del(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, E
 }
 
 EOLIAN static Eina_Bool
-_elm_check_elm_widget_activate(Eo *obj EINA_UNUSED, Elm_Check_Data *_pd EINA_UNUSED, Elm_Activate act)
+_efl_ui_check_elm_widget_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Elm_Activate act)
 {
    if (elm_widget_disabled_get(obj)) return EINA_FALSE;
    if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -149,7 +149,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 }
 
 EOLIAN static Eina_Bool
-_elm_check_elm_widget_widget_event(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
+_efl_ui_check_elm_widget_widget_event(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
 {
    (void) src;
    Evas_Event_Key_Down *ev = event_info;
@@ -165,7 +165,7 @@ _elm_check_elm_widget_widget_event(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, Eva
 }
 
 EOLIAN static Elm_Theme_Apply
-_elm_check_elm_widget_theme_apply(Eo *obj, Elm_Check_Data *sd EINA_UNUSED)
+_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
 {
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
 
@@ -290,7 +290,7 @@ _on_check_toggle(void *data,
 }
 
 EOLIAN static void
-_elm_check_efl_canvas_group_group_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
+_efl_ui_check_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -323,19 +323,19 @@ _elm_check_efl_canvas_group_group_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
-_elm_check_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Check_Data *_pd EINA_UNUSED)
+_efl_ui_check_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED)
 {
    return _text_aliases;
 }
 
 EOLIAN static Eina_Bool
-_elm_check_selected_get(Eo *obj, Elm_Check_Data *pd EINA_UNUSED)
+_efl_ui_check_selected_get(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
 {
    return !!efl_ui_nstate_value_get(obj);
 }
 
 EOLIAN static void
-_elm_check_selected_set(Eo *obj, Elm_Check_Data *sd, Eina_Bool value)
+_efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -350,13 +350,13 @@ _elm_check_selected_set(Eo *obj, Elm_Check_Data *sd, Eina_Bool value)
 }
 
 EOLIAN static void
-_elm_check_efl_ui_nstate_count_set(Eo *obj EINA_UNUSED, Elm_Check_Data *pd EINA_UNUSED, int nstate EINA_UNUSED)
+_efl_ui_check_efl_ui_nstate_count_set(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED, int nstate EINA_UNUSED)
 {
    //NOP;
 }
 
 EOLIAN static void
-_elm_check_efl_ui_nstate_value_set(Eo *obj, Elm_Check_Data *pd EINA_UNUSED, int state)
+_efl_ui_check_efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED, int state)
 {
    Eina_Bool _state = !!state;
    if (_state == efl_ui_nstate_value_get(obj)) return;
@@ -373,7 +373,7 @@ elm_check_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_check_efl_object_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
+_efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -417,7 +417,7 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
 }
 
 EOLIAN const Elm_Atspi_Action *
-_elm_check_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Check_Data *pd EINA_UNUSED)
+_efl_ui_check_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED)
 {
    static Elm_Atspi_Action atspi_action[] = {
           { "activate", "activate", NULL, _key_action_activate },
@@ -427,14 +427,14 @@ _elm_check_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
 }
 
 static void
-_elm_check_class_constructor(Efl_Class *klass)
+_efl_ui_check_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
 
 /* Internal EO APIs and hidden overrides */
 
-#define ELM_CHECK_EXTRA_OPS \
-   EFL_CANVAS_GROUP_ADD_OPS(elm_check)
+#define EFL_UI_CHECK_EXTRA_OPS \
+   EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check)
 
-#include "elm_check.eo.c"
+#include "efl_ui_check.eo.c"
diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/efl_ui_check.eo
index e67ddf5c93..833547d923 100644
--- a/src/lib/elementary/elm_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -1,4 +1,4 @@
-class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
+class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
 {
    [[Check widget
 
@@ -8,7 +8,6 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
    the value of a boolean between false and true.
    ]]
    legacy_prefix: elm_check;
-   eo_prefix: efl_ui_check;
    methods {
       @property selected {
          [[The on/off state of the check object.]]
diff --git a/src/lib/elementary/elm_widget_check.h b/src/lib/elementary/efl_ui_check_private.h
index d26d3b2464..e930e0d9eb 100644
--- a/src/lib/elementary/elm_widget_check.h
+++ b/src/lib/elementary/efl_ui_check_private.h
@@ -1,5 +1,5 @@
-#ifndef ELM_WIDGET_CHECK_H
-#define ELM_WIDGET_CHECK_H
+#ifndef EFL_UI_CHECK_H
+#define EFL_UI_CHECK_H
 
 #include "Elementary.h"
 
@@ -23,8 +23,8 @@
 /**
  * Base layout smart data extended with check instance data.
  */
-typedef struct _Elm_Check_Data Elm_Check_Data;
-struct _Elm_Check_Data
+typedef struct _Efl_Ui_Check_Data Efl_Ui_Check_Data;
+struct _Efl_Ui_Check_Data
 {
    Eina_Bool            *statep;
 };
@@ -34,7 +34,7 @@ struct _Elm_Check_Data
  */
 
 #define ELM_CHECK_DATA_GET(o, sd) \
-  Elm_Check_Data * sd = efl_data_scope_get(o, ELM_CHECK_CLASS)
+  Efl_Ui_Check_Data * sd = efl_data_scope_get(o, EFL_UI_CHECK_CLASS)
 
 #define ELM_CHECK_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_CHECK_DATA_GET(o, ptr);                        \
diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index dfac2f7e1b..c200f7f94f 100644
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -60,7 +60,7 @@
  */
 
 #ifdef EFL_EO_API_SUPPORT
-#include "elm_check_eo.h"
+#include "efl_ui_check.eo.h"
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_check_legacy.h"
diff --git a/src/lib/elementary/elm_check_eo.h b/src/lib/elementary/elm_check_eo.h
deleted file mode 100644
index 970ee42428..0000000000
--- a/src/lib/elementary/elm_check_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_check.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_check_legacy.h b/src/lib/elementary/elm_check_legacy.h
index 06d7035a3d..6cc2d05582 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -50,5 +50,5 @@ EAPI void                        elm_check_state_set(Evas_Object *obj, Eina_Bool
 EAPI void                        elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
 
 #ifdef EFL_EO_API_SUPPORT
-# include "elm_check.eo.legacy.h"
+# include "efl_ui_check.eo.legacy.h"
 #endif
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 752cbbce17..086b459f77 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -168,7 +168,7 @@ _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
    Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
-   int_ret = elm_obj_widget_theme_apply(efl_super(obj, ELM_CHECK_CLASS));
+   int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
    if (!int_ret) return ELM_THEME_APPLY_FAILED;
 
    if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
@@ -224,7 +224,7 @@ _elm_radio_efl_canvas_group_group_add(Eo *obj, Elm_Radio_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   efl_canvas_group_add(efl_super(obj, ELM_CHECK_CLASS));
+   efl_canvas_group_add(efl_super(obj, EFL_UI_CHECK_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
@@ -255,7 +255,7 @@ _elm_radio_efl_canvas_group_group_del(Eo *obj, Elm_Radio_Data *sd)
    sd->group->radios = eina_list_remove(sd->group->radios, obj);
    if (!sd->group->radios) free(sd->group);
 
-   efl_canvas_group_del(efl_super(obj, ELM_CHECK_CLASS));
+   efl_canvas_group_del(efl_super(obj, EFL_UI_CHECK_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 57bb719938..18627129a2 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -1,4 +1,4 @@
-class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
+class Elm.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
 {
    [[Elementary radio class]]
    legacy_prefix: elm_radio;