efl_part: use efl_ui_widget's default_part_get

Summary:
efl_part macros are using each widget's internally defined
default_part_get() functions to get default part name.
This might potentially cause errors when future widgets
inherits the widget but not overriding Efl.Text.text and
Efl.Content.content.

Reviewers: jpeg, cedric, woohyun, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D5797

src/lib/elementary/efl_ui_button.c

@@ -464,7 +464,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
    ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
    ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
    ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
-   EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
+   EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \
+   ELM_PART_TEXT_DEFAULT_OPS(efl_ui_button), \
+   ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button)
 
 #include "efl_ui_button.eo.c"
 

src/lib/elementary/efl_ui_frame.c

@@ -217,6 +217,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_frame)
 #define EFL_UI_FRAME_EXTRA_OPS \
    EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
    ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_frame), \
+   ELM_PART_TEXT_DEFAULT_OPS(efl_ui_frame), \
    ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_frame), \
    ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_frame)
 

src/lib/elementary/efl_ui_popup.c

@@ -395,6 +395,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
 /* Internal EO APIs and hidden overrides */
 
 #define EFL_UI_POPUP_EXTRA_OPS \
-   ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup)
+   ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup), \
+   ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_popup)
 
 #include "efl_ui_popup.eo.c"

src/lib/elementary/efl_ui_progressbar.c

@@ -737,7 +737,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar)
    ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
    ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_progressbar), \
    ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
-   EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
+   EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \
+   ELM_PART_TEXT_DEFAULT_OPS(efl_ui_progressbar), \
+   ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar)
 
 #include "efl_ui_progressbar.eo.c"
 

src/lib/elementary/efl_ui_radio.c

@@ -357,11 +357,6 @@ _efl_ui_radio_efl_access_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSE
    return ret;
 }
 
-/* Part APIs */
-
-ELM_PART_CONTENT_DEFAULT_GET(efl_ui_radio, "elm.swallow.content")
-ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data)
-
 /* Internal EO APIs and hidden overrides */
 
 ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data)
@@ -410,4 +405,4 @@ elm_radio_value_get(const Evas_Object *obj)
    return efl_ui_nstate_value_get(obj);
 }
 
-#include "efl_ui_radio_legacy.eo.c"
+#include "efl_ui_radio_legacy.eo.c"

src/lib/elementary/efl_ui_radio.eo

@@ -66,8 +66,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content)
       Efl.Ui.Widget.widget_event;
       Efl.Access.state_set { get; }
       Efl.Access.Widget.Action.elm_actions { get; }
-      Efl.Content.content { get; set; }
-      Efl.Content.content_unset;
       Efl.Ui.Nstate.value { set; get; }
    }
 }

src/lib/elementary/efl_ui_slider.c

@@ -1542,7 +1542,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_slider)
    ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_slider), \
    ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_slider), \
    ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_slider), \
-   EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)
+   EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider), \
+   ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_slider), \
+   ELM_PART_TEXT_DEFAULT_OPS(efl_ui_slider)
 
 #include "efl_ui_slider.eo.c"
 

src/lib/elementary/elc_popup.c

@@ -1851,9 +1851,9 @@ ELM_PART_CONTENT_DEFAULT_GET(elm_popup, "default")
 /* Internal EO APIs and hidden overrides */
 
 #define ELM_POPUP_EXTRA_OPS \
-   ELM_PART_CONTENT_DEFAULT_OPS(elm_popup), \
    ELM_LAYOUT_SIZING_EVAL_OPS(elm_popup), \
-   EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup)
+   EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup), \
+   ELM_PART_CONTENT_DEFAULT_OPS(elm_popup)   
 
 #include "elm_popup.eo.c"
 #include "elm_popup_item.eo.c"

src/lib/elementary/elm_part_helper.h

@@ -34,21 +34,21 @@ struct _Elm_Part_Data
 
 #define ELM_PART_CONTENT_DEFAULT_IMPLEMENT(type, typedata) \
    EOLIAN static Eina_Bool \
