summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongJong Lee <yj34.lee@samsung.com>2018-05-28 17:32:46 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-05-28 17:32:46 +0900
commit55cd0f49709af1f5f63ceb91171eb78f19cf3887 (patch)
tree81b36f45f2b1d02cefd24757e645eabf59a45cae
parenta1d07e6c83b85eaffb144320f371ba465698ba4c (diff)
downloadefl-55cd0f49709af1f5f63ceb91171eb78f19cf3887.tar.gz
efl_part: remove unnecessary default_xxx_part_get
Summary: They can call default_xxx_part_get of layout. ref 6e49db0739c38a378c48c6c880f5b41c986ee1e9 Test Plan: elementary_test -to button elementary_test -to 'efl.ui.button' elementary_test -to 'efl.ui.popup' elementary_test -to 'progressbar' elementary_test -to 'slider' Reviewers: Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: cedric, #committers, herb, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6218
-rw-r--r--src/lib/elementary/efl_ui_button.c12
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c5
-rw-r--r--src/lib/elementary/efl_ui_popup.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c12
-rw-r--r--src/lib/elementary/elm_slider.c12
5 files changed, 4 insertions, 41 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 331c5ee397..7081d8c915 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -353,15 +353,6 @@ _efl_ui_button_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSE
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
-
-static const char * _efl_ui_button_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
-{
- if (elm_widget_is_legacy(obj))
- return "elm.swallow.content";
- else
- return "efl.content";
-}
-
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
EAPI void
@@ -407,8 +398,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BUTTON_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
- EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \
- ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button)
+ EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index 8434e05d6b..e00dc31e40 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -50,11 +50,6 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
}
/* Standard widget overrides */
-ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "efl.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_layout, Efl_Ui_Navigation_Layout_Data)
-/* Internal EO APIs and hidden overrides */
-#define EFL_UI_NAVIGATION_LAYOUT_EXTRA_OPS \
- ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_navigation_layout)
-
#include "efl_ui_navigation_layout.eo.c"
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 44108442e3..1ff2e850a2 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -320,7 +320,6 @@ _efl_ui_popup_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Popup_Data *pd)
/* Standard widget overrides */
-ELM_PART_CONTENT_DEFAULT_GET(efl_ui_popup, "efl.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data)
EOLIAN static Eo *
@@ -397,7 +396,6 @@ _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_PART_CONTENT_DEFAULT_OPS(efl_ui_popup)
+ ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup)
#include "efl_ui_popup.eo.c"
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 9f334ac2ce..c1a3f1a998 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -766,15 +766,6 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(const Eo *obj, void *_pd
/* Internal EO APIs and hidden overrides */
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
-
-static const char * _efl_ui_progressbar_default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED)
-{
- if (elm_widget_is_legacy(obj))
- return "elm.swallow.content";
- else
- return "efl.content";
-}
-
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
@@ -782,8 +773,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
- EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \
- ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar)
+ EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 88c3b54784..b0d53292d2 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -31,12 +31,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static Eina_Bool _key_action_drag(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = {
@@ -1068,7 +1062,6 @@ _elm_slider_efl_ui_format_format_cb_set(Eo *obj, Elm_Slider_Data *sd, void *func
/* Standard widget overrides */
-ELM_PART_TEXT_DEFAULT_GET(elm_slider, _text_aliases[0].real_part)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(elm_slider, Elm_Slider_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(elm_slider, Elm_Slider_Data)
@@ -1486,16 +1479,13 @@ elm_slider_indicator_visible_mode_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(elm_slider)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider)
#define ELM_SLIDER_EXTRA_OPS \
- ELM_LAYOUT_TEXT_ALIASES_OPS(elm_slider), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(elm_slider), \
EFL_UI_SLIDER_VAL_FETCH_OPS(elm_slider), \
EFL_UI_SLIDER_VAL_SET_OPS(elm_slider), \
EFL_UI_SLIDER_DOWN_KNOB_OPS(elm_slider), \
- EFL_UI_SLIDER_MOVE_KNOB_OPS(elm_slider), \
- ELM_PART_TEXT_DEFAULT_OPS(elm_slider)
+ EFL_UI_SLIDER_MOVE_KNOB_OPS(elm_slider)
#include "elm_slider.eo.c"