rename elm panes to Efl.Ui.Panes

10 files changed, 55 insertions, 56 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08a4de46b9..2ce033c039 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -144,7 +144,7 @@ src/lib/elementary/elm_menu.c
 src/lib/elementary/elm_module.c
 src/lib/elementary/elm_notify.c
 src/lib/elementary/elm_panel.c
-src/lib/elementary/elm_panes.c
+src/lib/elementary/efl_ui_panes.c
 src/lib/elementary/elm_photo.c
 src/lib/elementary/efl_ui_image_zoomable.c
 src/lib/elementary/elm_plug.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 993e13032e..eb90c53541 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -51,7 +51,7 @@ elm_public_eolian_files = \
 	lib/elementary/efl_ui_nstate.eo \
 	lib/elementary/elm_pan.eo \
 	lib/elementary/elm_panel.eo \
-	lib/elementary/elm_panes.eo \
+	lib/elementary/efl_ui_panes.eo \
 	lib/elementary/efl_ui_image_zoomable.eo \
 	lib/elementary/efl_ui_image_zoomable_pan.eo \
 	lib/elementary/elm_player.eo \
@@ -260,7 +260,7 @@ includesunstable_HEADERS = \
 	lib/elementary/elm_widget_naviframe.h \
 	lib/elementary/elm_widget_notify.h \
 	lib/elementary/elm_widget_panel.h \
-	lib/elementary/elm_widget_panes.h \
+	lib/elementary/efl_ui_panes_private.h \
 	lib/elementary/elm_widget_photo.h \
 	lib/elementary/efl_ui_image_zoomable_private.h \
 	lib/elementary/elm_widget_player.h \
@@ -458,7 +458,7 @@ includesub_HEADERS = \
 	lib/elementary/elm_panel_eo.h \
 	lib/elementary/elm_panel_legacy.h \
 	lib/elementary/elm_panes.h \
-	lib/elementary/elm_panes_eo.h \
+	lib/elementary/efl_ui_panes_eo.h \
 	lib/elementary/elm_panes_legacy.h \
 	lib/elementary/elm_photo.h \
 	lib/elementary/elm_photo_legacy.h \
@@ -628,7 +628,7 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/elm_notify.c \
 	lib/elementary/efl_ui_nstate.c \
 	lib/elementary/elm_panel.c \
-	lib/elementary/elm_panes.c \
+	lib/elementary/efl_ui_panes.c \
 	lib/elementary/elm_photo.c \
 	lib/elementary/efl_ui_image_zoomable.c \
 	lib/elementary/elm_plug.c \
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 6aa0729d03..7c88c49a41 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -441,7 +441,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
    }
 
    /* FIXME: No panes in EO APIs. */