-   _ ## type ## _efl_content_content_set(Eo *obj, typedata *sd, Evas_Object *content) \
+   _ ## type ## _efl_content_content_set(Eo *obj, typedata *sd EINA_UNUSED, Evas_Object *content) \
    { \
-      return efl_content_set(efl_part(obj, _ ## type ## _default_content_part_get(obj, sd)), content); \
+      return efl_content_set(efl_part(obj, efl_ui_widget_default_content_part_get(obj)), content); \
    } \
    \
    EOLIAN static Evas_Object* \
-   _ ## type ## _efl_content_content_get(Eo *obj, typedata *sd) \
+   _ ## type ## _efl_content_content_get(Eo *obj, typedata *sd EINA_UNUSED) \
    { \
-      return efl_content_get(efl_part(obj, _ ## type ## _default_content_part_get(obj, sd))); \
+      return efl_content_get(efl_part(obj, efl_ui_widget_default_content_part_get(obj))); \
    } \
    \
    EOLIAN static Evas_Object* \
-   _ ## type ## _efl_content_content_unset(Eo *obj, typedata *sd) \
+   _ ## type ## _efl_content_content_unset(Eo *obj, typedata *sd EINA_UNUSED) \
    { \
-      return efl_content_unset(efl_part(obj, _ ## type ## _default_content_part_get(obj, sd))); \
+      return efl_content_unset(efl_part(obj, efl_ui_widget_default_content_part_get(obj))); \
    }
 
 static inline Eo *
@@ -176,36 +176,36 @@ _ ## full ## _efl_text_markup_markup_set(Eo *obj, void *_pd EINA_UNUSED, const c
 
 #define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, typedata) \
 EOLIAN static void \
-_ ## type ## _efl_text_text_set(Eo *obj, typedata *sd, const char *text) \
+_ ## type ## _efl_text_text_set(Eo *obj, typedata *sd EINA_UNUSED, const char *text) \
 { \
-   efl_text_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), text); \
+   efl_text_set(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj)), text); \
 } \
 EOLIAN static const char * \
-_ ## type ## _efl_text_text_get(Eo *obj, typedata *sd) \
+_ ## type ## _efl_text_text_get(Eo *obj, typedata *sd EINA_UNUSED) \
 { \
-  return efl_text_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd))); \
+  return efl_text_get(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj))); \
 } \
 EOLIAN static void \
-_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, typedata *sd, const char *label, const char *domain) \
+_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, typedata *sd EINA_UNUSED, const char *label, const char *domain) \
 { \
-   efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), label, domain); \
+   efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj)), label, domain); \
 } \
 EOLIAN static const char * \
-_ ## type ## _efl_ui_translatable_translatable_text_get(Eo *obj, typedata *sd, const char **domain) \
+_ ## type ## _efl_ui_translatable_translatable_text_get(Eo *obj, typedata *sd EINA_UNUSED, const char **domain) \
 { \
-  return efl_ui_translatable_text_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), domain); \
+  return efl_ui_translatable_text_get(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj)), domain); \
 }
 
 #define ELM_PART_MARKUP_DEFAULT_IMPLEMENT(type, typedata) \
 EOLIAN static const char * \
-_ ## type ## _efl_text_markup_markup_get(Eo *obj, typedata *sd) \
+_ ## type ## _efl_text_markup_markup_get(Eo *obj, typedata *sd EINA_UNUSED) \
 { \
-  return efl_text_markup_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd))); \
+  return efl_text_markup_get(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj))); \
 } \
 EOLIAN static void \
-_ ## type ## _efl_text_markup_markup_set(Eo *obj, typedata *sd, const char *markup) \
+_ ## type ## _efl_text_markup_markup_set(Eo *obj, typedata *sd EINA_UNUSED, const char *markup) \
 { \
-  efl_text_markup_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), markup); \
-} \
+  efl_text_markup_set(efl_part(efl_super(obj, MY_CLASS), efl_ui_widget_default_text_part_get(obj)), markup); \
+}
 
 #endif