jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4b18e754de9070c748a0ce5a7f4a3c6aa42a92ad
commit 4b18e754de9070c748a0ce5a7f4a3c6aa42a92ad
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Wed Nov 29 13:43:21 2017 +0900
elm_part_helper: Change macro name for default content part
---
src/lib/elementary/efl_ui_button.c | 2 +-
src/lib/elementary/efl_ui_flip.c | 2 +-
src/lib/elementary/efl_ui_frame.c | 2 +-
src/lib/elementary/efl_ui_popup.c | 2 +-
src/lib/elementary/efl_ui_radio.c | 2 +-
src/lib/elementary/efl_ui_slider.c | 2 +-
src/lib/elementary/efl_ui_win.c | 2 +-
src/lib/elementary/elc_ctxpopup.c | 2 +-
src/lib/elementary/elc_fileselector_entry.c | 2 +-
src/lib/elementary/elc_player.c | 2 +-
src/lib/elementary/elc_popup.c | 2 +-
src/lib/elementary/elm_entry.c | 2 +-
src/lib/elementary/elm_inwin.c | 2 +-
src/lib/elementary/elm_mapbuf.c | 2 +-
src/lib/elementary/elm_notify.c | 2 +-
src/lib/elementary/elm_part_helper.h | 2 +-
src/lib/elementary/elm_scroller.c | 2 +-
src/lib/elementary/elm_widget.c | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/lib/elementary/efl_ui_button.c
b/src/lib/elementary/efl_ui_button.c
index 36eaebd5bf..2f820baae3 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -409,7 +409,7 @@ _efl_ui_button_class_constructor(Efl_Class *klass)
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)
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_button, _content_aliases[0].real_part)
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_button, _content_aliases[0].real_part)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
/* Efl.Part begin */
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index c001567b5d..feb83ffdb9 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2353,7 +2353,7 @@ ELM_PART_OVERRIDE(efl_ui_flip, EFL_UI_FLIP,
Efl_Ui_Flip_Data)
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data)
ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data)
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_flip, "front")
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_flip, "front")
#include "efl_ui_flip_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/efl_ui_frame.c
b/src/lib/elementary/efl_ui_frame.c
index 2ca12ad428..b1cab58135 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -215,7 +215,7 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data)
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_frame, "elm.swallow.content")
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_frame, "elm.swallow.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data)
/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/efl_ui_popup.c
b/src/lib/elementary/efl_ui_popup.c
index 0975386735..7f8fbe133b 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -253,7 +253,7 @@ _efl_ui_popup_content_unset(Eo *obj, Efl_Ui_Popup_Data *pd
EINA_UNUSED, const ch
/* Standard widget overrides */
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_popup, "elm.swallow.content")
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_popup, "elm.swallow.content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data)
/* Efl.Part begin */
diff --git a/src/lib/elementary/efl_ui_radio.c
b/src/lib/elementary/efl_ui_radio.c
index f0b4f563fd..56b901f80c 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -366,7 +366,7 @@ _efl_ui_radio_efl_access_state_set_get(Eo *obj,
Efl_Ui_Radio_Data *pd EINA_UNUSE
/* Part APIs */
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_radio, "elm.swallow.content")
+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 */
diff --git a/src/lib/elementary/efl_ui_slider.c
b/src/lib/elementary/efl_ui_slider.c
index b5da71ef2a..0af9a787f2 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1355,7 +1355,7 @@
_efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_slider, _content_aliases[0].real_part)
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_slider, _content_aliases[0].real_part)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
static void
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 08b52d8a7a..ba35fee7ec 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7231,7 +7231,7 @@ ELM_PART_OVERRIDE(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data)
ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data)
ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data)
-ELM_PART_CONTENT_DEFAULT_SET(efl_ui_win, "content")
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_win, "content")
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_win, Efl_Ui_Win_Data)
#include "efl_ui_win_part.eo.c"
diff --git a/src/lib/elementary/elc_ctxpopup.c
b/src/lib/elementary/elc_ctxpopup.c
index b8e6f8018b..84543812e1 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1611,7 +1611,7 @@ ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP,
Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default")
+ELM_PART_CONTENT_DEFAULT_GET(elm_ctxpopup, "default")
#include "elm_ctxpopup_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elc_fileselector_entry.c
b/src/lib/elementary/elc_fileselector_entry.c
index 9557871d99..8b0c4238b0 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -628,7 +628,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry,
ELM_FILESELECTOR_ENTRY, El
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry,
ELM_FILESELECTOR_ENTRY, Elm_Fileselector_Entry_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY,
Elm_Fileselector_Entry_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY,
Elm_Fileselector_Entry_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon")
+ELM_PART_CONTENT_DEFAULT_GET(elm_fileselector_entry, "button icon")
#include "elm_fileselector_entry_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 33c434082e..27cd4f4bd2 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -698,7 +698,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_player,
Elm_Player_Data)
ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, Elm_Player_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, Elm_Player_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video")
+ELM_PART_CONTENT_DEFAULT_GET(elm_player, "video")
#include "elm_player_part.eo.c"
/* End of Efl.Part */
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 5889f4e728..d7bb894572 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1843,7 +1843,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_popup, ELM_POPUP,
Elm_Popup_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, Elm_Popup_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, Elm_Popup_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, Elm_Popup_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default")
+ELM_PART_CONTENT_DEFAULT_GET(elm_popup, "default")
#include "elm_popup_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 58097a7a6a..56c8c305db 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -6071,7 +6071,7 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY,
Elm_Entry_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
+ELM_PART_CONTENT_DEFAULT_GET(elm_entry, "icon")
#include "elm_entry_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 34fe7eb720..30647e7197 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -159,7 +159,7 @@ _elm_inwin_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_inwin)
-ELM_PART_CONTENT_DEFAULT_SET(elm_inwin, _content_aliases[0].real_part)
+ELM_PART_CONTENT_DEFAULT_GET(elm_inwin, _content_aliases[0].real_part)
#define ELM_INWIN_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index fcd2ef226e..97ab0d3259 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -445,7 +445,7 @@ ELM_PART_OVERRIDE(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_mapbuf, "default")
+ELM_PART_CONTENT_DEFAULT_GET(elm_mapbuf, "default")
#include "elm_mapbuf_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index b4fa304347..6a0b72c9af 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -709,7 +709,7 @@ ELM_PART_OVERRIDE_TEXT_GET(elm_notify, ELM_NOTIFY,
Elm_Notify_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data)
-ELM_PART_CONTENT_DEFAULT_SET(elm_notify, "default")
+ELM_PART_CONTENT_DEFAULT_GET(elm_notify, "default")
EOLIAN static const char *
_elm_notify_part_efl_ui_translatable_translatable_text_get(Eo *obj, void *_pd
EINA_UNUSED, const char **domain)
diff --git a/src/lib/elementary/elm_part_helper.h
b/src/lib/elementary/elm_part_helper.h
index f451437a38..25001d714e 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -23,7 +23,7 @@ struct _Elm_Part_Data
// FIXME: Some widgets return the alias name, some return the real name
// alias doesn't work for frame, _elm_layout_part_aliasing_eval() fails for
scroller
-#define ELM_PART_CONTENT_DEFAULT_SET(type, part) \
+#define ELM_PART_CONTENT_DEFAULT_GET(type, part) \
static const char * _ ## type ## _default_content_part_get(const Eo *obj
EINA_UNUSED, void *sd EINA_UNUSED) { return part; }
#define ELM_PART_CONTENT_DEFAULT_OPS(type) \
diff --git a/src/lib/elementary/elm_scroller.c
b/src/lib/elementary/elm_scroller.c
index e953961bbe..f06ad69165 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1374,7 +1374,7 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_scroller, ELM_SCROLLER,
Elm_Scroller_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, Elm_Scroller_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, Elm_Scroller_Data)
// FIXME: should be "content" but "default" was legacy API
-ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default")
+ELM_PART_CONTENT_DEFAULT_GET(elm_scroller, "default")
#include "elm_scroller_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index e629d7c700..2633f2e53e 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5635,7 +5635,7 @@ _efl_ui_widget_part_bg_efl_ui_image_scale_type_get(Eo
*obj, void *pd EINA_UNUSED
EFL_FUNC_BODY_CONST(elm_widget_default_content_part_get, const char *, NULL)
EFL_FUNC_BODY_CONST(elm_widget_default_text_part_get, const char *, NULL)
-ELM_PART_CONTENT_DEFAULT_SET(elm_widget, NULL)
+ELM_PART_CONTENT_DEFAULT_GET(elm_widget, NULL)
ELM_PART_TEXT_DEFAULT_GET(elm_widget, NULL)
#define ELM_WIDGET_EXTRA_OPS \
--