-   o = split = efl_add(ELM_PANES_CLASS, win,
+   o = split = efl_add(EFL_UI_PANES_CLASS, win,
                        efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
                        efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
                        efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL),
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7879e1c0fa..c7a7792cf9 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -9,11 +9,11 @@
 
 #include "elm_priv.h"
 #include "elm_widget_layout.h"
-#include "elm_widget_panes.h"
+#include "efl_ui_panes_private.h"
 
-#define MY_CLASS ELM_PANES_CLASS
+#define MY_CLASS EFL_UI_PANES_CLASS
 
-#define MY_CLASS_NAME "Elm_Panes"
+#define MY_CLASS_NAME "Efl.Ui.Panes"
 #define MY_CLASS_NAME_LEGACY "elm_panes"
 /**
  * TODO
@@ -44,7 +44,7 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
 };
 
 EOLIAN static Elm_Theme_Apply
-_elm_panes_elm_widget_theme_apply(Eo *obj, Elm_Panes_Data *sd)
+_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
 {
    double size;
    Evas_Coord minw = 0, minh = 0;
@@ -83,7 +83,7 @@ _elm_panes_elm_widget_theme_apply(Eo *obj, Elm_Panes_Data *sd)
 }
 
 EOLIAN static Eina_Bool
-_elm_panes_elm_widget_focus_next(Eo *obj, Elm_Panes_Data *sd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
+_efl_ui_panes_elm_widget_focus_next(Eo *obj, Efl_Ui_Panes_Data *sd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
@@ -139,7 +139,7 @@ _double_clicked(void *data,
                 const char *emission EINA_UNUSED,
                 const char *source EINA_UNUSED)
 {
-   ELM_PANES_DATA_GET(data, sd);
+   EFL_UI_PANES_DATA_GET(data, sd);
 
    sd->double_clicked = EINA_TRUE;
 }
@@ -159,7 +159,7 @@ _on_unpressed(void *data,
               const char *emission EINA_UNUSED,
               const char *source EINA_UNUSED)
 {
-   ELM_PANES_DATA_GET(data, sd);
+   EFL_UI_PANES_DATA_GET(data, sd);
    efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
 
    if (sd->double_clicked)
@@ -172,7 +172,7 @@ _on_unpressed(void *data,
 static void
 _set_min_size(void *data)
 {
-   ELM_PANES_DATA_GET(data, sd);
+   EFL_UI_PANES_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
 
    double sizer = sd->right_min_relative_size;
@@ -202,7 +202,7 @@ _set_min_size(void *data)
 static void
 _update_fixed_sides(void *data)
 {
-   ELM_PANES_DATA_GET(data, sd);
+   EFL_UI_PANES_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
    Evas_Coord w, h;
    evas_object_geometry_get(wd->resize_obj, NULL, NULL, &w, &h);
@@ -251,10 +251,10 @@ _on_resize(void *data,
 }
 
 EOLIAN static void
-_elm_panes_efl_canvas_group_group_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
+_efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   ELM_PANES_DATA_GET(obj, sd);
+   EFL_UI_PANES_DATA_GET(obj, sd);
 
    efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
@@ -316,7 +316,7 @@ elm_panes_add(Evas_Object *parent)
 }
 
 EOLIAN static Eo *
-_elm_panes_efl_object_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
+_efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -365,7 +365,7 @@ elm_panes_content_right_unset(Evas_Object *obj)
 }
 
 EOLIAN static double
-_elm_panes_content_left_size_get(Eo *obj, Elm_Panes_Data *sd)
+_efl_ui_panes_content_left_size_get(Eo *obj, Efl_Ui_Panes_Data *sd)
 {
    double w, h;
 
@@ -380,7 +380,7 @@ _elm_panes_content_left_size_get(Eo *obj, Elm_Panes_Data *sd)
 }
 
 EOLIAN static void
-_elm_panes_content_left_size_set(Eo *obj, Elm_Panes_Data *sd, double size)
+_efl_ui_panes_content_left_size_set(Eo *obj, Efl_Ui_Panes_Data *sd, double size)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -396,19 +396,19 @@ _elm_panes_content_left_size_set(Eo *obj, Elm_Panes_Data *sd, double size)
 }
 
 EOLIAN static double
-_elm_panes_content_right_size_get(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
+_efl_ui_panes_content_right_size_get(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED)
 {
    return 1.0 - elm_panes_content_left_size_get(obj);
 }
 
 EOLIAN static void
-_elm_panes_content_right_size_set(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED, double size)
+_efl_ui_panes_content_right_size_set(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED, double size)
 {
    elm_panes_content_left_size_set(obj, (1.0 - size));
 }
 
 EOLIAN static void
-_elm_panes_efl_orientation_orientation_set(Eo *obj, Elm_Panes_Data *sd, Efl_Orient dir)
+_efl_ui_panes_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl_Orient dir)
 {
    if ((dir != EFL_ORIENT_HORIZONTAL) && (dir != EFL_ORIENT_VERTICAL))
      return;
@@ -423,7 +423,7 @@ _elm_panes_efl_orientation_orientation_set(Eo *obj, Elm_Panes_Data *sd, Efl_Orie
 }
 
 EOLIAN static Efl_Orient
-_elm_panes_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *sd)
+_efl_ui_panes_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *sd)
 {
    return sd->orientation;
 }
@@ -453,7 +453,7 @@ elm_panes_horizontal_get(const Evas_Object *obj)
 }
 
 EOLIAN static void
-_elm_panes_fixed_set(Eo *obj, Elm_Panes_Data *sd, Eina_Bool fixed)
+_efl_ui_panes_fixed_set(Eo *obj, Efl_Ui_Panes_Data *sd, Eina_Bool fixed)
 {
    sd->fixed = !!fixed;
    if (sd->fixed == EINA_TRUE)
@@ -475,13 +475,13 @@ _elm_panes_fixed_set(Eo *obj, Elm_Panes_Data *sd, Eina_Bool fixed)
 }
 
 EOLIAN static Eina_Bool
-_elm_panes_fixed_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *sd)
+_efl_ui_panes_fixed_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *sd)
 {
    return sd->fixed;
 }
 
 EOLIAN static void
-_elm_panes_content_left_min_relative_size_set(Eo *obj, Elm_Panes_Data *_pd, double size)
+_efl_ui_panes_content_left_min_relative_size_set(Eo *obj, Efl_Ui_Panes_Data *_pd, double size)
 {
    _pd->left_min_relative_size = size;
    if (_pd->left_min_relative_size < 0) _pd->left_min_relative_size = 0;
@@ -490,13 +490,13 @@ _elm_panes_content_left_min_relative_size_set(Eo *obj, Elm_Panes_Data *_pd, doub
 }
 
 EOLIAN static double
-_elm_panes_content_left_min_relative_size_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd)
+_efl_ui_panes_content_left_min_relative_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd)
 {
    return _pd->left_min_relative_size;
 }
 
 EOLIAN static void
-_elm_panes_content_right_min_relative_size_set(Eo *obj, Elm_Panes_Data *_pd, double size)
+_efl_ui_panes_content_right_min_relative_size_set(Eo *obj, Efl_Ui_Panes_Data *_pd, double size)
 {
    _pd->right_min_relative_size = size;
    if (_pd->right_min_relative_size < 0) _pd->right_min_relative_size = 0;
@@ -505,13 +505,13 @@ _elm_panes_content_right_min_relative_size_set(Eo *obj, Elm_Panes_Data *_pd, dou
 }
 
 EOLIAN static double
-_elm_panes_content_right_min_relative_size_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd)
+_efl_ui_panes_content_right_min_relative_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd)
 {
    return _pd->right_min_relative_size;
 }
 
 EOLIAN static void
-_elm_panes_content_left_min_size_set(Eo *obj, Elm_Panes_Data *_pd, Evas_Coord size)
+_efl_ui_panes_content_left_min_size_set(Eo *obj, Efl_Ui_Panes_Data *_pd, Evas_Coord size)
 {
    _pd->left_min_size = size;
    if (_pd->left_min_size < 0) _pd->left_min_size = 0;
@@ -520,13 +520,13 @@ _elm_panes_content_left_min_size_set(Eo *obj, Elm_Panes_Data *_pd, Evas_Coord si
 }
 
 EOLIAN static Evas_Coord
-_elm_panes_content_left_min_size_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd)
+_efl_ui_panes_content_left_min_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd)
 {
    return _pd->left_min_size;
 }
 
 EOLIAN static void
-_elm_panes_content_right_min_size_set(Eo *obj, Elm_Panes_Data *_pd, Evas_Coord size)
+_efl_ui_panes_content_right_min_size_set(Eo *obj, Efl_Ui_Panes_Data *_pd, Evas_Coord size)
 {
    _pd->right_min_size = size;
    if (_pd->right_min_size < 0) _pd->right_min_size = 0;
@@ -535,32 +535,32 @@ _elm_panes_content_right_min_size_set(Eo *obj, Elm_Panes_Data *_pd, Evas_Coord s
 }
 
 EOLIAN static Evas_Coord
-_elm_panes_content_right_min_size_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd)
+_efl_ui_panes_content_right_min_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd)
 {
    return _pd->right_min_size;
 }
 
 EOLIAN static Eina_Bool
-_elm_panes_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd EINA_UNUSED)
+_efl_ui_panes_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd EINA_UNUSED)
 {
    return EINA_TRUE;
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
-_elm_panes_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd EINA_UNUSED)
+_efl_ui_panes_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *_pd EINA_UNUSED)
 {
    return _content_aliases;
 }
 
 static void
-_elm_panes_class_constructor(Efl_Class *klass)
+_efl_ui_panes_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
 
 /* Internal EO APIs and hidden overrides */
 
-#define ELM_PANES_EXTRA_OPS \
-   EFL_CANVAS_GROUP_ADD_OPS(elm_panes)
+#define EFL_UI_PANES_EXTRA_OPS \
+   EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes)
 
-#include "elm_panes.eo.c"
+#include "efl_ui_panes.eo.c"
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index 309140b96b..07ce977d4b 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,9 +1,8 @@
-class Elm.Panes (Elm.Layout, Efl.Orientation,
-                 Efl.Ui.Clickable)
+class Efl.Ui.Panes (Elm.Layout, Efl.Orientation,
+                    Efl.Ui.Clickable)
 {
    [[Elementary panes class]]
    legacy_prefix: elm_panes;
-   eo_prefix: elm_obj_panes;
    event_prefix: elm_panes;
    methods {
       @property content_left_size {
diff --git a/src/lib/elementary/efl_ui_panes_eo.h b/src/lib/elementary/efl_ui_panes_eo.h
new file mode 100644
index 0000000000..7dda4e15c0
--- /dev/null
+++ b/src/lib/elementary/efl_ui_panes_eo.h
@@ -0,0 +1 @@
+#include "efl_ui_panes.eo.h"
diff --git a/src/lib/elementary/elm_widget_panes.h b/src/lib/elementary/efl_ui_panes_private.h
index 47ac2d6114..d82bdc48a4 100644
--- a/src/lib/elementary/elm_widget_panes.h
+++ b/src/lib/elementary/efl_ui_panes_private.h
@@ -23,8 +23,8 @@
 /**
  * Base layout smart data extended with panes instance data.
  */
-typedef struct _Elm_Panes_Data Elm_Panes_Data;
-struct _Elm_Panes_Data
+typedef struct _Efl_Ui_Panes_Data Efl_Ui_Panes_Data;
+struct _Efl_Ui_Panes_Data
 {
    Evas_Object *event;
    struct
@@ -49,11 +49,11 @@ struct _Elm_Panes_Data
  * @}
  */
 
-#define ELM_PANES_DATA_GET(o, sd) \
-  Elm_Panes_Data * sd = efl_data_scope_get(o, ELM_PANES_CLASS)
+#define EFL_UI_PANES_DATA_GET(o, sd) \
+  Efl_Ui_Panes_Data * sd = efl_data_scope_get(o, EFL_UI_PANES_CLASS)
 
-#define ELM_PANES_DATA_GET_OR_RETURN(o, ptr)         \
-  ELM_PANES_DATA_GET(o, ptr);                        \
+#define EFL_UI_PANES_DATA_GET_OR_RETURN(o, ptr)         \
+  EFL_UI_PANES_DATA_GET(o, ptr);                        \
   if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
        CRI("No widget data for object %p (%s)",      \
@@ -61,8 +61,8 @@ struct _Elm_Panes_Data
        return;                                       \
     }
 
-#define ELM_PANES_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
-  ELM_PANES_DATA_GET(o, ptr);                         \
+#define EFL_UI_PANES_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
+  EFL_UI_PANES_DATA_GET(o, ptr);                         \
   if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
        CRI("No widget data for object %p (%s)",       \
@@ -70,8 +70,8 @@ struct _Elm_Panes_Data
        return val;                                    \
     }
 
-#define ELM_PANES_CHECK(obj)                              \
-  if (EINA_UNLIKELY(!efl_isa((obj), ELM_PANES_CLASS))) \
+#define EFL_UI_PANES_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_PANES_CLASS))) \
     return
 
 #endif
diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h
index af4a70f359..1f5a6a81ae 100644
--- a/src/lib/elementary/elm_panes.h
+++ b/src/lib/elementary/elm_panes.h
@@ -55,7 +55,7 @@
  */
 
 #ifdef EFL_EO_API_SUPPORT
-#include "elm_panes_eo.h"
+#include "efl_ui_panes_eo.h"
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_panes_legacy.h"
diff --git a/src/lib/elementary/elm_panes_eo.h b/src/lib/elementary/elm_panes_eo.h
deleted file mode 100644
index 659a93b8bc..0000000000
--- a/src/lib/elementary/elm_panes_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_panes.eo.h"
diff --git a/src/lib/elementary/elm_panes_legacy.h b/src/lib/elementary/elm_panes_legacy.h
index 40c5b4db80..3ebf8b7f5b 100644
--- a/src/lib/elementary/elm_panes_legacy.h
+++ b/src/lib/elementary/elm_panes_legacy.h
@@ -45,4 +45,4 @@ EAPI void elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
  */
 EAPI Eina_Bool elm_panes_horizontal_get(const Evas_Object *obj);
 
-#include "elm_panes.eo.legacy.h"
+#include "efl_ui_panes.eo.legacy.h"